| commit | 900f2814b8da951a450f5762dabb1b248dd77abc | |
| author | Jeff King <peff@peff.net> | |
| Sat, 11 May 2013 16:15:59 +0000 (11 18:15 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 12 May 2013 22:23:48 +0000 (12 15:23 -0700) | ||
| tree | 936ac5bd34c4d7ba6d879a209db80a2065364862 | treesnapshot (tar.gz zip) |
| parent | 4ab90e7a5c46ce929ae8b3b7bbb5b276f2f60e0d | commitdiff |
refactor "ref->merge" flag
Each "struct ref" has a boolean flag that is set by the
fetch code to determine whether the ref should be marked as
"not-for-merge" or not when we write it out to FETCH_HEAD.
It would be useful to turn this boolean into a tri-state,
with the third state meaning "do not bother writing it out
to FETCH_HEAD at all". That would let us add extra refs to
the set of refs to be stored (e.g., to store copies of
things we fetched) without impacting FETCH_HEAD.
This patch turns it into an enum that covers the tri-state
case, and hopefully makes the code more explicit and easier
to read.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Each "struct ref" has a boolean flag that is set by the
fetch code to determine whether the ref should be marked as
"not-for-merge" or not when we write it out to FETCH_HEAD.
It would be useful to turn this boolean into a tri-state,
with the third state meaning "do not bother writing it out
to FETCH_HEAD at all". That would let us add extra refs to
the set of refs to be stored (e.g., to store copies of
things we fetched) without impacting FETCH_HEAD.
This patch turns it into an enum that covers the tri-state
case, and hopefully makes the code more explicit and easier
to read.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/fetch.c | diffblobblamehistory | |
| cache.h | diffblobblamehistory |