diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-22 12:39:01 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-26 01:16:59 +0100 |
commit | 6e73b40874dcd924dd1f0091591cbc759070f276 (patch) | |
tree | 53063f77c3a77da7bc814bbd7c10c4dfa87d0601 /dgit | |
parent | 55f12281eebd4352753e45a31ee4e69bfbc5c48e (diff) |
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>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 |