Jeff King 900f2814b8 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>		2013-05-12 15:23:48 -07:00
..
add.c	Merge branch 'jc/add-ignore-removal'	2013-04-26 15:28:09 -07:00
annotate.c
apply.c	Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint	2013-04-22 11:26:56 -07:00
archive.c	pkt-line: provide a LARGE_PACKET_MAX static buffer	2013-02-20 13:42:22 -08:00
bisect--helper.c	i18n: bisect--helper: mark parseopt strings for translation	2012-08-20 12:23:15 -07:00
blame.c	Merge branch 'nd/pretty-formats'	2013-04-23 11:22:48 -07:00
branch.c	branch: colour upstream branches	2013-04-15 11:04:44 -07:00
bundle.c
cat-file.c	cat-file: print tags raw for "cat-file -p"	2013-04-17 14:48:45 -07:00
check-attr.c	Merge branch 'maint'	2012-09-17 15:59:34 -07:00
check-ignore.c	dir.c: git-status --ignored: don't scan the work tree twice	2013-04-15 12:36:42 -07:00
check-ref-format.c
checkout-index.c	Use imperative form in help usage to describe an action	2012-08-22 12:02:28 -07:00
checkout.c	Merge branch 'nd/checkout-keep-sparse'	2013-04-22 11:11:40 -07:00
clean.c	Merge branch 'as/check-ignore'	2013-01-23 21:19:10 -08:00
clone.c	Merge branch 'jk/check-corrupt-objects-carefully'	2013-04-28 11:57:54 -07:00
column.c	i18n: column: mark parseopt strings for translation	2012-08-20 12:23:16 -07:00
commit-tree.c	commit-tree: document -S option consistently	2013-03-25 15:01:22 -07:00
commit.c	pretty: save commit encoding from logmsg_reencode if the caller needs it	2013-04-18 16:28:27 -07:00
config.c	Merge branch 'cn/config-missing-path' into maint	2012-11-25 18:35:46 -08:00
count-objects.c	count-objects: add -H option to humanize sizes	2013-04-10 13:27:26 -07:00
credential.c	git credential fill: output the whole 'struct credential'	2012-06-25 11:56:24 -07:00
describe.c	Merge branch 'jc/describe' into maint	2013-04-03 09:25:52 -07:00
diff-files.c
diff-index.c	update-index/diff-index: use core.preloadindex to improve performance	2012-11-02 11:38:29 -04:00
diff-tree.c
diff.c	Merge branch 'kb/preload-index-more'	2012-11-20 10:32:10 -08:00
fast-export.c	fast-export: add --signed-tags=warn-strip mode	2013-04-15 09:02:25 -07:00
fetch-pack.c	Merge branch 'jk/pkt-line-cleanup'	2013-04-01 08:59:37 -07:00
fetch.c	refactor "ref->merge" flag	2013-05-12 15:23:48 -07:00
fmt-merge-msg.c	Merge branch 'rt/commentchar-fmt-merge-msg'	2013-04-15 12:40:56 -07:00
for-each-ref.c	Merge branch 'nd/i18n-parseopt-help'	2012-09-07 11:09:09 -07:00
fsck.c	i18n: fsck: mark parseopt strings for translation	2012-08-20 12:23:17 -07:00
gc.c	silence git gc --auto --quiet output	2012-09-27 17:57:26 -07:00
grep.c	Sync with 1.8.1 maintenance track	2013-04-03 09:18:01 -07:00
hash-object.c	i18n: hash-object: mark parseopt strings for translation	2012-08-20 12:23:17 -07:00
help.c	help: mark common_guides[] as translatable	2013-04-12 09:49:00 -07:00
index-pack.c	Merge branch 'nd/index-pack-threaded-fixes' into maint	2013-04-04 13:00:41 -07:00
init-db.c	i18n: init-db: mark parseopt strings for translation	2012-08-20 12:23:17 -07:00
log.c	Merge branch 'rr/shortlog-doc'	2013-04-26 15:28:39 -07:00
ls-files.c	dir.c: replace is_path_excluded with now equivalent is_excluded API	2013-04-15 12:34:01 -07:00
ls-remote.c	ls-remote: document the '--get-url' option	2012-09-07 10:58:35 -07:00
ls-tree.c	pathspec: save the non-wildcard length part	2012-11-19 13:08:28 -08:00
mailinfo.c	Merge branch 'jc/same-encoding' into maint	2012-12-07 14:10:56 -08:00
mailsplit.c	mailsplit: sort maildir filenames more cleverly	2013-03-02 22:52:44 -08:00
merge-base.c	Merge branch 'jc/merge-bases'	2012-09-11 11:36:05 -07:00
merge-file.c	i18n: merge-file: mark parseopt strings for translation	2012-08-20 12:23:18 -07:00
merge-index.c	Which merge_file() function do you mean?	2012-12-09 23:05:27 -08:00
merge-ours.c
merge-recursive.c
merge-tree.c	merge-tree: handle directory/empty conflict correctly	2013-05-06 22:17:00 -07:00
merge.c	Merge branch 'jc/merge-tag-object' into maint	2013-04-24 16:14:06 -07:00
mktag.c
mktree.c	i18n: mktree: mark parseopt strings for translation	2012-08-20 12:23:18 -07:00
mv.c	i18n: mv: mark parseopt strings for translation	2012-08-20 12:23:18 -07:00
name-rev.c	i18n: name-rev: mark parseopt strings for translation	2012-08-20 12:23:18 -07:00
notes.c	Allow custom "comment char"	2013-01-16 12:48:22 -08:00
pack-objects.c	Merge branch 'jk/peel-ref'	2012-10-25 06:42:27 -04:00
pack-redundant.c	Fix sizeof usage in get_permutations	2012-12-13 11:13:44 -08:00
pack-refs.c	i18n: pack-refs: mark parseopt strings for translation	2012-08-20 12:23:19 -07:00
patch-id.c
prune-packed.c	i18n: prune-packed: mark parseopt strings for translation	2012-08-20 12:23:19 -07:00
prune.c	Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1	2013-04-03 08:43:03 -07:00
push.c	remote.c: introduce a way to have different remotes for fetch/push	2013-04-02 10:41:42 -07:00
read-tree.c	i18n: read-tree: mark parseopt strings for translation	2012-08-20 12:23:19 -07:00
receive-pack.c	Merge branch 'jk/receive-pack-deadlocks-with-early-failure'	2013-04-23 11:16:50 -07:00
reflog.c	Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maint	2013-03-26 12:39:51 -07:00
remote-ext.c
remote-fd.c
remote.c	remote: check for superfluous arguments in 'git remote add'	2013-04-24 13:12:51 -07:00
replace.c	replace: parse revision argument for -d	2012-11-13 08:34:14 -05:00
rerere.c	i18n: rerere: mark parseopt strings for translation	2012-08-20 12:23:19 -07:00
reset.c	reset: update documentation to require only tree-ish with paths	2013-01-16 12:50:23 -08:00
rev-list.c	Move print_commit_list to libgit.a	2012-10-29 03:08:30 -04:00
rev-parse.c	Merge branch 'maint-1.7.11' into maint	2012-09-12 14:08:05 -07:00
revert.c	cherry-pick/revert: make usage say '<commit-ish>...'	2013-04-24 09:48:01 -07:00
rm.c	rm: do not complain about d/f conflicts during deletion	2013-04-04 12:28:47 -07:00
send-pack.c	teach get_remote_heads to read from a memory buffer	2013-02-24 00:17:38 -08:00
shortlog.c	builtin/shortlog.c: make usage string consistent with log	2013-04-22 08:00:54 -07:00
show-branch.c	show-branch: use strbuf instead of static buffer	2013-04-06 18:57:15 -07:00
show-ref.c	Merge branch 'jk/peel-ref'	2012-10-25 06:42:27 -04:00
stripspace.c	Allow custom "comment char"	2013-01-16 12:48:22 -08:00
symbolic-ref.c	git symbolic-ref --delete $symref	2012-10-21 12:17:38 -07:00
tag.c	Merge branch 'ph/tag-force-no-warn-on-creation' into maint	2013-04-03 09:24:51 -07:00
tar-tree.c
unpack-file.c
unpack-objects.c
update-index.c	update-index: allow "-h" to also display options	2013-02-23 23:49:33 -08:00
update-ref.c	Use imperative form in help usage to describe an action	2012-08-22 12:02:28 -07:00
update-server-info.c	i18n: update-server-info: mark parseopt strings for translation	2012-08-22 10:58:29 -07:00
upload-archive.c	pkt-line: provide a LARGE_PACKET_MAX static buffer	2013-02-20 13:42:22 -08:00
var.c
verify-pack.c	i18n: verify-pack: mark parseopt strings for translation	2012-08-22 10:58:29 -07:00
verify-tag.c	gpg_interface: allow to request status return	2013-02-14 09:30:04 -08:00
write-tree.c	i18n: write-tree: mark parseopt strings for translation	2012-08-22 10:58:29 -07:00