Skip to content

Commit

Permalink
revert/cherry-pick: do not mention the original ref
Browse files Browse the repository at this point in the history
When you cherry-pick or revert a commit, naming it with an annotated
tag, we added a comment, attempting to repeat what we got from the end
user, to the message.

But this was inconsistent.  When we got "cherry-pick branch", we
recorded the object name (40-letter SHA-1) without saying anything like
"original was 'branch'".  There was no need to.  Also recent rewrite to
use parse-options made it impossible to parrot the original command line
without "unparsing".

This removes the code that implements the misguided "we dereferenced the
tag so record that in the commit message" behaviour.

Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
gitster committed Nov 25, 2007
1 parent 92b7ba1 commit 757f58e
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions builtin-revert.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ static const char * const cherry_pick_usage[] = {
NULL
};

static int edit, no_replay, no_commit, needed_deref, mainline;
static int edit, no_replay, no_commit, mainline;
static enum { REVERT, CHERRY_PICK } action;
static struct commit *commit;

Expand Down Expand Up @@ -66,7 +66,6 @@ static void parse_args(int argc, const char **argv)
if (commit->object.type == OBJ_TAG) {
commit = (struct commit *)
deref_tag((struct object *)commit, arg, strlen(arg));
needed_deref = 1;
}
if (commit->object.type != OBJ_COMMIT)
die ("'%s' does not point to a commit", arg);
Expand Down Expand Up @@ -333,17 +332,6 @@ static int revert_or_cherry_pick(int argc, const char **argv)
add_to_msg(")\n");
}
}
if (needed_deref) {
add_to_msg("(original 'git ");
add_to_msg(me);
add_to_msg("' arguments: ");
for (i = 0; i < argc; i++) {
if (i)
add_to_msg(" ");
add_to_msg(argv[i]);
}
add_to_msg(")\n");
}

if (merge_recursive(sha1_to_hex(base->object.sha1),
sha1_to_hex(head), "HEAD",
Expand Down

0 comments on commit 757f58e

Please sign in to comment.