mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
revert: Rename no_replay to record_origin
The "-x" command-line option is used to record the name of the original commits being picked in the commit message. The variable corresponding to this option is named "no_replay" for historical reasons; the name is especially confusing because the term "replay" is used to describe what cherry-pick does (for example, in the documentation of the "--mainline" option). So, give the variable corresponding to the "-x" command-line option a better name: "record_origin". Mentored-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a2ec3ad28f
commit
54decbd4d8
|
@ -35,7 +35,7 @@ static const char * const cherry_pick_usage[] = {
|
|||
NULL
|
||||
};
|
||||
|
||||
static int edit, no_replay, no_commit, mainline, signoff, allow_ff;
|
||||
static int edit, record_origin, no_commit, mainline, signoff, allow_ff;
|
||||
static enum { REVERT, CHERRY_PICK } action;
|
||||
static struct commit *commit;
|
||||
static int commit_argc;
|
||||
|
@ -91,7 +91,7 @@ static void parse_args(int argc, const char **argv)
|
|||
|
||||
if (action == CHERRY_PICK) {
|
||||
struct option cp_extra[] = {
|
||||
OPT_BOOLEAN('x', NULL, &no_replay, "append commit name"),
|
||||
OPT_BOOLEAN('x', NULL, &record_origin, "append commit name"),
|
||||
OPT_BOOLEAN(0, "ff", &allow_ff, "allow fast-forward"),
|
||||
OPT_END(),
|
||||
};
|
||||
|
@ -464,7 +464,7 @@ static int do_pick_commit(void)
|
|||
strbuf_addstr(&msgbuf, p);
|
||||
}
|
||||
|
||||
if (no_replay) {
|
||||
if (record_origin) {
|
||||
strbuf_addstr(&msgbuf, "(cherry picked from commit ");
|
||||
strbuf_addstr(&msgbuf, sha1_to_hex(commit->object.sha1));
|
||||
strbuf_addstr(&msgbuf, ")\n");
|
||||
|
@ -559,7 +559,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
|
|||
die(_("cherry-pick --ff cannot be used with --signoff"));
|
||||
if (no_commit)
|
||||
die(_("cherry-pick --ff cannot be used with --no-commit"));
|
||||
if (no_replay)
|
||||
if (record_origin)
|
||||
die(_("cherry-pick --ff cannot be used with -x"));
|
||||
if (edit)
|
||||
die(_("cherry-pick --ff cannot be used with --edit"));
|
||||
|
|
Loading…
Reference in a new issue