From 80a14665b199a0ccacceb095e3a8bfc4f1e8645e Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Wed, 12 Jun 2013 02:12:59 +0200 Subject: finish_copy_notes_for_rewrite(): Let caller provide commit message When copying notes for a rewritten object, the resulting notes commit would have the following hardcoded commit message: Notes added by 'git notes copy' This is obviously bogus when the notes rewriting is performed by 'git commit --amend'. Therefore, let the caller specify an appropriate notes commit message instead of hardcoding it. The above message is used for 'git notes copy', but when calling finish_copy_notes_for_rewrite() from builtin/commit.c, we use the following message instead: Notes added by 'git commit --amend' Cc: Thomas Rast Signed-off-by: Johan Herland Signed-off-by: Junio C Hamano --- builtin/commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin/commit.c') diff --git a/builtin/commit.c b/builtin/commit.c index d2f30d960a..f8df8ca60d 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1591,7 +1591,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) if (cfg) { /* we are amending, so current_head is not NULL */ copy_note_for_rewrite(cfg, current_head->object.sha1, sha1); - finish_copy_notes_for_rewrite(cfg); + finish_copy_notes_for_rewrite(cfg, "Notes added by 'git commit --amend'"); } run_rewrite_hook(current_head->object.sha1, sha1); } -- cgit v1.2.1 From 49c2470400bbb695b953abeb4e6737be747317af Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Wed, 12 Jun 2013 02:13:00 +0200 Subject: Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c This is a pure code movement of the machinery for copying notes to rewritten objects. This code was located in builtin/notes.c for historical reasons. In order to make it available to builtin/commit.c it was declared in builtin.h. This was more of an accident of history than a concious design, and we now want to make this machinery more widely available. Hence, this patch moves the code into the new notes-utils.[hc] files which are included into libgit.a. Except for adjusting #includes accordingly, this patch merely moves the relevant functions verbatim into the new files. Cc: Thomas Rast Signed-off-by: Johan Herland Signed-off-by: Junio C Hamano --- builtin/commit.c | 1 + 1 file changed, 1 insertion(+) (limited to 'builtin/commit.c') diff --git a/builtin/commit.c b/builtin/commit.c index f8df8ca60d..ce40176087 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -29,6 +29,7 @@ #include "gpg-interface.h" #include "column.h" #include "sequencer.h" +#include "notes-utils.h" static const char * const builtin_commit_usage[] = { N_("git commit [options] [--] ..."), -- cgit v1.2.1