diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2012-02-12 00:23:06 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2012-02-21 21:37:31 +0000 |
| commit | 83cf21f9852f22f5a46a48e3b636ecc6403a717e (patch) | |
| tree | 84da9e6c18cdf5200e0335de50d8cb3946d32085 /git-svn.perl | |
| parent | b380e3a79211f59adf6761968ff76c8d6535f72e (diff) | |
| download | git-83cf21f9852f22f5a46a48e3b636ecc6403a717e.tar.gz git-83cf21f9852f22f5a46a48e3b636ecc6403a717e.tar.xz | |
git-svn: un-break "git svn rebase" when log.abbrevCommit=true
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.
Without this patch the code will fail to parse a SHA1, and then just
spew a bunch of "Use of uninitialized value $hash in string eq"
warnings at "if ($c && $c eq $hash) { ..." and never do anything
useful.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl index 712eeebe1..bebe38b1a 100755 --- 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/; my ($fh, $ctx) = command_output_pipe(@args, $head); my $hash; my %max; |