submodule add: show 'add --dry-run' stderr when aborting
PATCH 1/1 submodule add: show 'add --dry-run' stderr when aborting
Unless --force is specified, 'submodule add' checks if the destination path is ignored by calling 'git add --dry-run --ignore-missing', and, if that call fails, aborts with a custom "path is ignored" message (a slight variant of what 'git add' shows). Aborting early rather than letting the downstream 'git add' call fail is done so that the command exits before cloning into the destination path. However, in rare cases where the dry-run call fails for a reason other than the path being ignored---for example, due to a preexisting index.lock file---displaying the "ignored path" error message hides the real source of the failure.
Instead of displaying the tailored "ignored path" message, let's report the standard error from the dry run to give the caller more accurate information about failures that are not due to an ignored path.
For the ignored path case, this leads to the following change in the error message:
The following [-path is-]{+paths are+} ignored by one of your .gitignore files:
<destination path>
Use -f if you really want to add [-it.-]{+them.+}
The new phrasing is a bit awkward, because 'submodule add' is only dealing with one destination path. Alternatively, we could continue to use the tailored message when the exit code is 1 (the expected status for a failure due to an ignored path) and relay the standard error for all other non-zero exits. That, however, risks hiding the message of unrelated failures that share an exit code of 1, so it doesn't seem worth doing just to avoid a clunkier, but still clear, error message.
--- git-submodule.sh | 14 ++++++++------ t/t7400-submodule-basic.sh | 15 +++++++++++++-- 2 files changed, 21 insertions(+), 8 deletions(-)
git-submodule.sh +8 -6
@@ -241,13 +241,15 @@ cmd_add() die "$(eval_gettext "'\$sm_path' does not have a commit checked out")" fi - if test -z "$force" && - ! git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" > /dev/null 2>&1 + if test -z "$force" then - eval_gettextln "The following path is ignored by one of your .gitignore files: -\$sm_path -Use -f if you really want to add it." >&2 - exit 1 + dryerr=$(git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" 2>&1 >/dev/null) + res=$? + if test $res -ne 0 + then + echo >&2 "$dryerr" + exit $res + fi fi if test -n "$custom_name"
t/t7400-submodule-basic.sh +13 -2
@@ -156,9 +156,9 @@ test_expect_success 'submodule add to .gitignored path fails' ' ( cd addtest-ignore && cat <<-\EOF >expect && - The following path is ignored by one of your .gitignore files: + The following paths are ignored by one of your .gitignore files: submod - Use -f if you really want to add it. + Use -f if you really want to add them. EOF # Does not use test_commit due to the ignore echo "*" > .gitignore &&
@@ -191,6 +191,17 @@ test_expect_success 'submodule add to reconfigure existing submodule with --forc ) ' +test_expect_success 'submodule add relays add --dry-run stderr' ' + test_when_finished "rm -rf addtest/.git/index.lock" && + ( + cd addtest && + : >.git/index.lock && + ! git submodule add "$submodurl" sub-while-locked 2>output.err && + test_i18ngrep "^fatal: .*index\.lock" output.err && + test_path_is_missing sub-while-locked + ) +' + test_expect_success 'submodule add --branch' ' echo "refs/heads/initial" >expect-head && cat <<-\EOF >expect-heads &&
base-commit: 042ed3e048af08014487d19196984347e3be7d1c
Signature · 1 line
2.24.1
Quoted 54 lines · Kyle Meyer
Unless --force is specified, 'submodule add' checks if the destination path is ignored by calling 'git add --dry-run --ignore-missing', and, if that call fails, aborts with a custom "path is ignored" message (a slight variant of what 'git add' shows). Aborting early rather than letting the downstream 'git add' call fail is done so that the command exits before cloning into the destination path. However, in rare cases where the dry-run call fails for a reason other than the path being ignored---for example, due to a preexisting index.lock file---displaying the "ignored path" error message hides the real source of the failure.
Instead of displaying the tailored "ignored path" message, let's report the standard error from the dry run to give the caller more accurate information about failures that are not due to an ignored path.
For the ignored path case, this leads to the following change in the error message:
The following [-path is-]{+paths are+} ignored by one of your .gitignore files:
<destination path>
Use -f if you really want to add [-it.-]{+them.+}The new phrasing is a bit awkward, because 'submodule add' is only dealing with one destination path. Alternatively, we could continue to use the tailored message when the exit code is 1 (the expected status for a failure due to an ignored path) and relay the standard error for all other non-zero exits. That, however, risks hiding the message of unrelated failures that share an exit code of 1, so it doesn't seem worth doing just to avoid a clunkier, but still clear, error message.
Signed-off-by Kyle Meyer <[email protected]>--- git-submodule.sh | 14 ++++++++------ t/t7400-submodule-basic.sh | 15 +++++++++++++-- 2 files changed, 21 insertions(+), 8 deletions(-)git-submodule.sh +1
-6@@ -241,13 +241,15 @@ cmd_add() die "$(eval_gettext "'\$sm_path' does not have a commit checked out")" fi - if test -z "$force" && - ! git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" > /dev/null 2>&1 + if test -z "$force" then - eval_gettextln "The following path is ignored by one of your .gitignore files: -\$sm_path -Use -f if you really want to add it." >&2 - exit 1
git-submodule.sh cmd_add() · line 255
Quoted 10 lines
git-submodule.sh +7
-0+ dryerr=$(git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" 2>&1 >/dev/null) + res=$? + if test $res -ne 0 + then + echo >&2 "$dryerr" + exit $res + fi fi if test -n "$custom_name"
Seems reasonable: we move the dry-run add inside the if block, and capture its stderr, then display the message only if the return code is non-zero.
Quoted 24 lines
t/t7400-submodule-basic.sh +6
-2@@ -156,9 +156,9 @@ test_expect_success 'submodule add to .gitignored path fails' ' ( cd addtest-ignore && cat <<-\EOF >expect && - The following path is ignored by one of your .gitignore files: + The following paths are ignored by one of your .gitignore files: submod - Use -f if you really want to add it. + Use -f if you really want to add them. EOF # Does not use test_commit due to the ignore echo "*" > .gitignore &&@@ -191,6 +191,17 @@ test_expect_success 'submodule add to reconfigure existing submodule with --forc ) ' +test_expect_success 'submodule add relays add --dry-run stderr' ' + test_when_finished "rm -rf addtest/.git/index.lock" && + ( + cd addtest &&
t/t7400-submodule-basic.sh test_expect_success 'submodule add to reconfigure existing submodule with --forc · line 207
Quoted 10 lines
t/t7400-submodule-basic.sh +7
-0+ : >.git/index.lock && + ! git submodule add "$submodurl" sub-while-locked 2>output.err && + test_i18ngrep "^fatal: .*index\.lock" output.err && + test_path_is_missing sub-while-locked + ) +' + test_expect_success 'submodule add --branch' ' echo "refs/heads/initial" >expect-head && cat <<-\EOF >expect-heads &&
I had to look up what ":" does, but it looks like it's reasonably widely used in other tests so that seems fine. However, it looks like you don't even need the : command and can just ">.git/index.lock" by itself (see the "setup - initial commit" test case in this file for an example).
Quoted 4 lines
base-commit:
042ed3e048af08014487d19196984347e3be7d1cSignature · 1 line
2.24.1
Looks good to me. Thanks for the patch!
Quoted 1 line · Josh Steadmon
On 2020.01.07 19:31, Kyle Meyer wrote:
[...]
Quoted 5 lines
Quoted 5 lines
t/t7400-submodule-basic.sh +5
-0+test_expect_success 'submodule add relays add --dry-run stderr' ' + test_when_finished "rm -rf addtest/.git/index.lock" && + ( + cd addtest && + : >.git/index.lock &&
[...]
Quoted 4 lines
I had to look up what ":" does, but it looks like it's reasonably widely used in other tests so that seems fine. However, it looks like you don't even need the : command and can just ">.git/index.lock" by itself (see the "setup - initial commit" test case in this file for an example).
Indeed. I spot some recent commits that added new instances of ": >", so I suspect it's not strongly discouraged in this project, but I'm not particularly attached to the unneeded colon :>
Quoted 1 line
Looks good to me. Thanks for the patch!
Thanks for the review!
Hi (in particular Junio),
t/t7400-submodule-basic.sh test_expect_success 'submodule add to .gitignored path fails' ' · line 161
Quoted 13 lines · Kyle Meyer
t/t7400-submodule-basic.sh +2
-2@@ -156,9 +156,9 @@ test_expect_success 'submodule add to .gitignored path fails' ' ( cd addtest-ignore && cat <<-\EOF >expect && - The following path is ignored by one of your .gitignore files: + The following paths are ignored by one of your .gitignore files: submod - Use -f if you really want to add it. + Use -f if you really want to add them.
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 --
t/t7400-submodule-basic.sh +1 -1
@@ -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 &&
Quoted 10 lines · Johannes Schindelin
I think this got mis-merged when merging down
km/submodule-add-errmsg:
it needs to be prefixed withhint:because ofhw/advice-add-nothing, i.e.-- snipsnap --
t/t7400-submodule-basic.sh +0
-0
t/t7400-submodule-basic.sh test_expect_success 'submodule add to .gitignored path fails' ' · line 164
Quoted 8 lines
t/t7400-submodule-basic.sh +1
-1@@ -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.