delta/git.git/setup.c, branch jc/signed-commit

Merge branch 'cb/common-prefix-unification'

2011-10-10T22:56:17+00:00

* cb/common-prefix-unification:
  rename pathspec_prefix() to common_prefix() and move to dir.[ch]
  consolidate pathspec_prefix and common_prefix
  remove prefix argument from pathspec_prefix

Merge branch 'fg/submodule-git-file-git-dir'

2011-10-10T22:56:17+00:00

* fg/submodule-git-file-git-dir:
  Move git-dir for submodules
  rev-parse: add option --resolve-git-dir 

Conflicts:
	cache.h
	git-submodule.sh

rename pathspec_prefix() to common_prefix() and move to dir.[ch]

2011-09-12T21:38:32+00:00

Also make common_prefix_len() static as this refactoring makes dir.c
itself the only caller of this helper function.

Signed-off-by: Clemens Buchacher 
Signed-off-by: Junio C Hamano

consolidate pathspec_prefix and common_prefix

2011-09-06T19:54:19+00:00

The implementation from pathspec_prefix (slightly modified) replaces the
current common_prefix, because it also respects glob characters.

Based on a patch by Clemens Buchacher.

Signed-off-by: Junio C Hamano

remove prefix argument from pathspec_prefix

2011-09-06T19:50:10+00:00

Passing a prefix to a function that is supposed to find the prefix is
strange. And it's really only used if the pathspec is NULL. Make the
callers handle this case instead.

As we are always returning a fresh copy of a string (or NULL), change the
type of the returned value to non-const "char *".

Signed-off-by: Clemens Buchacher 
Signed-off-by: Junio C Hamano

Merge branch 'nd/maint-clone-gitdir'

2011-08-29T04:20:28+00:00

* 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:20+00:00

* 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:56+00:00

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

rev-parse: add option --resolve-git-dir

2011-08-16T18:04:31+00:00

Check if  is a valid git-dir or a valid git-file that points
to a valid git-dir.

We want tests to be independent from the fact that a git-dir may
be a git-file. Thus we changed tests to use this feature.

Signed-off-by: Fredrik Gustafsson 
Mentored-by: Jens Lehmann 
Mentored-by: Heiko Voigt 
Signed-off-by: Junio C Hamano

Reduce parse-options.o dependencies

2011-08-11T19:18:02+00:00

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