mirror of
https://github.com/git/git.git
synced 2024-11-14 21:23:03 +01:00
9e3751d443
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>
|
||
|---|---|---|
| .. | ||
| howto | ||
| RelNotes | ||
| technical | ||
| .gitattributes | ||
| .gitignore | ||
| asciidoc.conf | ||
| blame-options.txt | ||
| build-docdep.perl | ||
| cat-texi.perl | ||
| cmd-list.perl | ||
| CodingGuidelines | ||
| config.txt | ||
| date-formats.txt | ||
| diff-config.txt | ||
| diff-format.txt | ||
| diff-generate-patch.txt | ||
| diff-options.txt | ||
| docbook-xsl.css | ||
| docbook.xsl | ||
| everyday.txto | ||
| fetch-options.txt | ||
| fix-texi.perl | ||
| git-add.txt | ||
| git-am.txt | ||
| git-annotate.txt | ||
| git-apply.txt | ||
| git-archimport.txt | ||
| git-archive.txt | ||
| git-bisect-lk2009.txt | ||
| git-bisect.txt | ||
| git-blame.txt | ||
| git-branch.txt | ||
| git-bundle.txt | ||
| git-cat-file.txt | ||
| git-check-attr.txt | ||
| git-check-ignore.txt | ||
| git-check-mailmap.txt | ||
| git-check-ref-format.txt | ||
| git-checkout-index.txt | ||
| git-checkout.txt | ||
| git-cherry-pick.txt | ||
| git-cherry.txt | ||
| git-citool.txt | ||
| git-clean.txt | ||
| git-clone.txt | ||
| git-column.txt | ||
| git-commit-tree.txt | ||
| git-commit.txt | ||
| git-config.txt | ||
| git-count-objects.txt | ||
| git-credential-cache--daemon.txt | ||
| git-credential-cache.txt | ||
| git-credential-store.txt | ||
| git-credential.txt | ||
| git-cvsexportcommit.txt | ||
| git-cvsimport.txt | ||
| git-cvsserver.txt | ||
| git-daemon.txt | ||
| git-describe.txt | ||
| git-diff-files.txt | ||
| git-diff-index.txt | ||
| git-diff-tree.txt | ||
| git-diff.txt | ||
| git-difftool.txt | ||
| git-fast-export.txt | ||
| git-fast-import.txt | ||
| git-fetch-pack.txt | ||
| git-fetch.txt | ||
| git-filter-branch.txt | ||
| git-fmt-merge-msg.txt | ||
| git-for-each-ref.txt | ||
| git-format-patch.txt | ||
| git-fsck-objects.txt | ||
| git-fsck.txt | ||
| git-gc.txt | ||
| git-get-tar-commit-id.txt | ||
| git-grep.txt | ||
| git-gui.txt | ||
| git-hash-object.txt | ||
| git-help.txt | ||
| git-http-backend.txt | ||
| git-http-fetch.txt | ||
| git-http-push.txt | ||
| git-imap-send.txt | ||
| git-index-pack.txt | ||
| git-init-db.txt | ||
| git-init.txt | ||
| git-instaweb.txt | ||
| git-interpret-trailers.txt | ||
| git-log.txt | ||
| git-ls-files.txt | ||
| git-ls-remote.txt | ||
| git-ls-tree.txt | ||
| git-mailinfo.txt | ||
| git-mailsplit.txt | ||
| git-merge-base.txt | ||
| git-merge-file.txt | ||
| git-merge-index.txt | ||
| git-merge-one-file.txt | ||
| git-merge-tree.txt | ||
| git-merge.txt | ||
| git-mergetool--lib.txt | ||
| git-mergetool.txt | ||
| git-mktag.txt | ||
| git-mktree.txt | ||
| git-mv.txt | ||
| git-name-rev.txt | ||
| git-notes.txt | ||
| git-p4.txt | ||
| git-pack-objects.txt | ||
| git-pack-redundant.txt | ||
| git-pack-refs.txt | ||
| git-parse-remote.txt | ||
| git-patch-id.txt | ||
| git-prune-packed.txt | ||
| git-prune.txt | ||
| git-pull.txt | ||
| git-push.txt | ||
| git-quiltimport.txt | ||
| git-read-tree.txt | ||
| git-rebase.txt | ||
| git-receive-pack.txt | ||
| git-reflog.txt | ||
| git-relink.txt | ||
| git-remote-ext.txt | ||
| git-remote-fd.txt | ||
| git-remote-helpers.txto | ||
| git-remote-testgit.txt | ||
| git-remote.txt | ||
| git-repack.txt | ||
| git-replace.txt | ||
| git-request-pull.txt | ||
| git-rerere.txt | ||
| git-reset.txt | ||
| git-rev-list.txt | ||
| git-rev-parse.txt | ||
| git-revert.txt | ||
| git-rm.txt | ||
| git-send-email.txt | ||
| git-send-pack.txt | ||
| git-sh-i18n--envsubst.txt | ||
| git-sh-i18n.txt | ||
| git-sh-setup.txt | ||
| git-shell.txt | ||
| git-shortlog.txt | ||
| git-show-branch.txt | ||
| git-show-index.txt | ||
| git-show-ref.txt | ||
| git-show.txt | ||
| git-stage.txt | ||
| git-stash.txt | ||
| git-status.txt | ||
| git-stripspace.txt | ||
| git-submodule.txt | ||
| git-svn.txt | ||
| git-symbolic-ref.txt | ||
| git-tag.txt | ||
| git-tools.txt | ||
| git-unpack-file.txt | ||
| git-unpack-objects.txt | ||
| git-update-index.txt | ||
| git-update-ref.txt | ||
| git-update-server-info.txt | ||
| git-upload-archive.txt | ||
| git-upload-pack.txt | ||
| git-var.txt | ||
| git-verify-commit.txt | ||
| git-verify-pack.txt | ||
| git-verify-tag.txt | ||
| git-web--browse.txt | ||
| git-whatchanged.txt | ||
| git-write-tree.txt | ||
| git.txt | ||
| gitattributes.txt | ||
| gitcli.txt | ||
| gitcore-tutorial.txt | ||
| gitcredentials.txt | ||
| gitcvs-migration.txt | ||
| gitdiffcore.txt | ||
| giteveryday.txt | ||
| gitglossary.txt | ||
| githooks.txt | ||
| gitignore.txt | ||
| gitk.txt | ||
| gitmodules.txt | ||
| gitnamespaces.txt | ||
| gitremote-helpers.txt | ||
| gitrepository-layout.txt | ||
| gitrevisions.txt | ||
| gittutorial-2.txt | ||
| gittutorial.txt | ||
| gitweb.conf.txt | ||
| gitweb.txt | ||
| gitworkflows.txt | ||
| glossary-content.txt | ||
| howto-index.sh | ||
| i18n.txt | ||
| install-doc-quick.sh | ||
| install-webdoc.sh | ||
| line-range-format.txt | ||
| mailmap.txt | ||
| Makefile | ||
| manpage-1.72.xsl | ||
| manpage-base-url.xsl.in | ||
| manpage-base.xsl | ||
| manpage-bold-literal.xsl | ||
| manpage-normal.xsl | ||
| manpage-quote-apos.xsl | ||
| manpage-suppress-sp.xsl | ||
| merge-config.txt | ||
| merge-options.txt | ||
| merge-strategies.txt | ||
| pretty-formats.txt | ||
| pretty-options.txt | ||
| pull-fetch-param.txt | ||
| rev-list-options.txt | ||
| revisions.txt | ||
| sequencer.txt | ||
| SubmittingPatches | ||
| urls-remotes.txt | ||
| urls.txt | ||
| user-manual.conf | ||
| user-manual.txt | ||