summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Nicolas Pitre <nico@cam.org>2006-11-01 17:06:23 -0500
committerLibravatar Junio C Hamano <junkio@cox.net>2006-11-03 00:24:07 -0800
commitda093d37506f034bfb14e6de26cce9c14b1a1216 (patch)
treefe01e9d8a345c25b23521af3e6d0a34732a70f03 /git-merge-octopus.sh
parentgit-fetch can use both --thin and --keep with fetch-pack now (diff)
downloadtgif-da093d37506f034bfb14e6de26cce9c14b1a1216.tar.xz
improve fetch-pack's handling of kept packs
Since functions in fetch-clone.c were only used from fetch-pack.c, its content has been merged with fetch-pack.c. This allows for better coupling of features with much simpler implementations. One new thing is that the (abscence of) --thin also enforce it on index-pack now, such that index-pack will abort if a thin pack was _not_ asked for. The -k or --keep, when provided twice, now causes the fetched pack to be left as a kept pack just like receive-pack currently does. Eventually this will be used to close a race against concurrent repacking. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions