Re: [PATCH] Document git-diff whitespace flags -b and -w

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Sun, 3 Dec 2006, Jakub Narebski wrote:

> Alternate solution would be to fix documentation, to document existing 
> code. I used GNU diff documentation, perhaps it is better if we are GNU 
> diff compatibile...

Since the whole point of "-w/-b" is to steal the nice feature from GNU 
diff, it does not make any sense breaking compatibility.

BTW on top of my patch you need this, if you want the tests to pass 
(danger ahead: intentional white space at eol):

-- snip --
make tests pass for recent "diff -b" change

---

	Am I the only one finding it funny to read diffs of diffs, 
	especially when being used to combined diffs?

diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 1bc5b7a..adf4993 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -109,12 +109,10 @@ index d99af23..8b32fb5 100644
 +	whitespace at beginning
  whitespace change
 -whitespace in the middle
--whitespace at end
 +white space in the middle
-+whitespace at end  
+ whitespace at end
  unchanged line
--CR at endQ
-+CR at end
+ CR at endQ
 EOF
 git-diff -b > out
 test_expect_success 'another test, with -b' 'diff -u expect out'
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]