* [PATCH] git-svn: fix processing of decorated commit hashes
@ 2010-09-23 22:05 Mathias Lafeldt
2010-09-24 16:28 ` Eric Wong
0 siblings, 1 reply; 2+ messages in thread
From: Mathias Lafeldt @ 2010-09-23 22:05 UTC (permalink / raw)
To: git, Eric Wong
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] git-svn: fix processing of decorated commit hashes
2010-09-23 22:05 [PATCH] git-svn: fix processing of decorated commit hashes Mathias Lafeldt
@ 2010-09-24 16:28 ` Eric Wong
0 siblings, 0 replies; 2+ messages in thread
From: Eric Wong @ 2010-09-24 16:28 UTC (permalink / raw)
To: Mathias Lafeldt; +Cc: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-24 16:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-23 22:05 [PATCH] git-svn: fix processing of decorated commit hashes Mathias Lafeldt
2010-09-24 16:28 ` Eric Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).