From f18eae634f175b488386abca5cf80237e4418fce Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 21 Aug 2015 16:39:17 +0100 Subject: [PATCH] Reject debian/source/local-patch-header --- debian/changelog | 3 ++- dgit | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d362977a..1097b779 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,8 @@ dgit (1.4~~) UNRELEASED; urgency=low the error message. (This has been broken forever.) * In dgit(7), discuss binaries and documentation present in upstream but removed by rules clean. - * Detect and reject git trees containing debian/source/local-options. + * Detect and reject git trees containing debian/source/local-options + or debian/source/local-patch-header. * In --dry-run mode, _do_ actually run dpkg-source --commit so that we actually do construct the quilt fixup commit; instead, honour --dry-run by avoiding pulling it back to your HEAD. diff --git a/dgit b/dgit index f4e2abfb..a49c7667 100755 --- a/dgit +++ b/dgit @@ -1762,8 +1762,10 @@ sub check_not_dirty () { failedcmd @cmd; } - if (stat_exists "debian/source/local-options") { - fail "git tree contains debian/source/local-options"; + foreach my $f (qw(local-options local-patch-header)) { + if (stat_exists "debian/source/$f") { + fail "git tree contains debian/source/$f"; + } } } -- 2.30.2