Michael Haggerty 8e86c155d2 close_lock_file(): if close fails, roll back ... If closing an open lockfile fails, then we cannot be sure of the contents of the lockfile, so there is nothing sensible to do but delete it. This change also insures that the lock_file object is left in a defined state in this error path (namely, unlocked). The only caller that is ultimately affected by this change is try_merge_strategy() -> write_locked_index(), which can call close_lock_file() via various execution paths. This caller uses a static lock_file object which previously could have been reused after a failed close_lock_file() even though it was still in locked state. This change causes the lock_file object to be unlocked on failure, thus fixing this error-handling path. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2014-10-01 13:45:13 -07:00
..
howto	Merge branch 'ss/howto-manage-trunk'	2014-06-06 11:39:12 -07:00
RelNotes	Sync with 2.1.2	2014-09-29 22:17:57 -07:00
technical	close_lock_file(): if close fails, roll back	2014-10-01 13:45:13 -07:00
.gitattributes
.gitignore
asciidoc.conf
blame-options.txt
build-docdep.perl
cat-texi.perl
cmd-list.perl
CodingGuidelines	Merge branch 'po/error-message-style'	2014-07-16 11:33:03 -07:00
config.txt	diff --stat: mark any file larger than core.bigfilethreshold binary	2014-08-18 10:16:45 -07:00
date-formats.txt
diff-config.txt	Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues	2014-05-21 13:57:10 -07:00
diff-format.txt
diff-generate-patch.txt	Documentation: fix misuses of "nor"	2014-03-31 15:16:22 -07:00
diff-options.txt	Documentation: fix misuses of "nor"	2014-03-31 15:16:22 -07:00
docbook-xsl.css
docbook.xsl
everyday.txt	Documentation: fix misuses of "nor"	2014-03-31 15:16:22 -07:00
fetch-options.txt	fetch: allow explicit --refmap to override configuration	2014-06-05 15:13:12 -07:00
fix-texi.perl
git-add.txt	Merge branch 'jl/nor-or-nand-and'	2014-04-08 12:00:28 -07:00
git-am.txt	Merge branch 'cp/am-patch-format-doc'	2014-03-25 11:01:31 -07:00
git-annotate.txt
git-apply.txt
git-archimport.txt
git-archive.txt
git-bisect-lk2009.txt
git-bisect.txt	Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues	2014-05-21 13:57:10 -07:00
git-blame.txt
git-branch.txt
git-bundle.txt
git-cat-file.txt
git-check-attr.txt
git-check-ignore.txt
git-check-mailmap.txt
git-check-ref-format.txt
git-checkout-index.txt
git-checkout.txt
git-cherry-pick.txt	parse-options: multi-word argh should use dash to separate words	2014-03-24 10:43:34 -07:00
git-cherry.txt
git-citool.txt
git-clean.txt
git-clone.txt
git-column.txt
git-commit-tree.txt
git-commit.txt	Merge branch 'jc/rev-parse-argh-dashed-multi-words'	2014-04-08 11:59:27 -07:00
git-config.txt	Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues	2014-05-21 13:57:10 -07:00
git-count-objects.txt	Documentation: fix misuses of "nor"	2014-03-31 15:16:22 -07:00
git-credential-cache--daemon.txt	credential-cache: close stderr in daemon process	2014-09-16 11:11:58 -07:00
git-credential-cache.txt
git-credential-store.txt
git-credential.txt
git-cvsexportcommit.txt
git-cvsimport.txt
git-cvsserver.txt
git-daemon.txt	Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues	2014-05-21 13:57:10 -07:00
git-describe.txt
git-diff-files.txt
git-diff-index.txt
git-diff-tree.txt
git-diff.txt	Documentation: fix misuses of "nor"	2014-03-31 15:16:22 -07:00
git-difftool.txt
git-fast-export.txt	docs/fast-export: explain --anonymize more completely	2014-08-28 10:32:52 -07:00
git-fast-import.txt	Merge branch 'fc/remote-helper-refmap'	2014-06-16 12:18:15 -07:00
git-fetch-pack.txt
git-fetch.txt	docs: Explain the purpose of fetch's and pull's <refspec> parameter.	2014-06-12 09:59:13 -07:00
git-filter-branch.txt
git-fmt-merge-msg.txt
git-for-each-ref.txt
git-format-patch.txt	format-patch: add "--signature-file=<file>" option	2014-05-27 12:38:32 -07:00
git-fsck-objects.txt
git-fsck.txt
git-gc.txt	gc --aggressive: make --depth configurable	2014-03-31 10:26:24 -07:00
git-get-tar-commit-id.txt
git-grep.txt	grep: add grep.fullName config variable	2014-03-20 12:38:00 -07:00
git-gui.txt
git-hash-object.txt
git-help.txt	Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues	2014-05-21 13:57:10 -07:00
git-http-backend.txt	Merge commit 'doc/http-backend: missing accent grave in literal mark-up'	2014-04-09 11:45:04 -07:00
git-http-fetch.txt
git-http-push.txt
git-imap-send.txt	Merge branch 'tf/imap-send-create'	2014-09-09 12:54:09 -07:00
git-index-pack.txt
git-init-db.txt
git-init.txt	Documentation: git-init: flesh out example	2014-08-08 13:17:42 -07:00
git-instaweb.txt
git-log.txt
git-ls-files.txt	Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues	2014-05-21 13:57:10 -07:00
git-ls-remote.txt
git-ls-tree.txt
git-mailinfo.txt
git-mailsplit.txt
git-merge-base.txt
git-merge-file.txt
git-merge-index.txt
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt	merge: enable defaulttoupstream by default	2014-04-22 12:53:59 -07:00
git-mergetool--lib.txt
git-mergetool.txt	mergetool: document the default for --[no-]prompt	2014-04-24 11:29:05 -07:00
git-mktag.txt
git-mktree.txt
git-mv.txt
git-name-rev.txt
git-notes.txt	parse-options: multi-word argh should use dash to separate words	2014-03-24 10:43:34 -07:00
git-p4.txt
git-pack-objects.txt	upload-pack: send shallow info over stdin to pack-objects	2014-03-11 13:32:10 -07:00
git-pack-redundant.txt
git-pack-refs.txt
git-parse-remote.txt
git-patch-id.txt	patch-id: make it stable against hunk reordering	2014-06-10 13:09:24 -07:00
git-prune-packed.txt
git-prune.txt	Documentation: fix misuses of "nor"	2014-03-31 15:16:22 -07:00
git-pull.txt
git-push.txt	Merge branch 'tf/maint-doc-push'	2014-08-04 14:03:45 -07:00
git-quiltimport.txt
git-read-tree.txt	Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues	2014-05-21 13:57:10 -07:00
git-rebase.txt	Documentation/git-rebase.txt: <upstream> must be given to specify <branch>	2014-09-16 11:27:12 -07:00
git-receive-pack.txt
git-reflog.txt
git-relink.txt
git-remote-ext.txt
git-remote-fd.txt
git-remote-helpers.txto
git-remote-testgit.txt
git-remote.txt
git-repack.txt	Merge branch 'jk/repack-pack-keep-objects'	2014-03-18 13:50:29 -07:00
git-replace.txt	Merge branch 'cc/replace-graft'	2014-07-27 15:14:18 -07:00
git-request-pull.txt	request-pull: documentation updates	2014-03-13 14:22:20 -07:00
git-rerere.txt
git-reset.txt	Merge branch 'jl/nor-or-nand-and'	2014-04-08 12:00:28 -07:00
git-rev-list.txt	pretty: provide a strict ISO 8601 date format	2014-08-29 12:37:02 -07:00
git-rev-parse.txt	Documentation: a note about stdout for git rev-parse --verify --quiet	2014-09-15 15:34:31 -07:00
git-revert.txt	parse-options: multi-word argh should use dash to separate words	2014-03-24 10:43:34 -07:00
git-rm.txt
git-send-email.txt	Merge branch 'mt/send-email-cover-to-cc'	2014-06-20 13:12:20 -07:00
git-send-pack.txt	send-pack: take refspecs over stdin	2014-08-26 12:58:02 -07:00
git-sh-i18n--envsubst.txt
git-sh-i18n.txt
git-sh-setup.txt
git-shell.txt	shell doc: remove stray "+" in example	2014-05-08 10:26:26 -07:00
git-shortlog.txt
git-show-branch.txt	Documentation: fix misuses of "nor"	2014-03-31 15:16:22 -07:00
git-show-index.txt
git-show-ref.txt	Documentation: fix misuses of "nor"	2014-03-31 15:16:22 -07:00
git-show.txt
git-stage.txt
git-stash.txt
git-status.txt	Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'	2014-03-31 16:30:52 -07:00
git-stripspace.txt
git-submodule.txt	Merge branch 'mc/doc-submodule-sync-recurse' into maint	2014-07-10 11:08:31 -07:00
git-svn.txt	git svn: find-rev allows short switches for near matches	2014-09-14 08:08:24 +00:00
git-symbolic-ref.txt
git-tag.txt	tag: support configuring --sort via .gitconfig	2014-07-17 09:22:20 -07:00
git-tools.txt
git-unpack-file.txt
git-unpack-objects.txt
git-update-index.txt	Merge branch 'sp/doc-update-index-cacheinfo'	2014-09-19 11:38:40 -07:00
git-update-ref.txt	update-ref --stdin -z: deprecate interpreting the empty string as zeros	2014-04-07 12:09:13 -07:00
git-update-server-info.txt
git-upload-archive.txt
git-upload-pack.txt
git-var.txt
git-verify-commit.txt	verify-commit: scriptable commit signature verification	2014-06-23 15:50:31 -07:00
git-verify-pack.txt
git-verify-tag.txt
git-web--browse.txt	Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues	2014-05-21 13:57:10 -07:00
git-whatchanged.txt
git-write-tree.txt
git.txt	Git 2.1.2	2014-09-29 22:15:00 -07:00
gitattributes.txt	diff --stat: mark any file larger than core.bigfilethreshold binary	2014-08-18 10:16:45 -07:00
gitcli.txt	Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues	2014-05-21 13:57:10 -07:00
gitcore-tutorial.txt
gitcredentials.txt
gitcvs-migration.txt
gitdiffcore.txt
gitglossary.txt
githooks.txt
gitignore.txt	Merge branch 'nd/gitignore-trailing-whitespace'	2014-03-14 14:23:37 -07:00
gitk.txt	Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues	2014-05-21 13:57:10 -07:00
gitmodules.txt	status/commit: show staged submodules regardless of ignore config	2014-04-07 10:32:20 -07:00
gitnamespaces.txt
gitremote-helpers.txt	Merge branch 'fc/transport-helper-fixes'	2014-03-18 13:49:33 -07:00
gitrepository-layout.txt	read-cache: split-index mode	2014-06-13 11:49:39 -07:00
gitrevisions.txt
gittutorial-2.txt
gittutorial.txt
gitweb.conf.txt	Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues	2014-05-21 13:57:10 -07:00
gitweb.txt
gitworkflows.txt
glossary-content.txt	Documentation: wording fixes in the user manual and glossary	2014-05-28 10:40:06 -07:00
howto-index.sh	howto-index.sh: use the $( ... ) construct for command substitution	2014-04-17 11:14:57 -07:00
i18n.txt
install-doc-quick.sh
install-webdoc.sh	install-webdoc.sh: use the $( ... ) construct for command substitution	2014-04-17 11:14:58 -07:00
line-range-format.txt
mailmap.txt
Makefile	How to keep a project's canonical history correct.	2014-05-28 13:35:43 -07:00
manpage-1.72.xsl
manpage-base-url.xsl.in
manpage-base.xsl
manpage-bold-literal.xsl
manpage-normal.xsl
manpage-quote-apos.xsl
manpage-suppress-sp.xsl
merge-config.txt
merge-options.txt	Documentation: fix misuses of "nor"	2014-03-31 15:16:22 -07:00
merge-strategies.txt	Merge branch 'rr/doc-merge-strategies' into maint	2014-04-03 13:39:03 -07:00
pretty-formats.txt	Merge branch 'hj/pretty-naked-decoration'	2014-09-29 12:36:09 -07:00
pretty-options.txt	Documentation: fix misuses of "nor"	2014-03-31 15:16:22 -07:00
pull-fetch-param.txt	docs: Explain the purpose of fetch's and pull's <refspec> parameter.	2014-06-12 09:59:13 -07:00
rev-list-options.txt	pretty: provide a strict ISO 8601 date format	2014-08-29 12:37:02 -07:00
revisions.txt	Documentation: mention config sources for @{upstream}	2014-05-13 12:35:00 -07:00
sequencer.txt
SubmittingPatches
urls-remotes.txt
urls.txt
user-manual.conf
user-manual.txt	Merge branch 'jm/doc-wording-tweaks'	2014-06-16 12:18:39 -07:00