gitweb.git
Merge branch 'nd/test-rename-reset'Junio C Hamano Thu, 27 Feb 2014 22:01:35 +0000 (14:01 -0800)

Merge branch 'nd/test-rename-reset'

* nd/test-rename-reset:
t7101, t7014: rename test files to indicate what that file is for

Merge branch 'wk/submodule-on-branch'Junio C Hamano Thu, 27 Feb 2014 22:01:31 +0000 (14:01 -0800)

Merge branch 'wk/submodule-on-branch'

Make sure 'submodule update' modes that do not detach HEADs can
be used more pleasantly by checking out a concrete branch when
cloning them to prime the well.

* wk/submodule-on-branch:
Documentation: describe 'submodule update --remote' use case
submodule: explicit local branch creation in module_clone
submodule: document module_clone arguments in comments
submodule: make 'checkout' update_module mode more explicit

Merge branch 'ep/varscope'Junio C Hamano Thu, 27 Feb 2014 22:01:30 +0000 (14:01 -0800)

Merge branch 'ep/varscope'

Shrink lifetime of variables by moving their definitions to an
inner scope where appropriate.

* ep/varscope:
builtin/gc.c: reduce scope of variables
builtin/fetch.c: reduce scope of variable
builtin/commit.c: reduce scope of variables
builtin/clean.c: reduce scope of variable
builtin/blame.c: reduce scope of variables
builtin/apply.c: reduce scope of variables
bisect.c: reduce scope of variable

Merge branch 'bs/stdio-undef-before-redef'Junio C Hamano Thu, 27 Feb 2014 22:01:28 +0000 (14:01 -0800)

Merge branch 'bs/stdio-undef-before-redef'

When we replace broken macros from stdio.h in git-compat-util.h,
preprocessor.

* bs/stdio-undef-before-redef:
git-compat-util.h: #undef (v)snprintf before #define them

Merge branch 'jk/config-path-include-fix'Junio C Hamano Thu, 27 Feb 2014 22:01:25 +0000 (14:01 -0800)

Merge branch 'jk/config-path-include-fix'

include.path variable (or any variable that expects a path that can
use ~username expansion) in the configuration file is not a
boolean, but the code failed to check it.

* jk/config-path-include-fix:
handle_path_include: don't look at NULL value
expand_user_path: do not look at NULL path

Merge branch 'ds/rev-parse-required-args'Junio C Hamano Thu, 27 Feb 2014 22:01:23 +0000 (14:01 -0800)

Merge branch 'ds/rev-parse-required-args'

"git rev-parse --default" without the required option argument did
not diagnose it as an error.

* ds/rev-parse-required-args:
rev-parse: check i before using argv[i] against argc

Merge branch 'nd/diff-quiet-stat-dirty'Junio C Hamano Thu, 27 Feb 2014 22:01:21 +0000 (14:01 -0800)

Merge branch 'nd/diff-quiet-stat-dirty'

"git diff --quiet -- pathspec1 pathspec2" sometimes did not return
correct status value.

* nd/diff-quiet-stat-dirty:
diff: do not quit early on stat-dirty files
diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later

Merge branch 'nd/submodule-pathspec-ending-with-slash'Junio C Hamano Thu, 27 Feb 2014 22:01:15 +0000 (14:01 -0800)

Merge branch 'nd/submodule-pathspec-ending-with-slash'

Allow "git cmd path/", when the 'path' is where a submodule is
bound to the top-level working tree, to match 'path', despite the
extra and unnecessary trailing slash.

* nd/submodule-pathspec-ending-with-slash:
clean: use cache_name_is_other()
clean: replace match_pathspec() with dir_path_match()
pathspec: pass directory indicator to match_pathspec_item()
match_pathspec: match pathspec "foo/" against directory "foo"
dir.c: prepare match_pathspec_item for taking more flags
pathspec: rename match_pathspec_depth() to match_pathspec()
pathspec: convert some match_pathspec_depth() to dir_path_match()
pathspec: convert some match_pathspec_depth() to ce_path_match()

Merge branch 'bk/refresh-missing-ok-in-merge-recursive'Junio C Hamano Thu, 27 Feb 2014 22:01:14 +0000 (14:01 -0800)

Merge branch 'bk/refresh-missing-ok-in-merge-recursive'

Allow "merge-recursive" to work in an empty (temporary) working
tree again when there are renames involved, correcting an old
regression in 1.7.7 era.

* bk/refresh-missing-ok-in-merge-recursive:
merge-recursive.c: tolerate missing files while refreshing index
read-cache.c: extend make_cache_entry refresh flag with options
read-cache.c: refactor --ignore-missing implementation
t3030-merge-recursive: test known breakage with empty work tree

Merge branch 'da/pull-ff-configuration'Junio C Hamano Thu, 27 Feb 2014 22:01:11 +0000 (14:01 -0800)

Merge branch 'da/pull-ff-configuration'

"git pull" learned to pay attention to pull.ff configuration
variable.

* da/pull-ff-configuration:
pull: add --ff-only to the help text
pull: add pull.ff configuration

Merge branch 'kb/fast-hashmap'Junio C Hamano Thu, 27 Feb 2014 22:01:09 +0000 (14:01 -0800)

Merge branch 'kb/fast-hashmap'

Improvements to our hash table to get it to meet the needs of the
msysgit fscache project, with some nice performance improvements.

* kb/fast-hashmap:
name-hash: retire unused index_name_exists()
hashmap.h: use 'unsigned int' for hash-codes everywhere
test-hashmap.c: drop unnecessary #includes
.gitignore: test-hashmap is a generated file
read-cache.c: fix memory leaks caused by removed cache entries
builtin/update-index.c: cleanup update_one
fix 'git update-index --verbose --again' output
remove old hash.[ch] implementation
name-hash.c: remove cache entries instead of marking them CE_UNHASHED
name-hash.c: use new hash map implementation for cache entries
name-hash.c: remove unreferenced directory entries
name-hash.c: use new hash map implementation for directories
diffcore-rename.c: use new hash map implementation
diffcore-rename.c: simplify finding exact renames
diffcore-rename.c: move code around to prepare for the next patch
buitin/describe.c: use new hash map implementation
add a hashtable implementation that supports O(1) removal
submodule: don't access the .gitmodules cache entry after removing it

Merge branch 'nv/commit-gpgsign-config'Junio C Hamano Thu, 27 Feb 2014 22:01:03 +0000 (14:01 -0800)

Merge branch 'nv/commit-gpgsign-config'

Introduce commit.gpgsign configuration variable to force every
commit to be GPG signed. The variable cannot be overriden from the
command line of some of the commands that create commits except for
"git commit" and "git commit-tree", but I am not convinced that it
is a good idea to sprinkle support for --no-gpg-sign everywhere,
which in turn means that this configuration variable may not be
such a good idea.

* nv/commit-gpgsign-config:
test the commit.gpgsign config option
commit-tree: add and document --no-gpg-sign
commit-tree: add the commit.gpgsign option to sign all commits

name-hash: retire unused index_name_exists()Eric Sunshine Thu, 2 Jan 2014 21:57:12 +0000 (16:57 -0500)

name-hash: retire unused index_name_exists()

db5360f3f496 (name-hash: refactor polymorphic index_name_exists();
2013-09-17) split index_name_exists() into index_file_exists() and
index_dir_exists() but retained index_name_exists() as a thin wrapper
to avoid disturbing possible in-flight topics. Since this change
landed in 'master' some time ago and there are no in-flight topics
referencing index_name_exists(), retire it.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

hashmap.h: use 'unsigned int' for hash-codes everywhereKarsten Blees Wed, 18 Dec 2013 13:41:27 +0000 (14:41 +0100)

hashmap.h: use 'unsigned int' for hash-codes everywhere

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

test the commit.gpgsign config optionNicolas Vigier Mon, 16 Dec 2013 13:55:04 +0000 (14:55 +0100)

test the commit.gpgsign config option

The tests are checking that :

- when commit.gpgsign is true, "git commit" creates signed commits

- when commit.gpgsign is false, "git commit" creates unsigned commits

- when commit.gpgsign is true, "git commit --no-gpg-sign" creates
unsigned commits

- when commit.gpgsign is true, "git rebase -f" creates signed commits

Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit-tree: add and document --no-gpg-signJunio C Hamano Fri, 13 Dec 2013 23:40:35 +0000 (15:40 -0800)

commit-tree: add and document --no-gpg-sign

Document how to override commit.gpgsign configuration that is set to
true per "git commit" invocation (parse-options machinery lets us
say "--no-gpg-sign" to do so).

"git commit-tree" does not use parse-options, so manually add the
corresponding option for now.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit-tree: add the commit.gpgsign option to sign... Nicolas Vigier Mon, 4 Nov 2013 23:14:41 +0000 (00:14 +0100)

commit-tree: add the commit.gpgsign option to sign all commits

If you want to GPG sign all your commits, you have to add the -S option
all the time. The commit.gpgsign config option allows to sign all
commits automatically.

Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff: do not quit early on stat-dirty filesNguyễn Thái Ngọc Duy Sat, 25 Jan 2014 06:46:50 +0000 (13:46 +0700)

diff: do not quit early on stat-dirty files

When QUICK is set (i.e. with --quiet) we try to do as little work as
possible, stopping after seeing the first change. stat-dirty is
considered a "change" but it may turn out not, if no actual content is
changed. The actual content test is performed too late in the process
and the shortcut may be taken prematurely, leading to incorrect return
code.

Assume we do "git diff --quiet". If we have a stat-dirty file "a" and
a really dirty file "b". We break the loop in run_diff_files() and
stop after "a" because we have got a "change". Later in
diffcore_skip_stat_unmatch() we find out "a" is actually not
changed. But there's nothing else in the diff queue, we incorrectly
declare "no change", ignoring the fact that "b" is changed.

This also happens to "git diff --quiet HEAD" when it hits
diff_can_quit_early() in oneway_diff().

This patch does the content test earlier in order to keep going if "a"
is unchanged. The test result is cached so that when
diffcore_skip_stat_unmatch() is done in the end, we spend no cycles on
re-testing "a".

Reported-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff.c: move diffcore_skip_stat_unmatch core logic... Nguyễn Thái Ngọc Duy Sat, 25 Jan 2014 06:46:49 +0000 (13:46 +0700)

diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

clean: use cache_name_is_other()Nguyễn Thái Ngọc Duy Fri, 24 Jan 2014 13:40:35 +0000 (20:40 +0700)

clean: use cache_name_is_other()

cmd_clean() has the exact same code of index_name_is_other(). Reduce
code duplication.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

clean: replace match_pathspec() with dir_path_match()Nguyễn Thái Ngọc Duy Fri, 24 Jan 2014 13:40:34 +0000 (20:40 +0700)

clean: replace match_pathspec() with dir_path_match()

This instance was left out when many match_pathspec() call sites that
take input from dir_entry were converted to dir_path_match() because
it passed a path with the trailing slash stripped out to match_pathspec()
while the others did not. Stripping for all call sites back then would
be a regression because match_pathspec() did not know how to match
pathspec foo/ against _directory_ foo (the stripped version of path
"foo/").

match_pathspec() knows how to do it now. And dir_path_match() strips
the trailing slash also. Use the new function, because the stripping
code is removed in the next patch.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pathspec: pass directory indicator to match_pathspec_item()Nguyễn Thái Ngọc Duy Fri, 24 Jan 2014 13:40:33 +0000 (20:40 +0700)

pathspec: pass directory indicator to match_pathspec_item()

This patch activates the DO_MATCH_DIRECTORY code in m_p_i(), which
makes "git diff HEAD submodule/" and "git diff HEAD submodule" produce
the same output. Previously only the version without trailing slash
returns the difference (if any).

That's the effect of new ce_path_match(). dir_path_match() is not
executed by the new tests. And it should not introduce regressions.

Previously if path "dir/" is passed in with pathspec "dir/", they
obviously match. With new dir_path_match(), the path becomes
_directory_ "dir" vs pathspec "dir/", which is not executed by the old
code path in m_p_i(). The new code path is executed and produces the
same result.

The other case is pathspec "dir" and path "dir/" is now turned to
"dir" (with DO_MATCH_DIRECTORY). Still the same result before or after
the patch.

So why change? Because of the next patch about clean.c.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

match_pathspec: match pathspec "foo/" against directory... Nguyễn Thái Ngọc Duy Fri, 24 Jan 2014 13:40:32 +0000 (20:40 +0700)

match_pathspec: match pathspec "foo/" against directory "foo"

Currently we do support matching pathspec "foo/" against directory
"foo". That is because match_pathspec() has no way to tell "foo" is a
directory and matching "foo/" against _file_ "foo" is wrong.

The callers can now tell match_pathspec if "foo" is a directory, we
could make an exception for this case. Code is not executed though
because no callers pass the flag yet.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

dir.c: prepare match_pathspec_item for taking more... Nguyễn Thái Ngọc Duy Fri, 24 Jan 2014 13:40:31 +0000 (20:40 +0700)

dir.c: prepare match_pathspec_item for taking more flags

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pathspec: rename match_pathspec_depth() to match_pathspec()Nguyễn Thái Ngọc Duy Fri, 24 Jan 2014 13:40:30 +0000 (20:40 +0700)

pathspec: rename match_pathspec_depth() to match_pathspec()

A long time ago, for some reason I was not happy with
match_pathspec(). I created a better version, match_pathspec_depth()
that was suppose to replace match_pathspec()
eventually. match_pathspec() has finally been gone since 6 months
ago. Use the shorter name for match_pathspec_depth().

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pathspec: convert some match_pathspec_depth() to dir_pa... Nguyễn Thái Ngọc Duy Fri, 24 Jan 2014 13:40:29 +0000 (20:40 +0700)

pathspec: convert some match_pathspec_depth() to dir_path_match()

This helps reduce the number of match_pathspec_depth() call sites and
show how m_p_d() is used. And it usage is:

- match against an index entry (ce_path_match or match_pathspec_depth
in ls-files)

- match against a dir_entry from read_directory (dir_path_match and
match_pathspec_depth in clean.c, which will be converted later)

- resolve-undo (rerere.c and ls-files.c)

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pathspec: convert some match_pathspec_depth() to ce_pat... Nguyễn Thái Ngọc Duy Fri, 24 Jan 2014 13:40:28 +0000 (20:40 +0700)

pathspec: convert some match_pathspec_depth() to ce_path_match()

This helps reduce the number of match_pathspec_depth() call sites and
show how match_pathspec_depth() is used.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: describe 'submodule update --remote... W. Trevor King Sun, 26 Jan 2014 20:45:16 +0000 (12:45 -0800)

Documentation: describe 'submodule update --remote' use case

Make it clear that there is no implicit floating going on; --remote
lets you explicitly integrate the upstream branch in your current
HEAD (just like running 'git pull' in the submodule). The only
distinction with the current 'git pull' is the config location and
setting used for the upstream branch, which is hopefully clear now.

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

submodule: explicit local branch creation in module_cloneW. Trevor King Sun, 26 Jan 2014 20:45:15 +0000 (12:45 -0800)

submodule: explicit local branch creation in module_clone

The previous code only checked out branches in cmd_add. This commit
moves the branch-checkout logic into module_clone, where it can be
shared by cmd_add and cmd_update. I also update the initial checkout
command to use 'reset' to preserve branches setup during module_clone.

With this change, folks cloning submodules for the first time via:

$ git submodule update ...

will get a local branch instead of a detached HEAD, unless they are
using the default checkout-mode updates. This is a change from the
previous situation where cmd_update always used checkout-mode logic
(regardless of the requested update mode) for updates that triggered
an initial clone, which always resulted in a detached HEAD.

This commit does not change the logic for updates after the initial
clone, which will continue to create detached HEADs for checkout-mode
updates, and integrate remote work with the local HEAD (detached or
not) in other modes.

The motivation for the change is that developers doing local work
inside the submodule are likely to select a non-checkout-mode for
updates so their local work is integrated with upstream work.
Developers who are not doing local submodule work stick with
checkout-mode updates so any apparently local work is blown away
during updates. For example, if upstream rolls back the remote branch
or gitlinked commit to an earlier version, the checkout-mode developer
wants their old submodule checkout to be rolled back as well, instead
of getting a no-op merge/rebase with the rolled-back reference.

By using the update mode to distinguish submodule developers from
black-box submodule consumers, we can setup local branches for the
developers who will want local branches, and stick with detached HEADs
for the developers that don't care.

Testing
=======

In t7406, just-cloned checkouts now update to the gitlinked hash with
'reset', to preserve the local branch for situations where we're not
on a detached HEAD.

I also added explicit tests to t7406 for HEAD attachement after
cloning updates, showing that it depends on their update mode:

* Checkout-mode updates get detached HEADs
* Everyone else gets a local branch, matching the configured
submodule.<name>.branch and defaulting to master.

The 'initial-setup' tag makes it easy to reset the superproject to a
known state, as several earlier tests commit to submodules and commit
the changed gitlinks to the superproject, but don't push the new
submodule commits to the upstream subprojects. This makes it
impossible to checkout the current super master, because it references
submodule commits that don't exist in the upstream subprojects. For a
specific example, see the tests that currently generate the
'two_new_submodule_commits' commits.

Documentation
=============

I updated the docs to describe the 'submodule update' modes in detail.
The old documentation did not distinguish between cloning and
non-cloning updates and lacked clarity on which operations would lead
to detached HEADs, and which would not. The new documentation
addresses these issues while updating the docs to reflect the changes
introduced by this commit's explicit local branch creation in
module_clone.

I also add '--checkout' to the usage summary and group the update-mode
options into a single set.

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

submodule: document module_clone arguments in commentsW. Trevor King Thu, 16 Jan 2014 04:10:23 +0000 (20:10 -0800)

submodule: document module_clone arguments in comments

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

submodule: make 'checkout' update_module mode more... W. Trevor King Thu, 16 Jan 2014 04:10:22 +0000 (20:10 -0800)

submodule: make 'checkout' update_module mode more explicit

This avoids the current awkwardness of having either '' or 'checkout'
for checkout-mode updates, which makes testing for checkout-mode
updates (or non-checkout-mode updates) easier.

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

test-hashmap.c: drop unnecessary #includesJonathan Nieder Sat, 14 Dec 2013 02:06:40 +0000 (18:06 -0800)

test-hashmap.c: drop unnecessary #includes

Per Documentation/CodingGuidelines most C files in git start with
a #include of git-compat-util.h or another header file that includes
it, such as cache.h or builtin.h. This file doesn't need anything
beyond "git-compat-util.h", so use that.

Remove a #include of the system header <stdio.h> since it is already
included by "git-compat-util.h".

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

.gitignore: test-hashmap is a generated fileJonathan Nieder Sat, 14 Dec 2013 02:05:26 +0000 (18:05 -0800)

.gitignore: test-hashmap is a generated file

Prevent the "test-hashmap" program from being accidentally tracked
with "git add" or cluttering "git status" output.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

merge-recursive.c: tolerate missing files while refresh... Brad King Mon, 27 Jan 2014 14:45:09 +0000 (09:45 -0500)

merge-recursive.c: tolerate missing files while refreshing index

Teach add_cacheinfo to tell make_cache_entry to skip refreshing stat
information when a file is missing from the work tree. We do not want
the index to be stat-dirty after the merge but also do not want to fail
when a file happens to be missing.

This fixes the 'merge-recursive w/ empty work tree - ours has rename'
case in t3030-merge-recursive.

Suggested-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

read-cache.c: extend make_cache_entry refresh flag... Brad King Mon, 27 Jan 2014 14:45:08 +0000 (09:45 -0500)

read-cache.c: extend make_cache_entry refresh flag with options

Convert the make_cache_entry boolean 'refresh' argument to a more
general 'refresh_options' argument. Pass the value through to the
underlying refresh_cache_ent call. Add option CE_MATCH_REFRESH to
enable stat refresh. Update call sites to use the new signature.

Signed-off-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

read-cache.c: refactor --ignore-missing implementationBrad King Mon, 27 Jan 2014 14:45:07 +0000 (09:45 -0500)

read-cache.c: refactor --ignore-missing implementation

Move lstat ENOENT handling from refresh_index to refresh_cache_ent and
activate it with a new CE_MATCH_IGNORE_MISSING option. This will allow
other call paths into refresh_cache_ent to use the feature.

Signed-off-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t3030-merge-recursive: test known breakage with empty... Brad King Mon, 27 Jan 2014 14:45:06 +0000 (09:45 -0500)

t3030-merge-recursive: test known breakage with empty work tree

Sometimes when working with a large repository it can be useful to try
out a merge and only check out conflicting files to disk (for example as
a speed optimization on a server). Until v1.7.7-rc1~28^2~20
(merge-recursive: When we detect we can skip an update, actually skip
it, 2011-08-11), it was possible to do so with the following idiom:

# Prepare a temporary index and empty work tree.
GIT_INDEX_FILE="$PWD/tmp-$$-index" &&
export GIT_INDEX_FILE &&
GIT_WORK_TREE="$PWD/tmp-$$-work" &&
export GIT_WORK_TREE &&
mkdir "$GIT_WORK_TREE" &&

# Convince the index that our side is on disk.
git read-tree -i -m $ours &&
git update-index --ignore-missing --refresh &&

# Merge their side into our side.
bases=$(git merge-base --all $ours $theirs) &&
git merge-recursive $bases -- $ours $theirs &&
tree=$(git write-tree)

Nowadays, that still works and the exit status is the same, but
merge-recursive produces a diagnostic if "our" side renamed a file:

error: addinfo_cache failed for path 'dst'

Add a test to document this regression.

Signed-off-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 1.9.0 v1.9.0Junio C Hamano Fri, 14 Feb 2014 19:35:04 +0000 (11:35 -0800)

Git 1.9.0

Signed-off-by: Junio C Hamano <gitster@pobox.com>

release notes: typo fixesMichael J Gruber Thu, 13 Feb 2014 10:35:08 +0000 (11:35 +0100)

release notes: typo fixes

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with 1.8.5.5Junio C Hamano Thu, 13 Feb 2014 21:42:26 +0000 (13:42 -0800)

Sync with 1.8.5.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 1.8.5.5 v1.8.5.5Junio C Hamano Thu, 13 Feb 2014 21:40:47 +0000 (13:40 -0800)

Git 1.8.5.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'bm/merge-base-octopus-dedup' into maintJunio C Hamano Thu, 13 Feb 2014 21:38:59 +0000 (13:38 -0800)

Merge branch 'bm/merge-base-octopus-dedup' into maint

"git merge-base --octopus" used to leave cleaning up suboptimal
result to the caller, but now it does the clean-up itself.

* bm/merge-base-octopus-dedup:
merge-base --octopus: reduce the result from get_octopus_merge_bases()
merge-base: separate "--independent" codepath into its own helper

Merge branch 'jc/revision-range-unpeel' into maintJunio C Hamano Thu, 13 Feb 2014 21:38:47 +0000 (13:38 -0800)

Merge branch 'jc/revision-range-unpeel' into maint

"git log --left-right A...B" lost the "leftness" of commits
reachable from A when A is a tag as a side effect of a recent
bugfix. This is a regression in 1.8.4.x series.

* jc/revision-range-unpeel:
revision: propagate flag bits from tags to pointees
revision: mark contents of an uninteresting tree uninteresting

Merge branch 'jk/allow-fetch-onelevel-refname' into... Junio C Hamano Thu, 13 Feb 2014 21:38:34 +0000 (13:38 -0800)

Merge branch 'jk/allow-fetch-onelevel-refname' into maint

"git clone" would fail to clone from a repository that has a ref
directly under "refs/", e.g. "refs/stash", because different
validation paths do different things on such a refname. Loosen the
client side's validation to allow such a ref.

* jk/allow-fetch-onelevel-refname:
fetch-pack: do not filter out one-level refs

Merge branch 'jk/interpret-branch-name-fix' into maintJunio C Hamano Thu, 13 Feb 2014 21:38:25 +0000 (13:38 -0800)

Merge branch 'jk/interpret-branch-name-fix' into maint

A handful of bugs around interpreting $branch@{upstream} notation
and its lookalike, when $branch part has interesting characters,
e.g. "@", and ":", have been fixed.

* jk/interpret-branch-name-fix:
interpret_branch_name: find all possible @-marks
interpret_branch_name: avoid @{upstream} past colon
interpret_branch_name: always respect "namelen" parameter
interpret_branch_name: rename "cp" variable to "at"
interpret_branch_name: factor out upstream handling

Merge branch 'rk/send-email-ssl-cert' into maintJunio C Hamano Thu, 13 Feb 2014 21:38:19 +0000 (13:38 -0800)

Merge branch 'rk/send-email-ssl-cert' into maint

A recent update to "git send-email" broke platforms where
/etc/ssl/certs/ directory exists but cannot be used as SSL_ca_path
(e.g. Fedora rawhide).

* rk/send-email-ssl-cert:
send-email: /etc/ssl/certs/ directory may not be usable as ca_path

Merge branch 'sb/repack-in-c' into maintJunio C Hamano Thu, 13 Feb 2014 21:38:09 +0000 (13:38 -0800)

Merge branch 'sb/repack-in-c' into maint

"git repack --max-pack-size=8g" stopped being parsed correctly when
the command was reimplemented in C.

* sb/repack-in-c:
repack: propagate pack-objects options as strings
repack: make parsed string options const-correct
repack: fix typo in max-pack-size option

Merge branch 'as/tree-walk-fix-aggressive-short-cut... Junio C Hamano Thu, 13 Feb 2014 21:37:53 +0000 (13:37 -0800)

Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint

The pathspec matching code, while comparing two trees (e.g. "git
diff A B -- path1 path2") was too aggressive and failed to match
some paths when multiple pathspecs were involved.

* as/tree-walk-fix-aggressive-short-cut:
tree_entry_interesting: match against all pathspecs

Merge git://github.com/git-l10n/git-poJunio C Hamano Wed, 12 Feb 2014 20:28:47 +0000 (12:28 -0800)

Merge git://github.com/git-l10n/git-po

* 'master' of git://github.com/git-l10n/git-po:
l10n: de.po: correct message when hiding commits by craft
l10n: de.po: translate 28 new messages

l10n: de.po: correct message when hiding commits by... Ralf Thielow Sat, 8 Feb 2014 21:01:36 +0000 (22:01 +0100)

l10n: de.po: correct message when hiding commits by craft

The recent translation was giving the idea that all commits
based on a graft were meant to be hidden. Make it clear that
it is the graft commit itself.

Reported-by: David Kastrup <dak@gnu.org>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>

l10n: de.po: translate 28 new messagesRalf Thielow Fri, 3 Jan 2014 17:38:12 +0000 (18:38 +0100)

l10n: de.po: translate 28 new messages

Translate 28 new messages came from git.pot update in
df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed)
and d57b24b (l10n: git.pot: v1.9 round 2 (1 new)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>

Merge git://github.com/git-l10n/git-poJunio C Hamano Tue, 11 Feb 2014 19:02:05 +0000 (11:02 -0800)

Merge git://github.com/git-l10n/git-po

* 'master' of git://github.com/git-l10n/git-po:
l10n: zh_CN.po: Disambiguation for rebase
l10n: zh_CN.po: translate 1 new message (2211t0f0u)
l10n: vi.po (2211t): Updated one new string
l10n: Update Swedish translation (2211t0f0u)
l10n: fr: 1.9rc2 2211t
l10n: git.pot: v1.9 round 2 (1 new)

Git 1.9.0-rc3 v1.9.0-rc3Junio C Hamano Fri, 7 Feb 2014 19:56:07 +0000 (11:56 -0800)

Git 1.9.0-rc3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'ow/manpages-typofix'Junio C Hamano Fri, 7 Feb 2014 19:55:11 +0000 (11:55 -0800)

Merge branch 'ow/manpages-typofix'

Various typofixes, all looked correct.

* ow/manpages-typofix:
Documentation: fix typos in man pages

Merge branch 'aj/ada-diff-word-pattern'Junio C Hamano Fri, 7 Feb 2014 19:55:10 +0000 (11:55 -0800)

Merge branch 'aj/ada-diff-word-pattern'

* aj/ada-diff-word-pattern:
userdiff: update Ada patterns

Merge branch 'nd/tag-doc'Junio C Hamano Fri, 7 Feb 2014 19:55:06 +0000 (11:55 -0800)

Merge branch 'nd/tag-doc'

* nd/tag-doc:
git-tag.txt: <commit> for --contains is optional

l10n: zh_CN.po: Disambiguation for rebaseJiang Xin Sun, 2 Feb 2014 12:46:58 +0000 (20:46 +0800)

l10n: zh_CN.po: Disambiguation for rebase

Disambiguate the Chinese translation for "rebase", and update other
related entries.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Documentation: fix typos in man pagesØystein Walle Wed, 5 Feb 2014 22:19:43 +0000 (23:19 +0100)

Documentation: fix typos in man pages

Signed-off-by: Øystein Walle <oystwa@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with 1.8.5.4Junio C Hamano Wed, 5 Feb 2014 22:14:40 +0000 (14:14 -0800)

Sync with 1.8.5.4

howto/maintain-git.txt: new version numbering schemeJunio C Hamano Fri, 31 Jan 2014 23:14:05 +0000 (15:14 -0800)

howto/maintain-git.txt: new version numbering scheme

We wanted to call the upcoming release "Git 1.9", with its
maintenance track being "Git 1.9.1", "Git 1.9.2", etc., but various
third-party tools are reported to assume that there are at least
three dewey-decimal components in our version number.

Adjust the plan so that vX.Y.0 are feature releases while vX.Y.Z
(Z > 0) are maintenance releases.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 1.8.5.4 v1.8.5.4Junio C Hamano Wed, 5 Feb 2014 22:05:31 +0000 (14:05 -0800)

Git 1.8.5.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jc/maint-pull-docfix' into maintJunio C Hamano Wed, 5 Feb 2014 22:03:47 +0000 (14:03 -0800)

Merge branch 'jc/maint-pull-docfix' into maint

The documentation to "git pull" hinted there is an "-m" option
because it incorrectly shared the documentation with "git merge".

* jc/maint-pull-docfix:
Documentation: "git pull" does not have the "-m" option
Documentation: exclude irrelevant options from "git pull"

Merge branch 'ow/stash-with-ifs' into maintJunio C Hamano Wed, 5 Feb 2014 22:03:20 +0000 (14:03 -0800)

Merge branch 'ow/stash-with-ifs' into maint

The implementation of 'git stash $cmd "stash@{...}"' did not quote
the stash argument properly and left it split at IFS whitespace.

* ow/stash-with-ifs:
stash: handle specifying stashes with $IFS

Merge branch 'js/lift-parent-count-limit' into maintJunio C Hamano Wed, 5 Feb 2014 22:03:01 +0000 (14:03 -0800)

Merge branch 'js/lift-parent-count-limit' into maint

There is no reason to have a hardcoded upper limit of the number of
parents for an octopus merge, created via the graft mechanism, but
there was.

* js/lift-parent-count-limit:
Remove the line length limit for graft files

Merge branch 'nd/add-empty-fix' into maintJunio C Hamano Wed, 5 Feb 2014 22:02:44 +0000 (14:02 -0800)

Merge branch 'nd/add-empty-fix' into maint

"git add -A" (no other arguments) in a totally empty working tree
used to emit an error.

* nd/add-empty-fix:
add: don't complain when adding empty project root

Merge branch 'bc/log-decoration' into maintJunio C Hamano Wed, 5 Feb 2014 22:02:05 +0000 (14:02 -0800)

Merge branch 'bc/log-decoration' into maint

"git log --decorate" did not handle a tag pointed by another tag
nicely.

* bc/log-decoration:
log: properly handle decorations with chained tags

Merge branch 'jh/rlimit-nofile-fallback' into maintJunio C Hamano Wed, 5 Feb 2014 22:01:23 +0000 (14:01 -0800)

Merge branch 'jh/rlimit-nofile-fallback' into maint

When we figure out how many file descriptors to allocate for
keeping packfiles open, a system with non-working getrlimit() could
cause us to die(), but because we make this call only to get a
rough estimate of how many is available and we do not even attempt
to use up all file descriptors available ourselves, it is nicer to
fall back to a reasonable low value rather than dying.

* jh/rlimit-nofile-fallback:
get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure

Merge branch 'jl/commit-v-strip-marker' into maintJunio C Hamano Wed, 5 Feb 2014 22:01:09 +0000 (14:01 -0800)

Merge branch 'jl/commit-v-strip-marker' into maint

"git commit -v" appends the patch to the log message before
editing, and then removes the patch when the editor returned
control. However, the patch was not stripped correctly when the
first modified path was a submodule.

* jl/commit-v-strip-marker:
commit -v: strip diffs and submodule shortlogs from the commit message

Merge branch 'tr/send-email-ssl' into maintJunio C Hamano Wed, 5 Feb 2014 22:00:18 +0000 (14:00 -0800)

Merge branch 'tr/send-email-ssl' into maint

SSL-related options were not passed correctly to underlying socket
layer in "git send-email".

* tr/send-email-ssl:
send-email: set SSL options through IO::Socket::SSL::set_client_defaults
send-email: --smtp-ssl-cert-path takes an argument
send-email: pass Debug to Net::SMTP::SSL::new

Merge branch 'tb/clone-ssh-with-colon-for-port' into... Junio C Hamano Wed, 5 Feb 2014 21:59:16 +0000 (13:59 -0800)

Merge branch 'tb/clone-ssh-with-colon-for-port' into maint

Remote repository URL expressed in scp-style host:path notation are
parsed more carefully (e.g. "foo/bar:baz" is local, "[::1]:/~user" asks
to connect to user's home directory on host at address ::1.

* tb/clone-ssh-with-colon-for-port:
git_connect(): use common return point
connect.c: refactor url parsing
git_connect(): refactor the port handling for ssh
git fetch: support host:/~repo
t5500: add test cases for diag-url
git fetch-pack: add --diag-url
git_connect: factor out discovery of the protocol and its parts
git_connect: remove artificial limit of a remote command
t5601: add tests for ssh
t5601: remove clear_ssh, refactor setup_ssh_wrapper

Merge branch 'nd/transport-positive-depth-only' into... Junio C Hamano Wed, 5 Feb 2014 21:58:51 +0000 (13:58 -0800)

Merge branch 'nd/transport-positive-depth-only' into maint

"git fetch --depth=0" was a no-op, and was silently ignored.
Diagnose it as an error.

* nd/transport-positive-depth-only:
clone,fetch: catch non positive --depth option value

Merge branch 'tb/repack-fix-renames' (early part)Junio C Hamano Wed, 5 Feb 2014 20:02:29 +0000 (12:02 -0800)

Merge branch 'tb/repack-fix-renames' (early part)

Finishing touches to the "rewrite repack in C" series.

* 'tb/repack-fix-renames' (early part):
repack.c: rename and unlink pack file if it exists

repack.c: rename and unlink pack file if it existsTorsten Bögershausen Sun, 2 Feb 2014 15:09:56 +0000 (16:09 +0100)

repack.c: rename and unlink pack file if it exists

When a repo was fully repacked, and is repacked again, we may run
into the situation that "new" packfiles have the same name as
already existing ones (traditionally packfiles have been named after
the list of names of objects in them, so repacking all the objects
in a single pack would have produced a packfile with the same name).

The logic is to rename the existing ones into filename like
"old-XXX", create the new ones and then remove the "old-" ones.
When something went wrong in the middle, this sequence is rolled
back by renaming the "old-" files back.

The renaming into "old-" did not work as intended, because
file_exists() was done on "XXX", not "pack-XXX". Also when rolling
back the change, the code tried to rename "old-pack-XXX" but the
saved ones are named "old-XXX", so this couldn't have worked.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

userdiff: update Ada patternsAdrian Johnson Mon, 3 Feb 2014 11:33:16 +0000 (22:03 +1030)

userdiff: update Ada patterns

- Allow extra space in "is new" and "is separate"
- Fix bug in word regex for numbers

Signed-off-by: Adrian Johnson <ajohnson@redneon.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t7101, t7014: rename test files to indicate what that... Nguyễn Thái Ngọc Duy Tue, 4 Feb 2014 02:20:08 +0000 (09:20 +0700)

t7101, t7014: rename test files to indicate what that file is for

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-tag.txt: <commit> for --contains is optionalNguyễn Thái Ngọc Duy Tue, 4 Feb 2014 02:56:26 +0000 (09:56 +0700)

git-tag.txt: <commit> for --contains is optional

This goes far back to e84fb2f (branch --contains: default to HEAD -
2008-07-08) where the same parsing code is shared with
builtin/tag.c. git-branch.txt correctly states that <commit> for
--contains is optional while git-tag.txt does not. Correct it.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

l10n: zh_CN.po: translate 1 new message (2211t0f0u)Jiang Xin Sun, 2 Feb 2014 12:46:58 +0000 (20:46 +0800)

l10n: zh_CN.po: translate 1 new message (2211t0f0u)

Update translation for git v1.9-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Merge branch 'master' of git://github.com/nafmo/git... Jiang Xin Mon, 3 Feb 2014 01:47:27 +0000 (09:47 +0800)

Merge branch 'master' of git://github.com/nafmo/git-l10n-sv

* 'master' of git://github.com/nafmo/git-l10n-sv:
l10n: Update Swedish translation (2211t0f0u)

Merge branch 'master' of git://github.com/vnwildman/gitJiang Xin Mon, 3 Feb 2014 01:45:14 +0000 (09:45 +0800)

Merge branch 'master' of git://github.com/vnwildman/git

* 'master' of git://github.com/vnwildman/git:
l10n: vi.po (2211t): Updated one new string

l10n: vi.po (2211t): Updated one new stringTran Ngoc Quan Mon, 3 Feb 2014 00:49:47 +0000 (07:49 +0700)

l10n: vi.po (2211t): Updated one new string

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>

l10n: Update Swedish translation (2211t0f0u)Peter Krefting Sun, 2 Feb 2014 16:22:21 +0000 (17:22 +0100)

l10n: Update Swedish translation (2211t0f0u)

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>

l10n: fr: 1.9rc2 2211tJean-Noel Avila Sun, 2 Feb 2014 13:36:32 +0000 (14:36 +0100)

l10n: fr: 1.9rc2 2211t

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>

l10n: git.pot: v1.9 round 2 (1 new)Jiang Xin Sat, 1 Feb 2014 00:07:02 +0000 (08:07 +0800)

l10n: git.pot: v1.9 round 2 (1 new)

Generate po/git.pot from v1.9-rc2 for git v1.9 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Git 1.9-rc2 v1.9-rc2Junio C Hamano Fri, 31 Jan 2014 22:16:06 +0000 (14:16 -0800)

Git 1.9-rc2

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge git://github.com/git-l10n/git-poJunio C Hamano Fri, 31 Jan 2014 18:52:29 +0000 (10:52 -0800)

Merge git://github.com/git-l10n/git-po

* 'master' of git://github.com/git-l10n/git-po:
l10n: Bulgarian translation of git (222t21f1967u)
po/TEAMS: Added Bulgarian team
l10n: remove 2 blank translations on Danish, Dutch
l10n: zh_CN.po: translate 27 messages (2210t0f0u)
l10n: Update Swedish translation (2210t0f0u)
[fr] update french translation 2210/2210
l10n: vi.po (2210t): Updated git-core translation
l10n: git.pot: v1.9 round 1 (27 new, 11 removed)

Merge branch 'jn/pager-lv-default-env'Junio C Hamano Fri, 31 Jan 2014 18:51:57 +0000 (10:51 -0800)

Merge branch 'jn/pager-lv-default-env'

A finishing touch to its test.

* jn/pager-lv-default-env:
pager test: make fake pager consume all its input

builtin/gc.c: reduce scope of variablesElia Pinto Wed, 29 Jan 2014 16:59:37 +0000 (08:59 -0800)

builtin/gc.c: reduce scope of variables

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/fetch.c: reduce scope of variableElia Pinto Wed, 29 Jan 2014 16:54:16 +0000 (08:54 -0800)

builtin/fetch.c: reduce scope of variable

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/commit.c: reduce scope of variablesElia Pinto Thu, 30 Jan 2014 15:15:56 +0000 (07:15 -0800)

builtin/commit.c: reduce scope of variables

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/clean.c: reduce scope of variableElia Pinto Wed, 29 Jan 2014 13:36:15 +0000 (05:36 -0800)

builtin/clean.c: reduce scope of variable

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/blame.c: reduce scope of variablesElia Pinto Wed, 29 Jan 2014 13:33:15 +0000 (05:33 -0800)

builtin/blame.c: reduce scope of variables

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/apply.c: reduce scope of variablesElia Pinto Wed, 29 Jan 2014 13:30:27 +0000 (05:30 -0800)

builtin/apply.c: reduce scope of variables

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

bisect.c: reduce scope of variableElia Pinto Wed, 29 Jan 2014 13:25:00 +0000 (05:25 -0800)

bisect.c: reduce scope of variable

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-compat-util.h: #undef (v)snprintf before #define... Benoit Sigoure Fri, 31 Jan 2014 06:25:12 +0000 (22:25 -0800)

git-compat-util.h: #undef (v)snprintf before #define them

When we detect that vsnprintf / snprintf are broken, we #define them
to an alternative implementation. On OS X, stdio.h already
re-define them in `git-compat-util.h'.

Signed-off-by: Benoit Sigoure <tsunanet@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pager test: make fake pager consume all its inputJonathan Nieder Thu, 30 Jan 2014 16:42:32 +0000 (08:42 -0800)

pager test: make fake pager consume all its input

Otherwise there is a race: if 'git log' finishes writing before the
pager terminates and closes the pipe, all is well, and if the pager
finishes quickly enough then 'git log' terminates with SIGPIPE.

died of signal 13 at /build/buildd/git-1.9~rc1/t/test-terminal.perl line 33.
not ok 6 - LESS and LV envvars are set for pagination

Noticed on Ubuntu PPA builders, where the race was lost about half the
time. Compare v1.7.0.2~6^2 (tests: Fix race condition in t7006-pager,
2010-02-22).

Reported-by: Anders Kaseorg <andersk@MIT.EDU>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

l10n: Bulgarian translation of git (222t21f1967u)Alexander Shopov Mon, 20 Jan 2014 19:39:30 +0000 (21:39 +0200)

l10n: Bulgarian translation of git (222t21f1967u)

Signed-off-by: Alexander Shopov <ash@kambanaria.org>

rev-parse: check i before using argv[i] against argcDavid Sharp Tue, 28 Jan 2014 21:21:00 +0000 (13:21 -0800)

rev-parse: check i before using argv[i] against argc

The --prefix, --default, and --resolve-git-dir options to
git-rev-parse require an argument, but when given no argument,
the code uses the NULL read from argv[argc] without checking,
leading to a segfault.

Instead, check first and die() with an error message.

Signed-off-by: David Sharp <dhsharp@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

handle_path_include: don't look at NULL valueJeff King Tue, 28 Jan 2014 01:37:30 +0000 (20:37 -0500)

handle_path_include: don't look at NULL value

When we see config like:

[include]
path

the expand_user_path helper notices that the config value is
empty, but we then dereference NULL while printing the error
message (glibc will helpfully print "(null)" for us here,
but we cannot rely on that).

$ git -c include.path rev-parse
error: Could not expand include path '(null)'
fatal: unable to parse command-line config

Instead of tweaking our message, let's actually use
config_error_nonbool to match other config variables that
expect a value:

$ git -c include.path rev-parse
error: Missing value for 'include.path'
fatal: unable to parse command-line config

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

expand_user_path: do not look at NULL pathJeff King Tue, 28 Jan 2014 01:36:12 +0000 (20:36 -0500)

expand_user_path: do not look at NULL path

We explicitly check for and handle the case that the
incoming "path" variable is NULL, but before doing so we
call strchrnul on it, leading to a potential segfault.

We can fix this simply by moving the strchrnul call down; as
a bonus, we can tighten the scope on the associated
variable.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

po/TEAMS: Added Bulgarian teamAlexander Shopov Tue, 28 Jan 2014 17:14:08 +0000 (19:14 +0200)

po/TEAMS: Added Bulgarian team

Signed-off-by: Alexander Shopov <ash@kambanaria.org>