add: die if both --dry-run and --interactive are given

Osse · gitster · commit a1989cf7b8d0 · 2021-05-07T06:14:04.000+09:00
The interactive machinery does not obey --dry-run. Die appropriately
if both flags are passed.

Signed-off-by: Øystein Walle &lt;oystwa@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/add.c b/builtin/add.c
@@ -459,6 +459,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 	if (patch_interactive)
 		add_interactive = 1;
 	if (add_interactive) {
+		if (show_only)
+			die(_("--dry-run is incompatible with --interactive/--patch"));
 		if (pathspec_from_file)
 			die(_("--pathspec-from-file is incompatible with --interactive/--patch"));
 		exit(interactive_add(argv + 1, prefix, patch_interactive));
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
@@ -343,6 +343,10 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file out
 	test_cmp expect.err actual.err
 '
 
+test_expect_success 'git add --dry-run --interactive should fail' '
+	test_must_fail git add --dry-run --interactive
+'
+
 test_expect_success 'git add empty string should fail' '
 	test_must_fail git add ""
 '

Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,10 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file out`
`343`	`343`	`test_cmp expect.err actual.err`
`344`	`344`	`'`
`345`	`345`
	`346`	`+test_expect_success 'git add --dry-run --interactive should fail' '`
	`347`	`+ test_must_fail git add --dry-run --interactive`
	`348`	`+'`
	`349`	`+`
`346`	`350`	`test_expect_success 'git add empty string should fail' '`
`347`	`351`	`test_must_fail git add ""`
`348`	`352`	`'`