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:
b712058
)
Test suite: t-gbp-example-prep: Arrange to be FF from the archive
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 11:52:47 +0000
(12:52 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 16:42:03 +0000
(17:42 +0100)
Otherwise pushes will necessarily (spuriously) fail.
tests/lib
patch
|
blob
|
history
diff --git
a/tests/lib
b/tests/lib
index dd7a67ddc9dd772d341afade23fc202569782e69..b4c1128c9a82f834b7490ff83e8750257fe56049 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-552,6
+552,10
@@
t-gbp-example-prep () {
t-gbp-unapplied-pq2qc
t-commit 'some updates' 1.0-2
+
+ git merge -s ours \
+ -m 'Pseudo-merge to make descendant of archive' \
+ remotes/dgit/dgit/sid
}
t-commit () {