From 860fb101ec10956b4f0d309a00815aff48cffd85 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 18 Sep 2016 12:49:48 +0100 Subject: [PATCH] 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 --- dgit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dgit b/dgit index cd1bbad3..f60e15fc 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 = '+'; -- 2.30.2