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
(from parent 1:
e17b7eb
)
Split brain: Improve quiltify() message
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 4 Jun 2016 11:41:23 +0000
(12:41 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:47 +0000
(16:47 +0100)
Actually --quilt=gbp and --quilt=unapplied (well, what's called
--quilt=apply here) aren't going to be quite identical.
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index 2c72213a56bd04ace2af90aaa6514ee164de5a9e..295bbdf1ed1c323cb48bdfe9c6cbb3de60fdce32 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2682,7
+2682,7
@@
sub quiltify ($$$$) {
if (quilt_could_gbp($target,$unapplied,$oldtiptree)) {
print STDERR <<END;
$us: Tree looks like a patches-unapplied git branch.
-$us: Maybe you forgot --quilt=gbp (
aka
--quilt=apply) ?
+$us: Maybe you forgot --quilt=gbp (
or
--quilt=apply) ?
END
}
fail "quilt fixup naive history linearisation failed.\n".