diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2010-03-12 17:04:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-13 05:55:40 (GMT) |
| commit | eb2151bb8938a8e2af86e3ed34243af7b1c95786 (patch) | |
| tree | 3662a91fb03bd6c76d6ff1caa3409eeacf72f18d /t/t3400-rebase.sh | |
| parent | 6956f858f6237d426fa422949033e3c558104802 (diff) | |
| download | git-eb2151bb8938a8e2af86e3ed34243af7b1c95786.zip git-eb2151bb8938a8e2af86e3ed34243af7b1c95786.tar.gz git-eb2151bb8938a8e2af86e3ed34243af7b1c95786.tar.bz2 | |
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/t3400-rebase.sh')
| -rwxr-xr-x | t/t3400-rebase.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 4e6a44b..cca2840 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -155,4 +155,21 @@ test_expect_success 'Rebase a commit that sprinkles CRs in' ' git diff --exit-code file-with-cr:CR HEAD:CR ' +test_expect_success 'rebase 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)" +' + +test_expect_success 'rebase -m can copy notes' ' + git reset --hard n3 && + git rebase -m --onto n1 n2 && + test "a note" = "$(git notes show HEAD)" +' + test_done |