chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
71c4678
)
Split brain: Pass $clogp to quiltify_splitbrain (nfc)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 4 Jun 2016 15:44:19 +0000
(16:44 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:47 +0000
(16:47 +0100)
We are going to want this in a moment.
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index 79e0cc53289564d9cef46f459adaa1f3ccfd57eb..29cf5076acd0942d746dda59249ef3c7469115c7 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2552,8
+2552,8
@@
sub quiltify_splitbrain_needed () {
}
}
-sub quiltify_splitbrain ($) {
- my ($diffbits) = @_;
+sub quiltify_splitbrain ($
$
) {
+ my ($
clogp, $
diffbits) = @_;
if ($quilt_mode !~ m/gbp|dpm/) {
# treat .gitignore just like any other upstream file
$diffbits = { %$diffbits };
@@
-3058,7
+3058,7
@@
END
" --quilt=gbp --quilt=dpm --quilt=unapplied ?";
if ($quilt_mode =~ m/gbp|dpm|unapplied/) {
- quiltify_splitbrain($diffbits);
+ quiltify_splitbrain($
clogp, $
diffbits);
return;
}