The following commit has been merged in the master branch:
commit 95b2be95fb3a8d7e0767be72bd7833ea060d9b46
Author: Benjamin Drung <[email protected]>
Date: Wed Apr 20 18:58:40 2011 +0200
debcommit: Support for commiting from debian/ when using bzr.
Thanks: Loïc Minier
Closes: #580861
diff --git a/debian/changelog b/debian/changelog
index ccbd466..d77bb40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ devscripts (2.10.73) UNRELEASED; urgency=low
* Add myself to uploaders.
* Wrap and sort lists in debian/control. (Closes: #577999)
* Switch to simple dh 8 rule.
+ * debcommit: Support for commiting from debian/ when using bzr. Thanks to
+ Loïc Minier for the patch. (Closes: #580861)
- -- Benjamin Drung <[email protected]> Wed, 20 Apr 2011 18:35:11 +0200
+ -- Benjamin Drung <[email protected]> Wed, 20 Apr 2011 18:52:18 +0200
devscripts (2.10.72) unstable; urgency=low
diff --git a/scripts/debcommit.pl b/scripts/debcommit.pl
index 4279e41..df4f18f 100755
--- a/scripts/debcommit.pl
+++ b/scripts/debcommit.pl
@@ -453,10 +453,13 @@ sub getprog {
}
}
- # .git may be in a parent directory, rather than the current
- # directory, if multiple packages are kept in one git repository.
+ # .bzr or .git may be in a parent directory, rather than the current
+ # directory, if multiple packages are kept in one repository.
my $dir=getcwd();
while ($dir=~s/[^\/]*\/?$// && length $dir) {
+ if (-d "$dir/.bzr") {
+ return "bzr";
+ }
if (-d "$dir/.git") {
return "git";
}
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
