Skip to content

Commit

Permalink
git-svn: fix processing of decorated commit hashes
Browse files Browse the repository at this point in the history
The function working_head_info() fails to parse commit hashes if they
are decorated (i.e. log.decorate is true), causing dcommit, rebase, and
other vital git-svn commands to malfunction.

This patch disables decorated log output with --no-decorate.

[ew: wrapped long line]

Signed-off-by: Mathias Lafeldt <misfire@debugon.org>
Acked-by: Eric Wong <normalperson@yhbt.net>
  • Loading branch information
Mathias Lafeldt authored and Eric Wong committed Sep 24, 2010
1 parent a3c7505 commit 8565a56
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion git-svn.perl
Original file line number Diff line number Diff line change
Expand Up @@ -1513,7 +1513,8 @@ sub cmt_sha2rev_batch {

sub working_head_info {
my ($head, $refs) = @_;
my @args = ('log', '--no-color', '--first-parent', '--pretty=medium');
my @args = qw/log --no-color --no-decorate --first-parent
--pretty=medium/;
my ($fh, $ctx) = command_output_pipe(@args, $head);
my $hash;
my %max;
Expand Down

0 comments on commit 8565a56

Please sign in to comment.