The following commit has been merged in the master branch:
commit bc292e30f1b01e50e1664f70affe7cba9f6ac2ff
Author: Christoph Berg <[email protected]>
Date: Sat Feb 12 14:28:24 2011 +0100
debcommit (git): Don't treat "no files to commit" as an error when called
with --release, otherwise it is not possible to tag after the final build.
diff --git a/debian/changelog b/debian/changelog
index 5be339e..167d5fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+devscripts (2.10.71) UNRELEASED; urgency=low
+
+ [ Christoph Berg ]
+ * debcommit (git): Don't treat "no files to commit" as an error when called
+ with --release, otherwise it is not possible to tag after the final build.
+
+ -- Christoph Berg <[email protected]> Sat, 12 Feb 2011 14:26:10 +0100
+
devscripts (2.10.70) unstable; urgency=low
[ James Vega ]
diff --git a/scripts/debcommit.pl b/scripts/debcommit.pl
index 48fd8a8..b7901d9 100755
--- a/scripts/debcommit.pl
+++ b/scripts/debcommit.pl
@@ -520,9 +520,9 @@ sub commit {
: action($prog, "commit", "-m", $message, @files_to_commit);
}
elsif ($prog eq 'git') {
- if (! @files_to_commit && $all) {
+ if (! @files_to_commit && ($all || $release)) {
# check to see if the WC is clean. git-commit would exit
- # nonzero, so don't run it.
+ # nonzero, so don't run it in --all or --release mode.
my $status=`LANG=C git status`;
if ($status=~/nothing to commit \(working directory clean\)/) {
print $status;
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
