Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-08-29 20:43:23 +0300
committerJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-04 15:20:03 +0300
commit816f806786e12435163c591942a204c5a3bdd795 (patch)
tree82ec316f687e84444dd516a1106ee566b84c6944
parentf94804c1f2626831c6bdf8cc269a571324e3f2f2 (diff)
t9300: create marks files for double-import-marks test
Our tests confirm that providing two "import-marks" options in a fast-import stream is an error. However, the invoked command would fail even without covering this case, because the marks files themselves do not actually exist. Let's create the files to make sure we fail for the right reason (we actually do, because the option parsing happens before we open anything, but this future-proofs our test). Signed-off-by: Jeff King <peff@peff.net>
-rwxr-xr-xt/t9300-fast-import.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 1d2a7516fd..c0d04ec3ee 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -2107,6 +2107,8 @@ test_expect_success 'R: abort on receiving feature after data command' '
'
test_expect_success 'R: only one import-marks feature allowed per stream' '
+ >git.marks &&
+ >git2.marks &&
cat >input <<-EOF &&
feature import-marks=git.marks
feature import-marks=git2.marks