git/t, branch v1.7.2

tests: correct "does reflog exist?" tests

2010-07-21T19:54:48Z

These two tests weren't about how "git reflog show " exits when there is no reflog, but were about "checkout" and "branch" create or not create reflog when creating a new . Update the tests to check what we are interested in, using "git rev-parse --verify". Also lose tests based on "test -f .git/logs/refs/heads/" from nearby, to avoid exposing this particular implementation detail unnecessarily. Signed-off-by: Junio C Hamano

t/: work around one-shot variable assignment with test_must_fail

2010-07-21T18:54:34Z

See e2007832552ccea9befed9003580c494f09e666e Signed-off-by: Junio C Hamano

t/README: correct an exception when breaking a && chain in tests

2010-07-21T18:52:26Z

The correct advice should have been taken from c289c31 (t/t7006: ignore return status of shell's unset builtin, 2010-06-02). A real-life issue we experienced was with "unset", not with "export" (exporting an unset variable may have similar portability issues, though). Signed-off-by: Junio C Hamano

t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_fail

2010-07-20T18:37:45Z

The '!()' notation is interpreted as a pattern-list on Ksh. The Ksh man page describe it as follows: !(pattern-list) Matches anything except one of the given patterns. Ksh performs a file glob using the pattern-list and then tries to execute the first file in the list. If a space is added between the '!' and the open parens, then Ksh will not interpret it as a pattern list, but in this case, it is preferred to use test_must_fail, so lets do so. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

t/t3700: convert two uses of negation operator '!' to use test_must_fail

2010-07-20T18:37:26Z

These two lines use the negation '!' operator to negate the result of a simple command. Since these commands do not contain any pipes or other complexities, the test_must_fail function can be used and is preferred since it will additionally detect termination due to a signal. This was noticed because the second use of '!' does not include a space between the '!' and the opening parens. Ksh interprets this as follows: !(pattern-list) Matches anything except one of the given patterns. Ksh performs a file glob using the pattern-list and then tries to execute the first file in the list. If a space is added between the '!' and the open parens, then Ksh will not interpret it as a pattern list, but in this case, it is preferred to use test_must_fail, so lets do so. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-07-20T18:29:30Z

* maint: t/README: clarify test_must_fail description Check size of path buffer before writing into it Conflicts: t/README

t/README: clarify test_must_fail description

2010-07-20T18:26:39Z

Some have found the wording of the description to be somewhat ambiguous with respect to when it is desirable to use test_must_fail instead of "! ". Tweak the wording somewhat to hopefully clarify that it is _because_ test_must_fail can detect segmentation fault that it is desirable to use it instead of "! ". Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

git submodule add: Require the new --force option to add ignored paths

2010-07-19T18:10:43Z

To make the behavior of "git submodule add" more consistent with "git add" ignored submodule paths should not be silently added when they match an entry in a .gitignore file. To be able to override that default behavior in the same way as we can do that for "git add", the new option "--force" is introduced. Signed-off-by: Jens Lehmann Acked-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

Merge branch 'jl/add-n-ignore-missing'

2010-07-19T18:09:38Z

* jl/add-n-ignore-missing: git add: Add the "--ignore-missing" option for the dry run

Only run aggregate-results over actual counts

2010-07-16T20:25:01Z

The current make target 'aggregate-results' scanned all files matching test-results/t*-*. Normally these are only the test counts (and the exit values, which are ignored), but with --tee the suite also dumps all output. Furthermore, with --verbose t1450 contains several lines starting with "broken link from ..." which matches the criteria used by aggregate-results.sh. Rename the counts output files to *.counts, and only scan those. Signed-off-by: Thomas Rast Acked-by: Sverre Rabbelier Signed-off-by: Junio C Hamano