diff options
| author | Mathias Lafeldt <misfire@debugon.org> | 2010-09-23 22:05:03 (GMT) |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2010-09-24 16:24:20 (GMT) |
| commit | 8565a568cdd8604d4b5a00e52c64064a8aebf690 (patch) | |
| tree | 524fe825c7a8cd568e16befc96033bc2c316d006 | |
| parent | a3c75056dc73661a6cdab180659f52cdb03b357c (diff) | |
| download | git-8565a568cdd8604d4b5a00e52c64064a8aebf690.zip git-8565a568cdd8604d4b5a00e52c64064a8aebf690.tar.gz git-8565a568cdd8604d4b5a00e52c64064a8aebf690.tar.bz2 | |
git-svn: fix processing of decorated commit hashes
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>
| -rwxr-xr-x | git-svn.perl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl index c7c4dcd..18cfb24 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -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; |