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