Go to file
Michael Haggerty fed6ebebf1 lock_packed_refs(): fix cache validity check
Commit 28ed9830b1 (get_packed_ref_cache(): assume "packed-refs" won't
change while locked, 2017-05-22) assumes that the "packed-refs" file
cannot change while we hold the lock. That assumption is
justified *if* the lock has been held the whole time since the
"packed-refs" file was last read.

But in `lock_packed_refs()`, we ourselves lock the "packed-refs" file
and then call `get_packed_ref_cache()` to ensure that the cache agrees
with the file. The intent is to guard against the possibility that
another process changed the "packed-refs" file the moment before we
locked it.

This check was defeated because `get_packed_ref_cache()` saw that the
file was locked, and therefore didn't do the `stat_validity_check()`
that we want.

The mistake was compounded with a misleading comment in
`lock_packed_refs()` claiming that it was doing the right thing. That
comment came from an earlier draft of the mh/packed-ref-store-prep
patch series when the commits were in a different order.

So instead:

* Extract a function `validate_packed_ref_cache()` that does the
  validity check independent of whether the lock is held.

* Change `get_packed_ref_cache()` to call the new function, but only
  if the lock *isn't* held.

* Change `lock_packed_refs()` to call the new function in any case
  before calling `get_packed_ref_cache()`.

* Fix the comment in `lock_packed_refs()`.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-12 10:11:36 -07:00
Documentation Second batch for 2.14 2017-05-23 13:51:32 +09:00
block-sha1
builtin ref_store: take a `msg` parameter when deleting references 2017-05-23 14:29:53 +09:00
ci Merge branch 'ls/travis-relays-for-windows-ci' 2017-05-23 13:46:04 +09:00
compat
contrib Merge branch 'ab/clone-no-tags' 2017-05-16 11:51:54 +09:00
ewah
git-gui
gitk-git
gitweb
mergetools
perl
po Merge branch 'master' of git://github.com/nafmo/git-l10n-sv 2017-05-09 22:12:34 +08:00
ppc
refs lock_packed_refs(): fix cache validity check 2017-06-12 10:11:36 -07:00
sha1dc
t ref_store: take a `msg` parameter when deleting references 2017-05-23 14:29:53 +09:00
templates
vcs-svn timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
xdiff
.gitattributes
.gitignore
.mailmap
.travis.yml Merge branch 'ab/fix-poison-tests' 2017-05-23 13:46:09 +09:00
COPYING
GIT-VERSION-GEN Start post 2.13 cycle 2017-05-16 11:52:15 +09:00
INSTALL
LGPL-2.1
Makefile Merge branch 'mh/separate-ref-cache' 2017-04-26 15:39:13 +09:00
README.md
RelNotes Start post 2.13 cycle 2017-05-16 11:52:15 +09:00
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
apply.c Merge branch 'jc/apply-fix-mismerge' 2017-05-16 11:51:59 +09:00
apply.h
archive-tar.c archive-tar: fix a sparse 'constant too large' warning 2017-05-09 11:23:14 +09:00
archive-zip.c Merge branch 'js/larger-timestamps' 2017-05-16 11:51:59 +09:00
archive.c tree: convert parse_tree_indirect to struct object_id 2017-05-08 15:12:58 +09:00
archive.h timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c Convert lookup_commit* to struct object_id 2017-05-08 15:12:57 +09:00
bisect.h
blob.c Convert lookup_blob to struct object_id 2017-05-08 15:12:57 +09:00
blob.h Convert lookup_blob to struct object_id 2017-05-08 15:12:57 +09:00
branch.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
branch.h
builtin.h
bulk-checkin.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
bulk-checkin.h
bundle.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
bundle.h bundle: convert to struct object_id 2017-05-02 10:46:41 +09:00
cache-tree.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
cache-tree.h Convert struct cache_tree to use struct object_id 2017-05-02 10:46:41 +09:00
cache.h Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'bc/object-id' 2017-04-19 21:37:13 -07:00
command-list.txt
commit-slab.h
commit.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
commit.h Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
common-main.c
config.c Merge branch 'js/larger-timestamps' 2017-05-16 11:51:59 +09:00
config.mak.in
config.mak.uname config.mak.uname: set NO_REGEX=NeedsStartEnd on AIX 2017-05-04 16:10:51 +09:00
configure.ac
connect.c Merge branch 'sf/putty-w-args' 2017-04-26 15:39:10 +09:00
connect.h
connected.c
connected.h
convert.c
convert.h
copy.c
credential-cache--daemon.c timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
credential-cache.c Merge branch 'nd/conditional-config-include' 2017-04-23 22:07:46 -07:00
credential-store.c path.c: and an option to call real_path() in expand_user_path() 2017-04-14 23:51:38 -07:00
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'dt/xgethostname-nul-termination' 2017-04-23 22:07:57 -07:00
date.c date.c: abort if the system time cannot handle one of our timestamps 2017-04-27 13:07:40 +09:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c tree: convert parse_tree_indirect to struct object_id 2017-05-08 15:12:58 +09:00
diff-no-index.c
diff.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
diff.h diff-lib: convert do_diff_cache to struct object_id 2017-05-08 15:12:58 +09:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c
dir.h
editor.c
entry.c
environment.c Merge branch 'nd/worktree-kill-parse-ref' 2017-05-16 11:51:51 +09:00
exec_cmd.c
exec_cmd.h
fast-import.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
fetch-pack.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
fetch-pack.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
fmt-merge-msg.h
fsck.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
fsck.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl Merge branch 'va/i18n-perl-scripts' 2017-04-19 21:37:17 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'js/larger-timestamps' 2017-05-16 11:51:59 +09:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py git-p4: don't use name-rev to get current branch 2017-04-16 21:13:26 -07:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh doc: replace more gmane links 2017-05-09 21:13:13 -07:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'gb/rebase-signoff' 2017-04-26 15:39:02 +09:00
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh
git-submodule.sh submodule: prevent backslash expantion in submodule names 2017-04-16 20:09:36 -07:00
git-svn.perl
git-web--browse.sh
git.c
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c convert unchecked snprintf into xsnprintf 2017-03-30 14:59:50 -07:00
grep.h
hash.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
http-backend.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
http-fetch.c
http-push.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
http-walker.c
http.c Merge branch 'dt/http-postbuffer-can-be-large' 2017-04-23 22:07:45 -07:00
http.h http.postbuffer: allow full range of ssize_t values 2017-04-13 18:24:32 -07:00
ident.c Merge branch 'dt/xgethostname-nul-termination' 2017-04-23 22:07:57 -07:00
imap-send.c convert unchecked snprintf into xsnprintf 2017-03-30 14:59:50 -07:00
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c
line-log.h
line-range.c
line-range.h
list-objects.c Convert lookup_tree to struct object_id 2017-05-08 15:12:57 +09:00
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h lockfile: add a new method, is_lock_file_locked() 2017-05-23 14:29:54 +09:00
log-tree.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
log-tree.h
mailinfo.c Merge branch 'lt/mailinfo-in-body-header-continuation' 2017-04-19 21:37:15 -07:00
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
merge-recursive.h
merge.c tree: convert parse_tree_indirect to struct object_id 2017-05-08 15:12:58 +09:00
mergesort.c
mergesort.h
mru.c
mru.h
name-hash.c name-hash: fix buffer overrun 2017-03-31 20:57:18 -07:00
notes-cache.c Convert lookup_commit* to struct object_id 2017-05-08 15:12:57 +09:00
notes-cache.h notes-cache: convert to struct object_id 2017-05-08 15:12:57 +09:00
notes-merge.c Convert lookup_commit* to struct object_id 2017-05-08 15:12:57 +09:00
notes-merge.h
notes-utils.c Convert lookup_commit* to struct object_id 2017-05-08 15:12:57 +09:00
notes-utils.h
notes.c
notes.h
object.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
object.h object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
oidset.c
oidset.h
pack-bitmap-write.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack-bitmap.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
pack-bitmap.h
pack-check.c Convert the verify_pack callback to struct object_id 2017-05-08 15:12:57 +09:00
pack-objects.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack.h Convert the verify_pack callback to struct object_id 2017-05-08 15:12:57 +09:00
pager.c
parse-options-cb.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'nd/conditional-config-include' 2017-04-23 22:07:46 -07:00
pathspec.c Merge branch 'ps/pathspec-empty-prefix-origin' 2017-04-26 15:39:03 +09:00
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
prio-queue.c Merge branch 'jk/prio-queue-avoid-swap-with-self' 2017-05-01 14:14:43 +09:00
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
reachable.h timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
read-cache.c Merge branch 'jk/no-null-sha1-in-cache-tree' 2017-05-16 11:51:50 +09:00
ref-filter.c ref-filter: limit traversal to prefix 2017-05-23 14:29:56 +09:00
ref-filter.h Convert struct ref_array_item to struct object_id 2017-05-08 15:12:57 +09:00
reflog-walk.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
reflog-walk.h
refs.c refs_ref_iterator_begin(): handle `GIT_REF_PARANOIA` 2017-05-23 14:29:56 +09:00
refs.h ref_transaction_prepare(): new optional step for reference updates 2017-05-23 14:29:55 +09:00
remote-curl.c Merge branch 'dt/http-postbuffer-can-be-large' 2017-04-23 22:07:45 -07:00
remote-testsvn.c
remote.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
remote.h Merge branch 'bw/push-options-recursively-to-submodules' 2017-04-19 21:37:14 -07:00
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
revision.h Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
run-command.c
run-command.h
send-pack.c Merge branch 'bc/object-id' 2017-04-19 21:37:13 -07:00
send-pack.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
sequencer.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
sequencer.h
server-info.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
setup.c
sh-i18n--envsubst.c
sha1-array.c Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
sha1-array.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'jk/loose-object-fsck' 2017-04-23 22:07:50 -07:00
sha1_name.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
shallow.c Convert lookup_commit* to struct object_id 2017-05-08 15:12:57 +09:00
shell.c Merge branch 'maint-2.8' into maint-2.9 2017-05-05 13:13:48 +09:00
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 Merge branch 'jh/string-list-micro-optim' 2017-04-23 22:07:47 -07:00
string-list.h
submodule-config.c
submodule-config.h
submodule.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
submodule.h submodule: convert merge_submodule to use struct object_id 2017-05-08 15:12:56 +09:00
symlinks.c
tag.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
tag.h Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trailer.c
trailer.h
transport-helper.c transport-helper: replace checked snprintf with xsnprintf 2017-03-30 14:59:50 -07:00
transport.c bundle: convert to struct object_id 2017-05-02 10:46:41 +09:00
transport.h
tree-diff.c
tree-walk.c doc: replace more gmane links 2017-05-09 21:13:13 -07:00
tree-walk.h
tree.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
tree.h tree: convert parse_tree_indirect to struct object_id 2017-05-08 15:12:58 +09:00
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'jh/unpack-trees-micro-optim' 2017-04-23 22:07:48 -07:00
unpack-trees.h
upload-pack.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
walker.h
wildmatch.c
wildmatch.h
worktree.c Merge branch 'nd/worktree-kill-parse-ref' 2017-05-16 11:51:51 +09:00
worktree.h worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe() 2017-04-24 21:28:55 -07:00
wrap-for-bin.sh
wrapper.c Merge branch 'dt/xgethostname-nul-termination' 2017-04-23 22:07:57 -07:00
write_or_die.c
ws.c
wt-status.c Merge branch 'bc/object-id' 2017-05-23 14:29:19 +09:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

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.

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