summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-10 15:27:51 -0800
committerJunio C Hamano <gitster@pobox.com>2009-12-10 15:29:05 -0800
commit782a0005fcb26bb7ef27f720fd139ae40a6f434b (patch)
tree53c956ee887db28a5c48ce8d146862055dd9b1eb /git-merge-octopus.sh
parent1456b043fc0f0a395c35d6b5e55b0dad1b6e7acc (diff)
downloadgit-782a0005fcb26bb7ef27f720fd139ae40a6f434b.tar.gz
Fix archive format with -- on the command line
Giving --format from the command line, or using output file extention to DWIM the output format, with a pathspec that is disambiguated with an explicit double-dash on the command line, e.g. git archive -o file --format=zip HEAD -- path git archive -o file.zip HEAD -- path didn't work correctly. This was because the code reordered (when one was given) or added (when the format was inferred) a --format argument at the end, effectively making it to "archive HEAD -- path --format=zip", i.e. an extra pathspec that is unlikely to match anything. The command line argument list should always be "options, revs and then paths", and we should set a good example by inserting the --format at the beginning instead. Reported-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions