diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-28 22:55:53 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-29 00:59:39 +0100 |
commit | 7d2314ab7369c305eb1894fc07cb04f147590cf1 (patch) | |
tree | 6f3d5f74680ea3c33d9561a1669b79fa65d7a1da /dgit | |
parent | 44250fed27c2cf4b3ff93e6510a8017fcc09c402 (diff) |
dgit: Make $format available in build_or_push_prep_modes
By returning it from determine_whether_split_brain.
No functional change yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -989,6 +989,8 @@ sub determine_whether_split_brain () { $do_split_brain = 1; } $do_split_brain //= 0; + + return ($format); } sub supplementary_message ($) { @@ -6381,7 +6383,7 @@ sub build_or_push_prep_early () { } sub build_or_push_prep_modes () { - determine_whether_split_brain(); + my ($format,) = determine_whether_split_brain(); fail __ "dgit: --include-dirty is not supported with split view". " (including with view-splitting quilt modes)" |