Skip to content

Commit 8565a56

Browse files
mlafeldtEric Wong
authored andcommitted
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 <[email protected]> Acked-by: Eric Wong <[email protected]>
1 parent a3c7505 commit 8565a56

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

git-svn.perl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1513,7 +1513,8 @@ sub cmt_sha2rev_batch {
15131513

15141514
sub working_head_info {
15151515
my ($head, $refs) = @_;
1516-
my @args = ('log', '--no-color', '--first-parent', '--pretty=medium');
1516+
my @args = qw/log --no-color --no-decorate --first-parent
1517+
--pretty=medium/;
15171518
my ($fh, $ctx) = command_output_pipe(@args, $head);
15181519
my $hash;
15191520
my %max;

0 commit comments

Comments
 (0)