diff options
author | Doan Tran Cong Danh <congdanhqx@gmail.com> | 2019-11-18 18:57:47 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-11-20 11:53:57 +0900 |
commit | e02058a72967b18bd906674de6191f42d03b0763 (patch) | |
tree | d5f2580ad5866c767ad05111f5ae096b054b8ee1 /xdiff-interface.h | |
parent | rebase -r: let `label` generate safer labels (diff) | |
download | tgif-e02058a72967b18bd906674de6191f42d03b0763.tar.xz |
sequencer: handle rebase-merges for "onto" message
In order to work correctly, git-rebase --rebase-merges needs to make
initial todo list with unique labels.
Those unique labels is being handled by employing a hashmap and
appending an unique number if any duplicate is found.
But, we forget that beside those labels for side branches,
we also have a special label `onto' for our so-called new-base.
In a special case that any of those labels for side branches named
`onto', git will run into trouble.
Correct it.
Signed-off-by: Doan Tran Cong Danh <congdanhqx@gmail.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions