2007-03-14 00:17:04 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='Return value of diffs'
|
|
|
|
|
2020-11-18 23:44:27 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
leak tests: mark passing SANITIZE=leak tests as leak-free
Mark those remaining tests that pass when run under SANITIZE=leak with
TEST_PASSES_SANITIZE_LEAK=true, these were either omitted in
f346fcb62a0 (Merge branch 'ab/mark-leak-free-tests-even-more',
2021-12-15) and 5a4f8381b68 (Merge branch 'ab/mark-leak-free-tests',
2021-10-25), or have had their memory leaks fixed since then.
With this change there's now a a one-to-one mapping between those
tests that we have opted-in via "TEST_PASSES_SANITIZE_LEAK=true", and
those that pass with the new "check" mode:
GIT_TEST_PASSING_SANITIZE_LEAK=check \
GIT_TEST_SANITIZE_LEAK_LOG=true \
make test SANITIZE=leak
Note that the "GIT_TEST_SANITIZE_LEAK_LOG=true" is needed due to the
edge cases noted in a preceding commit, i.e. in some cases we'd pass
the test itself, but still have outstanding leaks due to ignored exit
codes.
The "GIT_TEST_SANITIZE_LEAK_LOG=true" corrects for that, we're only
marking those tests as passing that really don't have any leaks,
whether that was reflected in their exit code or not.
Note that the change here to "t9100-git-svn-basic.sh" is marking that
test as passing under SANITIZE=leak, we're removing a
"TEST_FAILS_SANITIZE_LEAK=true" line, not
"TEST_PASSES_SANITIZE_LEAK=true". See 7a98d9ab00d (revisions API: have
release_revisions() release "cmdline", 2022-04-13) for the
introduction of that t/lib-git-svn.sh-specific variable.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-07-27 23:13:41 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2007-03-14 00:17:04 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
2010-02-22 02:58:44 +00:00
|
|
|
echo "1 " >a &&
|
|
|
|
git add . &&
|
|
|
|
git commit -m zeroth &&
|
2007-03-14 00:17:04 +00:00
|
|
|
echo 1 >a &&
|
|
|
|
git add . &&
|
|
|
|
git commit -m first &&
|
|
|
|
echo 2 >b &&
|
|
|
|
git add . &&
|
|
|
|
git commit -a -m second
|
|
|
|
'
|
|
|
|
|
2010-02-22 02:58:44 +00:00
|
|
|
test_expect_success 'git diff --quiet -w HEAD^^ HEAD^' '
|
|
|
|
git diff --quiet -w HEAD^^ HEAD^
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git diff --quiet HEAD^^ HEAD^' '
|
|
|
|
test_must_fail git diff --quiet HEAD^^ HEAD^
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git diff --quiet -w HEAD^ HEAD' '
|
|
|
|
test_must_fail git diff --quiet -w HEAD^ HEAD
|
|
|
|
'
|
|
|
|
|
2007-03-14 00:17:04 +00:00
|
|
|
test_expect_success 'git diff-tree HEAD^ HEAD' '
|
2010-10-03 20:00:01 +00:00
|
|
|
test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD
|
2007-03-14 00:17:04 +00:00
|
|
|
'
|
|
|
|
test_expect_success 'git diff-tree HEAD^ HEAD -- a' '
|
|
|
|
git diff-tree --exit-code HEAD^ HEAD -- a
|
|
|
|
'
|
|
|
|
test_expect_success 'git diff-tree HEAD^ HEAD -- b' '
|
2010-10-03 20:00:01 +00:00
|
|
|
test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD -- b
|
2007-03-14 00:17:04 +00:00
|
|
|
'
|
|
|
|
test_expect_success 'echo HEAD | git diff-tree --stdin' '
|
2010-10-03 20:00:01 +00:00
|
|
|
echo $(git rev-parse HEAD) | test_expect_code 1 git diff-tree --exit-code --stdin
|
2007-03-14 00:17:04 +00:00
|
|
|
'
|
|
|
|
test_expect_success 'git diff-tree HEAD HEAD' '
|
|
|
|
git diff-tree --exit-code HEAD HEAD
|
|
|
|
'
|
|
|
|
test_expect_success 'git diff-files' '
|
|
|
|
git diff-files --exit-code
|
|
|
|
'
|
|
|
|
test_expect_success 'git diff-index --cached HEAD' '
|
|
|
|
git diff-index --exit-code --cached HEAD
|
|
|
|
'
|
|
|
|
test_expect_success 'git diff-index --cached HEAD^' '
|
2010-10-03 20:00:01 +00:00
|
|
|
test_expect_code 1 git diff-index --exit-code --cached HEAD^
|
2007-03-14 00:17:04 +00:00
|
|
|
'
|
|
|
|
test_expect_success 'git diff-index --cached HEAD^' '
|
|
|
|
echo text >>b &&
|
|
|
|
echo 3 >c &&
|
2010-10-03 20:00:01 +00:00
|
|
|
git add . &&
|
|
|
|
test_expect_code 1 git diff-index --exit-code --cached HEAD^
|
2007-03-14 00:17:04 +00:00
|
|
|
'
|
|
|
|
test_expect_success 'git diff-tree -Stext HEAD^ HEAD -- b' '
|
2010-10-03 20:00:01 +00:00
|
|
|
git commit -m "text in b" &&
|
|
|
|
test_expect_code 1 git diff-tree -p --exit-code -Stext HEAD^ HEAD -- b
|
2007-03-14 00:17:04 +00:00
|
|
|
'
|
|
|
|
test_expect_success 'git diff-tree -Snot-found HEAD^ HEAD -- b' '
|
|
|
|
git diff-tree -p --exit-code -Snot-found HEAD^ HEAD -- b
|
|
|
|
'
|
|
|
|
test_expect_success 'git diff-files' '
|
2010-10-03 20:00:01 +00:00
|
|
|
echo 3 >>c &&
|
|
|
|
test_expect_code 1 git diff-files --exit-code
|
2007-03-14 00:17:04 +00:00
|
|
|
'
|
|
|
|
test_expect_success 'git diff-index --cached HEAD' '
|
2010-10-03 20:00:01 +00:00
|
|
|
git update-index c &&
|
|
|
|
test_expect_code 1 git diff-index --exit-code --cached HEAD
|
2007-03-14 00:17:04 +00:00
|
|
|
'
|
|
|
|
|
2007-12-14 11:23:44 +00:00
|
|
|
test_expect_success '--check --exit-code returns 0 for no difference' '
|
|
|
|
|
|
|
|
git diff --check --exit-code
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--check --exit-code returns 1 for a clean difference' '
|
|
|
|
|
|
|
|
echo "good" > a &&
|
2010-10-03 20:00:01 +00:00
|
|
|
test_expect_code 1 git diff --check --exit-code
|
2007-12-14 11:23:44 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--check --exit-code returns 3 for a dirty difference' '
|
|
|
|
|
|
|
|
echo "bad " >> a &&
|
2010-10-03 20:00:01 +00:00
|
|
|
test_expect_code 3 git diff --check --exit-code
|
2007-12-14 11:23:44 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--check with --no-pager returns 2 for dirty difference' '
|
|
|
|
|
2010-10-03 20:00:01 +00:00
|
|
|
test_expect_code 2 git --no-pager diff --check
|
2007-12-14 11:23:44 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-06-26 20:16:33 +00:00
|
|
|
test_expect_success 'check should test not just the last line' '
|
|
|
|
echo "" >>a &&
|
2010-10-03 20:00:01 +00:00
|
|
|
test_expect_code 2 git --no-pager diff --check
|
2008-06-26 20:16:33 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-06-26 22:37:21 +00:00
|
|
|
test_expect_success 'check detects leftover conflict markers' '
|
|
|
|
git reset --hard &&
|
|
|
|
git checkout HEAD^ &&
|
|
|
|
echo binary >>b &&
|
|
|
|
git commit -m "side" b &&
|
2020-11-18 23:44:27 +00:00
|
|
|
test_must_fail git merge main &&
|
2010-10-03 20:00:01 +00:00
|
|
|
git add b &&
|
|
|
|
test_expect_code 2 git --no-pager diff --cached --check >test.out &&
|
2008-06-29 20:49:06 +00:00
|
|
|
test 3 = $(grep "conflict marker" test.out | wc -l) &&
|
2008-06-26 22:37:21 +00:00
|
|
|
git reset --hard
|
|
|
|
'
|
|
|
|
|
2010-03-25 02:21:32 +00:00
|
|
|
test_expect_success 'check honors conflict marker length' '
|
|
|
|
git reset --hard &&
|
|
|
|
echo ">>>>>>> boo" >>b &&
|
|
|
|
echo "======" >>a &&
|
|
|
|
git diff --check a &&
|
2010-10-03 20:00:01 +00:00
|
|
|
test_expect_code 2 git diff --check b &&
|
2010-03-25 02:21:32 +00:00
|
|
|
git reset --hard &&
|
|
|
|
echo ">>>>>>>> boo" >>b &&
|
|
|
|
echo "========" >>a &&
|
|
|
|
git diff --check &&
|
|
|
|
echo "b conflict-marker-size=8" >.gitattributes &&
|
2010-10-03 20:00:01 +00:00
|
|
|
test_expect_code 2 git diff --check b &&
|
2010-03-25 02:21:32 +00:00
|
|
|
git diff --check a &&
|
|
|
|
git reset --hard
|
|
|
|
'
|
|
|
|
|
diff: show usage for unknown builtin_diff_files() options
The git-diff command has many modes (comparing worktree to index, index
to HEAD, individual blobs, etc). As a result, it dispatches to many
helper functions and cannot completely parse its options until we're in
those helper functions.
Most of them, when seeing an unknown option, exit immediately by calling
usage(). But builtin_diff_files(), which is the default if no revision
or blob arguments are given, instead prints an error() and returns -1.
One obvious shortcoming here is that the user doesn't get to see the
usual usage message. But there's a much more important bug: the -1
return is fed to diff_result_code(), which is not ready to handle it.
By default, it passes the code along as an exit code. We try to avoid
negative exit codes because they get converted to unsigned values, but
it should at least consistently show up as non-zero (i.e., a failure).
But much worse is that when --exit-code is in effect, diff_result_code()
will _ignore_ the status passed in by the caller, and instead only
report on whether the diff found changes. It didn't, of course, because
we never ran the diff, and the program unexpectedly exits with success!
We can fix this bug by just calling usage(), like the other helpers do.
Another option would of course be to teach diff_result_code() to handle
this value. But as we'll see in the next few patches, it can be cleaned
up even further. Let's just fix this bug directly to start with.
Reported-by: Romain Chossart <romainchossart@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-08-21 20:16:26 +00:00
|
|
|
test_expect_success 'option errors are not confused by --exit-code' '
|
|
|
|
test_must_fail git diff --exit-code --nonsense 2>err &&
|
|
|
|
grep '^usage:' err
|
|
|
|
'
|
|
|
|
|
2007-03-14 00:17:04 +00:00
|
|
|
test_done
|