Sync with 1.8.3.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2013-06-10 12:35:32 -07:00
commit 39fd762572
5 changed files with 24 additions and 5 deletions

View file

@ -0,0 +1,14 @@
Git v1.8.3.1 Release Notes
========================
Fixes since v1.8.3
------------------
* When $HOME is misconfigured to point at an unreadable directory, we
used to complain and die. The check has been loosened.
* Handling of negative exclude pattern for directories "!dir" was
broken in the update to v1.8.3.
Also contains a handful of trivial code clean-ups, documentation
updates, updates to the test suite, etc.

View file

@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: Documentation for older releases are available here:
* link:v1.8.3/git.html[documentation for release 1.8.3] * link:v1.8.3.1/git.html[documentation for release 1.8.3.1]
* release notes for * release notes for
link:RelNotes/1.8.3.1.txt[1.8.3.1],
link:RelNotes/1.8.3.txt[1.8.3]. link:RelNotes/1.8.3.txt[1.8.3].
* link:v1.8.2.3/git.html[documentation for release 1.8.2.3] * link:v1.8.2.3/git.html[documentation for release 1.8.2.3]

View file

@ -211,6 +211,9 @@ shallow::
and maintained by shallow clone mechanism. See `--depth` and maintained by shallow clone mechanism. See `--depth`
option to linkgit:git-clone[1] and linkgit:git-fetch[1]. option to linkgit:git-clone[1] and linkgit:git-fetch[1].
modules::
Contains the git-repositories of the submodules.
SEE ALSO SEE ALSO
-------- --------
linkgit:git-init[1], linkgit:git-init[1],

View file

@ -1677,14 +1677,16 @@ int sigaction(int sig, struct sigaction *in, struct sigaction *out)
#undef signal #undef signal
sig_handler_t mingw_signal(int sig, sig_handler_t handler) sig_handler_t mingw_signal(int sig, sig_handler_t handler)
{ {
sig_handler_t old = timer_fn; sig_handler_t old;
switch (sig) { switch (sig) {
case SIGALRM: case SIGALRM:
old = timer_fn;
timer_fn = handler; timer_fn = handler;
break; break;
case SIGINT: case SIGINT:
old = sigint_fn;
sigint_fn = handler; sigint_fn = handler;
break; break;

View file

@ -603,9 +603,8 @@ int fetch_populated_submodules(const struct argv_array *options,
if (!work_tree) if (!work_tree)
goto out; goto out;
if (!the_index.initialized) if (read_cache() < 0)
if (read_cache() < 0) die("index file corrupt");
die("index file corrupt");
argv_array_push(&argv, "fetch"); argv_array_push(&argv, "fetch");
for (i = 0; i < options->argc; i++) for (i = 0; i < options->argc; i++)