diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2010-03-12 18:04:34 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-12 21:55:40 -0800 |
| commit | 6360d343af9acf7366be6ff89740f5077e12277b (patch) | |
| tree | ae4f1e77e120cf24e951ec729a7e006a50a880a7 | |
| parent | eb2151bb8938a8e2af86e3ed34243af7b1c95786 (diff) | |
| download | git-6360d343af9acf7366be6ff89740f5077e12277b.tar.gz git-6360d343af9acf7366be6ff89740f5077e12277b.tar.xz | |
commit --amend: copy notes to the new commit
Teaches 'git commit --amend' to copy notes. The catch is that this
must also be guarded by --no-post-rewrite, which we use to prevent
--amend from copying notes during a rebase -i 'edit'/'reword'.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-commit.c | 6 | ||||
| -rwxr-xr-x | t/t7501-commit.sh | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index f476d8529..ccc4f926c 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -1340,6 +1340,12 @@ int cmd_commit(int argc, const char **argv, const char *prefix) rerere(0); run_hook(get_index_file(), "post-commit", NULL); if (amend && !no_post_rewrite) { + struct notes_rewrite_cfg *cfg; + cfg = init_copy_notes_for_rewrite("amend"); + if (cfg) { + copy_note_for_rewrite(cfg, head_sha1, commit_sha1); + finish_copy_notes_for_rewrite(cfg); + } run_rewrite_hook(head_sha1, commit_sha1); } if (!quiet) diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 7940901d4..8297cb4f1 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -425,4 +425,16 @@ test_expect_success 'amend using the message from a commit named with tag' ' ' +test_expect_success 'amend can copy notes' ' + + git config notes.rewrite.amend true && + git config notes.rewriteRef "refs/notes/*" && + test_commit foo && + git notes add -m"a note" && + test_tick && + git commit --amend -m"new foo" && + test "$(git notes show)" = "a note" + +' + test_done |