summaryrefslogtreecommitdiff
path: root/t/t5536-fetch-conflicts.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-03-21 12:49:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-21 12:49:08 -0700
commit1ddb4d7e5ed478ec7a0335090482c1944a64aca5 (patch)
treef7d259210d2148375b7a59138f71d92b67d6196f /t/t5536-fetch-conflicts.sh
parentMerge branch 'jn/wt-status' (diff)
parentupload-pack: send shallow info over stdin to pack-objects (diff)
downloadtgif-1ddb4d7e5ed478ec7a0335090482c1944a64aca5.tar.xz
Merge branch 'nd/upload-pack-shallow'
Serving objects from a shallow repository needs to write a temporary file to be used, but the serving upload-pack may not have write access to the repository which is meant to be read-only. Instead feed these temporary shallow bounds from the standard input of pack-objects so that we do not have to use a temporary file. * nd/upload-pack-shallow: upload-pack: send shallow info over stdin to pack-objects
Diffstat (limited to 't/t5536-fetch-conflicts.sh')
0 files changed, 0 insertions, 0 deletions