completion: add deprecated __git_complete_file ()

77c130 (completion: clarify ls-tree, archive, show completion,
2013-06-02) removed __git_complete_file () because it had no callers
left in the file.  However, to avoid breaking user scripts that may
depend on this, add it back as a deprecated alias.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'rr/complete-difftool' into next

* rr/complete-difftool:
  completion: add deprecated __git_complete_file ()
Document .git/modules

A note in the beginning of this document describes the behavior already.
This patch just adds where to find the repositories.

Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
submodule: remove redundant check for the_index.initialized

read_cache already performs the same check and returns immediately if
the cache has already been loaded.

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Revert 77c1305 and 3c3b46b

As explained by SZEDER Gábor in $gmane/226272, git_complete_file
helper is about completing <tree-ish>, taking <commit> at the tips
of refs and also understanding <tree-ish>:<path> notation, and
changing "archive" and "ls-tree" to use git_complete_revlist_file
that in addition is meant to expand A..B range notation was a
mistake.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'rr/complete-difftool' into next

* rr/complete-difftool:
  Revert 77c1305 and 3c3b46b
Merge branch 'kb/status-ignored-optim-2' into maint

Fix recent regression of .gitignore files that list !directory to
mark it not-ignored.

* kb/status-ignored-optim-2:
  dir.c: fix ignore processing within not-ignored directories
Merge branch 'jn/config-ignore-inaccessible' into maint

A git daemon that starts as "root" and then drops privilege often
leaves $HOME set to that of the root user, which is unreadable by
the daemon process, which was diagnosed as a configuration error.

Make per-user configuration files that are inaccessible due to
EACCES as though these files do not exist to avoid this issue, as
the tightening which was originally meant as an additional security
has annoyed enough sysadmins.

* jn/config-ignore-inaccessible:
  config: allow inaccessible configuration under $HOME
mingw: make mingw_signal return the correct handler

Returning the SIGALRM handler for SIGINT is not very useful.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 1.8.3.1

Primarily to push out two regression issues that seem to affect many
people, namely, the ".gitignore !directory" bug and "daemon cannot
read from $HOME owned by root" bug.

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

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

* master:
  Git 1.8.3.1
  mingw: make mingw_signal return the correct handler
  submodule: remove redundant check for the_index.initialized
  Document .git/modules