kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Chris Packham 2016-12-14 21:37:57 +13:00 committed by Junio C Hamano
parent c261a87e70
commit 042e290da6
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/merge.c
View File

@ -1163,6 +1163,10 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
int nargc = 2; int nargc = 2;
const char *nargv[] = {"reset", "--merge", NULL}; 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())) if (!file_exists(git_path_merge_head()))
die(_("There is no merge to abort (MERGE_HEAD missing).")); die(_("There is no merge to abort (MERGE_HEAD missing)."));



2
t/t7600-merge.sh
View File

@ -154,6 +154,8 @@ test_expect_success 'test option parsing' '
test_must_fail git merge -s foobar c1 && test_must_fail git merge -s foobar c1 &&
test_must_fail git merge -s=foobar c1 && test_must_fail git merge -s=foobar c1 &&
test_must_fail git merge -m && test_must_fail git merge -m &&
test_must_fail git merge --abort foobar &&
test_must_fail git merge --abort --quiet &&
test_must_fail git merge --continue foobar && test_must_fail git merge --continue foobar &&
test_must_fail git merge --continue --quiet && test_must_fail git merge --continue --quiet &&
test_must_fail git merge test_must_fail git merge