diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:30 -0700 |
| commit | 22d94a72b3c4fa7989c4827e84ebc364a200cd76 (patch) | |
| tree | f71226003264e37bc59f505a542f5468292c460d /builtin/commit.c | |
| parent | 0039d60c3fdf0e01ad7e6fce59b2522764f2edc8 (diff) | |
| parent | bf9a05ba46a9d464424d22482aaa54abdd28b77d (diff) | |
| download | git-22d94a72b3c4fa7989c4827e84ebc364a200cd76.tar.gz git-22d94a72b3c4fa7989c4827e84ebc364a200cd76.tar.xz | |
Merge branch 'jh/libify-note-handling'
Make it possible to call into copy-notes API from the sequencer code.
* jh/libify-note-handling:
Move create_notes_commit() from notes-merge.c into notes-utils.c
Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
finish_copy_notes_for_rewrite(): Let caller provide commit message
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 1621dfcd4..6b693c16d 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] [--] <pathspec>..."), @@ -1593,7 +1594,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); } |