1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-08 02:03:12 +01:00
Find a file
Martin von Zweigbergk bc41bf422e reset [--mixed]: only write index file once
When doing a mixed reset without paths, the index is locked, read,
reset, and written back as part of the actual reset operation (in
reset_index()). Then, when showing the list of worktree modifications,
we lock the index again, refresh it, and write it.

Change this so we only write the index once, making "git reset" a
little faster. It does mean that the index lock will be held a little
longer, but the difference is small compared to the time spent
refreshing the index.

There is one minor functional difference: We used to say "Could not
write new index file." if the first write failed, and "Could not
refresh index" if the second write failed. Now, we will only use the
first message.

This speeds up "git reset" a little on the linux-2.6 repo (best of
five, warm cache):

        Before      After
real    0m0.239s    0m0.214s
user    0m0.160s    0m0.130s
sys     0m0.070s    0m0.080s

Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-15 09:38:08 -08:00
block-sha1
builtin reset [--mixed]: only write index file once 2013-01-15 09:38:08 -08:00
compat Merge branch 'ss/nedmalloc-compilation' into maint 2013-01-08 11:17:07 -08:00
contrib Merge branch 'fc/remote-bzr' 2013-01-09 08:26:26 -08:00
Documentation Update draft release notes to 1.8.2 2013-01-09 10:19:49 -08:00
git-gui git-gui 0.17.0 2012-10-17 15:55:46 -07:00
git_remote_helpers Merge branch 'er/python-version-requirements' 2013-01-09 08:25:48 -08:00
gitk-git Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11 2012-09-14 20:45:55 -07:00
gitweb Merge branch 'os/gitweb-highlight-uncaptured' 2013-01-09 08:26:09 -08:00
mergetools mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder 2012-12-26 18:13:15 -08:00
perl git-svn, perl/Git.pm: extend and use Git->prompt method for querying users 2012-12-17 17:21:26 -08:00
po l10n: de.po: address the user formally 2013-01-07 18:33:35 +01:00
ppc
t reset $pathspec: exit with code 0 if successful 2013-01-15 09:38:07 -08:00
templates
vcs-svn remote-svn: add incremental import 2012-10-07 14:10:17 -07:00
xdiff
.gitattributes
.gitignore Merge branch 'cc/no-gitk-build-dependency' 2013-01-06 22:11:30 -08:00
.mailmap .mailmap: normalize emails for Linus Torvalds 2012-12-12 11:09:11 -08:00
abspath.c Introduce new function real_path_if_valid() 2012-10-29 02:34:58 -04:00
aclocal.m4
advice.c push: allow already-exists advice to be disabled 2012-12-03 08:04:09 -08:00
advice.h push: allow already-exists advice to be disabled 2012-12-03 08:04:09 -08:00
alias.c
alloc.c
archive-tar.c
archive-zip.c archive-zip: write extended timestamp 2012-09-24 10:22:03 -07:00
archive.c Add directory pattern matching to attributes 2012-12-17 22:07:23 -08:00
archive.h
argv-array.c Merge branch 'fa/remote-svn' 2012-10-25 06:42:02 -04:00
argv-array.h Merge branch 'fa/remote-svn' 2012-10-25 06:42:02 -04:00
attr.c Add directory pattern matching to attributes 2012-12-17 22:07:23 -08:00
attr.h
base85.c
bisect.c Move estimate_bisect_steps to libgit.a 2012-10-29 03:08:30 -04:00
bisect.h Move print_commit_list to libgit.a 2012-10-29 03:08:30 -04:00
blob.c
blob.h
branch.c
branch.h
builtin.h Move setup_diff_pager to libgit.a 2012-10-29 03:08:30 -04:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c cache-tree: invalidate i-t-a paths after generating trees 2012-12-15 23:04:22 -08:00
cache-tree.h cache-tree: fix writing cache-tree when CE_REMOVE is present 2012-12-15 23:04:22 -08:00
cache.h Merge branch 'jk/pathspec-literal' 2013-01-05 23:42:07 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
command-list.txt
commit.c Move print_commit_list to libgit.a 2012-10-29 03:08:30 -04:00
commit.h Merge branch 'jc/format-color-auto' 2013-01-05 23:41:57 -08:00
config.c Merge branch 'jn/warn-on-inaccessible-loosen' 2013-01-06 22:11:16 -08:00
config.mak.in Makefile: whitespace style fixes in macro definitions 2012-12-10 08:35:56 -08:00
configure.ac Merge branch 'mh/pthreads-autoconf' 2013-01-03 10:28:33 -08:00
connect.c Merge branch 'jc/capabilities' into maint 2012-09-11 11:06:45 -07:00
connected.c
connected.h
convert.c
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 2012-09-11 10:53:40 -07:00
diff.c Merge branch 'lt/diff-stat-show-0-lines' 2012-11-29 12:53:54 -08:00
diff.h Move setup_diff_pager to libgit.a 2012-10-29 03:08:30 -04:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c pickaxe: use textconv for -S counting 2012-10-28 08:48:17 -04:00
diffcore-rename.c Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
diffcore.h Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
dir.c Merge branch 'jk/pathspec-literal' 2013-01-05 23:42:07 -08:00
dir.h pathspec: apply "*.c" optimization from exclude 2012-11-26 11:13:13 -08:00
editor.c launch_editor: propagate signals from editor to git 2012-12-02 02:07:08 -08:00
entry.c
environment.c
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'jc/merge-bases' 2012-09-11 11:36:05 -07:00
fetch-pack.c Merge branch 'mk/qnx' 2013-01-03 10:28:33 -08:00
fetch-pack.h filter_refs(): delete matched refs from sought list 2012-09-12 11:46:31 -07:00
fixup-builtins
fmt-merge-msg.h
fsck.c fsck: warn about ".git" in trees 2012-11-28 13:52:54 -08:00
fsck.h
generate-cmdlist.sh
gettext.c fetch: align per-ref summary report in UTF-8 locales 2012-09-14 12:45:50 -07:00
gettext.h Merge branch 'nd/fetch-status-alignment' 2012-09-18 14:35:55 -07:00
git-add--interactive.perl
git-am.sh Merge branch 'nd/am-i18n-fix' 2012-09-07 11:09:04 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'jn/warn-on-inaccessible-loosen' 2013-01-06 22:11:16 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl cvsimport: work around perl tzset issue 2012-11-04 08:02:41 -05:00
git-cvsserver.perl cvsserver status: provide real sticky info 2012-10-16 16:16:27 -07:00
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh filter-branch: use git-sh-setup's ident parsing functions 2012-10-18 15:43:49 -07:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh Merge branch 'da/mergetool-custom' 2012-10-01 12:58:57 -07:00
git-mergetool.sh
git-p4.py Add checks to Python scripts for version dependencies. 2012-12-28 11:35:04 -08:00
git-parse-remote.sh push/pull: adjust missing upstream help text to changed interface 2012-11-08 11:32:38 -05:00
git-pull.sh git-pull: Avoid merge-base on detached head 2012-10-25 05:32:11 -04:00
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'aw/rebase-i-edit-todo' 2012-09-29 22:28:12 -07:00
git-rebase--merge.sh
git-rebase.sh rebase -i: Teach "--edit-todo" action 2012-09-17 20:59:14 -07:00
git-relink.perl
git-remote-testgit remote-testgit: implement the "done" feature manually 2012-11-29 12:18:45 -08:00
git-remote-testpy.py Merge branch 'er/python-version-requirements' 2013-01-09 08:25:48 -08:00
git-repack.sh
git-request-pull.sh
git-send-email.perl Merge branch 'km/send-email-remove-cruft-in-address' 2012-11-29 12:52:49 -08:00
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'jc/maint-fbsd-sh-ifs-workaround' into maint 2013-01-08 11:17:01 -08:00
git-stash.sh Merge branch 'ph/stash-rerere' into maint-1.7.11 2012-09-11 11:10:12 -07:00
git-submodule.sh submodule add: If --branch is given, record it in .gitmodules 2012-12-19 09:40:51 -08:00
git-svn.perl git-svn: use path accessor for Git::SVN objects 2012-10-05 22:48:12 +00:00
GIT-VERSION-GEN Start 1.8.2 cycle 2013-01-02 10:56:08 -08:00
git-web--browse.sh
git.c add global --literal-pathspecs option 2012-12-19 14:58:59 -08:00
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c Merge branch 'mk/maint-graph-infinity-loop' 2013-01-02 10:39:09 -08:00
graph.h graph.c: mark private file-scope symbols as static 2012-09-15 22:58:20 -07:00
grep.c Merge branch 'nd/grep-true-path' into maint 2012-11-18 19:32:30 -08:00
grep.h Merge branch 'nd/grep-true-path' into maint 2012-11-18 19:32:30 -08:00
hash.c
hash.h
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c xml_entities(): use function strbuf_addstr_xml_quoted() 2012-11-26 13:30:52 -08:00
http-walker.c Rename static function fetch_pack() to http_fetch_pack() 2012-09-12 11:46:31 -07:00
http.c Merge branch 'rb/http-cert-cred-no-username-prompt' 2013-01-02 10:39:21 -08:00
http.h http: do not set up curl auth after a 401 2012-10-12 09:45:15 -07:00
ident.c ident: keep separate "explicit" flags for author and committer 2012-11-15 17:47:24 -08:00
imap-send.c wrap_in_html(): process message in bulk rather than line-by-line 2012-12-02 01:21:58 -08:00
INSTALL
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
list-objects.c
list-objects.h
ll-merge.c Merge branch 'jc/ll-merge-binary-ours' into maint 2012-10-17 10:26:51 -07:00
ll-merge.h
lockfile.c
log-tree.c Merge branch 'jc/format-color-auto' 2013-01-05 23:41:57 -08:00
log-tree.h
mailmap.c mailmap: default mailmap.blob in bare repositories 2012-12-13 10:22:13 -08:00
mailmap.h
Makefile Merge branch 'jn/less-reconfigure' 2013-01-09 08:25:59 -08:00
match-trees.c
merge-file.c
merge-file.h
merge-recursive.c Merge branch 'rj/path-cleanup' 2012-09-14 11:53:53 -07:00
merge-recursive.h Move try_merge_command and checkout_fast_forward to libgit.a 2012-10-29 03:08:30 -04:00
merge.c Move try_merge_command and checkout_fast_forward to libgit.a 2012-10-29 03:08:30 -04:00
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c Sync with 1.7.11.6 2012-09-11 11:23:54 -07:00
notes-merge.h
notes.c Merge branch 'jc/same-encoding' into maint 2012-12-07 14:10:56 -08:00
notes.h format_note(): simplify API 2012-10-17 22:42:40 -07:00
object.c
object.h
pack-check.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c Move setup_diff_pager to libgit.a 2012-10-29 03:08:30 -04:00
parse-options-cb.c
parse-options.c silence some -Wuninitialized false positives 2012-12-15 10:45:59 -08:00
parse-options.h silence some -Wuninitialized false positives 2012-12-15 10:45:59 -08:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c longest_ancestor_length(): require prefix list entries to be normalized 2012-10-29 02:34:58 -04:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'jc/format-color-auto' 2013-01-05 23:41:57 -08:00
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c read-cache.c: mark a private file-scope symbol as static 2012-09-15 22:58:21 -07:00
README README: it does not matter who the current maintainer is 2012-12-15 22:24:10 -08:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'jk/repack-ref-racefix' 2013-01-02 10:39:37 -08:00
refs.h
RelNotes Start 1.8.2 cycle 2013-01-02 10:56:08 -08:00
remote-curl.c Merge branch 'jk/maint-http-half-auth-fetch' 2012-11-21 11:59:29 -08:00
remote-testsvn.c remote-testsvn: fix unitialized variable 2012-12-15 10:43:11 -08:00
remote.c Merge branch 'jc/fetch-ignore-symref' 2013-01-05 23:41:37 -08:00
remote.h
replace_object.c
rerere.c rerere.c: mark private file-scope symbols as static 2012-09-15 22:58:20 -07:00
rerere.h rerere.c: mark private file-scope symbols as static 2012-09-15 22:58:20 -07:00
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jc/prettier-pretty-note' 2012-11-15 10:25:05 -08:00
revision.h format-patch --notes: show notes after three-dashes 2012-10-17 22:42:40 -07:00
run-command.c fix compilation with NO_PTHREADS 2013-01-05 22:47:27 -08:00
run-command.h
send-pack.c push: require force for refs under refs/tags/ 2012-12-02 01:44:34 -08:00
send-pack.h
sequencer.c Merge branch 'jc/same-encoding' into maint 2012-12-07 14:10:56 -08:00
sequencer.h Merge branch 'jc/make-static' 2012-09-18 14:37:46 -07:00
server-info.c
setup.c setup_git_directory_gently_1(): resolve symlinks in ceiling paths 2012-10-29 02:34:58 -04:00
sh-i18n--envsubst.c
sha1-array.c sha1-array.c: mark a private file-scope symbol as static 2012-09-15 22:58:21 -07:00
sha1-array.h sha1-array.c: mark a private file-scope symbol as static 2012-09-15 22:58:21 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c link_alt_odb_entries(): take (char *, len) rather than two pointers 2012-11-08 12:06:53 -05:00
sha1_name.c
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c Merge branch 'mh/unify-xml-in-imap-send-and-http-push' 2013-01-05 23:41:04 -08:00
strbuf.h Merge branch 'mh/unify-xml-in-imap-send-and-http-push' 2013-01-05 23:41:04 -08:00
streaming.c
streaming.h
string-list.c Merge branch 'mh/ceiling' 2013-01-02 10:36:59 -08:00
string-list.h Merge branch 'mh/ceiling' 2013-01-02 10:36:59 -08:00
submodule.c submodule: display summary header in bold 2012-11-18 19:18:13 -08:00
submodule.h submodule: display summary header in bold 2012-11-18 19:18:13 -08:00
symlinks.c symlinks.c: mark private file-scope symbols as static 2012-09-15 22:58:21 -07:00
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-genrandom.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 longest_ancestor_length(): require prefix list entries to be normalized 2012-10-29 02:34:58 -04:00
test-regex.c test-regex: Add a test to check for a bug in the regex routines 2012-09-02 18:57:21 -07:00
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 string_list_longest_prefix(): remove function 2012-10-29 02:34:58 -04:00
test-subprocess.c
test-svn-fe.c remote-svn: add incremental import 2012-10-07 14:10:17 -07:00
thread-utils.c
thread-utils.h
trace.c trace.c: mark a private file-scope symbol as static 2012-09-15 22:58:21 -07:00
transport-helper.c push: require force for refs under refs/tags/ 2012-12-02 01:44:34 -08:00
transport.c push: require force for refs under refs/tags/ 2012-12-02 01:44:34 -08:00
transport.h push: add advice for rejected tag reference 2012-12-02 01:39:50 -08:00
tree-diff.c Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 2012-09-11 10:53:40 -07:00
tree-walk.c tree_entry_interesting: do basedir compare on wildcard patterns when possible 2012-11-26 11:16:34 -08:00
tree-walk.h
tree.c
tree.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c oneway_merge(): only lstat() when told to update worktree 2012-12-20 13:07:22 -08:00
unpack-trees.h
upload-pack.c upload-pack: use peel_ref for ref advertisements 2012-10-04 20:34:29 -07:00
url.c
url.h
usage.c make error()'s constant return value more visible 2012-12-15 10:45:58 -08:00
userdiff.c Add userdiff patterns for Ada 2012-09-16 21:54:47 -07:00
userdiff.h
utf8.c Merge branch 'sp/shortlog-missing-lf' 2013-01-02 10:40:34 -08:00
utf8.h Merge branch 'sp/shortlog-missing-lf' 2013-01-02 10:40:34 -08:00
varint.c
varint.h
version.c
version.h
walker.c
walker.h
wrap-for-bin.sh
wrapper.c Merge branch 'jn/warn-on-inaccessible-loosen' 2013-01-06 22:11:16 -08:00
write_or_die.c maybe_flush_or_die: move a too-loose Windows specific error 2012-10-17 00:33:42 -07:00
ws.c
wt-status.c wt-status.c: mark a private file-scope symbol as static 2012-09-15 22:58:21 -07:00
wt-status.h wt-status.c: mark a private file-scope symbol as static 2012-09-15 22:58:21 -07:00
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://marc.theaimsgroup.com/?l=git and other archival
sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.