From: Johan Herland <johan@herland.net>
To: gitster@pobox.com
Cc: git@vger.kernel.org, jrnieder@gmail.com, pclouds@gmail.com,
artagnon@gmail.com, john@keeping.me.uk, vfr@lyx.org,
peff@peff.net, felipe.contreras@gmail.com,
torvalds@linux-foundation.org, johan@herland.net,
Thomas Rast <trast@inf.ethz.ch>
Subject: [PATCH 1/3] finish_copy_notes_for_rewrite(): Let caller provide commit message
Date: Wed, 12 Jun 2013 02:12:59 +0200 [thread overview]
Message-ID: <1370995981-1553-2-git-send-email-johan@herland.net> (raw)
In-Reply-To: <1370995981-1553-1-git-send-email-johan@herland.net>
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 <trast@inf.ethz.ch>
Signed-off-by: Johan Herland <johan@herland.net>
---
builtin.h | 2 +-
builtin/commit.c | 2 +-
builtin/notes.c | 9 +++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/builtin.h b/builtin.h
index faef559..78fb14d 100644
--- a/builtin.h
+++ b/builtin.h
@@ -36,7 +36,7 @@ struct notes_rewrite_cfg {
struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
const unsigned char *from_obj, const unsigned char *to_obj);
-void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c);
+void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c, const char *msg);
extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, int sha1_valid, char **buf, unsigned long *buf_size);
diff --git a/builtin/commit.c b/builtin/commit.c
index d2f30d9..f8df8ca 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);
}
diff --git a/builtin/notes.c b/builtin/notes.c
index 57748a6..6a80714 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -403,11 +403,11 @@ int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
return ret;
}
-void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c)
+void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c, const char *msg)
{
int i;
for (i = 0; c->trees[i]; i++) {
- commit_notes(c->trees[i], "Notes added by 'git notes copy'");
+ commit_notes(c->trees[i], msg);
free_notes(c->trees[i]);
}
free(c->trees);
@@ -420,6 +420,7 @@ static int notes_copy_from_stdin(int force, const char *rewrite_cmd)
struct notes_rewrite_cfg *c = NULL;
struct notes_tree *t = NULL;
int ret = 0;
+ const char *msg = "Notes added by 'git notes copy'";
if (rewrite_cmd) {
c = init_copy_notes_for_rewrite(rewrite_cmd);
@@ -461,10 +462,10 @@ static int notes_copy_from_stdin(int force, const char *rewrite_cmd)
}
if (!rewrite_cmd) {
- commit_notes(t, "Notes added by 'git notes copy'");
+ commit_notes(t, msg);
free_notes(t);
} else {
- finish_copy_notes_for_rewrite(c);
+ finish_copy_notes_for_rewrite(c, msg);
}
return ret;
}
--
1.8.1.3.704.g33f7d4f
next prev parent reply other threads:[~2013-06-12 0:13 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-08 17:29 [PATCH] build: get rid of the notion of a git library Felipe Contreras
2013-06-08 18:02 ` Ramkumar Ramachandra
2013-06-08 18:22 ` Felipe Contreras
2013-06-09 14:56 ` Ramkumar Ramachandra
2013-06-09 15:12 ` John Keeping
2013-06-09 15:40 ` Felipe Contreras
2013-06-09 16:02 ` John Keeping
2013-06-09 16:22 ` Felipe Contreras
2013-06-09 16:42 ` John Keeping
2013-06-09 17:03 ` Ramkumar Ramachandra
2013-06-09 17:12 ` Ramkumar Ramachandra
2013-06-09 17:13 ` Felipe Contreras
2013-06-09 17:32 ` John Keeping
2013-06-09 17:45 ` Felipe Contreras
2013-06-09 16:36 ` Ramkumar Ramachandra
2013-06-09 17:30 ` Vincent van Ravesteijn
2013-06-09 17:35 ` Felipe Contreras
2013-06-10 21:45 ` Jeff King
2013-06-10 21:52 ` Felipe Contreras
2013-06-10 22:06 ` Jeff King
2013-06-10 22:22 ` Felipe Contreras
2013-06-10 23:05 ` Junio C Hamano
2013-06-10 23:41 ` Junio C Hamano
2013-06-10 23:51 ` Felipe Contreras
2013-06-11 0:04 ` Junio C Hamano
2013-06-11 1:53 ` Junio C Hamano
2013-06-11 4:15 ` Felipe Contreras
2013-06-11 17:33 ` Junio C Hamano
2013-06-11 17:41 ` Felipe Contreras
2013-06-11 17:58 ` Junio C Hamano
2013-06-11 18:06 ` Felipe Contreras
2013-06-11 18:14 ` Linus Torvalds
2013-06-11 19:15 ` Felipe Contreras
2013-06-11 19:59 ` Junio C Hamano
2013-06-11 20:12 ` Felipe Contreras
2013-06-12 0:12 ` [PATCH 0/3] Refactor useful notes functions into notes-utils.[ch] Johan Herland
2013-06-12 0:12 ` Johan Herland [this message]
2013-06-12 17:27 ` [PATCH 1/3] finish_copy_notes_for_rewrite(): Let caller provide commit message Junio C Hamano
2013-06-12 0:13 ` [PATCH 2/3] Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c Johan Herland
2013-06-12 0:32 ` Felipe Contreras
2013-06-12 7:10 ` Johan Herland
2013-06-12 18:28 ` Felipe Contreras
2013-06-12 19:14 ` Johan Herland
2013-06-12 19:18 ` Felipe Contreras
2013-06-13 6:45 ` Andreas Krey
2013-06-13 13:13 ` Felipe Contreras
2013-06-12 20:02 ` Junio C Hamano
2013-06-12 0:13 ` [PATCH 3/3] Move create_notes_commit() from notes-merge.c into notes-utils.c Johan Herland
2013-06-12 20:02 ` [PATCH 0/3] Refactor useful notes functions into notes-utils.[ch] Junio C Hamano
2013-06-12 20:11 ` Felipe Contreras
2013-06-13 17:24 ` Junio C Hamano
2013-06-13 18:16 ` Felipe Contreras
2013-06-13 18:50 ` Felipe Contreras
2013-06-11 18:17 ` [PATCH] build: get rid of the notion of a git library Junio C Hamano
2013-06-11 19:01 ` Felipe Contreras
2013-06-11 19:24 ` Junio C Hamano
2013-06-11 19:49 ` Felipe Contreras
2013-06-11 4:04 ` Felipe Contreras
2013-06-09 15:41 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1370995981-1553-2-git-send-email-johan@herland.net \
--to=johan@herland.net \
--cc=artagnon@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--cc=jrnieder@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=torvalds@linux-foundation.org \
--cc=trast@inf.ethz.ch \
--cc=vfr@lyx.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).