fast-import parameter --import-marks-if-exists was introduced in commit dded4.. --import-marks can be set via a "feature" command in a fast-import stream and --import-marks-if-exists has support for such specification too, for free. Document "feature import-marks-if-exists=<file>" command and add a minimalistic test for it. Signed-off-by: Dmitry Ivankov <divanorama@xxxxxxxxx> --- Documentation/git-fast-import.txt | 5 +++++ t/t9300-fast-import.sh | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 3f5b912..bdcc81c 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -1005,6 +1005,11 @@ import-marks:: second, an --import-marks= command-line option overrides any "feature import-marks" command in the stream. +import-marks-if-exists:: + Like import-marks but instead of erroring out, silently + skips the file if it does not exist. Differences from -- + version are the same as with import-marks feature above. + cat-blob:: ls:: Require that the backend support the 'cat-blob' or 'ls' command. diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 2a53640..eed57df 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -1882,6 +1882,21 @@ test_expect_success 'R: --import-marks-if-exists' ' test_cmp expect io.marks ' +test_expect_success 'R: feature 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 && + feature import-marks-if-exists=io.marks + 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 -- 1.7.3.4 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html