summaryrefslogtreecommitdiff
path: root/t/t9300-fast-import.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-02-10 00:41:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-10 00:41:16 (GMT)
commitfc180d98a20b6270ec25ca19c8d18a0a1286fe15 (patch)
treeb6adc1fc09968b5cd087d6c08ec197a0ea312438 /t/t9300-fast-import.sh
parent5bb20ece6bdb31d395667855990dc540f2940a41 (diff)
parentdded4f12a46274753439e3a8fa4eb756c5d14ae1 (diff)
downloadgit-fc180d98a20b6270ec25ca19c8d18a0a1286fe15.zip
git-fc180d98a20b6270ec25ca19c8d18a0a1286fe15.tar.gz
git-fc180d98a20b6270ec25ca19c8d18a0a1286fe15.tar.bz2
Merge branch 'rr/fi-import-marks-if-exists'
* rr/fi-import-marks-if-exists: fast-import: Introduce --import-marks-if-exists
Diffstat (limited to 't/t9300-fast-import.sh')
-rwxr-xr-xt/t9300-fast-import.sh55
1 files changed, 55 insertions, 0 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 986bc14..52ac0e5 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -1748,6 +1748,61 @@ test_expect_success \
'cat input | git fast-import --export-marks=other.marks &&
grep :1 other.marks'
+test_expect_success 'R: catch typo in marks file name' '
+ test_must_fail git fast-import --import-marks=nonexistent.marks </dev/null &&
+ echo "feature import-marks=nonexistent.marks" |
+ test_must_fail git fast-import
+'
+
+test_expect_success 'R: import and output marks can be the same file' '
+ rm -f io.marks &&
+ blob=$(echo hi | git hash-object --stdin) &&
+ cat >expect <<-EOF &&
+ :1 $blob
+ :2 $blob
+ EOF
+ git fast-import --export-marks=io.marks <<-\EOF &&
+ blob
+ mark :1
+ data 3
+ hi
+
+ EOF
+ git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF &&
+ blob
+ mark :2
+ data 3
+ hi
+
+ EOF
+ test_cmp expect io.marks
+'
+
+test_expect_success 'R: --import-marks=foo --output-marks=foo to create foo fails' '
+ rm -f io.marks &&
+ test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF
+ blob
+ mark :1
+ data 3
+ hi
+
+ EOF
+'
+
+test_expect_success 'R: --import-marks-if-exists' '
+ rm -f io.marks &&
+ blob=$(echo hi | git hash-object --stdin) &&
+ echo ":1 $blob" >expect &&
+ git fast-import --import-marks-if-exists=io.marks --export-marks=io.marks <<-\EOF &&
+ blob
+ mark :1
+ data 3
+ hi
+
+ EOF
+ test_cmp expect io.marks
+'
+
cat >input << EOF
feature import-marks=marks.out
feature export-marks=marks.new