From: Sverre Rabbelier Date: Fri, 4 Dec 2009 17:06:59 +0000 (+0100) Subject: fast-import: allow for multiple --import-marks= arguments X-Git-Tag: v1.7.0-rc0~95^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/081751c882f8398081b94335faa23912a655fb1c?ds=inline;hp=081751c882f8398081b94335faa23912a655fb1c fast-import: allow for multiple --import-marks= arguments The --import-marks= option may be specified multiple times on the commandline and should result in all marks being read in. Only one import-marks feature may be specified in the stream, which is overriden by any --import-marks= commandline options. If one wishes to specify import-marks files in addition to the one specified in the stream, it is easy to repeat the stream option as a --import-marks= commandline option. Also verify this behavior with tests. Signed-off-by: Sverre Rabbelier Signed-off-by: Junio C Hamano ---