A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Stefan Beller 0ecd180a27 unpack-trees: simplify 'all other failures' case
In the 'if (current)' block of twoway_merge, we handle the boring
errors by checking if the entry from the old tree, current index, and
new tree are present, to get a pathname for the error message from one
of them:

	if (oldtree)
		return o->gently ? -1 : reject_merge(oldtree, o);
	if (current)
		return o->gently ? -1 : reject_merge(current, o);
	if (newtree)
		return o->gently ? -1 : reject_merge(newtree, o);
	return -1;

Since this is guarded by 'if (current)', the second test is guaranteed
to succeed.  Moreover, any of the three entries, if present, would
have the same path because there is no rename detection in this code
path.   Even if some day in the future the entries' paths differ, the
'current' path used in the index and worktree would presumably be the
most recognizable for the end user.

Simplify by just using 'current'.

Noticed by coverity, Id:290002

Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-08-13 10:32:08 -07:00
Documentation Documentation: fix missing text for rev-parse --verify 2014-07-22 10:10:57 -07:00
block-sha1 block-sha1/sha1.c: have SP around arithmetic operators 2013-10-16 10:27:27 -07:00
builtin annotate: use argv_array 2014-07-16 11:10:11 -07:00
compat C: have space around && and || operators 2013-10-16 10:26:39 -07:00
contrib Merge branch 'mi/typofixes' into maint 2013-12-17 11:34:01 -08:00
git-gui git-gui 0.18.0 2013-06-16 20:06:55 -07:00
gitk-git Merge git://ozlabs.org/~paulus/gitk 2013-05-17 11:55:02 -07:00
gitweb Merge branch 'ab/gitweb-author-initials' 2013-09-17 11:42:27 -07:00
mergetools mergetools/diffmerge: support DiffMerge as a git mergetool 2013-10-13 16:00:57 -07:00
perl git-svn: workaround for a bug in svn serf backend 2014-01-17 11:24:30 -08:00
po l10n: de.po: fix translation of 'prefix' 2014-01-03 18:21:38 +01:00
ppc
t t7300: repair filesystem permissions with test_when_finished 2014-07-02 12:51:38 -07:00
templates sample pre-commit hook: use --bool when retrieving config var 2013-09-24 12:26:49 -07:00
vcs-svn
xdiff C: have space around && and || operators 2013-10-16 10:26:39 -07:00
.gitattributes
.gitignore Merge branch 'jc/url-match' 2013-09-09 14:50:36 -07:00
.mailmap .mailmap: switch to Thomas Rast's personal address 2013-10-13 14:28:27 -07:00
COPYING
GIT-VERSION-GEN Git 1.8.5.5 2014-02-13 13:41:53 -08:00
INSTALL
LGPL-2.1
Makefile Merge branch 'sb/repack-in-c' 2013-10-18 13:49:57 -07:00
README
RelNotes Git 1.8.5.5 2014-02-13 13:41:53 -08:00
abspath.c abspath.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
aclocal.m4
advice.c Rename advice.object_name_warning to objectNameWarning 2013-07-31 15:20:07 -07:00
advice.h Merge branch 'jk/gcc-function-attributes' 2013-07-22 11:23:59 -07:00
alias.c alias: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
alloc.c alloc.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
archive-tar.c
archive-zip.c Merge branch 'sb/archive-zip-double-assignment-fix' into maint 2013-07-19 10:40:53 -07:00
archive.c archive.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
archive.h archive: convert to use parse_pathspec 2013-07-15 10:56:07 -07:00
argv-array.c
argv-array.h Add the LAST_ARG_MUST_BE_NULL macro 2013-07-19 09:26:15 -07:00
attr.c
attr.h
base85.c base85.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
bisect.c list-objects: reduce one argument in mark_edges_uninteresting 2013-08-28 11:54:18 -07:00
bisect.h
blob.c
blob.h
branch.c Merge branch 'jh/checkout-auto-tracking' into maint 2013-10-23 13:32:50 -07:00
branch.h
builtin.h repack: rewrite the shell script in C 2013-09-17 13:34:50 -07:00
bulk-checkin.c stream_to_pack: xread does not guarantee to read all requested bytes 2013-08-20 11:20:53 -07:00
bulk-checkin.h
bundle.c object_array_entry: fix memory handling of the name field 2013-06-02 15:28:46 -07:00
bundle.h
cache-tree.c Convert "struct cache_entry *" to "const ..." wherever possible 2013-07-09 09:12:48 -07:00
cache-tree.h Convert "struct cache_entry *" to "const ..." wherever possible 2013-07-09 09:12:48 -07:00
cache.h Merge branch 'jc/upload-pack-send-symref' into maint 2013-11-08 11:38:00 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c make color.ui default to 'auto' 2013-06-10 10:55:42 -07:00
color.h
column.c
column.h
combine-diff.c Merge branch 'tr/log-full-diff-keep-true-parents' into maint 2013-09-18 11:59:05 -07:00
command-list.txt builtin: add git-check-mailmap command 2013-07-13 10:19:37 -07:00
commit-slab.h commit-slab.h: Fix memory allocation and addressing 2013-07-29 08:44:29 -07:00
commit.c Remove the line length limit for graft files 2013-12-27 16:46:25 -08:00
commit.h Merge branch 'nd/fetch-into-shallow' into maint 2013-10-23 13:32:17 -07:00
config.c config.c: mark file-local function static 2013-10-14 16:00:37 -07:00
config.mak.in
config.mak.uname MinGW: Fix stat definitions to work with MinGW runtime version 4.0 2013-09-11 11:11:06 -07:00
configure.ac configure: fix option help message for --disable-pthreads 2013-06-28 10:49:26 -07:00
connect.c git_connect(): use common return point 2013-12-09 14:54:48 -08:00
connect.h connect.c: refactor url parsing 2013-12-09 14:54:48 -08:00
connected.c clone: open a shortcut for connectivity check 2013-05-28 08:07:20 -07:00
connected.h clone: open a shortcut for connectivity check 2013-05-28 08:07:20 -07:00
convert.c typofix: in-code comments 2013-07-22 16:06:49 -07:00
convert.h typofix: in-code comments 2013-07-22 16:06:49 -07:00
copy.c
credential-cache--daemon.c
credential-cache.c
credential-store.c sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c daemon: be strict at parsing parameters --[no-]informative-errors 2013-12-20 14:05:07 -08:00
date.c Merge branch 'jk/date-c-double-semicolon' 2013-10-30 12:11:01 -07:00
decorate.c decorate.c: compact table when growing 2013-05-16 11:51:08 -07:00
decorate.h
delta.h
diff-delta.c create_delta_index: simplify condition always evaluating to true 2013-08-18 12:56:23 -07:00
diff-lib.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
diff-no-index.c Merge branch 'dw/diff-no-index-doc' 2013-09-17 11:42:44 -07:00
diff.c Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
diff.h Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c Merge branch 'rs/pickaxe-simplify' 2013-07-12 12:04:17 -07:00
diffcore-rename.c
diffcore.h
dir.c Merge branch 'jc/ls-files-killed-optim' into maint 2013-10-23 13:33:08 -07:00
dir.h Merge branch 'jc/ls-files-killed-optim' 2013-09-11 15:03:28 -07:00
editor.c editor: use canonicalized absolute path 2013-07-29 12:15:27 -07:00
entry.c checkout_entry(): clarify the use of topath[] parameter 2013-10-24 14:59:39 -07:00
environment.c cache: remove unused function 'have_git_dir' 2013-10-28 08:56:06 -07:00
exec_cmd.c
exec_cmd.h Add the LAST_ARG_MUST_BE_NULL macro 2013-07-19 09:26:15 -07:00
fast-import.c Merge branch 'bk/refs-multi-update' 2013-09-20 12:36:12 -07:00
fetch-pack.c Merge branch 'jk/allow-fetch-onelevel-refname' into maint 2014-02-13 13:38:34 -08:00
fetch-pack.h git fetch-pack: add --diag-url 2013-12-09 14:54:47 -08:00
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl add-interactive: handle unborn branch in patch mode 2013-10-25 14:54:17 -07:00
git-am.sh am: replace uses of --resolved with --continue 2013-06-27 09:37:12 -07:00
git-archimport.perl
git-bisect.sh typofixes: fix misspelt comments 2013-11-12 09:24:27 -08:00
git-compat-util.h Windows: do not redefine _WIN32_WINNT 2013-09-11 14:50:19 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys' 2013-11-04 14:58:05 -08:00
git-difftool--helper.sh
git-difftool.perl difftool --dir-diff: allow changing any clean working tree file 2013-05-29 12:50:08 -07:00
git-filter-branch.sh Merge branch 'lc/filter-branch-too-many-refs' 2013-10-17 15:55:12 -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 mergetool--lib: Fix typo in the merge/difftool help 2013-10-14 16:28:38 -07:00
git-mergetool.sh
git-p4.py Merge branch 'ks/p4-view-spec' 2013-09-18 11:44:50 -07:00
git-parse-remote.sh
git-pull.sh Merge branch 'fc/trivial' 2013-09-17 11:42:34 -07:00
git-quiltimport.sh
git-rebase--am.sh am: return control to caller, for housekeeping 2013-05-12 23:20:07 -07:00
git-rebase--interactive.sh Merge branch 'es/rebase-i-no-abbrev' into maint 2013-10-17 15:45:50 -07:00
git-rebase--merge.sh rebase --merge: return control to caller, for housekeeping 2013-05-12 23:20:08 -07:00
git-rebase.sh Merge branch 'mm/rebase-continue-freebsd-WB' into maint 2013-09-26 12:41:14 -07:00
git-relink.perl
git-remote-testgit.sh transport-helper: add no-private-update capability 2013-09-03 11:57:53 -07:00
git-request-pull.sh request-pull: improve error message for invalid revision args 2013-07-17 12:30:58 -07:00
git-send-email.perl Merge branch 'rk/send-email-ssl-cert' into maint 2014-02-13 13:38:19 -08:00
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'jc/reflog-doc' 2013-10-18 13:50:12 -07:00
git-stash.sh stash: handle specifying stashes with $IFS 2014-01-07 10:51:04 -08:00
git-submodule.sh Sync with 1.8.4.5 2013-12-02 15:34:44 -08:00
git-svn.perl git-svn: Warn about changing default for --prefix in Git v2.0 2013-10-12 22:30:53 +00:00
git-web--browse.sh web--browse: Add support for xdg-open 2013-10-30 13:54:15 -07:00
git.c Merge branch 'sb/repack-in-c' 2013-10-18 13:49:57 -07:00
git.rc Provide a Windows version resource for the git executables. 2013-06-04 10:11:08 +01:00
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c graph: fix coloring around octopus merges 2013-10-18 12:48:48 -07:00
graph.h
grep.c grep: allow to use textconv filters 2013-05-10 10:27:31 -07:00
grep.h grep: allow to use textconv filters 2013-05-10 10:27:31 -07:00
hash.c
hash.h
help.c cygwin: Remove the Win32 l/stat() implementation 2013-07-18 10:44:17 -07:00
help.h help: add help_unknown_ref() 2013-05-08 15:31:54 -07:00
hex.c
http-backend.c Merge branch 'bc/http-backend-allow-405' into maint 2013-10-17 15:46:00 -07:00
http-fetch.c
http-push.c Merge branch 'jk/http-auth-redirects' into maint 2013-11-08 11:37:26 -08:00
http-walker.c
http.c Merge branch 'jk/http-auth-redirects' 2013-10-30 12:09:53 -07:00
http.h http: update base URLs when we see redirects 2013-10-14 16:56:47 -07:00
ident.c Merge branch 'jk/split-broken-ident' into maint 2013-11-07 14:34:51 -08:00
imap-send.c imap-send: use Apple's Security framework for base64 encoding 2013-07-30 08:53:24 -07:00
kwset.c typofix: in-code comments 2013-07-22 16:06:49 -07:00
kwset.h
levenshtein.c
levenshtein.h
line-log.c Merge branch 'nd/magic-pathspec' 2013-10-30 12:10:33 -07:00
line-log.h range-set: publish API for re-use by git-blame -L 2013-08-06 14:27:20 -07:00
line-range.c line-range: reject -L line numbers less than 1 2013-08-06 14:48:55 -07:00
line-range.h line-range: teach -L/RE/ to search relative to anchor point 2013-08-06 14:36:34 -07:00
list-objects.c Merge branch 'nd/fetch-into-shallow' 2013-09-20 12:25:32 -07:00
list-objects.h list-objects: reduce one argument in mark_edges_uninteresting 2013-08-28 11:54:18 -07:00
ll-merge.c
ll-merge.h
lockfile.c lockfile: fix buffer overflow in path handling 2013-07-07 10:29:28 -07:00
log-tree.c log: properly handle decorations with chained tags 2013-12-20 14:37:03 -08:00
log-tree.h
mailmap.c Merge branch 'jc/strcasecmp-pure-inline' 2013-09-24 23:28:13 -07:00
mailmap.h
match-trees.c match-trees: factor out fill_tree_desc_strict 2013-06-13 14:45:38 -07:00
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'jk/diff-algo' into maint 2013-10-28 10:16:11 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c name-hash: stop storing trailing '/' on paths in index_state.dir_hash 2013-09-17 10:08:07 -07:00
notes-cache.c
notes-cache.h
notes-merge.c remove diff_tree_{setup,release}_paths 2013-07-15 10:56:09 -07:00
notes-merge.h Move create_notes_commit() from notes-merge.c into notes-utils.c 2013-06-12 10:38:13 -07:00
notes-utils.c Move create_notes_commit() from notes-merge.c into notes-utils.c 2013-06-12 10:38:13 -07:00
notes-utils.h typofix: commit is spelled with two ems 2013-09-04 15:30:03 -07:00
notes.c string_list_add_refs_by_glob(): add a comment about memory management 2013-06-02 15:28:47 -07:00
notes.h many small typofixes 2013-07-29 12:32:25 -07:00
object.c Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
object.h Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
pack-check.c
pack-revindex.c pack-revindex: radix-sort the revindex 2013-07-12 09:20:54 -07:00
pack-revindex.h
pack-write.c
pack.h
pager.c pager: turn on "cat" optimization for DEFAULT_PAGER 2013-09-03 10:36:12 -07:00
parse-options-cb.c prune: introduce OPT_EXPIRY_DATE() and use it 2013-04-25 11:42:10 -07:00
parse-options.c parse-options: add OPT_CMDMODE() 2013-07-30 12:23:31 -07:00
parse-options.h Merge branch 'sb/parseopt-boolean-removal' 2013-09-04 12:39:03 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'jx/relative-path-regression-fix' 2013-10-28 10:42:30 -07:00
pathspec.c Merge branch 'mi/typofixes' into maint 2013-12-17 11:34:01 -08:00
pathspec.h pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses 2013-10-28 09:57:36 -07:00
pkt-line.c
pkt-line.h
preload-index.c convert read_cache_preload() to take struct pathspec 2013-07-15 10:56:08 -07:00
pretty.c enums: remove trailing ',' after last item in enum 2014-07-02 12:37:05 -07:00
prio-queue.c sort-in-topological-order: use prio-queue 2013-06-11 15:15:21 -07:00
prio-queue.h sort-in-topological-order: use prio-queue 2013-06-11 15:15:21 -07:00
progress.c
progress.h
prompt.c Revert "prompt: clean up strbuf usage" 2014-01-02 10:21:40 -08:00
prompt.h
quote.c quote: remove sq_quote_print() 2013-07-30 08:13:38 -07:00
quote.h quote: remove sq_quote_print() 2013-07-30 08:13:38 -07:00
reachable.c clear parsed flag when we free tree buffers 2013-06-06 10:29:12 -07:00
reachable.h
read-cache.c Merge branch 'es/name-hash-no-trailing-slash-in-dirs' 2013-10-17 15:55:16 -07:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'sb/refs-code-cleanup' 2013-11-01 07:38:58 -07:00
refs.h Merge branch 'sb/refs-code-cleanup' 2013-11-01 07:38:58 -07:00
remote-curl.c Merge branch 'jk/http-auth-redirects' 2013-10-30 12:09:53 -07:00
remote-testsvn.c sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
remote.c Merge branch 'jk/remote-literal-string-leakfix' 2013-10-28 10:43:28 -07:00
remote.h Merge branch 'jc/push-cas' 2013-09-09 14:30:29 -07:00
replace_object.c
rerere.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
rerere.h rerere: convert to use parse_pathspec 2013-07-15 10:56:07 -07:00
resolve-undo.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
resolve-undo.h convert unmerge_cache to take struct pathspec 2013-07-15 10:56:08 -07:00
revision.c Merge branch 'jc/revision-range-unpeel' into maint 2014-02-13 13:38:47 -08:00
revision.h revision: add missing include 2013-10-31 13:46:03 -07:00
run-command.c run-command: trivial style fixes 2013-10-31 13:48:26 -07:00
run-command.h Add the LAST_ARG_MUST_BE_NULL macro 2013-07-19 09:26:15 -07:00
send-pack.c Merge branch 'jl/pack-transfer-avoid-double-close' 2013-10-30 12:10:45 -07:00
send-pack.h
sequencer.c refs: report ref type from lock_any_ref_for_update 2013-08-30 14:57:28 -07:00
sequencer.h
server-info.c
setup.c setup: trivial style fixes 2013-10-31 13:48:32 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP 2013-08-24 22:31:20 -07:00
sha1-lookup.h
sha1_file.c get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure 2013-12-18 14:59:43 -08:00
sha1_name.c interpret_branch_name: find all possible @-marks 2014-01-15 12:51:14 -08:00
shallow.c shallow: add setup_temporary_shallow() 2013-08-28 11:51:54 -07:00
shell.c Merge branch 'tr/protect-low-3-fds' 2013-07-22 11:23:35 -07:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
streaming.c Merge branch 'jk/cat-file-batch-optim' 2013-07-24 19:21:21 -07:00
streaming.h
string-list.c
string-list.h
submodule.c Merge branch 'jl/some-submodule-config-are-not-boolean' into maint 2013-09-18 11:59:35 -07:00
submodule.h rm: delete .gitmodules entry of submodules removed from the work tree 2013-08-06 14:11:00 -07:00
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c Merge branch 'js/test-ln-s-add' 2013-06-20 16:02:18 -07:00
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c Convert "struct cache_entry *" to "const ..." wherever possible 2013-07-09 09:12:48 -07:00
test-genrandom.c
test-index-version.c sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
test-line-buffer.c
test-match-trees.c use 'tree-ish' instead of 'treeish' 2013-09-04 15:02:56 -07:00
test-mergesort.c sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
test-mktemp.c
test-parse-options.c sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
test-path-utils.c path-utils test: rename mingw_path function to print_path 2013-10-14 07:32:53 -07:00
test-prio-queue.c prio-queue: priority queue of pointers to structs 2013-06-11 15:15:21 -07:00
test-read-cache.c read-cache: add simple performance test 2013-06-09 17:03:00 -07:00
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1.c test-sha1: add a binary output mode 2013-08-22 16:39:46 -07:00
test-sha1.sh
test-sigchain.c
test-string-list.c
test-subprocess.c sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
test-svn-fe.c
test-urlmatch-normalization.c builtin/config.c: compilation fix 2013-08-09 09:20:38 -07:00
test-wildmatch.c
thread-utils.c mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE 2013-05-08 12:14:35 -07:00
thread-utils.h
trace.c add missing "format" function attributes 2013-07-09 22:23:04 -07:00
transport-helper.c transport-helper: trivial style fix 2013-10-31 13:47:22 -07:00
transport.c connect.c: refactor url parsing 2013-12-09 14:54:48 -08:00
transport.h Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' 2013-09-09 14:50:37 -07:00
tree-diff.c pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses 2013-10-28 09:57:36 -07:00
tree-walk.c Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint 2014-02-13 13:37:53 -08:00
tree-walk.h unpack-trees: don't shift conflicts left and right 2013-06-17 09:24:47 -07:00
tree.c Merge branch 'jk/free-tree-buffer' 2013-09-17 11:37:33 -07:00
tree.h Merge branch 'jk/free-tree-buffer' 2013-09-17 11:37:33 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c unpack-trees: simplify 'all other failures' case 2014-08-13 10:32:08 -07:00
unpack-trees.h diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const 2013-06-02 15:31:14 -07:00
upload-pack.c Merge branch 'maint' 2013-11-18 12:25:28 -08:00
url.c
url.h
urlmatch.c urlmatch.c: recompute pointer after append_normalized_escapes 2013-09-12 15:27:01 -07:00
urlmatch.h config: add generic callback wrapper to parse section.<url>.key 2013-07-31 14:58:42 -07:00
usage.c Merge branch 'jk/a-thread-only-dies-once' into maint 2013-04-26 11:25:59 -07:00
userdiff.c
userdiff.h
utf8.c pretty: Fix bug in truncation support for %>, %< and %>< 2013-04-28 12:09:37 -07:00
utf8.h add missing "format" function attributes 2013-07-09 22:23:04 -07:00
varint.c
varint.h
version.c
version.h
walker.c clear parsed flag when we free tree buffers 2013-06-06 10:29:12 -07:00
walker.h
wildmatch.c wildmatch: properly fold case everywhere 2013-06-02 14:13:05 -07:00
wildmatch.h
wrap-for-bin.sh wrap-for-bin: make bin-wrappers chainable 2013-07-08 08:55:34 -07:00
wrapper.c typofixes: fix misspelt comments 2013-11-12 09:24:27 -08:00
write_or_die.c
ws.c
wt-status.c commit -v: strip diffs and submodule shortlogs from the commit message 2013-12-05 14:39:11 -08:00
wt-status.h commit -v: strip diffs and submodule shortlogs from the commit message 2013-12-05 14:39:11 -08:00
xdiff-interface.c
xdiff-interface.h
zlib.c

README

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

	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.