diff options
| author | Martin von Zweigbergk <martinvonz@gmail.com> | 2013-01-15 05:47:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-15 17:38:07 (GMT) |
| commit | d94c5e2fa24dce13a3dc1ba178f381cb09bb0853 (patch) | |
| tree | 97c3a045e9e613d8fd74fce6c52fb6524d9b0459 /t/t2013-checkout-submodule.sh | |
| parent | 10746a361689aaa1aa98b8d4e7fb3b8463391864 (diff) | |
| download | git-d94c5e2fa24dce13a3dc1ba178f381cb09bb0853.zip git-d94c5e2fa24dce13a3dc1ba178f381cb09bb0853.tar.gz git-d94c5e2fa24dce13a3dc1ba178f381cb09bb0853.tar.bz2 | |
reset $pathspec: exit with code 0 if successful
"git reset $pathspec" currently exits with a non-zero exit code if the
worktree is dirty after resetting, which is inconsistent with reset
without pathspec, and it makes it harder to know whether the command
really failed. Change it to exit with code 0 regardless of whether the
worktree is dirty so that non-zero indicates an error.
This makes the 4 "disambiguation" test cases in t7102 clearer since
they all used to "fail", 3 of which "failed" due to changes in the
work tree. Now only the ambiguous one fails.
Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2013-checkout-submodule.sh')
| -rwxr-xr-x | t/t2013-checkout-submodule.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh index 70edbb3..06b18f8 100755 --- a/t/t2013-checkout-submodule.sh +++ b/t/t2013-checkout-submodule.sh @@ -23,7 +23,7 @@ test_expect_success '"reset <submodule>" updates the index' ' git update-index --refresh && git diff-files --quiet && git diff-index --quiet --cached HEAD && - test_must_fail git reset HEAD^ submodule && + git reset HEAD^ submodule && test_must_fail git diff-files --quiet && git reset submodule && git diff-files --quiet |