chiark / gitweb /
quilt-fixup checks that the git tree is clean, as for build-prep.
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 22 Aug 2015 10:22:12 +0000 (11:22 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 22 Aug 2015 12:23:04 +0000 (13:23 +0100)
debian/changelog
dgit

index 831973f1d734270ede05d0dd45230d2f1cc79930..564ccc3236438582a44424afb67b6c74665329f7 100644 (file)
@@ -22,6 +22,7 @@ dgit (1.4~~) UNRELEASED; urgency=low
     the user can override it.  Closes:#796019.
   * Test suite: run quilt-fixup with -wgf in distropatches-reject,
     so that we don't need build-depends.
+  * quilt-fixup checks that the git tree is clean, as for build-prep.
 
  --
 
diff --git a/dgit b/dgit
index dbb0a062e57bd206432dd05bf57b03e73c6c9709..e02a6bd267fc506b224c9abb2db9f6aa7b9749e1 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3161,6 +3161,8 @@ sub cmd_quilt_fixup {
     my $clogp = parsechangelog();
     $version = getfield $clogp, 'Version';
     $package = getfield $clogp, 'Source';
+    check_not_dirty();
+    clean_tree();
     build_maybe_quilt_fixup();
 }