threads / patch / 25216

patchgit-svn: fix processing of decorated commit hashes

Subject: [PATCH] git-svn: fix processing of decorated commit hashes

## tl;dr

2 messages between Sep 23, 2010 and Sep 24, 2010. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Mathias Lafeldt· Sep 23, 2010, 22:05 UTC · lore

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>
---
 git-svn.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to git-svn.perl +1 −1

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

Eric Wong· Sep 24, 2010, 16:28 UTC · re: Mathias Lafeldt · lore

Re: [PATCH] git-svn: fix processing of decorated commit hashes

Mathias Lafeldt <misfire@debugon.org> wrote:

Show 7 quoted lines

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

Show 19 quoted lines

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