From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 26 Dec 2009 22:03:18 +0000 (-0800)
Subject: Merge branch 'jc/1.7.0-diff-whitespace-only-status'
X-Git-Tag: v1.7.0-rc0~142
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3cc3fb7df67dc9c83b71fec82e5bfb1df3724089;p=git.git

Merge branch 'jc/1.7.0-diff-whitespace-only-status'

* jc/1.7.0-diff-whitespace-only-status:
  diff.c: fix typoes in comments
  Make test case number unique
  diff: Rename QUIET internal option to QUICK
  diff: change semantics of "ignore whitespace" options

Conflicts:
	diff.h
---

3cc3fb7df67dc9c83b71fec82e5bfb1df3724089
diff --cc builtin-rev-list.c
index 91b604289,69753dc20..cd97ded4d
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@@ -319,10 -319,8 +319,10 @@@ int cmd_rev_list(int argc, const char *
  
  	memset(&info, 0, sizeof(info));
  	info.revs = &revs;
 +	if (revs.bisect)
 +		bisect_list = 1;
  
- 	quiet = DIFF_OPT_TST(&revs.diffopt, QUIET);
+ 	quiet = DIFF_OPT_TST(&revs.diffopt, QUICK);
  	for (i = 1 ; i < argc; i++) {
  		const char *arg = argv[i];
  
diff --cc diff.h
index 15fcecdec,a7e7ccbd4..6f6d0ed01
--- a/diff.h
+++ b/diff.h
@@@ -66,9 -66,7 +66,9 @@@ typedef void (*diff_format_fn_t)(struc
  #define DIFF_OPT_DIRSTAT_CUMULATIVE  (1 << 19)
  #define DIFF_OPT_DIRSTAT_BY_FILE     (1 << 20)
  #define DIFF_OPT_ALLOW_TEXTCONV      (1 << 21)
- 
+ #define DIFF_OPT_DIFF_FROM_CONTENTS  (1 << 22)
 +#define DIFF_OPT_SUBMODULE_LOG       (1 << 23)
 +
  #define DIFF_OPT_TST(opts, flag)    ((opts)->flags & DIFF_OPT_##flag)
  #define DIFF_OPT_SET(opts, flag)    ((opts)->flags |= DIFF_OPT_##flag)
  #define DIFF_OPT_CLR(opts, flag)    ((opts)->flags &= ~DIFF_OPT_##flag)