Control: tag -1 patch
-- Joachim "nomeata" Breitner Debian Developer [email protected] | ICQ# 74513189 | GPG-Keyid: 4743206C JID: [email protected] | http://people.debian.org/~nomeata
From 690c34c9051ea2f882d7bef035b4620f15ff9a65 Mon Sep 17 00:00:00 2001 From: Joachim Breitner <[email protected]> Date: Tue, 29 Oct 2013 09:06:34 +0100 Subject: [PATCH] debcommit: Fix --release with darcs when the repository is clean. (Closes: #728177) --- debian/changelog | 4 ++++ scripts/debcommit.pl | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 43288f9..3bbf0c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ devscripts (2.13.5) UNRELEASED; urgency=low * debcheckout: allow setting the user for auth mode in the config. (Closes: #722171) + [ Joachim Breitner ] + * debcommit: Fix --release with darcs when the repository is clean. (Closes: + #728177) + -- James McCoy <[email protected]> Mon, 07 Oct 2013 22:21:31 -0400 devscripts (2.13.4) unstable; urgency=low diff --git a/scripts/debcommit.pl b/scripts/debcommit.pl index 00656d5..d11628e 100755 --- a/scripts/debcommit.pl +++ b/scripts/debcommit.pl @@ -586,6 +586,14 @@ sub commit { } } elsif ($prog eq 'darcs') { + if (! @files_to_commit && ($all || $release)) { + # check to see if the WC is clean. darcs record would exit + # nonzero, so don't run it in --all or --release mode. + $action_rc = action($prog, "status"); + if (!$action_rc) { + return; + } + } if ($diffmode) { $action_rc = action($prog, "diff", @files_to_commit); } else { -- 1.8.4.rc3
signature.asc
Description: This is a digitally signed message part
_______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
