git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Duy Nguyen <pclouds@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 0/2] Add "git rebase --show-patch"
Date: Sat, 27 Jan 2018 08:45:03 +0700	[thread overview]
Message-ID: <CACsJy8A=SDPEK7qeLRi_eLM+L5zszWWSiEQtbmQVuG1E2ENBig@mail.gmail.com> (raw)
In-Reply-To: <87372s78zo.fsf@passepartout.tim-landscheidt.de>

On Sat, Jan 27, 2018 at 1:47 AM, Tim Landscheidt <tim@tim-landscheidt.de> wrote:
> Nguyễn Thái Ngọc Duy <pclouds@gmail.com> 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

  reply	other threads:[~2018-01-27  1:45 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-26  9:55 Nguyễn Thái Ngọc Duy
2018-01-26  9:55 ` [PATCH 1/2] am: add --show-patch Nguyễn Thái Ngọc Duy
2018-01-26  9:55 ` [PATCH 2/2] rebase: " Nguyễn Thái Ngọc Duy
2018-01-26 11:12   ` Phillip Wood
2018-01-26 11:22     ` Duy Nguyen
2018-01-30 11:15       ` Phillip Wood
2018-01-26 19:11   ` Eric Sunshine
2018-01-27  1:42     ` Duy Nguyen
2018-01-26 18:47 ` [PATCH 0/2] Add "git rebase --show-patch" Tim Landscheidt
2018-01-27  1:45   ` Duy Nguyen [this message]
2018-01-27 11:26 ` Ævar Arnfjörð Bjarmason
2018-01-29 15:09 ` Johannes Schindelin
2018-01-30  9:10   ` Duy Nguyen
2018-01-30 12:32     ` Johannes Schindelin
2018-01-30 20:19       ` Junio C Hamano
2018-02-01  2:06         ` Tim Landscheidt
2018-01-31  9:30 ` [PATCH v2 0/3] " Nguyễn Thái Ngọc Duy
2018-01-31  9:30   ` [PATCH v2 1/3] am: add --show-current-patch Nguyễn Thái Ngọc Duy
2018-01-31  9:40     ` Eric Sunshine
2018-01-31 22:59       ` Junio C Hamano
2018-02-02  9:25         ` Duy Nguyen
2018-02-02  9:46           ` Eric Sunshine
2018-02-02  9:53             ` Duy Nguyen
2018-02-02 18:56           ` Junio C Hamano
2018-01-31  9:30   ` [PATCH] gitignore.txt: elaborate shell glob syntax Nguyễn Thái Ngọc Duy
2018-01-31 23:22     ` Junio C Hamano
2018-02-01  9:59       ` Duy Nguyen
2018-01-31  9:30   ` [PATCH v2 2/3] rebase: add --show-current-patch Nguyễn Thái Ngọc Duy
2018-01-31  9:30   ` [PATCH v2 3/3] rebase: introduce and use pseudo-ref ORIG_COMMIT Nguyễn Thái Ngọc Duy
2018-01-31 23:18     ` Junio C Hamano
2018-02-01 10:02       ` Duy Nguyen
2018-02-02 19:00         ` Junio C Hamano
2018-02-01 11:05     ` Phillip Wood
2018-02-11  9:43   ` [PATCH v3 0/3] Add "git rebase --show-current-patch" Nguyễn Thái Ngọc Duy
2018-02-11  9:43     ` [PATCH v3 1/3] am: add --show-current-patch Nguyễn Thái Ngọc Duy
2018-02-11  9:43     ` [PATCH v3 2/3] rebase: " Nguyễn Thái Ngọc Duy
2018-02-11  9:43     ` [PATCH v3 3/3] rebase: introduce and use pseudo-ref REBASE_HEAD Nguyễn Thái Ngọc Duy
2018-02-22  0:21     ` [PATCH v3 0/3] Add "git rebase --show-current-patch" Junio C Hamano
2018-02-22  0:54       ` Tim Landscheidt
2018-02-23 10:20         ` Duy Nguyen

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CACsJy8A=SDPEK7qeLRi_eLM+L5zszWWSiEQtbmQVuG1E2ENBig@mail.gmail.com' \
    --to=pclouds@gmail.com \
    --cc=git@vger.kernel.org \
    --subject='Re: [PATCH 0/2] Add "git rebase --show-patch"' \
    /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

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).