diff options
author | Daniel Barkalow <barkalow@iabervon.org> | 2007-09-10 23:03:25 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-09-19 03:22:30 -0700 |
commit | b888d61c8308027433df9c243fa551f42db1c76a (patch) | |
tree | 94459873b07253fce86f467af8347f1a2d74f140 /cache.h | |
parent | c7a8a16239c6bdbb4041dd8a8773ae055d3cccf8 (diff) | |
download | git-b888d61c8308027433df9c243fa551f42db1c76a.tar.gz git-b888d61c8308027433df9c243fa551f42db1c76a.tar.xz |
Make fetch a builtin
Thanks to Johannes Schindelin for review and fixes, and Julian
Phillips for the original C translation.
This changes a few small bits of behavior:
branch.<name>.merge is parsed as if it were the lhs of a fetch
refspec, and does not have to exactly match the actual lhs of a
refspec, so long as it is a valid abbreviation for the same ref.
branch.<name>.merge is no longer ignored if the remote is configured
with a branches/* file. Neither behavior is useful, because there can
only be one ref that gets fetched, but this is more consistant.
Also, fetch prints different information to standard out.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -492,6 +492,7 @@ struct ref { unsigned char old_sha1[20]; unsigned char new_sha1[20]; unsigned char force; + unsigned char merge; struct ref *peer_ref; /* when renaming */ char name[FLEX_ARRAY]; /* more */ }; |