From: Pedro Melo <melo@simplicidade.org>
Date: Thu, 10 Apr 2008 16:05:21 +0000 (+0100)
Subject: Force the medium pretty format on calls to git log
X-Git-Tag: v1.5.5.1~17
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b6309ac2b8bc9794f4e8e9e829ccfa3360f2df49;p=git.git

Force the medium pretty format on calls to git log

If a user has customized format.pretty in config, git-svn rebase fails with:

	Unable to determine upstream SVN information from working tree history

because the command expects to read the commit log in the default format.

This fixes the command to explicitly ask for the format it wants to read
from.

Signed-off-by: Pedro Melo <melo@simplicidade.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-svn.perl b/git-svn.perl
index 81afb5cfc..b864b54a4 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;