From: Mathias Lafeldt <misfire@debugon.org>
Date: Thu, 23 Sep 2010 22:05:03 +0000 (+0200)
Subject: git-svn: fix processing of decorated commit hashes
X-Git-Tag: v1.7.3.2~25^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8565a568cdd8604d4b5a00e52c64064a8aebf690;p=git.git

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>
---

diff --git a/git-svn.perl b/git-svn.perl
index c7c4dcdba..18cfb2466 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;