1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-14 21:23:03 +01:00
Find a file
Jeff King da66b2743c remote.c: provide per-branch pushremote name
When remote.c loads its config, it records the
branch.*.pushremote for the current branch along with the
global remote.pushDefault value, and then binds them into a
single value: the default push for the current branch. We
then pass this value (which may be NULL) to remote_get_1
when looking up a remote for push.

This has a few downsides:

  1. It's confusing. The early-binding of the "current
     value" led to bugs like the one fixed by 98b406f
     (remote: handle pushremote config in any order,
     2014-02-24). And the fact that pushremotes fall back to
     ordinary remotes is not explicit at all; it happens
     because remote_get_1 cannot tell the difference between
     "we are not asking for the push remote" and "there is
     no push remote configured".

  2. It throws away intermediate data. After read_config()
     finishes, we have no idea what the value of
     remote.pushDefault was, because the string has been
     overwritten by the current branch's
     branch.*.pushremote.

  3. It doesn't record other data. We don't note the
     branch.*.pushremote value for anything but the current
     branch.

Let's make this more like the fetch-remote config. We'll
record the pushremote for each branch, and then explicitly
compute the correct remote for the current branch at the
time of reading.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-05-21 11:03:58 -07:00
block-sha1
builtin remote.c: drop "remote" pointer from "struct branch" 2015-05-21 10:48:10 -07:00
compat
contrib Merge branch 'sg/completion-gitcomp-nl-for-refs' 2015-03-26 11:57:13 -07:00
Documentation remote.c: drop "remote" pointer from "struct branch" 2015-05-21 10:48:10 -07:00
ewah Merge branch 'jk/pack-bitmap' into maint 2015-03-05 13:13:02 -08:00
git-gui
gitk-git Merge branch 'master' of git://ozlabs.org/~paulus/gitk 2015-03-24 16:10:37 -07:00
gitweb
mergetools
perl Merge branch 'ew/svn-maint-fixes' into maint 2015-03-06 14:57:55 -08:00
po gitk: Update .po files 2015-03-15 17:25:02 +11:00
ppc
t Merge branch 'jk/test-chain-lint' 2015-03-26 11:57:14 -07:00
templates
vcs-svn
xdiff
.gitattributes
.gitignore
.mailmap
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c Merge branch 'rs/zip-text' 2015-03-17 16:01:27 -07:00
archive.c
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c ref_transaction_update(): remove "have_old" parameter 2015-02-17 11:22:50 -08:00
branch.h
builtin.h
bulk-checkin.c Merge branch 'rs/deflate-init-cleanup' into maint 2015-03-23 11:23:38 -07:00
bulk-checkin.h
bundle.c bundle.c: fix memory leak 2015-03-10 20:53:52 -07:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jc/report-path-error-to-dir' 2015-03-26 11:57:13 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-slab.h
commit.c
commit.h
config.c Merge branch 'jk/config-no-ungetc-eof' into maint 2015-03-05 13:13:00 -08:00
config.mak.in
config.mak.uname configure: support HAVE_BSD_SYSCTL option 2015-03-10 15:13:25 -07:00
configure.ac configure: support HAVE_BSD_SYSCTL option 2015-03-10 15:13:25 -07:00
connect.c Merge branch 'tb/connect-ipv6-parse-fix' into maint 2015-03-23 11:23:13 -07:00
connect.h
connected.c
connected.h
convert.c
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c sha1fd_check: die when we cannot open the file 2015-03-19 13:35:15 -07:00
csum-file.h
ctype.c kwset: use unsigned char to store values with high-bit set 2015-03-02 12:32:24 -08:00
daemon.c Merge branch 'rs/daemon-interpolate' into maint 2015-03-13 22:56:01 -07:00
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'rs/deflate-init-cleanup' into maint 2015-03-23 11:23:38 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Merge branch 'jk/diffcore-rename-duplicate' into maint 2015-03-13 22:56:08 -07:00
diffcore.h
dir.c Merge branch 'jc/report-path-error-to-dir' 2015-03-26 11:57:13 -07:00
dir.h Merge branch 'jc/report-path-error-to-dir' 2015-03-26 11:57:13 -07:00
editor.c
entry.c
environment.c refs: introduce a "ref paranoia" flag 2015-03-20 12:40:49 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'rs/deflate-init-cleanup' into maint 2015-03-23 11:23:38 -07:00
fetch-pack.c fetch-pack: remove dead assignment to ref->new_sha1 2015-03-19 14:11:52 -07:00
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c gettext.c: move get_preferred_languages() from http.c 2015-02-26 14:09:20 -08:00
gettext.h Merge branch 'ye/http-accept-language' 2015-03-06 15:02:25 -08:00
git-add--interactive.perl Merge branch 'ak/add-i-empty-candidates' into maint 2015-02-24 22:10:42 -08:00
git-am.sh
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'km/bsd-sysctl' 2015-03-20 13:11:49 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh git-instaweb: use @SHELL_PATH@ instead of /bin/sh 2015-03-10 15:10:35 -07:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'es/rebase-i-count-todo' into maint 2015-03-23 11:23:17 -07:00
git-rebase--merge.sh
git-rebase.sh
git-relink.perl
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'km/send-email-getopt-long-workarounds' 2015-03-03 14:37:03 -08:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh
git-submodule.sh Merge branch 'ps/submodule-sanitize-path-upon-add' into maint 2015-03-05 13:13:10 -08:00
git-svn.perl git-svn: lazy load some modules 2015-02-26 20:19:21 +00:00
GIT-VERSION-GEN Git 2.4.0-rc0 2015-03-26 11:59:05 -07:00
git-web--browse.sh
git.c Merge branch 'ak/git-done-help-cleanup' into maint 2015-03-23 11:23:35 -07:00
git.rc
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c Merge branch 'jk/blame-commit-label' into maint 2015-02-24 22:09:54 -08:00
grep.h
hashmap.c
hashmap.h
help.c
help.h
hex.c Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' into maint 2015-03-05 13:12:55 -08:00
http-backend.c
http-fetch.c
http-push.c Merge branch 'rs/deflate-init-cleanup' into maint 2015-03-23 11:23:38 -07:00
http-walker.c
http.c Merge branch 'ye/http-accept-language' 2015-03-06 15:02:25 -08:00
http.h
ident.c
imap-send.c imap-send: use cURL automatically when NO_OPENSSL defined 2015-03-10 15:19:05 -07:00
INSTALL
khash.h
kwset.c kwset: use unsigned char to store values with high-bit set 2015-03-02 12:32:24 -08:00
kwset.h kwset: use unsigned char to store values with high-bit set 2015-03-02 12:32:24 -08:00
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c Merge branch 'jc/decorate-leaky-separator-color' into maint 2015-03-23 11:23:28 -07:00
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'km/bsd-sysctl' 2015-03-20 13:11:49 -07:00
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c Merge branch 'jk/blame-commit-label' into maint 2015-02-24 22:09:54 -08:00
notes.h
object.c
object.h
pack-bitmap-write.c
pack-bitmap.c Merge branch 'jc/unused-symbols' 2015-02-11 13:44:07 -08:00
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c Merge branch 'jk/decimal-width-for-uintmax' into maint 2015-03-05 13:12:59 -08:00
parse-options-cb.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'rs/simple-cleanups' into maint 2015-03-06 14:57:57 -08:00
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'tg/fix-check-order-with-split-index' 2015-03-25 12:54:26 -07:00
README
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'jk/prune-with-corrupt-refs' 2015-03-25 12:54:26 -07:00
refs.h refs.h: remove duplication in function docstrings 2015-02-17 11:25:18 -08:00
RelNotes Git 2.3.4 2015-03-23 11:27:27 -07:00
remote-curl.c Merge branch 'rs/deflate-init-cleanup' into maint 2015-03-23 11:23:38 -07:00
remote-testsvn.c
remote.c remote.c: provide per-branch pushremote name 2015-05-21 11:03:58 -07:00
remote.h remote.c: provide per-branch pushremote name 2015-05-21 11:03:58 -07:00
replace_object.c
rerere.c Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint 2015-02-24 22:10:13 -08:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'dj/log-graph-with-no-walk' 2015-03-25 12:54:22 -07:00
revision.h Merge branch 'jc/unused-symbols' 2015-02-11 13:44:07 -08:00
run-command.c Merge branch 'jk/run-command-capture' 2015-03-25 12:54:27 -07:00
run-command.h run-command: introduce capture_command helper 2015-03-22 21:38:31 -07:00
send-pack.c Merge branch 'sb/atomic-push' 2015-02-11 13:43:51 -08:00
send-pack.h
sequencer.c Merge branch 'mg/sequencer-commit-messages-always-verbatim' 2015-03-17 16:01:32 -07:00
sequencer.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'rs/deflate-init-cleanup' into maint 2015-03-23 11:23:38 -07:00
sha1_name.c Merge branch 'rs/use-isxdigit' into maint 2015-03-23 11:23:41 -07:00
shallow.c Merge branch 'jk/blame-commit-label' into maint 2015-02-24 22:09:54 -08:00
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
submodule.c submodule: use capture_command 2015-03-22 21:39:16 -07:00
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-config.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-dump-split-index.c
test-genrandom.c
test-hashmap.c
test-index-version.c
test-line-buffer.c
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c
test-prio-queue.c
test-read-cache.c
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1-array.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-list.c
test-subprocess.c
test-svn-fe.c
test-urlmatch-normalization.c
test-wildmatch.c
thread-utils.c thread-utils.c: detect CPU count on older BSD-like systems 2015-03-10 15:13:28 -07:00
thread-utils.h
trace.c
trace.h
trailer.c trailer: use capture_command 2015-03-22 21:39:18 -07:00
trailer.h
transport-helper.c Merge branch 'jc/push-cert' into maint 2015-03-05 13:12:58 -08:00
transport.c Merge branch 'jk/fetch-pack' 2015-03-25 12:54:25 -07:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c
unpack-trees.h
update_unicode.sh
upload-pack.c Merge branch 'jk/smart-http-hide-refs' 2015-03-23 11:28:08 -07:00
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c do not include the same header twice 2015-02-13 13:16:12 -08:00
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c versionsort: support reorder prerelease suffixes 2015-02-27 13:38:22 -08:00
walker.c Merge branch 'jk/blame-commit-label' into maint 2015-02-24 22:09:54 -08:00
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c Merge branch 'jc/max-io-size-and-ssize-max' 2015-02-25 15:40:13 -08:00
write_or_die.c
ws.c
wt-status.c Merge branch 'jk/run-command-capture' 2015-03-25 12:54:27 -07:00
wt-status.h wt-status: refactor detached HEAD analysis 2015-03-06 11:52:35 -08:00
xdiff-interface.c
xdiff-interface.h
zlib.c zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw} 2015-03-05 15:46:03 -08:00

////////////////////////////////////////////////////////////////

	Git - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, depending on your mood.

 - random three-letter combination that is pronounceable, and not
   actually used by any common UNIX command.  The fact that it is a
   mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the
   dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually
   works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

Git is an Open Source project covered by the GNU General Public
License version 2 (some parts of it are under different licenses,
compatible with the GPLv2). It was originally written by Linus
Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/giteveryday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org (read
Documentation/SubmittingPatches for instructions on patch submission).
To subscribe to the list, send an email with just "subscribe git" in
the body to majordomo@vger.kernel.org. The mailing list archives are
available at http://news.gmane.org/gmane.comp.version-control.git/,
http://marc.info/?l=git and other archival sites.

The maintainer frequently sends the "What's cooking" reports that
list the current status of various development topics to the mailing
list.  The discussion following them give a good reference for
project status, development direction and remaining tasks.