summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-08-21 12:51:39 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-08-21 12:51:39 +0100
commit4880bd4da0a8e79a6cfb7697dc737e1e0e1caca2 (patch)
tree63650166d9412045788e3c5b6ac8245e699c9bca /dgit
parentd88139021717eeb85131c1e62b23bfb8ec1ca6c5 (diff)
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.
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit5
1 files changed, 3 insertions, 2 deletions
diff --git a/dgit b/dgit
index d6f37ff..ce858ab 100755
--- a/dgit
+++ b/dgit
@@ -2493,7 +2493,7 @@ END
local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
local $ENV{'VISUAL'} = $ENV{'EDITOR'};
local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
- runcmd_ordryrun_local @dpkgsource, qw(--commit .), $patchname;
+ runcmd @dpkgsource, qw(--commit .), $patchname;
}
}
@@ -2874,7 +2874,8 @@ END
}
changedir '../../../..';
- runcmd @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
+ runcmd_ordryrun_local
+ @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
}
sub quilt_fixup_editor () {