On Sat, Jan 27, 2018 at 1:47 AM, Tim Landscheidt <tim@xxxxxxxxxxxxxxxxxx> wrote:
> Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> wrote:
>
>> When a conflict happens during a rebase, you often need to look at the
>> original patch to see what the changes are. This requires opening your
>> favourite pager with some random path inside $GIT_DIR.
>
>> This series makes that experience a bit better, by providing a command
>> to read the patch. This is along the line of --edit-todo and --quit
>> where you can just tell git what to do and not bother with details.
>
>> My main focus is "git rebase", but because rebase uses "git am" behind
>> the scene, "git am" gains --show-patch option too.
>
>> There was something more I wanted to do, like coloring to the patch.
>> But that probably will come later. I'll try to merge these two
>> 21-months-old patches first.
>
>> […]
>
> I dislike the approach to use a separate command/option.
> The nice thing about rebase-apply/original-commit is that
> you can use it in /any/ git command, i. e. you can do "git
> log $whatever..rebase-apply/original-commit".
>
> What I would do instead is (besides documenting it :-)) to
> provide an alias that is more in line with ORIG_HEAD,
> FETCH_HEAD, etc.; i. e. something along the lines of (pseudo
> code, will probably not work):
>
> | --- a/builtin/am.c
> | +++ b/builtin/am.c
> | @@ -1110,6 +1110,7 @@ static void am_next(struct am_state *state)
> |
> | oidclr(&state->orig_commit);
> | unlink(am_path(state, "original-commit"));
> | + delete_ref(NULL, "ORIG_COMMIT", NULL, 0);
> |
> | if (!get_oid("HEAD", &head))
> | write_state_text(state, "abort-safety", oid_to_hex(&head));
> | @@ -1441,6 +1442,7 @@ static int parse_mail_rebase(struct am_state *state, const char *mail)
> |
> | oidcpy(&state->orig_commit, &commit_oid);
> | write_state_text(state, "original-commit", oid_to_hex(&commit_oid));
> | + update_ref_oid("am", "ORIG_COMMIT", &commit_oid, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
> |
> | return 0;
> | }
>
> This (when working) would allow to use ORIG_COMMIT in place
> of the mouthful rebase-apply/original-commit.
Interesting. Taken out of context, I don't think it really works for
"git am" because the source patches are in text form and "git am" only
fails when it can't apply the patch (and won't be able to create a
commit). But for rebase I can see how this is a good thing. Thanks.
Let me sleep on it for a bit. It works for cherry-pick too.
--
Duy
