fast-import: stricter parsing of integer options

diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 69179c61247bf05bc287c2a4b16ce2762dc4ac47..f823c05305e5021a8cca98d49256af3b1c008fb9 100755 (executable)
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -26,7 +26,7 @@ test_expect_success 'setup' '
        test_tick &&
        git tag rein &&
        git checkout -b wer HEAD^ &&
-       echo lange > file2
+       echo lange > file2 &&
        test_tick &&
        git commit -m sitzt file2 &&
        test_tick &&
@@ -355,6 +355,20 @@ test_expect_failure 'no exact-ref revisions included' '
        )
 '
 
+test_expect_success 'path limiting with import-marks does not lose unmodified files'        '
+       git checkout -b simple marks~2 &&
+       git fast-export --export-marks=marks simple -- file > /dev/null &&
+       echo more content >> file &&
+       test_tick &&
+       git commit -mnext file &&
+       git fast-export --import-marks=marks simple -- file file0 | grep file0
+'
+
+test_expect_success 'full-tree re-shows unmodified files'        '
+       git checkout -f simple &&
+       test $(git fast-export --full-tree simple | grep -c file0) -eq 3
+'
+
 test_expect_success 'set-up a few more tags for tag export tests' '
        git checkout -f master &&
        HEAD_TREE=`git show -s --pretty=raw HEAD | grep tree | sed "s/tree //"` &&
@@ -376,7 +390,7 @@ test_expect_success 'tree_tag-obj'    'git fast-export tree_tag-obj'
 test_expect_success 'tag-obj_tag'     'git fast-export tag-obj_tag'
 test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
 
-test_expect_failure 'directory becomes symlink'        '
+test_expect_success SYMLINKS 'directory becomes symlink'        '
        git init dirtosymlink &&
        git init result &&
        (