From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org,
"brian m. carlson" <sandals@crustytoothpaste.net>,
Alban Gruin <alban.gruin@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH 2/3] rebase -i: re-fix short SHA-1 collision
Date: Fri, 17 Jan 2020 22:31:16 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2001172229300.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqimladjh3.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Fri, 17 Jan 2020, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > + /* Expand the commit IDs */
> > + todo_list_to_strbuf(r, &new_todo, &buf2, -1, 0);
> > + strbuf_swap(&new_todo.buf, &buf2);
> > + strbuf_release(&buf2);
> > + new_todo.total_nr -= new_todo.nr;
> > + if (todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo) < 0) {
> > + fprintf(stderr, _(edit_todo_list_advice));
> > + checkout_onto(r, opts, onto_name, &onto->object.oid, orig_head);
> > + todo_list_release(&new_todo);
> > + return error(_("invalid todo list after expanding IDs"));
> > + }
>
> The above happens after edit_todo_list() returns and then the
> resulting data (i.e. new_todo) that came from the on-disk file has
> been parsed with an existing call to todo_lsit_parse_insn_buffer()?
>
> I am wondering when this if() statement would trigger, iow, under
> what condition the result of "Expand the commit IDs" operation fails
> to be parsed correctly, and what the user can do to remedy it.
You're right, this is defensive code to guard against bugs, but the error
message suggests that it might be a user error: it isn't.
> Especially given that incoming new_todo has passed the existing
> parse and check without hitting "return -1" we see above in the
> context, I am not sure if there is anything, other than any
> potential glitch in the added code above, that can cause this second
> parse_insn_buffer() to fail. Shouldn't the body of if() be simply a
> BUG()?
It should.
Will fix,
Dscho
> Or am I somehow missing a hunk that removes an existing call to
> parse&check?
>
> > diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> > index ae6e55ce79..1cc9f36bc7 100755
> > --- a/t/t3404-rebase-interactive.sh
> > +++ b/t/t3404-rebase-interactive.sh
> > @@ -1264,13 +1264,24 @@ test_expect_success SHA1 'short SHA-1 setup' '
> > test_expect_success SHA1 'short SHA-1 collide' '
> > test_when_finished "reset_rebase && git checkout master" &&
> > git checkout collide &&
> > + colliding_sha1=6bcda37 &&
> > + test $colliding_sha1 = "$(git rev-parse HEAD | cut -c 1-7)" &&
> > (
> > unset test_tick &&
> > test_tick &&
> > set_fake_editor &&
> > FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \
> > - FAKE_LINES="reword 1 2" git rebase -i HEAD~2
> > - )
> > + FAKE_LINES="reword 1 break 2" git rebase -i HEAD~2 &&
> > + test $colliding_sha1 = "$(git rev-parse HEAD | cut -c 1-7)" &&
> > + grep "^pick $colliding_sha1 " \
> > + .git/rebase-merge/git-rebase-todo.tmp &&
> > + grep "^pick [0-9a-f]\{40\}" \
> > + .git/rebase-merge/git-rebase-todo &&
> > + git rebase --continue
> > + ) &&
> > + collide2="$(git rev-parse HEAD~1 | cut -c 1-4)" &&
> > + collide3="$(git rev-parse collide3 | cut -c 1-4)" &&
> > + test "$collide2" = "$collide3"
> > '
> >
> > test_expect_success 'respect core.abbrev' '
>
>
next prev parent reply other threads:[~2020-01-17 21:31 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-16 21:18 [PATCH 0/3] Re-fix rebase -i with SHA-1 collisions Johannes Schindelin via GitGitGadget
2020-01-16 21:18 ` [PATCH 1/3] parse_insn_line(): improve error message when parsing failed Johannes Schindelin via GitGitGadget
2020-01-17 18:00 ` Junio C Hamano
2020-01-16 21:18 ` [PATCH 2/3] rebase -i: re-fix short SHA-1 collision Johannes Schindelin via GitGitGadget
2020-01-17 18:30 ` Junio C Hamano
2020-01-17 21:31 ` Johannes Schindelin [this message]
2020-01-16 21:18 ` [PATCH 3/3] rebase -i: also avoid SHA-1 collisions with missingCommitsCheck Johannes Schindelin via GitGitGadget
2020-01-16 23:54 ` [PATCH 0/3] Re-fix rebase -i with SHA-1 collisions brian m. carlson
2020-01-17 9:51 ` Johannes Schindelin
2020-01-17 22:37 ` brian m. carlson
2020-01-21 18:00 ` Junio C Hamano
2020-01-17 23:38 ` [PATCH v2 " Johannes Schindelin via GitGitGadget
2020-01-17 23:38 ` [PATCH v2 1/3] parse_insn_line(): improve error message when parsing failed Johannes Schindelin via GitGitGadget
2020-01-21 22:04 ` Junio C Hamano
2020-01-23 12:26 ` Johannes Schindelin
2020-01-17 23:38 ` [PATCH v2 2/3] rebase -i: re-fix short SHA-1 collision Johannes Schindelin via GitGitGadget
2020-01-20 16:49 ` Eric Sunshine
2020-01-20 20:04 ` Johannes Schindelin
2020-01-20 20:08 ` Eric Sunshine
2020-01-21 11:49 ` Johannes Schindelin
2020-01-21 22:02 ` Junio C Hamano
2020-01-22 14:10 ` Johannes Schindelin
2020-01-22 18:15 ` Junio C Hamano
2020-01-17 23:38 ` [PATCH v2 3/3] rebase -i: also avoid SHA-1 collisions with missingCommitsCheck Johannes Schindelin via GitGitGadget
2020-01-23 12:28 ` [PATCH v3 0/3] Re-fix rebase -i with SHA-1 collisions Johannes Schindelin via GitGitGadget
2020-01-23 12:28 ` [PATCH v3 1/3] parse_insn_line(): improve error message when parsing failed Johannes Schindelin via GitGitGadget
2020-01-23 12:28 ` [PATCH v3 2/3] rebase -i: re-fix short SHA-1 collision Johannes Schindelin via GitGitGadget
2020-01-23 12:28 ` [PATCH v3 3/3] rebase -i: also avoid SHA-1 collisions with missingCommitsCheck Johannes Schindelin via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2001172229300.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=alban.gruin@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=sandals@crustytoothpaste.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).