Commit aa37f3e
sequencer: ignore HEAD ref under --update-refs
When using the 'git rebase -i --update-refs' option, the todo list is
populated with 'update-ref' commands for all tip refs in the history
that is being rebased. Refs that are checked out by some worktree are
instead added as a comment to warn the user that they will not be
updated.
Until now, this included the HEAD ref, which is being updated by the
rebase process itself, regardless of the --update-refs option. Remove
the comment in this case by ignoring any decorations that match the HEAD
ref.
Reported-by: Elijah Newren <[email protected]>
Signed-off-by: Derrick Stolee <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>1 parent 3113fed commit aa37f3e
1 file changed
+13
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5888 | 5888 | | |
5889 | 5889 | | |
5890 | 5890 | | |
| 5891 | + | |
| 5892 | + | |
| 5893 | + | |
| 5894 | + | |
5891 | 5895 | | |
5892 | 5896 | | |
5893 | 5897 | | |
5894 | 5898 | | |
5895 | 5899 | | |
5896 | 5900 | | |
| 5901 | + | |
| 5902 | + | |
| 5903 | + | |
| 5904 | + | |
| 5905 | + | |
| 5906 | + | |
| 5907 | + | |
| 5908 | + | |
| 5909 | + | |
5897 | 5910 | | |
5898 | 5911 | | |
5899 | 5912 | | |
| |||
0 commit comments