undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/cherry-pick-reword' into maint

Browse Source 
* jk/cherry-pick-reword:
  cherry-pick: prettify the advice message
  cherry-pick: show commit name instead of sha1
  cherry-pick: format help message as strbuf
  cherry-pick: refactor commit parsing code
  cherry-pick: rewrap advice message
This commit is contained in:
Junio C Hamano 2010-02-17 14:55:24 -08:00
commit c69f921560
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
builtin-revert.c
View File

@ -38,6 +38,7 @@ static const char * const cherry_pick_usage[] = {
static int edit, no_replay, no_commit, mainline, signoff; static int edit, no_replay, no_commit, mainline, signoff;
static enum { REVERT, CHERRY_PICK } action; static enum { REVERT, CHERRY_PICK } action;
static struct commit *commit; static struct commit *commit;
static const char *commit_name;
static int allow_rerere_auto; static int allow_rerere_auto;
static const char *me; static const char *me;
@ -49,7 +50,6 @@ static void parse_args(int argc, const char **argv)
const char * const * usage_str = const char * const * usage_str =
action == REVERT ? revert_usage : cherry_pick_usage; action == REVERT ? revert_usage : cherry_pick_usage;
unsigned char sha1[20]; unsigned char sha1[20];
const char *arg;
int noop; int noop;
struct option options[] = { struct option options[] = {
OPT_BOOLEAN('n', "no-commit", &no_commit, "don't automatically commit"), OPT_BOOLEAN('n', "no-commit", &no_commit, "don't automatically commit"),
@ -64,19 +64,13 @@ static void parse_args(int argc, const char **argv)
if (parse_options(argc, argv, NULL, options, usage_str, 0) != 1) if (parse_options(argc, argv, NULL, options, usage_str, 0) != 1)
usage_with_options(usage_str, options); usage_with_options(usage_str, options);
arg = argv[0];
if (get_sha1(arg, sha1)) commit_name = argv[0];
die ("Cannot find '%s'", arg); if (get_sha1(commit_name, sha1))
commit = (struct commit *)parse_object(sha1); die ("Cannot find '%s'", commit_name);
commit = lookup_commit_reference(sha1);
if (!commit) if (!commit)
die ("Could not find %s", sha1_to_hex(sha1)); exit(1);
if (commit->object.type == OBJ_TAG) {
commit = (struct commit *)
deref_tag((struct object *)commit, arg, strlen(arg));
}
if (commit->object.type != OBJ_COMMIT)
die ("'%s' does not point to a commit", arg);
} }
static char *get_oneline(const char *message) static char *get_oneline(const char *message)
@ -204,25 +198,27 @@ static void set_author_ident_env(const char *message)
sha1_to_hex(commit->object.sha1)); sha1_to_hex(commit->object.sha1));
} }
static char *help_msg(const unsigned char *sha1) static char *help_msg(const char *name)
{ {
static char helpbuf[1024]; struct strbuf helpbuf = STRBUF_INIT;
char *msg = getenv("GIT_CHERRY_PICK_HELP"); char *msg = getenv("GIT_CHERRY_PICK_HELP");
if (msg) if (msg)
return msg; return msg;
strcpy(helpbuf, " After resolving the conflicts,\n" strbuf_addstr(&helpbuf, " After resolving the conflicts,\n"
"mark the corrected paths with 'git add <paths>' " "mark the corrected paths with 'git add <paths>' or 'git rm <paths>'\n"
"or 'git rm <paths>' and commit the result."); "and commit the result");
if (action == CHERRY_PICK) { if (action == CHERRY_PICK) {
sprintf(helpbuf + strlen(helpbuf), strbuf_addf(&helpbuf, " with: \n"
"\nWhen commiting, use the option " "\n"
"'-c %s' to retain authorship and message.", " git commit -c %s\n",
find_unique_abbrev(sha1, DEFAULT_ABBREV)); name);
} }
return helpbuf; else
strbuf_addch(&helpbuf, '.');
return strbuf_detach(&helpbuf, NULL);
} }
static struct tree *empty_tree(void) static struct tree *empty_tree(void)
@ -409,7 +405,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
if (commit_lock_file(&msg_file) < 0) if (commit_lock_file(&msg_file) < 0)
die ("Error wrapping up %s", defmsg); die ("Error wrapping up %s", defmsg);
fprintf(stderr, "Automatic %s failed.%s\n", fprintf(stderr, "Automatic %s failed.%s\n",
me, help_msg(commit->object.sha1)); me, help_msg(commit_name));
rerere(allow_rerere_auto); rerere(allow_rerere_auto);
exit(1); exit(1);
} }