diff options
| author |  Chris Packham <judge.packham@gmail.com> | 2016-12-14 21:37:57 +1300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-12-14 10:02:04 -0800 |
| commit | 042e290da6aee0a9f21cd5890ccf231c266e177e (patch) | |
| tree | 7056cb718d62c88dc75614b7f8b1a3c263bab346 /builtin | |
| parent | completion: add --continue option for merge (diff) | |
| download | tgif-042e290da6aee0a9f21cd5890ccf231c266e177e.tar.xz | |
merge: ensure '--abort' option takes no arguments
Like '--continue', the '--abort' option doesn't make any sense with
other options or arguments to 'git merge' so ensure that none are
present.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 836ec281b4..668aaffb84 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1163,6 +1163,10 @@ int cmd_merge(int argc, const char **argv, const char *prefix) int nargc = 2; const char *nargv[] = {"reset", "--merge", NULL}; + if (orig_argc != 2) + usage_msg_opt("--abort expects no arguments", + builtin_merge_usage, builtin_merge_options); + if (!file_exists(git_path_merge_head())) die(_("There is no merge to abort (MERGE_HEAD missing).")); |