debcommit Patch attached.

I think the documentation is inconsistent with other VCS's.
At least, it looks to me, if I do:

   debcommit XXX

I would get a commit message from debian/changes, which itself is not
committed, and the same message will appear again the next time.



'VCS diff' should probably take @files_to_commit as an option, and
then you will probably want to address
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=419657




regards,
        junichi
-- 
[EMAIL PROTECTED],netfort.gr.jp}   Debian Project



===File /tmp/devscripts/a===================================
diff -ur devscripts-2.10.4-orig/scripts/debcommit.pl 
devscripts-2.10.4/scripts/debcommit.pl
--- devscripts-2.10.4-orig/scripts/debcommit.pl 2007-04-19 05:19:26.000000000 
+0900
+++ devscripts-2.10.4/scripts/debcommit.pl      2007-06-04 08:02:23.848866426 
+0900
@@ -180,7 +180,12 @@
        }
     }
     elsif ($prog eq 'git') {
-       if (! action($prog, "commit", "-a", "-m", $message, @files_to_commit)) {
+       my @args;
+       @args=("-m", $message, @files_to_commit);
+       if (! @files_to_commit) {
+           push(@args, "-a") 
+       }
+       if (! action($prog, "commit", @args)) {
            die "debcommit: commit failed\n";
        }
     }
@@ -284,7 +289,12 @@
        if ($prog eq 'tla' || $prog eq 'baz') {
            @diffcmd = ($prog, 'file-diff');
        } elsif ($prog eq 'git') {
-           @diffcmd = ('git-diff', '--cached');
+           if (! @files_to_commit) {
+               @diffcmd = ('git-diff');
+           }
+           else {
+               @diffcmd = ('git-diff', @files_to_commit);
+           }
        } else {
            @diffcmd = ($prog, 'diff');
        }
============================================================


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to