Thread (47 messages) flat view 47 messages, 6 authors, 2021-09-24

Re: [PATCH v2 00/11] rebase: dereference tags

From: Elijah Newren <hidden>
Date: 2021-09-14 04:03:02

On Mon, Sep 13, 2021 at 8:46 AM Phillip Wood via GitGitGadget
[off-list ref] wrote:
Thanks to Ævar and Johannes for their comments.

 * Changed "! test_cmp_rev" to "test_cmp_rev !" (suggested by Ævar)
 * Fixed the quoting for the title of the "rebase --quit" tests.
 * Reworked the last commit to handle the error case first (suggested by
   Ævar)
 * Tweaked the commit messages for patches 8 & 11
 * Rebased onto 31e4a0db03 ("Merge branch 'ab/rebase-fatal-fatal-fix'",
   2021-09-08) to avoid a merge conflict that upset gitgitgadget

Cover letter for V1:

Aborting a rebase stated with git rebase <upstream> <tag-object> should
checkout the commit pointed to by . Instead it gives

    error: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write non-commit object       710d743b2b9892457fdcc3970f397e6ec07447e0 to branch 'HEAD'


The fix for that is in the last patch, the rest of the patches are cleanups
to t3407 and builtin/rebase.c
Might make sense to split this into 3 separate series (t3407 cleanups,
builtin/rebase.c cleanups, and the handling of tag objects).  But
anyway, reading over the 11 patches, the only issue I noticed was what
appears to be a simple typo.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help