git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pedro Melo <melo@simplicidade.org>
To: git@vger.kernel.org
Cc: Pedro Melo <melo@simplicidade.org>
Subject: [PATCH] Force the medium pretty format on calls to git log
Date: Thu, 10 Apr 2008 17:05:21 +0100	[thread overview]
Message-ID: <1207843521-8492-1-git-send-email-melo@simplicidade.org> (raw)

If a user as set a format.pretty in his config, git-svn rebase will fail with:

Unable to determine upstream SVN information from working tree history

We need to force the medium format to obtain the needed information from the log.

Signed-off-by: Pedro Melo <melo@simplicidade.org>
---
 git-svn.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index 81afb5c..b864b54 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1120,7 +1120,7 @@ sub cmt_metadata {
 
 sub working_head_info {
 	my ($head, $refs) = @_;
-	my @args = ('log', '--no-color', '--first-parent');
+	my @args = ('log', '--no-color', '--first-parent', '--pretty=medium');
 	my ($fh, $ctx) = command_output_pipe(@args, $head);
 	my $hash;
 	my %max;
-- 
1.5.5.23.g2a5f

             reply	other threads:[~2008-04-10 16:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-10 16:05 Pedro Melo [this message]
2008-04-11  5:41 ` [PATCH] Force the medium pretty format on calls to git log Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1207843521-8492-1-git-send-email-melo@simplicidade.org \
    --to=melo@simplicidade.org \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).