user/sven/git.git/setup.c, branch v1.7.7.4

Merge branch 'nd/maint-clone-gitdir'

2011-08-29T04:20:28Z

* nd/maint-clone-gitdir: clone: allow to clone from .git file read_gitfile_gently(): rename misnamed function to read_gitfile()

Merge branch 'di/parse-options-split'

2011-08-25T23:00:20Z

* di/parse-options-split: Reduce parse-options.o dependencies parse-options: export opterr, optbug

read_gitfile_gently(): rename misnamed function to read_gitfile()

2011-08-22T21:04:56Z

The function was not gentle at all to the callers and died without giving them a chance to deal with possible errors. Rename it to read_gitfile(), and update all the callers. As no existing caller needs a true "gently" variant, we do not bother adding one at this point. Signed-off-by: Junio C Hamano

Reduce parse-options.o dependencies

2011-08-11T19:18:02Z

Currently parse-options.o pulls quite a big bunch of dependencies. his complicates it's usage in contrib/ because it pulls external dependencies and it also increases executables size. Split off less generic and more internal to git part of parse-options.c to parse-options-cb.c. Move prefix_filename function from setup.c to abspath.c. abspath.o and wrapper.o pull each other, so it's unlikely to increase the dependencies. It was a dependency of parse-options.o that pulled many others. Now parse-options.o pulls just abspath.o, ctype.o, strbuf.o, usage.o, wrapper.o, libc directly and strlcpy.o indirectly. Signed-off-by: Dmitry Ivankov Signed-off-by: Junio C Hamano

Merge branch 'cb/partial-commit-relative-pathspec'

2011-08-11T18:04:28Z

* cb/partial-commit-relative-pathspec: commit: allow partial commits with relative paths

commit: allow partial commits with relative paths

2011-08-02T21:20:35Z

In order to do partial commits, git-commit overlays a tree on the cache and checks pathspecs against the result. Currently, the overlaying is done using "prefix" which prevents relative pathspecs with ".." and absolute pathspec from matching when they refer to files not under "prefix" and absent from the index, but still in the tree (i.e. files staged for removal). The point of providing a prefix at all is performance optimization. If we say there is no common prefix for the files of interest, then we have to read the entire tree into the index. But even if we cannot use the working directory as a prefix, we can still figure out if there is a common prefix for all given paths, and use that instead. The pathspec_prefix() routine from ls-files.c does exactly that. Any use of global variables is removed from pathspec_prefix() so that it can be called from commit.c. Reported-by: Reuben Thomas Analyzed-by: Michael J Gruber Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano

Merge branch 'da/git-prefix-everywhere' into next

2011-06-30T00:09:27Z

* da/git-prefix-everywhere: t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests git-mergetool--lib: Make vimdiff retain the current directory git: Remove handling for GIT_PREFIX setup: Provide GIT_PREFIX to built-ins

Merge branch 'maint'

2011-05-30T07:09:55Z

* maint: git-submodule.sh: separate parens by a space to avoid confusing some shells Documentation/technical/api-diff.txt: correct name of diff_unmerge() read_gitfile_gently: use ssize_t to hold read result remove tests of always-false condition rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'

Merge branch 'jm/maint-misc-fix' into maint

2011-05-30T07:09:41Z

* jm/maint-misc-fix: read_gitfile_gently: use ssize_t to hold read result remove tests of always-false condition rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'

setup: Provide GIT_PREFIX to built-ins

2011-05-26T22:05:33Z

GIT_PREFIX was added in 7cf16a14f5c070f7b14cf28023769450133172ae so that aliases can know the directory from which a !alias was called. Knowing the prefix relative to the root is helpful in other programs so export it to built-ins as well. Helped-by: Michael J Gruber Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano