Re: [PATCH 2/2] rebase: add --show-patch
- From
Duy Nguyen <pclouds@gmail.com>
- Date
- Jan 27, 2018, 01:42 UTC
- Message-ID
- <CACsJy8C4LO0x3HHYQeKzrA7XqFVLDQkoY8+=Cm7RB4k0wjaPXw@mail.gmail.com>
- In-Reply-To
- <CAPig+cSjxiOTEKuOR9zGrY=Z_RoSBPHaiyNkzp-tXjSVNj3RHg@mail.gmail.com>
On Sat, Jan 27, 2018 at 2:11 AM, Eric Sunshine <sunshine@sunshineco.com> wrote:
Show 24 quoted lines
> On Fri, Jan 26, 2018 at 4:55 AM, Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:
>> It is useful to see the full patch while resolving conflicts in a
>> rebase. The only way to do it now is
>>
>> less .git/rebase-*/patch
>>
>> which could turn out to be a lot longer to type [1] if you are in a
>> linked worktree, or not at top-dir. On top of that, an ordinary user
>> should not need to peek into .git directory. The new option is
>> provided to examine the patch.
>> [...]
>>
>> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
>> ---
>> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
>> @@ -840,6 +840,10 @@ To continue rebase after editing, run:
>> +show-patch)
>> + cmt="$(cat "$state_dir/stopped-sha")"
>> + exec git format-patch --subject-prefix= --stdout "${cmt}^!"
>> + ;;
>
> What is the behavior if a rebase (or conflicted rebase) is not in
> progress? Stated differently, do we only make it this far if
> $state_dir/stopped_sha exists?It belongs to the same --continue/--skip/--abort group and won't reach here unless a rebase is in progress (i.e. $state_dir exists).
-- Duy