chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split brain: Provide a lot more information to quiltify_splitbrain (nfc)
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 1c52b63551f15ba6008e1106b0fc0c0195e29262..d44f526d160da054402ae038dfbc0929fdeb429c 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2556,8
+2556,8
@@
sub quiltify_splitbrain_needed () {
}
}
}
}
-sub quiltify_splitbrain ($$) {
- my ($clogp, $
diffbit
s) = @_;
+sub quiltify_splitbrain ($$
$$$
) {
+ my ($clogp, $
unapplied, $headref, $diffbits, $editedignore
s) = @_;
if ($quilt_mode !~ m/gbp|dpm/) {
# treat .gitignore just like any other upstream file
$diffbits = { %$diffbits };
if ($quilt_mode !~ m/gbp|dpm/) {
# treat .gitignore just like any other upstream file
$diffbits = { %$diffbits };
@@
-3056,11
+3056,12
@@
END
# We calculate some guesswork now about what kind of tree this might
# be. This is mostly for error reporting.
# We calculate some guesswork now about what kind of tree this might
# be. This is mostly for error reporting.
+ my %editedignores;
my $diffbits = {
# H = user's HEAD
# O = orig, without patches applied
# A = "applied", ie orig with H's debian/patches applied
my $diffbits = {
# H = user's HEAD
# O = orig, without patches applied
# A = "applied", ie orig with H's debian/patches applied
- H2O => quiltify_trees_differ($headref, $unapplied, 1),
+ H2O => quiltify_trees_differ($headref, $unapplied, 1
,\%editedignores
),
H2A => quiltify_trees_differ($headref, $oldtiptree,1),
O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
};
H2A => quiltify_trees_differ($headref, $oldtiptree,1),
O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
};
@@
-3089,7
+3090,8
@@
END
" --quilt=gbp --quilt=dpm --quilt=unapplied ?";
if ($quilt_mode =~ m/gbp|dpm|unapplied/) {
" --quilt=gbp --quilt=dpm --quilt=unapplied ?";
if ($quilt_mode =~ m/gbp|dpm|unapplied/) {
- quiltify_splitbrain($clogp, $diffbits);
+ quiltify_splitbrain($clogp, $unapplied, $headref,
+ $diffbits, \%editedignores);
return;
}
return;
}