Merge branch 'jc/fetch-raw-sha1'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Mar 2013 21:02:27 +0000 (14:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Mar 2013 21:02:27 +0000 (14:02 -0700)
Allows requests to fetch objects at any tip of refs (including
hidden ones). It seems that there may be use cases even outside
Gerrit (e.g. $gmane/215701).

* jc/fetch-raw-sha1:
fetch: fetch objects by their exact SHA-1 object names
upload-pack: optionally allow fetching from the tips of hidden refs
fetch: use struct ref to represent refs to be fetched
parse_fetch_refspec(): clarify the codeflow a bit

1  2 
Documentation/config.txt
cache.h
fetch-pack.c
remote.c
t/t5516-fetch-push.sh
transport.c
upload-pack.c
Simple merge
diff --cc cache.h
index e493563f4c07e6adcd00a1b2476926d69a4a67f8,03b3285e4f426634c64896bf8c6d891001aa885d..6818d87fa033182c343164ace22fb21246db6a3b
+++ b/cache.h
@@@ -1015,9 -1008,13 +1015,10 @@@ struct ref 
        char *symref;
        unsigned int
                force:1,
 -              requires_force:1,
 +              forced_update:1,
                merge:1,
-               deletion:1;
 -              nonfastforward:1,
 -              not_forwardable:1,
 -              update:1,
+               deletion:1,
+               matched:1;
        enum {
                REF_STATUS_NONE = 0,
                REF_STATUS_OK,
diff --cc fetch-pack.c
Simple merge
diff --cc remote.c
Simple merge
Simple merge
diff --cc transport.c
Simple merge
diff --cc upload-pack.c
Simple merge