From: Eric Wong <normalperson@yhbt.net>
Date: Fri, 24 Sep 2010 16:28:38 GMT
Subject: Re: [PATCH] git-svn: fix processing of decorated commit hashes
Message-ID: <20100924162838.GB4513@dcvr.yhbt.net>
In-Reply-To: <4C9BCF0F.5020101@debugon.org>

Mathias Lafeldt <misfire@debugon.org> wrote:
> 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.
> 
> Signed-off-by: Mathias Lafeldt <misfire@debugon.org>

Thanks Mathias,

I wrapped the long line to 80 chars but otherwise everything is good.

Acked-by: Eric Wong <normalperson@yhbt.net>

> ---
>  git-svn.perl |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/git-svn.perl b/git-svn.perl
> index 9b046b6..90e1236 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -1513,7 +1513,7 @@ 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;
> -- 
> 1.7.3