aboutsummaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorPedro Melo <melo@simplicidade.org>2008-04-10 17:05:21 +0100
committerJunio C Hamano <gitster@pobox.com>2008-04-11 17:35:35 -0700
commitb6309ac2b8bc9794f4e8e9e829ccfa3360f2df49 (patch)
tree63aec325c9b583fe15637d1bb7cd3a8bd9083457 /git-svn.perl
parentf59774add488a6c5fb440a4aaa7255f594b1027d (diff)
downloadgit-b6309ac2b8bc9794f4e8e9e829ccfa3360f2df49.tar.gz
git-b6309ac2b8bc9794f4e8e9e829ccfa3360f2df49.tar.xz
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>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl2
1 files changed, 1 insertions, 1 deletions
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;