Author: adam-guest
Date: 2008-02-16 22:33:30 +0000 (Sat, 16 Feb 2008)
New Revision: 1020
Modified:
trunk/debian/changelog
trunk/scripts/debcommit.pl
Log:
debcommit: Use "git diff" instead of "git-diff" (Closes: #466158)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-02-16 10:10:48 UTC (rev 1019)
+++ trunk/debian/changelog 2008-02-16 22:33:30 UTC (rev 1020)
@@ -15,6 +15,7 @@
+ debian/control:
- Add unzip(1) to Suggests for uscan's zip repacking
- Update description of tagpending
+ * debcommit: Use "git diff" instead of "git-diff" (Closes: #466158)
-- Adam D. Barratt <[EMAIL PROTECTED]> Tue, 12 Feb 2008 08:50:01 +0000
Modified: trunk/scripts/debcommit.pl
===================================================================
--- trunk/scripts/debcommit.pl 2008-02-16 10:10:48 UTC (rev 1019)
+++ trunk/scripts/debcommit.pl 2008-02-16 22:33:30 UTC (rev 1020)
@@ -502,9 +502,9 @@
@diffcmd = ($prog, 'file-diff');
} elsif ($prog eq 'git') {
if ($all) {
- @diffcmd = ('git-diff', '--no-color');
+ @diffcmd = ('git', 'diff', '--no-color');
} else {
- @diffcmd = ('git-diff', '--cached', '--no-color');
+ @diffcmd = ('git', 'diff', '--cached', '--no-color');
}
} elsif ($prog eq 'svn' || $prog eq 'svk') {
@diffcmd = ($prog, 'diff', '--diff-cmd', '/usr/bin/diff');
--
To unsubscribe, send mail to [EMAIL PROTECTED]
