From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 22 Sep 2016 11:39:01 +0000 (+0100)
Subject: Split brain pseudomerge: Test $overwrite_version for definedness
X-Git-Tag: archive/debian/2.0~126
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6e73b40874dcd924dd1f0091591cbc759070f276

Split brain pseudomerge: Test $overwrite_version for definedness

Technically, `0' is a valid version number, but it is falsish.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 57c0e5c9..451985db 100755
--- a/dgit
+++ b/dgit
@@ -2408,7 +2408,7 @@ END
 
     return $dgitview unless defined $archive_hash;
 
-    if ($overwrite_version) {
+    if (defined $overwrite_version) {
 	progress "Declaring that HEAD inciudes all changes in archive...";
 	progress "Checking that $overwrite_version does so...";
 	$cond_equal->([ $overwrite_version, '--overwrite= version' ],
@@ -2429,7 +2429,7 @@ END
 
     $cond_equal->($i_dgit, $i_archive);
     $cond_ff->($i_dep14, $i_dgit);
-    $overwrite_version or $cond_ff->($i_dep14, [ $maintview, 'HEAD' ]);
+    $overwrite_version // $cond_ff->($i_dep14, [ $maintview, 'HEAD' ]);
 
     my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
     my $authline = clogp_authline $clogp;
@@ -2445,7 +2445,7 @@ author $authline
 commiter $authline
 
 END
-    if ($overwrite_version) {
+    if (defined $overwrite_version) {
 	print MC <<END;
 Declare fast forward from $overwrite_version