[SCM] Git repository for devscripts branch, master, updated. v2.13.2-12-ga37aa91
James McCoy
jamessan at debian.org
Tue Jul 9 23:57:58 UTC 2013
The following commit has been merged in the master branch:
commit a37aa91d75808e3fab65646d838fb38e81971960
Author: James McCoy <jamessan at debian.org>
Date: Tue Jul 9 19:56:56 2013 -0400
debcommit: Use "git status --porcelain" to check for a dirty working directory.
Closes: #712166
Signed-off-by: James McCoy <jamessan at debian.org>
diff --git a/debian/changelog b/debian/changelog
index 89a74d0..e5cb2e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ devscripts (2.13.3) UNRELEASED; urgency=low
* Suppress "given/when is experimental" warnings when using Perl 5.18.
* mk-build-deps: Take Build-Conflicts(-Indep) into account. (Closes:
#712227)
+ * debcommit: Use "git status --porcelain" to check for a dirty working
+ directory. (Closes: #712166)
[ Chris Boot ]
* bts: Fix no-mutt option. (Closes: #709999)
diff --git a/scripts/debcommit.pl b/scripts/debcommit.pl
index 675d063..00656d5 100755
--- a/scripts/debcommit.pl
+++ b/scripts/debcommit.pl
@@ -519,8 +519,8 @@ sub commit {
if (! @files_to_commit && ($all || $release)) {
# check to see if the WC is clean. git-commit would exit
# 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\)/) {
+ my $status=`git status --porcelain`;
+ if (!$status) {
print $status;
return;
}
--
Git repository for devscripts
More information about the devscripts-devel
mailing list