1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-15 13:43:45 +01:00
Find a file
Michael Haggerty 1fef4b5041 try_merge_strategy(): remove redundant lock_file allocation
By the time the "if" block is entered, the lock_file instance from the
main function block is no longer in use, so re-use that one instead of
allocating a second one.

Note that the "lock" variable in the "if" block shadowed the "lock"
variable at function scope, so the only change needed is to remove the
inner definition.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-10-01 13:49:00 -07:00
block-sha1
builtin try_merge_strategy(): remove redundant lock_file allocation 2014-10-01 13:49:00 -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
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
vcs-svn
xdiff
.gitattributes
.gitignore
.mailmap
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
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
bisect.h
blob.c
blob.h
branch.c
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
cache-tree.h
cache.h struct lock_file: declare some fields volatile 2014-10-01 13:49:00 -07:00
check-builtins.sh
check-racy.c
check_bindir
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
configure.ac
connect.c Merge branch 'rs/more-uses-of-skip-prefix' 2014-09-19 11:38:35 -07:00
connect.h
connected.c
connected.h
convert.c
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
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
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
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c
dir.h
editor.c
entry.c
environment.c
exec_cmd.c
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
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-am.sh
git-archimport.perl
git-bisect.sh
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
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
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
http-fetch.c
http-push.c
http-walker.c
http.c
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.h
lockfile.c struct lock_file: declare some fields volatile 2014-10-01 13:49:00 -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
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.h
pager.c
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
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
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c lockfile: avoid transitory invalid states 2014-10-01 13:48:59 -07:00
README
reflog-walk.c
reflog-walk.h
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
remote.c remote: simplify match_name_with_pattern() using strbuf 2014-09-22 12:40:27 -07:00
remote.h
replace_object.c
rerere.c
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.h
send-pack.c
send-pack.h
sequencer.c
sequencer.h
server-info.c server-info: clean up after writing info/packs 2014-09-15 11:39:54 -07:00
setup.c
sh-i18n--envsubst.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c
sha1_name.c refs: make rev-parse --quiet actually quiet 2014-09-19 10:46:15 -07:00
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
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.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.h
trace.c Merge branch 'kb/perf-trace' 2014-09-19 11:38:39 -07:00
trace.h
transport-helper.c
transport.c
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 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
write_or_die.c
ws.c
wt-status.c
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.