summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-18 12:49:48 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-25 20:12:52 +0100
commit860fb101ec10956b4f0d309a00815aff48cffd85 (patch)
treea4e8f302bf7ee1cb52ec5f11481ac5890d30ee15
parent1589309dc4be0896692c0ab294a9953baea5ff33 (diff)
Push reorg: Have FF check use dgit view, not HEAD
Quilt fixup may generate a dgit view, which is not HEAD, and it is the dgit view which will actually be pushed to the archive, so it is that that should be checked. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xdgit2
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit b/dgit
index cd1bbad..f60e15f 100755
--- a/dgit
+++ b/dgit
@@ -2576,7 +2576,7 @@ END
my $forceflag = '';
if ($archive_hash) {
- if (is_fast_fwd($archive_hash, 'HEAD')) {
+ if (is_fast_fwd($archive_hash, $dgithead)) {
# ok
} elsif (deliberately_not_fast_forward) {
$forceflag = '+';