diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2010-03-12 18:04:33 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-12 21:55:40 -0800 |
| commit | eb2151bb8938a8e2af86e3ed34243af7b1c95786 (patch) | |
| tree | 3662a91fb03bd6c76d6ff1caa3409eeacf72f18d /t/t3404-rebase-interactive.sh | |
| parent | notes: implement helpers needed for note copying during rewrite (diff) | |
| download | tgif-eb2151bb8938a8e2af86e3ed34243af7b1c95786.tar.xz | |
rebase: support automatic notes copying
Luckily, all the support already happens to be there.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 4e3513709e..19668c2c92 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -553,4 +553,28 @@ test_expect_success 'reword' ' git show HEAD~2 | grep "C changed" ' +test_expect_success 'rebase -i can copy notes' ' + git config notes.rewrite.rebase true && + git config notes.rewriteRef "refs/notes/*" && + test_commit n1 && + test_commit n2 && + test_commit n3 && + git notes add -m"a note" n3 && + git rebase --onto n1 n2 && + test "a note" = "$(git notes show HEAD)" +' + +cat >expect <<EOF +an earlier note +a note +EOF + +test_expect_success 'rebase -i can copy notes over a fixup' ' + git reset --hard n3 && + git notes add -m"an earlier note" n2 && + GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 fixup 2" git rebase -i n1 && + git notes show > output && + test_cmp expect output +' + test_done |