1
0
mirror of https://github.com/git/git.git synced 2024-10-20 14:39:10 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Michael Haggerty 707103fdfd lockfile: avoid transitory invalid states
Because remove_lock_file() can be called any time by the signal
handler, it is important that any lock_file objects that are in the
lock_file_list are always in a valid state.  And since lock_file
objects are often reused (but are never removed from lock_file_list),
that means we have to be careful whenever mutating a lock_file object
to always keep it in a well-defined state.

This was formerly not the case, because part of the state was encoded
by setting lk->filename to the empty string vs. a valid filename.  It
is wrong to assume that this string can be updated atomically; for
example, even

    strcpy(lk->filename, value)

is unsafe.  But the old code was even more reckless; for example,

    strcpy(lk->filename, path);
    if (!(flags & LOCK_NODEREF))
            resolve_symlink(lk->filename, max_path_len);
    strcat(lk->filename, ".lock");

During the call to resolve_symlink(), lk->filename contained the name
of the file that was being locked, not the name of the lockfile.  If a
signal were raised during that interval, then the signal handler would
have deleted the valuable file!

We could probably continue to use the filename field to encode the
state by being careful to write characters 1..N-1 of the filename
first, and then overwrite the NUL at filename[0] with the first
character of the filename, but that would be awkward and error-prone.

So, instead of using the filename field to determine whether the
lock_file object is active, add a new field "lock_file::active" for
this purpose.  Be careful to set this field only when filename really
contains the name of a file that should be deleted on cleanup.

Helped-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-10-01 13:48:59 -07:00
block-sha1
builtin prepare_index(): declare return value to be (const char *) 2014-10-01 13:45:12 -07:00
compat mingw.h: add dummy functions for sigset_t operations 2014-09-22 13:41:52 -07:00
contrib Merge branch 'jk/prompt-stash-could-be-packed' into maint 2014-09-19 14:05:11 -07:00
Documentation api-lockfile: document edge cases 2014-10-01 13:45:14 -07:00
ewah
git-gui
gitk-git Merge branch 'master' of git://ozlabs.org/~paulus/gitk 2014-08-10 11:03:03 -07:00
gitweb
mergetools
perl
po l10n: de.po: use comma before "um" 2014-09-25 20:26:27 +02:00
ppc
t Merge branch 'jc/test-lazy-prereq' 2014-09-29 22:17:23 -07:00
templates pre-push.sample: Write error message to stderr 2014-09-11 15:26:35 -07:00
vcs-svn
xdiff
.gitattributes
.gitignore test-config: add tests for the config_set API 2014-07-29 14:33:36 -07:00
.mailmap Sync with v2.0.3 2014-07-23 11:36:40 -07:00
abspath.c abspath: convert absolute_path() to strbuf 2014-08-26 11:06:06 -07:00
aclocal.m4
advice.c merge, pull: stop advising 'commit -a' in case of conflict 2014-08-28 10:29:53 -07:00
advice.h
alias.c alias.c: replace git_config() with git_config_get_string() 2014-08-07 13:33:29 -07:00
alloc.c alloc: factor out commit index 2014-07-28 10:14:33 -07:00
archive-tar.c Merge branch 'rs/child-process-init' 2014-09-11 10:33:27 -07:00
archive-zip.c
archive.c archive.c: replace git_config() with git_config_get_bool() family 2014-08-07 13:33:27 -07:00
archive.h
argv-array.c
argv-array.h
attr.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
attr.h
base85.c
bisect.c Merge branch 'jk/name-decoration-alloc' 2014-09-11 10:33:36 -07:00
bisect.h
blob.c add object_as_type helper for casting objects 2014-07-28 10:14:33 -07:00
blob.h
branch.c Merge branch 'rs/ref-transaction-1' 2014-09-11 10:33:31 -07:00
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c Merge branch 'lf/bundle-exclusion' into maint 2014-09-19 14:05:11 -07:00
bundle.h
cache-tree.c Merge branch 'dt/cache-tree-repair' 2014-09-11 10:33:32 -07:00
cache-tree.h Merge branch 'dt/cache-tree-repair' 2014-09-11 10:33:32 -07:00
cache.h lockfile: avoid transitory invalid states 2014-10-01 13:48:59 -07:00
check_bindir
check-builtins.sh
check-racy.c
color.c
color.h
column.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
column.h
combine-diff.c Merge branch 'jk/pretty-empty-format' into maint 2014-09-19 14:05:09 -07:00
command-list.txt
commit-slab.h use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
commit.c Merge branch 'da/styles' 2014-09-19 11:38:35 -07:00
commit.h Merge branch 'da/styles' 2014-09-19 11:38:35 -07:00
config.c git_config_set_multivar_in_file(): avoid call to rollback_lock_file() 2014-10-01 13:48:59 -07:00
config.mak.in
config.mak.uname Merge branch 'jc/config-mak-document-darwin-vs-macosx' 2014-09-09 12:54:05 -07:00
configure.ac autoconf: check for setitimer() 2014-08-29 10:45:32 -07:00
connect.c Merge branch 'rs/more-uses-of-skip-prefix' 2014-09-19 11:38:35 -07:00
connect.h
connected.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
connected.h
convert.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
convert.h
copy.c
COPYING
credential-cache--daemon.c credential-cache: close stderr in daemon process 2014-09-16 11:11:58 -07:00
credential-cache.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
credential-store.c
credential.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'rs/child-process-init' 2014-09-11 10:33:27 -07:00
date.c Merge branch 'jk/commit-author-parsing' 2014-09-19 11:38:33 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'nd/large-blobs' 2014-09-11 10:33:33 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c diff.c: allow to pass more flags to diff_populate_filespec 2014-08-18 10:16:35 -07:00
diffcore.h diff --stat: mark any file larger than core.bigfilethreshold binary 2014-08-18 10:16:45 -07:00
dir.c Merge branch 'rs/strbuf-getcwd' 2014-09-02 13:28:44 -07:00
dir.h
editor.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
entry.c
environment.c
exec_cmd.c use strbuf_add_absolute_path() to add absolute paths 2014-08-26 11:06:06 -07:00
exec_cmd.h
fast-import.c dump_marks(): remove a redundant call to rollback_lock_file() 2014-10-01 13:48:59 -07:00
fetch-pack.c Merge branch 'rs/child-process-init' 2014-09-11 10:33:27 -07:00
fetch-pack.h
fmt-merge-msg.h
fsck.c fsck: check tag objects' headers 2014-09-11 10:44:26 -07:00
fsck.h fsck_object(): allow passing object data separately from the object itself 2014-09-10 13:54:21 -07:00
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-am.sh
git-archimport.perl
git-bisect.sh grammofix in user-facing messages 2014-09-02 12:00:30 -07:00
git-compat-util.h Merge branch 'jt/itimer-autoconf' 2014-09-29 22:17:24 -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-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 merge, pull: stop advising 'commit -a' in case of conflict 2014-08-28 10:29:53 -07:00
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh
git-rebase--merge.sh
git-rebase.sh
git-relink.perl
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh Merge branch 'da/rev-parse-verify-quiet' 2014-09-29 12:36:10 -07:00
git-submodule.sh
git-svn.perl git-svn: delay term initialization 2014-09-14 08:08:54 +00:00
GIT-VERSION-GEN Git 2.1.2 2014-09-29 22:15:00 -07:00
git-web--browse.sh
git.c Merge branch 'pr/use-default-sigpipe-setting' 2014-09-29 22:17:20 -07:00
git.rc
git.spec.in
gpg-interface.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
gpg-interface.h
graph.c Merge branch 'rs/graph-simplify' 2014-09-29 12:36:11 -07:00
graph.h
grep.c
grep.h
hashmap.c
hashmap.h
help.c Merge branch 'sb/help-unknown-command-sort-fix' 2014-09-26 14:39:49 -07:00
help.h
hex.c
http-backend.c Merge branch 'rs/child-process-init' 2014-09-11 10:33:27 -07:00
http-fetch.c
http-push.c Merge branch 'ah/fix-http-push' into maint 2014-07-22 10:29:07 -07:00
http-walker.c http-walker: simplify process_alternates_response() using strbuf 2014-09-02 10:57:14 -07:00
http.c Merge branch 'br/http-init-fix' 2014-09-11 10:33:28 -07:00
http.h
ident.c Merge branch 'jk/commit-author-parsing' 2014-09-19 11:38:33 -07:00
imap-send.c Merge branch 'as/calloc-takes-nmemb-then-size' 2014-09-19 11:38:37 -07:00
INSTALL
khash.h use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
ll-merge.c ll-merge.c: refactor read_merge_config() to use git_config_string() 2014-08-13 12:36:21 -07:00
ll-merge.h
lockfile.c lockfile: avoid transitory invalid states 2014-10-01 13:48:59 -07:00
log-tree.c Merge branch 'hj/pretty-naked-decoration' 2014-09-29 12:36:09 -07:00
log-tree.h pretty: add %D format specifier 2014-09-18 15:15:21 -07:00
mailmap.c
mailmap.h
Makefile Merge branch 'ir/makefile-typofix' 2014-09-19 11:38:41 -07:00
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'sb/merge-recursive-copy-paste-fix' 2014-09-29 22:17:22 -07:00
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
notes.h
object.c Merge branch 'rs/realloc-array' 2014-09-26 14:39:45 -07:00
object.h Refactor type_from_string() to allow continuing after detecting an error 2014-09-10 13:52:13 -07:00
pack-bitmap-write.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
pack-bitmap.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
pack-bitmap.h
pack-check.c
pack-objects.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c pack-write: simplify index_pack_lockfile using skip_prefix() and xstrfmt() 2014-09-02 10:37:24 -07:00
pack.h
pager.c Merge branch 'rs/child-process-init' 2014-09-11 10:33:27 -07:00
parse-options-cb.c
parse-options.c Merge branch 'jc/parseopt-verify-short-name' 2014-09-19 11:38:38 -07:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'mm/config-edit-global' 2014-09-02 13:23:20 -07:00
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'hj/pretty-naked-decoration' 2014-09-29 12:36:09 -07:00
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
prompt.h
quote.c
quote.h
reachable.c reachable.c: add HEAD to reachability starting commits 2014-09-03 10:47:44 -07:00
reachable.h
read-cache.c lockfile: avoid transitory invalid states 2014-10-01 13:48:59 -07:00
README
reflog-walk.c stylefix: asterisks stick to the variable, not the type 2014-09-02 11:33:32 -07:00
reflog-walk.h stylefix: asterisks stick to the variable, not the type 2014-09-02 11:33:32 -07:00
refs.c delete_ref_loose(): don't muck around in the lock_file's filename 2014-10-01 13:45:11 -07:00
refs.h Merge branch 'da/rev-parse-verify-quiet' 2014-09-29 12:36:10 -07:00
RelNotes Git 2.1.2 2014-09-29 22:15:00 -07:00
remote-curl.c Merge branch 'da/styles' 2014-09-19 11:38:35 -07:00
remote-testsvn.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
remote.c remote: simplify match_name_with_pattern() using strbuf 2014-09-22 12:40:27 -07:00
remote.h use a hashmap to make remotes faster 2014-07-30 11:29:33 -07:00
replace_object.c
rerere.c rerere.c: replace git_config() with git_config_get_*() family 2014-08-07 13:33:27 -07:00
rerere.h rerere.h: mark string for translation 2014-09-15 11:29:46 -07:00
resolve-undo.c
resolve-undo.h
revision.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
revision.h
run-command.c run-command: inline prepare_run_command_v_opt() 2014-08-20 09:56:12 -07:00
run-command.h run-command: introduce child_process_init() 2014-08-20 09:54:58 -07:00
send-pack.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
send-pack.h
sequencer.c Merge branch 'rs/ref-transaction-1' 2014-09-11 10:33:31 -07:00
sequencer.h
server-info.c server-info: clean up after writing info/packs 2014-09-15 11:39:54 -07:00
setup.c Merge branch 'rs/strbuf-getcwd' 2014-09-02 13:28:44 -07:00
sh-i18n--envsubst.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
sha1_file.c Merge branch 'nd/large-blobs' 2014-09-11 10:33:33 -07:00
sha1_name.c refs: make rev-parse --quiet actually quiet 2014-09-19 10:46:15 -07:00
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
shallow.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c Merge branch 'rs/export-strbuf-addchars' 2014-09-19 11:38:39 -07:00
strbuf.h Merge branch 'rs/export-strbuf-addchars' 2014-09-19 11:38:39 -07:00
streaming.c
streaming.h
string-list.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
string-list.h
submodule.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
submodule.h
symlinks.c
tag.c add object_as_type helper for casting objects 2014-07-28 10:14:33 -07:00
tag.h
tar.h
test-chmtime.c
test-config.c add tests for git_config_get_string_const() 2014-08-07 11:41:20 -07:00
test-ctype.c
test-date.c date: use strbufs in date-formatting functions 2014-08-27 10:32:56 -07:00
test-delta.c
test-dump-cache-tree.c Merge branch 'dt/cache-tree-repair' 2014-09-11 10:33:32 -07:00
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 run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
test-scrap-cache-tree.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-list.c
test-subprocess.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
test-svn-fe.c
test-urlmatch-normalization.c
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c Merge branch 'kb/perf-trace' 2014-09-19 11:38:39 -07:00
trace.h
transport-helper.c run-command: introduce child_process_init() 2014-08-20 09:54:58 -07:00
transport.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c add object_as_type helper for casting objects 2014-07-28 10:14:33 -07:00
tree.h
unicode_width.h
unimplemented.sh
unix-socket.c Merge branch 'rs/strbuf-getcwd' 2014-09-02 13:28:44 -07:00
unix-socket.h
unpack-trees.c Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint 2014-09-19 14:05:12 -07:00
unpack-trees.h
update_unicode.sh
upload-pack.c Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maint 2014-09-19 14:05:13 -07:00
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c
userdiff.h
utf8.c Merge branch 'rs/export-strbuf-addchars' 2014-09-19 11:38:39 -07:00
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c Merge branch 'nd/large-blobs' 2014-09-11 10:33:33 -07:00
write_or_die.c refs: write packed_refs file using stdio 2014-09-10 10:58:32 -07:00
ws.c
wt-status.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

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

	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/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://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.