summaryrefslogtreecommitdiff
path: root/send-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-25 05:55:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-25 05:55:23 (GMT)
commitf0b0af1b04f558b684cae2a3b805ca4bab84d45f (patch)
tree2cd7477b64b6a732adce241d1403830df2b15c38 /send-pack.c
parent1509bd9e69b916ca7f04a89fc03662e03e2ba312 (diff)
parente646de0d14bac20ef6e156c1742b9e62fb0b9020 (diff)
parenteeef7135fed9b8784627c4c96e125241c06c65e1 (diff)
downloadgit-f0b0af1b04f558b684cae2a3b805ca4bab84d45f.zip
git-f0b0af1b04f558b684cae2a3b805ca4bab84d45f.tar.gz
git-f0b0af1b04f558b684cae2a3b805ca4bab84d45f.tar.bz2
Merge branches 'jc/rev-list' and 'jc/pack-thin'
* jc/rev-list: rev-list --objects: use full pathname to help hashing. rev-list --objects-edge: remove duplicated edge commit output. rev-list --objects-edge * jc/pack-thin: pack-objects: hash basename and direname a bit differently. pack-objects: allow "thin" packs to exceed depth limits pack-objects: use full pathname to help hashing with "thin" pack. pack-objects: thin pack micro-optimization. Use thin pack transfer in "git fetch". Add git-push --thin. send-pack --thin: use "thin pack" delta transfer. Thin pack - create packfile with missing delta base. Conflicts: pack-objects.c (taking "next") send-pack.c (taking "next")