Re: [PATCH v2 2/2] git-svn: un-break "git svn rebase" when log.abbrevCommit=true

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Feb 12, 2012, 00:31 UTC
Message-ID: <20120212003131.GG2719@burratino>
In-Reply-To: <1329006186-21346-2-git-send-email-avarab@gmail.com>

Ævar Arnfjörð Bjarmason wrote:

> Change git-svn to use git-rev-list(1) instead of git-log(1) since the
> latter is porcelain that'll cause "git svn rebase" to fail completely
> if log.abbrevCommit is set to true in the configuration.

[...]

Show 9 quoted lines

> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -1878,8 +1878,7 @@ sub cmt_sha2rev_batch {
>  
>  sub working_head_info {
>  	my ($head, $refs) = @_;
> -	my @args = qw/log --no-color --no-decorate --first-parent
> -	              --pretty=medium/;
> +	my @args = qw/rev-list --first-parent --pretty=medium/;

Thanks! The other caller to "git log" in this script uses --pretty=raw and should be safe.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>