Go to file
Junio C Hamano f8fb971eac fetch: ignore wildcarded refspecs that update local symbolic refs
In a repository cloned from somewhere else, you typically have a
symbolic ref refs/remotes/origin/HEAD pointing at the 'master'
remote-tracking ref that is next to it.  When fetching into such a
repository with "git fetch --mirror" from another repository that
was similarly cloned, the implied wildcard refspec refs/*:refs/*
will end up asking to update refs/remotes/origin/HEAD with the
object at refs/remotes/origin/HEAD at the remote side, while asking
to update refs/remotes/origin/master the same way.  Depending on the
order the two updates happen, the latter one would find that the
value of the ref before it is updated has changed from what the code
expects.

When the user asks to update the underlying ref via the symbolic ref
explicitly without using a wildcard refspec, e.g. "git fetch $there
refs/heads/master:refs/remotes/origin/HEAD", we should still let him
do so, but when expanding wildcard refs, it will result in a more
intuitive outcome if we simply ignore local symbolic refs.

As the purpose of the symbolic ref refs/remotes/origin/HEAD is to
follow the ref it points at (e.g. refs/remotes/origin/master), its
value would change when the underlying ref is updated.

Earlier commit da3efdb (receive-pack: detect aliased updates which
can occur with symrefs, 2010-04-19) fixed a similar issue for "git
push".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-11 14:53:32 -08:00
Documentation Git 1.8.0.2 2012-12-10 13:05:47 -08:00
block-sha1
builtin Merge branch 'jc/same-encoding' into maint 2012-12-07 14:10:56 -08:00
compat Merge branch 'nd/maint-compat-fnmatch-fix' into maint 2012-11-27 13:29:00 -08:00
contrib git-remote-mediawiki: escape ", \, and LF in file names 2012-11-29 11:16:33 -08:00
git-gui git-gui 0.17.0 2012-10-17 15:55:46 -07:00
git_remote_helpers
gitk-git Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11 2012-09-14 20:45:55 -07:00
gitweb Merge branch 'rh/maint-gitweb-highlight-ext' into maint 2012-11-28 12:05:30 -08:00
mergetools Merge branch 'da/mergetools-p4' into maint 2012-11-18 19:31:40 -08:00
perl git svn: work around SVN 1.7 mishandling of svn:special changes 2012-10-10 20:02:33 +00:00
po Merge branch 'master' of https://github.com/nafmo/git-l10n-sv 2012-10-17 09:38:30 +08:00
ppc
t fetch: ignore wildcarded refspecs that update local symbolic refs 2012-12-11 14:53:32 -08:00
templates
vcs-svn
xdiff
.gitattributes
.gitignore Merge branch 'mh/string-list' 2012-09-17 15:53:31 -07:00
.mailmap Update mailmap for a handful of folks 2012-09-03 16:24:23 -07:00
COPYING
GIT-VERSION-GEN Git 1.8.0.2 2012-12-10 13:05:47 -08:00
INSTALL
LGPL-2.1
Makefile Makefile: hide stderr of curl-config test 2012-11-26 10:31:11 -08:00
README
RelNotes Start preparing for 1.8.0.2 2012-11-28 13:40:02 -08:00
abspath.c real_path(): properly handle nonexistent top-level paths 2012-09-06 16:19:58 -07:00
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c archive-zip: write extended timestamp 2012-09-24 10:22:03 -07:00
archive.c
archive.h
argv-array.c argv-array: fix bogus cast when freeing array 2012-09-02 21:10:24 -07:00
argv-array.h argv-array: add pop function 2012-09-02 21:10:01 -07:00
attr.c Merge branch 'jc/ll-merge-binary-ours' into maint 2012-10-17 10:26:51 -07:00
attr.h
base85.c
bisect.c Call git_pathdup() rather than xstrdup(git_path("...")) 2012-09-04 13:34:46 -07:00
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h builtin/notes.c: mark file-scope private symbols as static 2012-09-15 22:58:20 -07:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h ident.c: mark private file-scope symbols as static 2012-09-15 22:58:21 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
command-list.txt
commit.c Merge branch 'jc/merge-bases-paint-fix' 2012-10-08 11:42:15 -07:00
commit.h commit.c: mark a file-scope private symbol as static 2012-09-15 22:58:20 -07:00
config.c Remove the hard coded length limit on variable names in config files 2012-10-01 12:27:45 -07:00
config.mak.in build: don't duplicate substitution of make variables 2012-09-11 10:24:39 -07:00
configure.ac configure.ac: Add missing comma to CC_LD_DYNPATH 2012-10-09 14:19:37 -07:00
connect.c Merge branch 'jc/capabilities' into maint 2012-09-11 11:06:45 -07:00
connected.c
connected.h
convert.c
convert.h
copy.c
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 2012-09-11 10:53:40 -07:00
diff.c diff --shortstat: do not count "unmerged" entries 2012-11-27 14:19:36 -08:00
diff.h diff.c: mark a private file-scope symbol as static 2012-09-15 22:58:20 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c diff_grep: use textconv buffers for add/deleted files 2012-10-28 07:59:44 -04:00
diffcore-rename.c Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
diffcore.h Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
dir.c
dir.h
editor.c
entry.c
environment.c
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'jc/merge-bases' 2012-09-11 11:36:05 -07:00
fetch-pack.h filter_refs(): delete matched refs from sought list 2012-09-12 11:46:31 -07:00
fixup-builtins
fmt-merge-msg.h
fsck.c Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
fsck.h
generate-cmdlist.sh
gettext.c fetch: align per-ref summary report in UTF-8 locales 2012-09-14 12:45:50 -07:00
gettext.h Merge branch 'nd/fetch-status-alignment' 2012-09-18 14:35:55 -07:00
git-add--interactive.perl
git-am.sh Merge branch 'nd/am-i18n-fix' 2012-09-07 11:09:04 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'js/format-2047' into maint 2012-11-20 09:57:44 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl cvsimport: strip all inappropriate tag strings 2012-09-06 10:40:09 -07:00
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh Merge branch 'da/mergetool-custom' 2012-10-01 12:58:57 -07:00
git-mergetool.sh
git-p4.py Merge branch 'pw/maint-p4-rcs-expansion-newline' into maint 2012-11-28 12:04:50 -08:00
git-parse-remote.sh push/pull: adjust missing upstream help text to changed interface 2012-11-08 11:32:38 -05:00
git-pull.sh git-pull: Avoid merge-base on detached head 2012-10-25 05:32:11 -04:00
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'aw/rebase-i-edit-todo' 2012-09-29 22:28:12 -07:00
git-rebase--merge.sh
git-rebase.sh rebase -i: Teach "--edit-todo" action 2012-09-17 20:59:14 -07:00
git-relink.perl
git-remote-testgit.py
git-repack.sh
git-request-pull.sh
git-send-email.perl Merge branch 'sb/send-email-reconfirm-fix' into maint 2012-09-14 21:32:07 -07:00
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'jc/maint-protect-sh-from-ifs' into maint-1.7.11 2012-09-10 15:25:45 -07:00
git-stash.sh Merge branch 'ph/stash-rerere' into maint-1.7.11 2012-09-11 11:10:12 -07:00
git-submodule.sh git-submodule: wrap branch option with "<>" in usage strings. 2012-10-25 04:46:13 -04:00
git-svn.perl git-svn: use path accessor for Git::SVN objects 2012-10-05 22:48:12 +00:00
git-web--browse.sh
git.c
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c graph.c: mark private file-scope symbols as static 2012-09-15 22:58:20 -07:00
graph.h graph.c: mark private file-scope symbols as static 2012-09-15 22:58:20 -07:00
grep.c Merge branch 'nd/grep-true-path' into maint 2012-11-18 19:32:30 -08:00
grep.h Merge branch 'nd/grep-true-path' into maint 2012-11-18 19:32:30 -08:00
hash.c
hash.h
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c Merge branch 'jc/merge-bases' 2012-09-11 11:36:05 -07:00
http-walker.c Rename static function fetch_pack() to http_fetch_pack() 2012-09-12 11:46:31 -07:00
http.c Fix potential hang in https handshake 2012-10-19 14:15:17 -07:00
http.h http: fix segfault in handle_curl_result 2012-10-12 09:42:31 -07:00
ident.c ident.c: mark private file-scope symbols as static 2012-09-15 22:58:21 -07:00
imap-send.c
kwset.c
kwset.h
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c Merge branch 'jc/ll-merge-binary-ours' into maint 2012-10-17 10:26:51 -07:00
ll-merge.h
lockfile.c
log-tree.c
log-tree.h
mailmap.c mailmap: avoid out-of-bounds memory access 2012-10-28 07:50:18 -04:00
mailmap.h
match-trees.c
merge-file.c
merge-file.h
merge-recursive.c Merge branch 'rj/path-cleanup' 2012-09-14 11:53:53 -07:00
merge-recursive.h
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c Sync with 1.7.11.6 2012-09-11 11:23:54 -07:00
notes-merge.h
notes.c Merge branch 'jc/same-encoding' into maint 2012-12-07 14:10:56 -08:00
notes.h notes.c: mark a private file-scope symbol as static 2012-09-15 22:58:20 -07:00
object.c
object.h
pack-check.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c path.c: Use vsnpath() in the implementation of git_path() 2012-09-04 13:34:46 -07:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'jc/same-encoding' into maint 2012-12-07 14:10:56 -08:00
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c read-cache.c: mark a private file-scope symbol as static 2012-09-15 22:58:21 -07:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'jh/update-ref-d-through-symref' into maint 2012-11-27 13:28:45 -08:00
refs.h
remote-curl.c Merge branch 'jk/maint-http-half-auth-push' into maint 2012-10-17 10:29:24 -07:00
remote.c fetch: ignore wildcarded refspecs that update local symbolic refs 2012-12-11 14:53:32 -08:00
remote.h
replace_object.c
rerere.c rerere.c: mark private file-scope symbols as static 2012-09-15 22:58:20 -07:00
rerere.h rerere.c: mark private file-scope symbols as static 2012-09-15 22:58:20 -07:00
resolve-undo.c
resolve-undo.h
revision.c log --grep: use the same helper to set -E/-F options as "git grep" 2012-10-09 23:21:29 -07:00
revision.h Merge branch 'mz/cherry-pick-cmdline-order' into maint 2012-09-14 21:24:18 -07:00
run-command.c Merge branch 'dg/run-command-child-cleanup' into maint 2012-09-20 15:55:12 -07:00
run-command.h
send-pack.h
sequencer.c Merge branch 'jc/same-encoding' into maint 2012-12-07 14:10:56 -08:00
sequencer.h Merge branch 'jc/make-static' 2012-09-18 14:37:46 -07:00
server-info.c
setup.c Merge branch 'maint-1.7.11' into maint 2012-09-10 15:31:06 -07:00
sh-i18n--envsubst.c
sha1-array.c sha1-array.c: mark a private file-scope symbol as static 2012-09-15 22:58:21 -07:00
sha1-array.h sha1-array.c: mark a private file-scope symbol as static 2012-09-15 22:58:21 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c
sha1_name.c
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c strbuf.c: mark a private file-scope symbol as static 2012-09-15 22:58:21 -07:00
strbuf.h strbuf.c: mark a private file-scope symbol as static 2012-09-15 22:58:21 -07:00
streaming.c
streaming.h
string-list.c string_list: add a function string_list_longest_prefix() 2012-09-12 11:43:25 -07:00
string-list.h string_list: add a function string_list_longest_prefix() 2012-09-12 11:43:25 -07:00
submodule.c Merge branch 'dj/fetch-all-tags' into maint 2012-09-24 12:39:21 -07:00
submodule.h submodule: use argv_array instead of hand-building arrays 2012-09-02 21:13:50 -07:00
symlinks.c symlinks.c: mark private file-scope symbols as static 2012-09-15 22:58:21 -07:00
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-genrandom.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-regex.c test-regex: Add a test to check for a bug in the regex routines 2012-09-02 18:57:21 -07:00
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-list.c test-string-list.c: Fix some sparse warnings 2012-09-15 23:33:58 -07:00
test-subprocess.c
test-svn-fe.c
thread-utils.c
thread-utils.h
trace.c trace.c: mark a private file-scope symbol as static 2012-09-15 22:58:21 -07:00
transport-helper.c
transport.c filter_refs(): delete matched refs from sought list 2012-09-12 11:46:31 -07:00
transport.h fetch: align per-ref summary report in UTF-8 locales 2012-09-14 12:45:50 -07:00
tree-diff.c Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 2012-09-11 10:53:40 -07:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c
unpack-trees.h
upload-pack.c
url.c
url.h
usage.c
userdiff.c Add userdiff patterns for Ada 2012-09-16 21:54:47 -07:00
userdiff.h
utf8.c Merge branch 'jc/same-encoding' into maint 2012-12-07 14:10:56 -08:00
utf8.h reencode_string(): introduce and use same_encoding() 2012-11-04 08:10:33 -05:00
varint.c
varint.h
version.c
version.h
walker.c
walker.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c
wt-status.c wt-status.c: mark a private file-scope symbol as static 2012-09-15 22:58:21 -07:00
wt-status.h wt-status.c: mark a private file-scope symbol as static 2012-09-15 22:58:21 -07:00
xdiff-interface.c
xdiff-interface.h
zlib.c

README

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

	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.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.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://marc.theaimsgroup.com/?l=git and other archival
sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.