Skip to content

Commit

Permalink
Force the medium pretty format on calls to git log
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pedro Melo authored and Junio C Hamano committed Apr 12, 2008
1 parent f59774a commit b6309ac
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-svn.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b6309ac

Please sign in to comment.