From 26f8f32a2039a0e4568fb7d3682be19b94a9dd7f Mon Sep 17 00:00:00 2001 From: Fredrik Gustafsson Date: Sun, 9 Jun 2013 13:11:36 +0200 Subject: [PATCH 1/4] 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 Signed-off-by: Junio C Hamano --- Documentation/gitrepository-layout.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt index d6f3393c5f..aa03882ddb 100644 --- a/Documentation/gitrepository-layout.txt +++ b/Documentation/gitrepository-layout.txt @@ -211,6 +211,9 @@ shallow:: and maintained by shallow clone mechanism. See `--depth` option to linkgit:git-clone[1] and linkgit:git-fetch[1]. +modules:: + Contains the git-repositories of the submodules. + SEE ALSO -------- linkgit:git-init[1], From 467b8fe1bb900832f51281fe954d9134b545d6dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Sun, 9 Jun 2013 18:33:45 +0200 Subject: [PATCH 2/4] submodule: remove redundant check for the_index.initialized MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit read_cache already performs the same check and returns immediately if the cache has already been loaded. Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano --- submodule.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/submodule.c b/submodule.c index e728025f60..1821a5b316 100644 --- a/submodule.c +++ b/submodule.c @@ -603,9 +603,8 @@ int fetch_populated_submodules(const struct argv_array *options, if (!work_tree) goto out; - if (!the_index.initialized) - if (read_cache() < 0) - die("index file corrupt"); + if (read_cache() < 0) + die("index file corrupt"); argv_array_push(&argv, "fetch"); for (i = 0; i < options->argc; i++) From a45406585b0a42e38e580baf47b0daf631c5e454 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 10 Jun 2013 07:48:17 +0200 Subject: [PATCH 3/4] mingw: make mingw_signal return the correct handler Returning the SIGALRM handler for SIGINT is not very useful. Signed-off-by: Erik Faye-Lund Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- compat/mingw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compat/mingw.c b/compat/mingw.c index b673625580..dae30a081c 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -1677,14 +1677,16 @@ int sigaction(int sig, struct sigaction *in, struct sigaction *out) #undef signal sig_handler_t mingw_signal(int sig, sig_handler_t handler) { - sig_handler_t old = timer_fn; + sig_handler_t old; switch (sig) { case SIGALRM: + old = timer_fn; timer_fn = handler; break; case SIGINT: + old = sigint_fn; sigint_fn = handler; break; From 362de916c06521205276acb7f51c99f47db94727 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 9 Jun 2013 17:16:20 -0700 Subject: [PATCH 4/4] 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 --- Documentation/RelNotes/1.8.3.1.txt | 14 ++++++++++++++ Documentation/git.txt | 6 ++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes/1.8.3.1.txt diff --git a/Documentation/RelNotes/1.8.3.1.txt b/Documentation/RelNotes/1.8.3.1.txt new file mode 100644 index 0000000000..fc3ea185a5 --- /dev/null +++ b/Documentation/RelNotes/1.8.3.1.txt @@ -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. diff --git a/Documentation/git.txt b/Documentation/git.txt index 9e302b0a60..443d88ff12 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,6 +43,12 @@ unreleased) version of Git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: +* link:v1.8.3.1/git.html[documentation for release 1.8.3.1] + +* release notes for + link:RelNotes/1.8.3.1.txt[1.8.3.1], + link:RelNotes/1.8.3.txt[1.8.3]. + * link:v1.8.2.3/git.html[documentation for release 1.8.2.3] * release notes for diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 1c0ca639ba..eeecb5d9fc 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.8.3 +DEF_VER=v1.8.3.1 LF=' ' diff --git a/RelNotes b/RelNotes index 80b7e388ad..cecd093624 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.8.3.txt \ No newline at end of file +Documentation/RelNotes/1.8.3.1.txt \ No newline at end of file