Author: adam-guest
Date: 2008-02-21 22:59:36 +0000 (Thu, 21 Feb 2008)
New Revision: 1038
Modified:
trunk/debian/changelog
trunk/scripts/debcommit.pl
Log:
debcommit:
+ Use "git diff" instead of "git-diff" (Closes: #466158)
+ Ignore whitespace changes in diffs
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-02-21 20:33:43 UTC (rev 1037)
+++ trunk/debian/changelog 2008-02-21 22:59:36 UTC (rev 1038)
@@ -25,7 +25,9 @@
+ debian/control:
- Add unzip(1) to Suggests for uscan's zip repacking
- Update descriptions of tagpending and debchange
- * debcommit: Use "git diff" instead of "git-diff" (Closes: #466158)
+ * debcommit:
+ + Use "git diff" instead of "git-diff" (Closes: #466158)
+ + Ignore whitespace changes in diffs
* dget: Correctly handle the processing of a file that we've already
retrieved (Closes: #445546)
* wnpp-alert: Note in the manpage that the results are source package
Modified: trunk/scripts/debcommit.pl
===================================================================
--- trunk/scripts/debcommit.pl 2008-02-21 20:33:43 UTC (rev 1037)
+++ trunk/scripts/debcommit.pl 2008-02-21 22:59:36 UTC (rev 1038)
@@ -500,16 +500,18 @@
if ($prog eq 'tla' || $prog eq 'baz') {
@diffcmd = ($prog, 'file-diff');
+ } elsif ($prog eq 'bzr') {
+ @diffcmd = ($prog, 'diff', '--using', '/usr/bin/diff',
'--diff-options', '-w');
} elsif ($prog eq 'git') {
if ($all) {
- @diffcmd = ('git', 'diff', '--no-color');
+ @diffcmd = ('git', 'diff', '-w', '--no-color');
} else {
- @diffcmd = ('git', 'diff', '--cached', '--no-color');
+ @diffcmd = ('git', 'diff', '-w', '--cached', '--no-color');
}
} elsif ($prog eq 'svn' || $prog eq 'svk') {
- @diffcmd = ($prog, 'diff', '--diff-cmd', '/usr/bin/diff');
+ @diffcmd = ($prog, 'diff', '--diff-cmd', '/usr/bin/diff',
'--extensions', '-wu');
} else {
- @diffcmd = ($prog, 'diff');
+ @diffcmd = ($prog, 'diff', '-w');
}
open CHLOG, '-|', @diffcmd, $changelog
--
To unsubscribe, send mail to [EMAIL PROTECTED]
