summaryrefslogtreecommitdiff
path: root/tests/lib
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib9
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/lib b/tests/lib
index 42e1344..9693c25 100644
--- a/tests/lib
+++ b/tests/lib
@@ -1026,6 +1026,15 @@ t-make-badcommit () {
t-expect-fsck-fail $badcommit
}
+t-make-orig () {
+ # leaves ust set to filename of orig tarball
+ local p=$1
+ local v=$2
+ local tag=${3-v$2}
+ ust=${p}_${v}.orig.tar.gz
+ git archive -o ../$ust --prefix=${p}-${v}/ $tag
+}
+
t-merge-conflicted-stripping-conflict-markers () {
local otherbranch=$1
local file=$2