Skip to content

Commit b6309ac

Browse files
melogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f59774a commit b6309ac

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-svn.perl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,7 @@ sub cmt_metadata {
11201120

11211121
sub working_head_info {
11221122
my ($head, $refs) = @_;
1123-
my @args = ('log', '--no-color', '--first-parent');
1123+
my @args = ('log', '--no-color', '--first-parent', '--pretty=medium');
11241124
my ($fh, $ctx) = command_output_pipe(@args, $head);
11251125
my $hash;
11261126
my %max;

0 commit comments

Comments
 (0)