chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1589309
)
Push reorg: Have FF check use dgit view, not HEAD
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 18 Sep 2016 11:49:48 +0000
(12:49 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 25 Sep 2016 19:12:52 +0000
(20:12 +0100)
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>
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index cd1bbad3600dfe423759df3a3434cb0b6320d57f..f60e15fcd9666ca4d70f65af07829aca108256f4 100755
(executable)
--- 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 = '+';