Thread (1 message) 1 message, 1 author, 2020-01-16

Re: [PATCH] submodule add: show 'add --dry-run' stderr when aborting

From: Junio C Hamano <hidden>
Date: 2020-01-16 20:23:17

Johannes Schindelin [off-list ref] writes:
quoted hunk
I think this got mis-merged when merging down `km/submodule-add-errmsg`:
it needs to be prefixed with `hint:` because of `hw/advice-add-nothing`,
i.e.

-- snipsnap --
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 42a00f95b9d..a6973a3003c 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -158,7 +158,7 @@ test_expect_success 'submodule add to .gitignored path fails' '
 		cat <<-\EOF >expect &&
 		The following paths are ignored by one of your .gitignore files:
 		submod
-		Use -f if you really want to add them.
+		hint: Use -f if you really want to add them.
 		EOF
 		# Does not use test_commit due to the ignore
 		echo "*" > .gitignore &&
Thanks, will prepare merge-fix material for this.

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help