# [PATCH] git-svn: un-break "git svn rebase" when log.abbrevCommit=true 9 messages from 2012-01-29 to 2012-02-12. Participants: Ævar Arnfjörð Bjarmason, Jonathan Nieder, Dan Johnson, Eric Wong. Thread: https://gitlist.dev/t/29462 ## Ævar Arnfjörð Bjarmason, 2012-01-29 02:11 Subject: [PATCH] git-svn: un-break "git svn rebase" when log.abbrevCommit=true Message-ID: <1327803073-7000-1-git-send-email-avarab@gmail.com> URL: https://gitlist.dev/e/1327803073-7000-1-git-send-email-avarab%40gmail.com ``` Change git-svn to parse --no-abbrev-commit --no-decorate to git-log since it's trying to parse the log output, and the parsing will fail completely if log.abbrevCommit is set to true in the configuration, also set --no-decorate so we won't fail if we're processing a commit that has a tag pointing to it. 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. A real fix would be to make git-svn not use any porcelain utilities, but just work around it for now. Signed-off-by: Ævar Arnfjörð Bjarmason --- git-svn.perl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index eeb83d3..570fe9c 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1879,7 +1879,8 @@ sub cmt_sha2rev_batch { sub working_head_info { my ($head, $refs) = @_; my @args = qw/log --no-color --no-decorate --first-parent - --pretty=medium/; + --pretty=medium --no-abbrev-commit --no-decorate/; + my ($fh, $ctx) = command_output_pipe(@args, $head); my $hash; my %max; -- 1.7.8.3 ``` ## Jonathan Nieder, 2012-01-29 02:59 Subject: Re: [PATCH] git-svn: un-break "git svn rebase" when log.abbrevCommit=true Message-ID: <20120129025914.GA5981@burratino> URL: https://gitlist.dev/e/20120129025914.GA5981%40burratino In-Reply-To: <1327803073-7000-1-git-send-email-avarab@gmail.com> ``` Ævar Arnfjörð Bjarmason wrote: > --- a/git-svn.perl > +++ b/git-svn.perl > @@ -1879,7 +1879,8 @@ sub cmt_sha2rev_batch { > sub working_head_info { > my ($head, $refs) = @_; > my @args = qw/log --no-color --no-decorate --first-parent > - --pretty=medium/; > + --pretty=medium --no-abbrev-commit --no-decorate/; > + Oh, dear. Wouldn't my @args = qw/rev-list --first-parent --pretty=medium/; be simpler and more robust as a quick fix? Of course something that takes plain rev-list --first-parent output and pipes it through to cat-file --batch might be more intuitive, but rev-list --pretty should at least work. ;-) ``` ## Ævar Arnfjörð Bjarmason, 2012-01-29 03:12 Subject: Re: [PATCH] git-svn: un-break "git svn rebase" when log.abbrevCommit=true Message-ID: URL: https://gitlist.dev/e/CACBZZX4_54LNqiEEA1BVvJFcLh_o%3D_ErHWGZMxSHTV2yTqte_Q%40mail.gmail.com In-Reply-To: <20120129025914.GA5981@burratino> ``` On Sun, Jan 29, 2012 at 03:59, Jonathan Nieder wrote: > Ævar Arnfjörð Bjarmason wrote: > >> --- a/git-svn.perl >> +++ b/git-svn.perl >> @@ -1879,7 +1879,8 @@ sub cmt_sha2rev_batch { >>  sub working_head_info { >>       my ($head, $refs) = @_; >>       my @args = qw/log --no-color --no-decorate --first-parent >> -                   --pretty=medium/; >> +                   --pretty=medium --no-abbrev-commit --no-decorate/; >> + > > Oh, dear.  Wouldn't > >        my @args = qw/rev-list --first-parent --pretty=medium/; > > be simpler and more robust as a quick fix? > > Of course something that takes plain rev-list --first-parent output > and pipes it through to cat-file --batch might be more intuitive, but > rev-list --pretty should at least work. ;-) That sounds like a better fix. I forgot that rev-list could emulate git-log like that. ``` ## Dan Johnson, 2012-01-30 20:41 Subject: Re: [PATCH] git-svn: un-break "git svn rebase" when log.abbrevCommit=true Message-ID: URL: https://gitlist.dev/e/CAPBPrntdWAM056C_iZDD1XZy6KZ%3D5rKvH98Owgc-J8ZbBwrErg%40mail.gmail.com In-Reply-To: <1327803073-7000-1-git-send-email-avarab@gmail.com> ``` On Sat, Jan 28, 2012 at 9:11 PM, Ævar Arnfjörð Bjarmason wrote: > Change git-svn to parse --no-abbrev-commit --no-decorate to git-log Did you mean _pass_ --no-abbrev-commit here? -- -Dan ``` ## Ævar Arnfjörð Bjarmason, 2012-01-30 21:18 Subject: Re: [PATCH] git-svn: un-break "git svn rebase" when log.abbrevCommit=true Message-ID: URL: https://gitlist.dev/e/CACBZZX5cwZ4Xz3-C8B3v4eEmyO0B-JiohfRATu1UhxzST0ar5w%40mail.gmail.com In-Reply-To: ``` On Mon, Jan 30, 2012 at 21:41, Dan Johnson wrote: > On Sat, Jan 28, 2012 at 9:11 PM, Ævar Arnfjörð Bjarmason > wrote: >> Change git-svn to parse --no-abbrev-commit --no-decorate to git-log > Did you mean _pass_ --no-abbrev-commit here? Yup. I'l submit another patch fixing this and using rev-list. ``` ## Ævar Arnfjörð Bjarmason, 2012-02-12 00:23 Subject: [PATCH v2 1/2] git-svn: remove redundant porcelain option to rev-list Message-ID: <1329006186-21346-1-git-send-email-avarab@gmail.com> URL: https://gitlist.dev/e/1329006186-21346-1-git-send-email-avarab%40gmail.com In-Reply-To: ``` Change an invocation of git-rev-list(1) to not use --no-color, git-rev-list(1) will always ignore that option and the --color option, so there's no need to pass it. Signed-off-by: Ævar Arnfjörð Bjarmason --- git-svn.perl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index eeb83d3..712eeeb 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -3920,7 +3920,7 @@ sub rebuild { my ($base_rev, $head) = ($partial ? $self->rev_map_max_norebuild(1) : (undef, undef)); my ($log, $ctx) = - command_output_pipe(qw/rev-list --pretty=raw --no-color --reverse/, + command_output_pipe(qw/rev-list --pretty=raw --reverse/, ($head ? "$head.." : "") . $self->refname, '--'); my $metadata_url = $self->metadata_url; -- 1.7.9 ``` ## Ævar Arnfjörð Bjarmason, 2012-02-12 00:23 Subject: [PATCH v2 2/2] git-svn: un-break "git svn rebase" when log.abbrevCommit=true Message-ID: <1329006186-21346-2-git-send-email-avarab@gmail.com> URL: https://gitlist.dev/e/1329006186-21346-2-git-send-email-avarab%40gmail.com In-Reply-To: <1329006186-21346-1-git-send-email-avarab@gmail.com> ``` 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 Helped-by: Jonathan Nieder --- git-svn.perl | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index 712eeeb..bebe38b 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; -- 1.7.9 ``` ## Jonathan Nieder, 2012-02-12 00:31 Subject: Re: [PATCH v2 2/2] git-svn: un-break "git svn rebase" when log.abbrevCommit=true Message-ID: <20120212003131.GG2719@burratino> URL: https://gitlist.dev/e/20120212003131.GG2719%40burratino 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. [...] > --- 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 ``` ## Eric Wong, 2012-02-12 06:49 Subject: Re: [PATCH v2 1/2] git-svn: remove redundant porcelain option to rev-list Message-ID: <20120212064942.GA30253@dcvr.yhbt.net> URL: https://gitlist.dev/e/20120212064942.GA30253%40dcvr.yhbt.net In-Reply-To: <1329006186-21346-1-git-send-email-avarab@gmail.com> ``` Ævar Arnfjörð Bjarmason wrote: > Change an invocation of git-rev-list(1) to not use --no-color, > git-rev-list(1) will always ignore that option and the --color option, > so there's no need to pass it. > > Signed-off-by: Ævar Arnfjörð Bjarmason Acked-by: Eric Wong Thanks, will push this series. ```