mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-01 07:46:19 +02:00
Code

Merge branch 'maint-1.6.1' into maint 

* maint-1.6.1:
  test-lib: Clean up comments and Makefile.
  diff --no-index: Do not generate patch output if other output is requested
This commit is contained in:
Junio C Hamano 2009-03-28 00:41:50 -07:00
parent a8fac795dd 81db4abf84
commit 9d5156496d
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diff-no-index.c
View File

@ -201,8 +201,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"))
@ -248,6 +246,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);

2
t/Makefile
View File

@ -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

8
t/test-lib.sh
View File

@ -466,14 +466,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" &&