diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-28 01:16:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-28 01:16:46 -0700 |
| commit | b0085a716770d9d2876edd74c6119c48d9d6f232 (patch) | |
| tree | 3658953cbb5a9a2fd1bab5fe0bf80781a6362383 | |
| parent | a1b1ae0571f6b57117678aeaa1939d97c992a254 (diff) | |
| parent | 9d5156496d2d32800df52fa372295c16ab2578f0 (diff) | |
| download | git-b0085a716770d9d2876edd74c6119c48d9d6f232.tar.gz git-b0085a716770d9d2876edd74c6119c48d9d6f232.tar.xz | |
Merge branch 'maint'
* maint:
test-lib: Clean up comments and Makefile.
diff --no-index: Do not generate patch output if other output is requested
| -rw-r--r-- | diff-no-index.c | 4 | ||||
| -rw-r--r-- | t/Makefile | 2 | ||||
| -rw-r--r-- | t/test-lib.sh | 8 |
3 files changed, 3 insertions, 11 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index 598687b50..42c1dd8ad 100644 --- 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 09623414a..bf816fc85 100644 --- 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 2979e8ea0..b050196cb 100644 --- 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" && |