Merge branch 'maint'

* maint:
  test-lib: Clean up comments and Makefile.
  diff --no-index: Do not generate patch output if other output is requested

diff --git a/diff-no-index.c b/diff-no-index.c
index 598687b50ac7b88ca0860faf1670d03047bb3603..42c1dd8ad3b0633767bf577975a895722f882565 100644 (file)
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -205,8 +205,6 @@ void diff_no_index(struct rev_info *revs,
                    no_index ? "--no-index" : "[--no-index]");
 
        diff_setup(&revs->diffopt);
-       if (!revs->diffopt.output_format)
-               revs->diffopt.output_format = DIFF_FORMAT_PATCH;
        for (i = 1; i < argc - 2; ) {
                int j;
                if (!strcmp(argv[i], "--no-index"))
@@ -252,6 +250,8 @@ void diff_no_index(struct rev_info *revs,
                revs->diffopt.paths = argv + argc - 2;
        revs->diffopt.nr_paths = 2;
        revs->diffopt.skip_stat_unmatch = 1;
+       if (!revs->diffopt.output_format)
+               revs->diffopt.output_format = DIFF_FORMAT_PATCH;
 
        DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
        DIFF_OPT_SET(&revs->diffopt, NO_INDEX);

diff --git a/t/Makefile b/t/Makefile
index 09623414a755dc7e964a0d21768e136dba4556e2..bf816fc8505508c91999175ad6544a67febabb33 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -24,7 +24,7 @@ pre-clean:
        $(RM) -r test-results
 
 clean:
-       $(RM) -r 'trash directory' test-results
+       $(RM) -r 'trash directory'.* test-results
 
 aggregate-results-and-cleanup: $(T)
        $(MAKE) aggregate-results

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 2979e8ea0e85c86a57d9f0dda8915d3b031478de..b050196cb7bb1b668925afe4c9307ea578c97166 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -523,14 +523,6 @@ test_done () {
        fi
        case "$test_failure" in
        0)
-               # We could:
-               # cd .. && rm -fr 'trash directory'
-               # but that means we forbid any tests that use their own
-               # subdirectory from calling test_done without coming back
-               # to where they started from.
-               # The Makefile provided will clean this test area so
-               # we will leave things as they are.
-
                say_color pass "passed all $msg"
 
                test -d "$remove_trash" &&