A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Ævar Arnfjörð Bjarmason 0bc8d71b99 fetch: stop clobbering existing tags without --force
Change "fetch" to treat "+" in refspecs (aka --force) to mean we
should clobber a local tag of the same name.

This changes the long-standing behavior of "fetch" added in
853a3697dc ("[PATCH] Multi-head fetch.", 2005-08-20). Before this
change, all tag fetches effectively had --force enabled. See the
git-fetch-script code in fast_forward_local() with the comment:

    > Tags need not be pointing at commits so there is no way to
    > guarantee "fast-forward" anyway.

That commit and the rest of the history of "fetch" shows that the
"+" (--force) part of refpecs was only conceived for branch updates,
while tags have accepted any changes from upstream unconditionally and
clobbered the local tag object. Changing this behavior has been
discussed as early as 2011[1].

The current behavior doesn't make sense to me, it easily results in
local tags accidentally being clobbered. We could namespace our tags
per-remote and not locally populate refs/tags/*, but as with my
97716d217c ("fetch: add a --prune-tags option and fetch.pruneTags
config", 2018-02-09) it's easier to work around the current
implementation than to fix the root cause.

So this change implements suggestion #1 from Jeff's 2011 E-Mail[1],
"fetch" now only clobbers the tag if either "+" is provided as part of
the refspec, or if "--force" is provided on the command-line.

This also makes it nicely symmetrical with how "tag" itself works when
creating tags. I.e. we refuse to clobber any existing tags unless
"--force" is supplied. Now we can refuse all such clobbering, whether
it would happen by clobbering a local tag with "tag", or by fetching
it from the remote with "fetch".

Ref updates outside refs/{tags,heads/* are still still not symmetrical
with how "git push" works, as discussed in the recently changed
pull-fetch-param.txt documentation. This change brings the two
divergent behaviors more into line with one another. I don't think
there's any reason "fetch" couldn't fully converge with the behavior
used by "push", but that's a topic for another change.

One of the tests added in 31b808a032 ("clone --single: limit the fetch
refspec to fetched branch", 2012-09-20) is being changed to use
--force where a clone would clobber a tag. This changes nothing about
the existing behavior of the test.

1. https://public-inbox.org/git/20111123221658.GA22313@sigill.intra.peff.net/

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-31 14:04:06 -07:00
.github
Documentation fetch: stop clobbering existing tags without --force 2018-08-31 14:04:06 -07:00
block-sha1
builtin fetch: stop clobbering existing tags without --force 2018-08-31 14:04:06 -07:00
ci Merge branch 'nd/travis-gcc-8' 2018-05-30 14:04:08 +09:00
compat Merge branch 'nd/command-list' 2018-07-24 14:50:50 -07:00
contrib Merge branch 'tb/grep-column' 2018-07-18 12:20:31 -07:00
ewah ewah: delete unused 'rlwit_discharge_empty()' 2018-06-21 09:39:48 -07:00
git-gui Merge branch 'cb/git-gui-ttk-style' 2018-04-25 13:28:49 +09:00
gitk-git
gitweb
mergetools
perl Merge branch 'ab/git-svn-get-record-typofix' 2018-05-08 15:59:28 +09:00
po l10n: ko.po: Update Korean translation 2018-06-19 02:19:42 +09:00
ppc
refs Merge branch 'bp/log-ref-write-fd-with-strbuf' 2018-07-24 14:50:47 -07:00
sha1collisiondetection@19d97bf5af
sha1dc
t fetch: stop clobbering existing tags without --force 2018-08-31 14:04:06 -07:00
templates Update shell scripts to compute empty tree object ID 2018-05-02 13:59:53 +09:00
vcs-svn Convert remaining die*(BUG) messages 2018-05-06 19:06:14 +09:00
xdiff
.clang-format
.gitattributes .gitattributes: add a diff driver for Python 2018-04-27 09:18:55 +09:00
.gitignore Merge branch 'ag/rebase-p' 2018-06-25 13:22:39 -07:00
.gitmodules
.mailmap .mailmap: merge different spellings of names 2018-06-29 09:29:44 -07:00
.travis.yml travis-ci: run gcc-8 on linux-gcc jobs 2018-05-21 14:14:09 +09:00
.tsan-suppressions
COPYING
GIT-VERSION-GEN Prepare to start 2.19 cycle 2018-06-25 13:22:27 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'js/enhanced-version-info' 2018-07-18 12:20:35 -07:00
README.md note git-security@googlegroups.com in more places 2018-06-01 09:24:11 +09:00
RelNotes Prepare to start 2.19 cycle 2018-06-25 13:22:27 -07:00
abspath.c
aclocal.m4
advice.c am: move advice.amWorkDir parsing back to advice.c 2018-05-29 14:51:28 +09:00
advice.h am: move advice.amWorkDir parsing back to advice.c 2018-05-29 14:51:28 +09:00
alias.c completion: add and use --list-cmds=alias 2018-05-21 13:23:14 +09:00
alias.h completion: add and use --list-cmds=alias 2018-05-21 13:23:14 +09:00
alloc.c Merge branch 'sb/object-store-alloc' 2018-06-25 13:22:38 -07:00
alloc.h alloc: allow arbitrary repositories for alloc functions 2018-05-16 11:16:50 +09:00
apply.c Merge branch 'en/apply-comment-fix' 2018-07-24 14:50:43 -07:00
apply.h apply: add --intent-to-add 2018-05-29 12:42:30 +09:00
archive-tar.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
archive-zip.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
archive.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
archive.h
argv-array.c Merge branch 'ma/unpack-trees-free-msgs' 2018-05-30 21:51:29 +09:00
argv-array.h Merge branch 'ma/unpack-trees-free-msgs' 2018-05-30 21:51:29 +09:00
attr.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
attr.h
base85.c
bisect.c bisect.c: use commit-slab for commit weight instead of commit->util 2018-05-21 14:07:20 +09:00
bisect.h
blame.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
blame.h blame: use commit-slab for blame suspects instead of commit->util 2018-05-21 14:07:20 +09:00
blob.c alloc: allow arbitrary repositories for alloc functions 2018-05-16 11:16:50 +09:00
blob.h
branch.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
branch.h
builtin.h Merge branch 'jk/show-index' 2018-06-25 13:22:37 -07:00
bulk-checkin.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
bulk-checkin.h
bundle.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
bundle.h
cache-tree.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
cache-tree.h
cache.h Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
chdir-notify.c
chdir-notify.h
check-builtins.sh
check-racy.c
check_bindir
checkout.c refspec: rename struct refspec to struct refspec_item 2018-05-18 06:19:41 +09:00
checkout.h
color.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
color.h color: introduce support for colorizing stderr 2018-04-24 10:38:47 +09:00
column.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
column.h
combine-diff.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
command-list.txt Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
commit-graph.c Merge branch 'ds/commit-graph-lockfile-fix' 2018-06-25 13:22:36 -07:00
commit-graph.h commit-graph: always load commit-graph information 2018-05-22 12:36:34 +09:00
commit-slab-decl.h commit-slab: support shared commit-slab 2018-05-21 14:07:19 +09:00
commit-slab-impl.h commit-slab: support shared commit-slab 2018-05-21 14:07:19 +09:00
commit-slab.h commit-slab: support shared commit-slab 2018-05-21 14:07:19 +09:00
commit.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
commit.h Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
common-main.c Merge branch 'dj/runtime-prefix' 2018-05-08 15:59:17 +09:00
config.c Merge branch 'ao/config-from-gitmodules' 2018-07-18 12:20:31 -07:00
config.h config: move config_from_gitmodules to submodule-config.c 2018-06-26 12:56:11 -07:00
config.mak.dev Makefile: add a DEVOPTS to get all of -Wextra 2018-04-16 13:54:53 +09:00
config.mak.in
config.mak.uname Merge branch 'nd/repack-keep-pack' 2018-05-23 14:38:14 +09:00
configure.ac Merge branch 'es/fread-reads-dir-autoconf-fix' 2018-04-25 13:29:01 +09:00
connect.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
connect.h fixup! connect.h: avoid forward declaration of an enum 2018-07-09 14:35:39 -07:00
connected.c fetch-pack: write shallow, then check connectivity 2018-07-03 14:57:44 -07:00
connected.h fetch-pack: write shallow, then check connectivity 2018-07-03 14:57:44 -07:00
convert.c Merge branch 'bb/pedantic' 2018-07-24 14:50:47 -07:00
convert.h Merge branch 'ls/checkout-encoding' 2018-05-08 15:59:22 +09:00
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 Merge branch 'lw/daemon-log-destination' 2018-04-25 13:28:58 +09:00
date.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
decorate.c
decorate.h
delta.h
detect-compiler Makefile: detect compiler and enable more warnings in DEVELOPER=1 2018-04-16 13:54:53 +09:00
diff-delta.c
diff-lib.c diff: ignore --ita-[in]visible-in-index when diffing worktree-to-tree 2018-05-29 12:36:31 +09:00
diff-no-index.c
diff.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
diff.h add status config and command line options for rename detection 2018-05-13 10:57:37 +09:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c regex: do not call `regfree()` if compilation fails 2018-05-21 13:58:32 +09:00
diffcore-rename.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
diffcore.h
dir-iterator.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
dir-iterator.h
dir.c Merge branch 'tz/exclude-doc-smallfixes' 2018-07-18 12:20:34 -07:00
dir.h Merge branch 'bc/object-id' 2018-05-30 14:04:10 +09:00
editor.c
entry.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
environment.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
exec-cmd.c Merge branch 'js/runtime-prefix' 2018-05-08 15:59:34 +09:00
exec-cmd.h Merge branch 'dj/runtime-prefix' 2018-05-08 15:59:17 +09:00
fast-import.c fast-import: do not call diff_delta() with empty buffer 2018-07-06 09:46:12 -07:00
fetch-object.c fetch-pack: put shallow info in output parameter 2018-06-28 09:33:29 -07:00
fetch-object.h
fetch-pack.c Merge branch 'jt/connectivity-check-after-unshallow' 2018-07-24 14:50:44 -07:00
fetch-pack.h fetch-pack: write shallow, then check connectivity 2018-07-03 14:57:44 -07:00
fmt-merge-msg.h
fsck.c Merge branch 'rj/submodule-fsck-skip' 2018-07-24 14:50:42 -07:00
fsck.h fsck: detect gitmodules files 2018-05-21 23:55:12 -04:00
fsmonitor.c Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
fsmonitor.h
generate-cmdlist.sh help: add --config to list all available config 2018-05-29 14:51:28 +09:00
gettext.c Merge branch 'js/runtime-prefix' 2018-05-08 15:59:34 +09:00
gettext.h
git-add--interactive.perl Merge branch 'pw/add-p-recount' 2018-06-28 12:53:32 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh Merge branch 'mb/filter-branch-optim' 2018-07-18 12:20:32 -07:00
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh merge-one-file: compute empty blob object ID 2018-05-02 13:59:53 +09:00
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py git-p4: python3: fix octal constants 2018-06-19 09:34:32 -07:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh Merge branch 'pw/rebase-signoff' 2018-04-25 13:28:51 +09:00
git-rebase--interactive.sh Merge branch 'ag/rebase-p' 2018-06-25 13:22:39 -07:00
git-rebase--merge.sh Merge branch 'en/rebase-i-microfixes' 2018-07-18 12:20:33 -07:00
git-rebase--preserve-merges.sh git-rebase--preserve-merges: fix formatting of todo help message 2018-07-06 12:09:27 -07:00
git-rebase.sh Merge branch 'en/rebase-consistency' 2018-07-24 14:50:43 -07:00
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl send-email: automatically determine transfer-encoding 2018-07-09 10:55:12 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh
git-submodule.sh Merge branch 'sb/submodule-core-worktree' 2018-07-18 12:20:28 -07:00
git-svn.perl
git-web--browse.sh
git.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
git.rc
gpg-interface.c gpg-interface: make parse_gpg_output static and remove from interface header 2018-07-11 10:05:22 -07:00
gpg-interface.h gpg-interface: make parse_gpg_output static and remove from interface header 2018-07-11 10:05:22 -07:00
graph.c
graph.h
grep.c Merge branch 'tb/grep-column' 2018-07-18 12:20:31 -07:00
grep.h Merge branch 'tb/grep-column' 2018-07-18 12:20:31 -07:00
hash.h
hashmap.c
hashmap.h
help.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
help.h completion: drop the hard coded list of config vars 2018-05-29 14:51:28 +09:00
hex.c
http-backend.c Merge branch 'bw/protocol-v2' 2018-05-08 15:59:16 +09:00
http-fetch.c Merge branch 'ma/http-walker-no-partial' 2018-05-08 15:59:35 +09:00
http-push.c Merge branch 'bw/ref-prefix-for-configured-refspec' 2018-05-30 21:51:26 +09:00
http-walker.c
http.c Merge branch 'bw/remote-curl-compressed-responses' 2018-05-30 21:51:29 +09:00
http.h Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
ident.c
imap-send.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c Merge branch 'ds/lazy-load-trees' 2018-05-23 14:38:13 +09:00
line-log.h
line-range.c
line-range.h
list-objects-filter-options.c list-objects: check if filter is NULL before using 2018-06-12 10:46:56 -07:00
list-objects-filter-options.h
list-objects-filter.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
list-objects-filter.h
list-objects.c Merge branch 'jt/partial-clone-fsck-connectivity' 2018-07-24 14:50:47 -07:00
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
lockfile.h
log-tree.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
log-tree.h format-patch: make cover letters always text/plain 2018-05-02 12:55:00 +09:00
ls-refs.c
ls-refs.h
mailinfo.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
mailinfo.h
mailmap.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
mailmap.h
match-trees.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
mem-pool.c mem-pool: move reusable parts of memory pool into its own file 2018-04-12 11:55:20 +09:00
mem-pool.h mem-pool: move reusable parts of memory pool into its own file 2018-04-12 11:55:20 +09:00
merge-blobs.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
merge-blobs.h
merge-recursive.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
merge-recursive.h merge: add merge.renames config setting 2018-05-08 16:19:41 +09:00
merge.c Merge branch 'ma/unpack-trees-free-msgs' 2018-05-30 21:51:29 +09:00
mergesort.c
mergesort.h
name-hash.c
notes-cache.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
notes-cache.h
notes-merge.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
notes.h
object-store.h Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
object.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
object.h Merge branch 'jt/partial-clone-fsck-connectivity' 2018-07-24 14:50:47 -07:00
oidmap.c
oidmap.h
oidset.c
oidset.h
pack-bitmap-write.c Merge branch 'jt/remove-pack-bitmap-global' 2018-07-18 12:20:30 -07:00
pack-bitmap.c pack-bitmap: add free function 2018-06-21 12:22:48 -07:00
pack-bitmap.h pack-bitmap: add free function 2018-06-21 12:22:48 -07:00
pack-check.c packfile: add repository argument to unpack_entry 2018-04-26 10:54:27 +09:00
pack-objects.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
pack-objects.h Merge branch 'nd/pack-objects-pack-struct' 2018-05-23 14:38:19 +09:00
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c Merge branch 'jl/zlib-restore-nul-termination' 2018-06-18 10:18:43 -07:00
packfile.h Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
pager.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
parse-options-cb.c parseopt: handle malformed --expire arguments more nicely 2018-04-23 22:36:59 +09:00
parse-options.c completion: collapse extra --no-.. options 2018-06-11 10:38:10 -07:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
path.h Merge branch 'bb/pedantic' 2018-07-24 14:50:47 -07:00
pathspec.c Convert remaining die*(BUG) messages 2018-05-06 19:06:14 +09:00
pathspec.h
pkt-line.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
pkt-line.h
preload-index.c
pretty.c Merge branch 'ds/lazy-load-trees' 2018-05-23 14:38:13 +09:00
pretty.h
prio-queue.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
protocol.c
protocol.h
quote.c
quote.h
reachable.c cache.h: add repository argument to oid_object_info 2018-04-26 10:54:27 +09:00
reachable.h
read-cache.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
ref-filter.c Merge branch 'jk/for-each-ref-icase' 2018-07-24 14:50:44 -07:00
ref-filter.h Merge branch 'ot/libify-get-ref-atom-value' 2018-05-08 15:59:18 +09:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'bp/log-ref-write-fd-with-strbuf' 2018-07-24 14:50:47 -07:00
refs.h Merge branch 'sb/object-store-replace' 2018-05-08 15:59:21 +09:00
refspec.c Merge branch 'ab/refspec-init-fix' 2018-06-28 12:53:29 -07:00
refspec.h refspec: add back a refspec_item_init() function 2018-06-11 10:11:31 -07:00
remote-curl.c remote-curl: accept compressed responses with protocol v2 2018-05-23 10:24:13 +09:00
remote-testsvn.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
remote.c Merge branch 'jt/connectivity-check-after-unshallow' 2018-07-24 14:50:44 -07:00
remote.h fetch-pack: implement ref-in-want 2018-06-28 09:33:30 -07:00
replace-object.c Merge branch 'sb/object-store-replace' 2018-05-23 14:38:09 +09:00
replace-object.h replace-object: allow lookup_replace_object to handle arbitrary repositories 2018-04-12 11:38:57 +09:00
repository.c Merge branch 'sb/object-store-alloc' 2018-06-25 13:22:38 -07:00
repository.h Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
rerere.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
rerere.h
resolve-undo.c cache: add a function to read an object ID from a buffer 2018-05-02 13:59:48 +09:00
resolve-undo.h
revision.c Merge branch 'jt/partial-clone-fsck-connectivity' 2018-07-24 14:50:47 -07:00
revision.h Merge branch 'jt/partial-clone-fsck-connectivity' 2018-07-24 14:50:47 -07:00
run-command.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
run-command.h
send-pack.c shallow: add repository argument to is_repository_shallow 2018-05-18 08:13:10 +09:00
send-pack.h
sequencer.c Merge branch 'as/sequencer-customizable-comment-char' 2018-07-24 14:50:51 -07:00
sequencer.h Merge branch 'js/sequencer-and-root-commits' 2018-05-30 14:04:04 +09:00
serve.c serve: introduce the server-option capability 2018-04-24 11:24:40 +09:00
serve.h
server-info.c server-info: remove unused members from struct pack_info 2018-05-02 13:59:48 +09:00
setup.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
sh-i18n--envsubst.c
sha1-array.c get_short_oid: sort ambiguous objects by type, then SHA-1 2018-05-11 14:43:23 +09:00
sha1-array.h get_short_oid: sort ambiguous objects by type, then SHA-1 2018-05-11 14:43:23 +09:00
sha1-file.c Merge branch 'ds/commit-graph-lockfile-fix' 2018-06-25 13:22:36 -07:00
sha1-lookup.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
sha1-lookup.h
sha1-name.c Merge branch 'wc/find-commit-with-pattern-on-detached-head' 2018-07-24 14:50:49 -07:00
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
shell.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
shortlog.h
sideband.c Avoid multiple PREFIX definitions 2018-04-24 11:12:32 +09:00
sideband.h
sigchain.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
sigchain.h
split-index.c split-index: convert struct split_index to object_id 2018-05-02 13:59:50 +09:00
split-index.h split-index: convert struct split_index to object_id 2018-05-02 13:59:50 +09:00
strbuf.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
strbuf.h Merge branch 'en/rename-directory-detection-reboot' 2018-05-23 14:38:19 +09:00
streaming.c cache.h: add repository argument to oid_object_info_extended 2018-04-26 10:54:27 +09:00
streaming.h
string-list.c string-list.c: avoid conversion from void * to function pointer 2018-07-09 14:37:50 -07:00
string-list.h
sub-process.c
sub-process.h
submodule-config.c Merge branch 'ao/config-from-gitmodules' 2018-07-18 12:20:31 -07:00
submodule-config.h submodule-config: make 'config_from_gitmodules' private 2018-06-26 12:56:12 -07:00
submodule.c Merge branch 'sb/submodule-move-head-error-msg' 2018-07-24 14:50:43 -07:00
submodule.h submodule: unset core.worktree if no working tree is present 2018-06-14 14:13:46 -07:00
symlinks.c
tag.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
tag.h alloc: allow arbitrary repositories for alloc functions 2018-05-16 11:16:50 +09:00
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
tmp-objdir.h
trace.c
trace.h
trailer.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
trailer.h
transport-helper.c fetch-pack: put shallow info in output parameter 2018-06-28 09:33:29 -07:00
transport-internal.h fetch-pack: put shallow info in output parameter 2018-06-28 09:33:29 -07:00
transport.c fetch-pack: write shallow, then check connectivity 2018-07-03 14:57:44 -07:00
transport.h fetch-pack: write shallow, then check connectivity 2018-07-03 14:57:44 -07:00
tree-diff.c
tree-walk.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
tree-walk.h tree-walk: convert get_tree_entry_follow_symlinks to object_id 2018-05-02 13:59:50 +09:00
tree.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
tree.h
unicode-width.h unicode: update the width tables to Unicode 11 2018-07-09 14:02:51 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'mk/merge-in-sparse-checkout' 2018-07-24 14:50:48 -07:00
unpack-trees.h unpack_trees_options: free messages when done 2018-05-22 11:59:31 +09:00
upload-pack.c Merge branch 'jt/connectivity-check-after-unshallow' 2018-07-24 14:50:44 -07:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
userdiff.c userdiff: support new keywords in PHP hunk header 2018-07-06 14:59:28 -07:00
userdiff.h
utf8.c utf8.c: avoid char overflow 2018-07-09 14:38:12 -07:00
utf8.h Sync with Git 2.17.1 2018-05-29 17:10:05 +09:00
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
walker.h walker: drop fields of `struct walker` which are always 1 2018-04-24 10:55:04 +09:00
wildmatch.c
wildmatch.h
worktree.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
worktree.h
wrap-for-bin.sh Make running git under other debugger-like programs easy 2018-04-25 10:47:22 +09:00
wrapper.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
write-or-die.c
ws.c
wt-status.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
wt-status.h add status config and command line options for rename detection 2018-05-13 10:57:37 +09:00
xdiff-interface.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
xdiff-interface.h
zlib.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00

README.md

Git - fast, scalable, distributed revision control system

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.

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

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-.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).

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 https://public-inbox.org/git/, http://marc.info/?l=git and other archival sites.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

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.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (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