From 6360d343af9acf7366be6ff89740f5077e12277b Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Fri, 12 Mar 2010 18:04:34 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- builtin-commit.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'builtin-commit.c') diff --git a/builtin-commit.c b/builtin-commit.c index f476d85293..ccc4f926c0 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) -- cgit v1.2.3