summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit15
1 files changed, 9 insertions, 6 deletions
diff --git a/dgit b/dgit
index 55a20df..879adea 100755
--- a/dgit
+++ b/dgit
@@ -2506,9 +2506,16 @@ END
if (check_for_git()) {
git_fetch_us();
}
+ my $archive_hash = fetch_from_archive();
+ if (!$archive_hash) {
+ $new_package or
+ fail "package appears to be new in this suite;".
+ " if this is intentional, use --new";
+ }
+
my $forceflag = '';
- if (fetch_from_archive()) {
- if (is_fast_fwd(lrref(), 'HEAD')) {
+ if ($archive_hash) {
+ if (is_fast_fwd($archive_hash, 'HEAD')) {
# ok
} elsif (deliberately_not_fast_forward) {
$forceflag = '+';
@@ -2520,10 +2527,6 @@ END
"dgit: To rewind history, if permitted by the archive,".
" use --deliberately-not-fast-forward";
}
- } else {
- $new_package or
- fail "package appears to be new in this suite;".
- " if this is intentional, use --new";
}
supplementary_message(<<'END');