1
0
mirror of https://github.com/git/git.git synced 2024-10-19 23:28:32 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Nguyễn Thái Ngọc Duy b3f66fd3e3 setup: rework setup_explicit_git_dir()
This function is the most complex one among the three setup_*
functions because all GIT_DIR, GIT_WORK_TREE, core.worktree and
core.bare are involved.

Because core.worktree is only effective inside
setup_explicit_git_dir() and the extra code in setup_git_directory()
is to handle that. The extra code can now be retired.

Also note that setup_explicit assignment is removed, worktree setting
is no longer decided by get_git_work_tree(). get_git_work_tree() will
be simplified in the next commit.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-22 14:34:24 -08:00
block-sha1 msvc: Select the "fast" definition of the {get,put}_be32() macros 2010-06-27 21:59:32 -07:00
builtin setup: limit get_git_work_tree()'s to explicit setup case only 2010-12-22 14:34:24 -08:00
compat Add MinGW-specific execv() override. 2010-10-03 23:34:25 +01:00
contrib Merge branch 'ab/require-perl-5.8' 2010-10-26 21:57:31 -07:00
Documentation git-rev-parse.txt: clarify --git-dir 2010-11-29 13:26:00 -08:00
git_remote_helpers remote-helpers: build in platform independent directory 2010-09-27 10:42:50 -07:00
git-gui Merge git://repo.or.cz/git-gui 2010-09-15 12:34:48 -07:00
gitk-git
gitweb Merge branch 'ab/require-perl-5.8' 2010-10-26 21:57:31 -07:00
perl perl: bump the required Perl version to 5.8 from 5.6.[21] 2010-09-27 12:37:41 -07:00
ppc
t setup: rework setup_explicit_git_dir() 2010-12-22 14:34:24 -08:00
templates
vcs-svn vcs-svn: Fix some printf format compiler warnings 2010-09-12 10:24:55 -07:00
xdiff xdiff: cast arguments for ctype functions to unsigned char 2010-10-06 10:46:45 -07:00
.gitattributes
.gitignore Merge branch 'ab/test-2' 2010-09-04 08:15:36 -07:00
.mailmap Martin Langhoff has a new e-mail address 2010-10-06 12:08:48 -07:00
abspath.c Fix 'clone' failure at DOS root directory. 2010-10-03 23:34:23 +01:00
aclocal.m4
advice.c
advice.h
alias.c split_cmdline: Allow caller to access error string 2010-08-11 09:36:23 -07:00
alloc.c
archive-tar.c
archive-zip.c
archive.c Use angles for placeholders consistently 2010-10-08 12:29:52 -07:00
archive.h
attr.c Add global and system-wide gitattributes 2010-09-01 12:19:36 -07:00
attr.h
base85.c Standardize do { ... } while (0) style 2010-08-12 15:44:51 -07:00
bisect.c bisect: use find_commit_subject() instead of custom code 2010-07-23 16:12:47 -07:00
bisect.h
blob.c
blob.h
branch.c builtin/checkout: handle -B from detached HEAD correctly 2010-08-09 12:57:17 -07:00
branch.h
builtin.h Merge branch 'rr/fmt-merge-msg' 2010-09-29 13:48:20 -07:00
bundle.c bundle: detect if bundle file cannot be created 2010-08-27 16:46:26 -07:00
bundle.h
cache-tree.c cache_tree_free: Fix small memory leak 2010-09-06 17:32:28 -07:00
cache-tree.h
cache.h setup: limit get_git_work_tree()'s to explicit setup case only 2010-12-22 14:34:24 -08:00
check_bindir
check-builtins.sh
check-racy.c
color.c
color.h
combine-diff.c Merge branch 'rs/diff-no-minimal' into maint 2010-06-21 05:38:50 -07:00
command-list.txt
commit.c Merge branch 'cc/find-commit-subject' 2010-08-18 12:46:55 -07:00
commit.h Merge branch 'cc/find-commit-subject' 2010-08-18 12:46:55 -07:00
config.c Add git_config_early() 2010-12-22 14:34:24 -08:00
config.mak.in Merge branch 'ab/compat-regex' 2010-09-03 09:43:45 -07:00
configure.ac Merge branch 'po/etc-gitattributes' 2010-09-29 13:47:51 -07:00
connect.c Make sure that git_getpass() never returns NULL 2010-09-30 12:22:02 -07:00
convert.c Don't expand CRLFs when normalizing text during merge 2010-07-02 15:45:18 -07:00
copy.c
COPYING
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'as/daemon-multi-listen' 2010-10-26 21:50:03 -07:00
date.c Export parse_date_basic() to convert a date string to timestamp 2010-07-15 15:35:12 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c fix >4GiB source delta assertion failure 2010-08-21 23:53:26 -07:00
diff-lib.c Submodules: Add the new "ignore" config option for diff and status 2010-08-09 09:01:52 -07:00
diff-no-index.c string_list: Add STRING_LIST_INIT macro and make use of it. 2010-07-05 11:47:57 -07:00
diff.c Merge branch 'kb/merge-recursive-rename-threshold' 2010-10-26 21:54:04 -07:00
diff.h Merge branch 'kb/merge-recursive-rename-threshold' 2010-10-26 21:54:04 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c diffcore-pickaxe.c: a void function shouldn't try to return something 2010-10-06 13:45:18 -07:00
diffcore-rename.c
diffcore.h diff: pass the entire diff-options to diffcore_pickaxe() 2010-08-31 14:30:28 -07:00
dir.c dir.c: squelch false uninitialized memory warning 2010-09-27 11:43:12 -07:00
dir.h git add: Add the "--ignore-missing" option for the dry run 2010-07-12 15:13:54 -07:00
editor.c
entry.c
environment.c setup: limit get_git_work_tree()'s to explicit setup case only 2010-12-22 14:34:24 -08:00
exec_cmd.c Merge branch 'cw/maint-exec-defpath' into maint 2010-06-16 16:33:47 -07:00
exec_cmd.h
fast-import.c Sync with 1.7.3.2 2010-10-21 17:16:10 -07:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl perl: use "use warnings" instead of -w 2010-09-27 12:37:56 -07:00
git-am.sh Sync with 1.7.3.2 2010-10-21 17:16:10 -07:00
git-archimport.perl perl: use "use warnings" instead of -w 2010-09-27 12:37:56 -07:00
git-bisect.sh
git-compat-util.h do not depend on signed integer overflow 2010-10-06 11:10:07 -07:00
git-cvsexportcommit.perl perl: use "use warnings" instead of -w 2010-09-27 12:37:56 -07:00
git-cvsimport.perl Merge branch 'ab/require-perl-5.8' 2010-10-26 21:57:31 -07:00
git-cvsserver.perl Merge branch 'ab/require-perl-5.8' 2010-10-26 21:57:31 -07:00
git-difftool--helper.sh
git-difftool.perl perl: bump the required Perl version to 5.8 from 5.6.[21] 2010-09-27 12:37:41 -07:00
git-filter-branch.sh filter-branch: retire --remap-to-ancestor 2010-08-27 16:47:01 -07:00
git-instaweb.sh instaweb: add access+error logging for WEBrick 2010-08-05 08:51:26 +00:00
git-lost-found.sh
git-merge-octopus.sh merge-octopus: Work around environment issue on Windows 2010-10-01 23:08:46 +01:00
git-merge-one-file.sh build: propagate $DIFF to scripts 2010-06-05 09:36:13 -07:00
git-merge-resolve.sh
git-mergetool--lib.sh mergetool-lib: make the three-way diff the default for vim/gvim 2010-09-29 13:09:48 -07:00
git-mergetool.sh Merge branch 'cb/maint-mergetool-no-tty' 2010-09-03 09:43:44 -07:00
git-parse-remote.sh
git-pull.sh Merge branch 'en/rebase-against-rebase-fix' into maint 2010-09-01 13:43:55 -07:00
git-quiltimport.sh
git-rebase--interactive.sh git-rebase--interactive.sh: replace cut with ${v%% *} 2010-09-17 14:58:08 -07:00
git-rebase.sh shell portability: no "export VAR=VAL" 2010-10-13 11:36:36 -07:00
git-relink.perl Merge branch 'ab/require-perl-5.8' 2010-10-26 21:57:31 -07:00
git-remote-testgit.py Remove python 2.5'isms 2010-06-13 20:02:50 -07:00
git-repack.sh repack: add -F flag to let user choose between --no-reuse-delta/object 2010-09-27 12:39:05 -07:00
git-request-pull.sh
git-send-email.perl Merge branch 'ab/send-email-perl' 2010-10-26 22:02:52 -07:00
git-sh-setup.sh Merge branch 'uk/fix-author-ident-sed-script' 2010-10-06 12:11:12 -07:00
git-stash.sh shell portability: no "export VAR=VAL" 2010-10-13 11:36:36 -07:00
git-submodule.sh submodule sync: Update "submodule.<name>.url" 2010-08-18 13:54:30 -07:00
git-svn.perl Merge branch 'ab/require-perl-5.8' 2010-10-26 21:57:31 -07:00
GIT-VERSION-GEN Git 1.7.3.2 2010-10-21 17:14:32 -07:00
git-web--browse.sh Add a google-chrome option for web--browse 2010-07-25 23:14:18 -07:00
git.c builtins: print setup info if repo is found 2010-11-29 13:25:53 -08:00
git.spec.in git.spec.in: Add gitweb subpackage 2010-06-30 15:49:18 -07:00
graph.c Merge branch 'maint' 2010-08-22 20:18:37 -07:00
graph.h Enable custom schemes for column colors in the graph API 2010-07-13 16:33:02 -07:00
grep.c log --author: take union of multiple "author" requests 2010-09-13 01:11:55 -07:00
grep.h log --author: take union of multiple "author" requests 2010-09-13 01:11:55 -07:00
hash.c
hash.h
help.c
help.h builtin.h: Move two functions definitions to help.h. 2010-09-01 08:00:51 -07:00
hex.c
http-backend.c Merge branch 'jp/string-list-api-cleanup' 2010-06-30 11:55:38 -07:00
http-fetch.c
http-push.c
http-walker.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
http.c Allow HTTP user agent string to be modified. 2010-08-11 14:07:31 -07:00
http.h Standardize do { ... } while (0) style 2010-08-12 15:44:51 -07:00
ident.c
imap-send.c imap-send: Fix sprintf usage 2010-08-09 11:35:46 -07:00
INSTALL perl: bump the required Perl version to 5.8 from 5.6.[21] 2010-09-27 12:37:41 -07:00
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c merge-recursive --patience 2010-08-26 09:20:03 -07:00
ll-merge.h merge-recursive --patience 2010-08-26 09:20:03 -07:00
lockfile.c
log-tree.c Allow customizable commit decorations colors 2010-06-24 12:57:34 -07:00
log-tree.h Allow customizable commit decorations colors 2010-06-24 12:57:34 -07:00
mailmap.c string_list: Fix argument order for string_list_lookup 2010-06-27 10:06:51 -07:00
mailmap.h
Makefile Merge branch 'ab/makefile-track-cc' 2010-10-06 12:10:29 -07:00
match-trees.c
merge-file.c ll-merge: replace flag argument with options struct 2010-08-26 09:18:51 -07:00
merge-recursive.c Merge branch 'kb/merge-recursive-rename-threshold' 2010-10-26 21:54:04 -07:00
merge-recursive.h Merge branch 'kb/merge-recursive-rename-threshold' 2010-10-26 21:54:04 -07:00
name-hash.c
notes-cache.c
notes-cache.h
notes.c notes: Don't create (empty) commit when removing non-existing notes 2010-08-31 11:07:34 -07:00
notes.h notes: Don't create (empty) commit when removing non-existing notes 2010-08-31 11:07:34 -07:00
object.c Merge branch 'maint' 2010-09-06 00:12:04 -07:00
object.h object.h: Add OBJECT_ARRAY_INIT macro and make use of it. 2010-08-29 22:42:49 -07:00
pack-check.c Typos in code comments, an error message, documentation 2010-08-22 13:25:08 -07:00
pack-refs.c pack-refs: remove newly empty directories 2010-07-07 09:11:37 -07:00
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h Merge branch 'sp/maint-dumb-http-pack-reidx' into maint 2010-06-16 16:21:30 -07:00
pager.c
parse-options.c parseopt: wrap rev-parse --parseopt usage for eval consumption 2010-06-13 09:38:14 -07:00
parse-options.h parse-options: clarify PARSE_OPT_NOARG description 2010-08-24 10:37:39 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'hv/submodule-find-ff-merge' 2010-08-21 23:27:59 -07:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'mg/pretty-magic-space' 2010-06-22 09:45:22 -07:00
progress.c
progress.h
quote.c quote.c: separate quoting and relative path generation 2010-06-05 09:14:13 -07:00
quote.h quote.c: separate quoting and relative path generation 2010-06-05 09:14:13 -07:00
reachable.c object.h: Add OBJECT_ARRAY_INIT macro and make use of it. 2010-08-29 22:42:49 -07:00
reachable.h
read-cache.c core: Stop leaking ondisk_cache_entrys 2010-08-11 09:57:43 -07:00
README
reflog-walk.c string_list: Fix argument order for string_list_lookup 2010-06-27 10:06:51 -07:00
reflog-walk.h
refs.c Merge branch 'hv/submodule-find-ff-merge' 2010-08-21 23:27:59 -07:00
refs.h setup_revisions(): Allow walking history in a submodule 2010-07-07 09:48:33 -07:00
RelNotes Git 1.7.3.2 2010-10-21 17:14:32 -07:00
remote-curl.c Merge branch 'sp/fix-smart-http-deadlock-on-error' into maint 2010-08-18 16:30:11 -07:00
remote.c string_list: Add STRING_LIST_INIT macro and make use of it. 2010-07-05 11:47:57 -07:00
remote.h
replace_object.c
rerere.c Merge branch 'jf/merge-ignore-ws' 2010-10-26 21:40:54 -07:00
rerere.h
resolve-undo.c Convert the users of for_each_string_list to for_each_string_list_item macro 2010-07-05 11:44:35 -07:00
resolve-undo.h
revision.c Merge branch 'mm/shortopt-detached' 2010-08-21 23:28:31 -07:00
revision.h setup_revisions(): Allow walking history in a submodule 2010-07-07 09:48:33 -07:00
run-command.c Merge branch 'js/async-thread' 2010-06-21 06:02:45 -07:00
run-command.h
send-pack.h
server-info.c update-server-info: Shorten read_pack_info_file() 2010-07-19 11:13:52 -07:00
setup.c setup: rework setup_explicit_git_dir() 2010-12-22 14:34:24 -08:00
sha1_file.c sha1_file: Show the the type and path to corrupt objects 2010-07-14 15:35:12 -07:00
sha1_name.c update comment and documentation for :/foo syntax 2010-09-27 10:54:52 -07:00
sha1-lookup.c
sha1-lookup.h
shallow.c object.h: Add OBJECT_ARRAY_INIT macro and make use of it. 2010-08-29 22:42:49 -07:00
shell.c shell: Display errors from improperly-formatted command lines 2010-08-27 10:43:59 -07:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c disallow branch names that start with a hyphen 2010-09-15 12:33:09 -07:00
strbuf.h strbuf.h: fix comment typo 2010-09-27 10:42:11 -07:00
string-list.c string_list: Fix argument order for string_list_append 2010-06-27 10:06:52 -07:00
string-list.h string_list: Add STRING_LIST_INIT macro and make use of it. 2010-07-05 11:47:57 -07:00
submodule.c Merge branch 'hv/submodule-find-ff-merge' 2010-08-21 23:27:59 -07:00
submodule.h Merge branch 'hv/submodule-find-ff-merge' 2010-08-21 23:27:59 -07:00
symlinks.c
tag.c Merge branch 'xx/trivial' into maint 2010-09-06 00:11:59 -07:00
tag.h
tar.h
test-chmtime.c
test-ctype.c
test-date.c test-date: fix sscanf type conversion 2010-07-06 08:42:15 -07:00
test-delta.c
test-dump-cache-tree.c
test-genrandom.c
test-index-version.c
test-line-buffer.c Add stream helper library 2010-08-14 19:35:37 -07:00
test-match-trees.c
test-obj-pool.c Add memory pool library 2010-08-14 19:35:37 -07:00
test-parse-options.c
test-path-utils.c
test-run-command.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-pool.c Add string-specific memory pool 2010-08-14 19:35:37 -07:00
test-svn-fe.c SVN dump parser 2010-08-14 19:35:38 -07:00
test-treap.c Add treap implementation 2010-08-14 19:35:37 -07:00
thread-utils.c
thread-utils.h
trace.c builtins: print setup info if repo is found 2010-11-29 13:25:53 -08:00
transport-helper.c string_list: Add STRING_LIST_INIT macro and make use of it. 2010-07-05 11:47:57 -07:00
transport.c
transport.h
tree-diff.c Merge branch 'en/tree-walk-optim' 2010-10-26 21:37:49 -07:00
tree-walk.c unpack_trees: group error messages by type 2010-08-11 10:36:06 -07:00
tree-walk.h Merge branch 'maint' 2010-08-26 16:42:59 -07:00
tree.c
tree.h
unimplemented.sh
unpack-trees.c Merge branch 'dg/local-mod-error-messages' 2010-09-03 22:23:49 -07:00
unpack-trees.h Move "show_all_errors = 1" to setup_unpack_trees_porcelain() 2010-09-03 09:31:51 -07:00
upload-pack.c Use angles for placeholders consistently 2010-10-08 12:29:52 -07:00
url.c Do not unquote + into ' ' in URLs 2010-07-25 21:57:23 -07:00
url.h
usage.c
userdiff.c userdiff.c: add builtin fortran regex patterns 2010-09-10 09:38:29 -07:00
userdiff.h
utf8.c
utf8.h
walker.c
walker.h
wrap-for-bin.sh
wrapper.c xmalloc: include size in the failure message 2010-08-20 09:27:38 -07:00
write_or_die.c
ws.c
wt-status.c wt-status.c: don't leak directory entries when processing untracked,ignored 2010-09-27 11:41:25 -07:00
wt-status.h Merge branch 'jl/status-ignore-submodules' 2010-06-30 11:55:39 -07:00
xdiff-interface.c xdiff-interface.c: always trim trailing space from xfuncname matches 2010-09-09 17:18:29 -07:00
xdiff-interface.h

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

	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.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

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