t6042: add testcase covering rename/rename(2to1)/delete/delete conflict

diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index ce6de6f491e5a6bf5f1d767e14af2b19c467330b..78f7c9958030bee8d8040eda0380ba5af16d0441 100755 (executable)
--- a/t/t3430-rebase-merges.sh
+++ b/t/t3430-rebase-merges.sh
@@ -313,4 +313,20 @@ test_expect_success 'A root commit can be a cousin, treat it that way' '
        EOF
 '
 
+test_expect_success 'labels that are object IDs are rewritten' '
+       git checkout -b third B &&
+       test_commit I &&
+       third=$(git rev-parse HEAD) &&
+       git checkout -b labels master &&
+       git merge --no-commit third &&
+       test_tick &&
+       git commit -m "Merge commit '\''$third'\'' into labels" &&
+       echo noop >script-from-scratch &&
+       test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+       test_tick &&
+       git rebase -i -r A &&
+       grep "^label $third-" .git/ORIGINAL-TODO &&
+       ! grep "^label $third$" .git/ORIGINAL-TODO
+'
+
 test_done