Jeff King 9e3751d443 remote.c: drop "remote" pointer from "struct branch" ... When we create each branch struct, we fill in the "remote_name" field from the config, and then fill in the actual "remote" field (with a "struct remote") based on that name. However, it turns out that nobody really cares about the latter field. The only two sites that access it at all are: 1. git-merge, which uses it to notice when the branch does not have a remote defined. But we can easily replace this with looking at remote_name instead. 2. remote.c itself, when setting up the @{upstream} merge config. But we don't need to save the "remote" in the "struct branch" for that; we can just look it up for the duration of the operation. So there is no need to have both fields; they are redundant with each other (the struct remote contains the name, or you can look up the struct from the name). It would be nice to simplify this, especially as we are going to add matching pushremote config in a future patch (and it would be nice to keep them consistent). So which one do we keep and which one do we get rid of? If we had a lot of callers accessing the struct, it would be more efficient to keep it (since you have to do a lookup to go from the name to the struct, but not vice versa). But we don't have a lot of callers; we have exactly one, so efficiency doesn't matter. We can decide this based on simplicity and readability. And the meaning of the struct value is somewhat unclear. Is it always the remote matching remote_name? If remote_name is NULL (i.e., no per-branch config), does the struct fall back to the "origin" remote, or is it also NULL? These questions will get even more tricky with pushremotes, whose fallback behavior is more complicated. So let's just store the name, which pretty clearly represents the branch.*.remote config. Any lookup or fallback behavior can then be implemented in helper functions. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2015-05-21 10:48:10 -07:00
..
add.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
annotate.c	annotate: use argv_array	2014-07-16 11:10:11 -07:00
apply.c	Merge branch 'jc/apply-beyond-symlink' into maint	2015-03-13 22:56:02 -07:00
archive.c	replace {pre,suf}fixcmp() with {starts,ends}_with()	2013-12-05 14:13:21 -08:00
bisect--helper.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
blame.c	Merge branch 'es/blame-commit-info-fix' into maint	2015-03-05 13:13:12 -08:00
branch.c	Merge branch 'mg/detached-head-report'	2015-03-20 13:11:46 -07:00
bundle.c
cat-file.c	Merge branch 'ah/usage-strings'	2015-02-11 13:44:20 -08:00
check-attr.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
check-ignore.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
check-mailmap.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
check-ref-format.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
checkout-index.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
checkout.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
clean.c	Merge branch 'ja/clean-confirm-i18n'	2015-03-06 15:02:30 -08:00
clone.c	Merge branch 'jk/cleanup-failed-clone'	2015-03-25 12:54:24 -07:00
column.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
commit-tree.c	commit-tree: simplify parsing of option -S using skip_prefix()	2014-12-29 09:32:45 -08:00
commit.c	Merge branch 'mh/refs-have-new'	2015-03-05 12:45:39 -08:00
config.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
count-objects.c	count-objects: use for_each_loose_file_in_objdir	2014-10-16 10:10:41 -07:00
credential.c	git credential fill: output the whole 'struct credential'	2012-06-25 11:56:24 -07:00
describe.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
diff-files.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
diff-index.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
diff-tree.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
diff.c	lockfile.h: extract new header file for the functions in lockfile.c	2014-10-01 13:56:14 -07:00
fast-export.c	teach fast-export an --anonymize option	2014-08-27 10:42:16 -07:00
fetch-pack.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
fetch.c	Merge branch 'mh/refs-have-new'	2015-03-05 12:45:39 -08:00
fmt-merge-msg.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
for-each-ref.c	Merge branch 'rs/simple-cleanups' into maint	2015-03-06 14:57:57 -08:00
fsck.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
gc.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
get-tar-commit-id.c	use skip_prefix() to avoid more magic numbers	2014-10-07 11:09:16 -07:00
grep.c	Merge branch 'ws/grep-quiet-no-pager'	2015-03-25 12:54:20 -07:00
hash-object.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
help.c	Merge branch 'sb/leaks'	2015-03-20 13:11:53 -07:00
index-pack.c	Merge branch 'rs/deflate-init-cleanup'	2015-03-17 16:01:26 -07:00
init-db.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
interpret-trailers.c	trailer: add interpret-trailers command	2014-10-13 13:55:27 -07:00
log.c	Merge branch 'dk/format-patch-ignore-diff-submodule' into maint	2015-02-24 22:10:15 -08:00
ls-files.c	Merge branch 'jc/report-path-error-to-dir'	2015-03-26 11:57:13 -07:00
ls-remote.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
ls-tree.c	ls-tree: disable negative pathspec because it's not supported	2014-12-01 11:33:45 -08:00
mailinfo.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
mailsplit.c	mailsplit: remove unnecessary unlink(2) call	2014-10-07 10:49:57 -07:00
merge-base.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
merge-file.c	Merge branch 'ab/merge-file-prefix'	2015-02-22 12:28:25 -08:00
merge-index.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
merge-ours.c
merge-recursive.c	replace {pre,suf}fixcmp() with {starts,ends}_with()	2013-12-05 14:13:21 -08:00
merge-tree.c	merge-tree: remove unused df_conflict arguments	2014-09-02 11:02:58 -07:00
merge.c	remote.c: drop "remote" pointer from "struct branch"	2015-05-21 10:48:10 -07:00
mktag.c
mktree.c	builtin/mktree.c: use ALLOC_GROW() in append_to_tree()	2014-03-03 14:54:45 -08:00
mv.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
name-rev.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
notes.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
pack-objects.c	Merge branch 'rs/deflate-init-cleanup'	2015-03-17 16:01:26 -07:00
pack-redundant.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
pack-refs.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
patch-id.c	patch-id: make it stable against hunk reordering	2014-06-10 13:09:24 -07:00
prune-packed.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
prune.c	prune: turn on ref_paranoia flag	2015-03-20 12:40:56 -07:00
push.c	push: allow --follow-tags to be set by config push.followTags	2015-03-14 15:08:35 -07:00
read-tree.c	lockfile.h: extract new header file for the functions in lockfile.c	2014-10-01 13:56:14 -07:00
receive-pack.c	ref_transaction_delete(): remove "have_old" parameter	2015-02-17 11:23:48 -08:00
reflog.c	reflog: improve and update documentation	2015-03-05 12:35:36 -08:00
remote-ext.c	use skip_prefix() to avoid more magic numbers	2014-10-07 11:09:16 -07:00
remote-fd.c
remote.c	Merge branch 'ah/usage-strings'	2015-02-11 13:44:20 -08:00
repack.c	Merge branch 'jk/prune-with-corrupt-refs'	2015-03-25 12:54:26 -07:00
replace.c	ref_transaction_update(): remove "have_old" parameter	2015-02-17 11:22:50 -08:00
rerere.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
reset.c	lockfile.h: extract new header file for the functions in lockfile.c	2014-10-01 13:56:14 -07:00
rev-list.c	commit: record buffer length in cache	2014-06-13 12:09:38 -07:00
rev-parse.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
revert.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
rm.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
send-pack.c	send-pack.c: add --atomic command line argument	2015-01-07 19:56:44 -08:00
shortlog.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
show-branch.c	Merge branch 'ah/usage-strings'	2015-02-11 13:44:20 -08:00
show-ref.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
stripspace.c	builtin/stripspace.c: fix broken indentation	2013-09-06 13:33:17 -07:00
symbolic-ref.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
tag.c	Merge branch 'jk/tag-h-column-is-a-listing-option'	2015-03-23 11:28:02 -07:00
unpack-file.c
unpack-objects.c	index-pack: terminate object buffers with NUL	2014-12-09 11:56:37 -08:00
update-index.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
update-ref.c	ref_transaction_verify(): new function to check a reference's value	2015-02-17 11:24:59 -08: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	replace {pre,suf}fixcmp() with {starts,ends}_with()	2013-12-05 14:13:21 -08:00
var.c	ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT	2012-05-24 17:16:41 -07:00
verify-commit.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
verify-pack.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
verify-tag.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
write-tree.c	i18n: write-tree: mark parseopt strings for translation	2012-08-22 10:58:29 -07:00