Git 1.8.2-rc2

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

diff --git a/Documentation/RelNotes/1.8.2.txt b/Documentation/RelNotes/1.8.2.txt
index 861ef026d625ba01351861fd49f51eae740ba12e..78c65776657d135e775e8f06a0973c407279ca14 100644 (file)
--- a/Documentation/RelNotes/1.8.2.txt
+++ b/Documentation/RelNotes/1.8.2.txt
@@ -29,10 +29,15 @@ Many users found this counter-intuitive, given that "git commit -a"
 and other commands operate on the entire tree regardless of where you
 are. In this release, these commands give warning in such a case and
 encourage the user to say "git add -u/-A ." instead when restricting
 and other commands operate on the entire tree regardless of where you
 are. In this release, these commands give warning in such a case and
 encourage the user to say "git add -u/-A ." instead when restricting

-the scope to the current directory. At Git 2.0 (not *this* one), we
-plan to change these commands without pathspec to operate on the
-entire tree, and training your fingers to type "." will protect you
-against the future change.
+the scope to the current directory.
+
+At Git 2.0 (not *this* one), we plan to change these commands without
+pathspec to operate on the entire tree.  Forming a habit to type "."
+when you mean to limit the command to the current working directory
+will protect you against the planned future change, and that is the
+whole point of the new message (there will be no configuration
+variable to squelch this warning---it goes against the "habit forming"
+objective).

 
 
 Updates since v1.8.1
 
 
 Updates since v1.8.1


@@ -463,3 +468,20 @@ details).
 
  * Scripts to test bash completion was inherently flaky as it was
    affected by whatever random things the user may have on $PATH.
 
  * Scripts to test bash completion was inherently flaky as it was
    affected by whatever random things the user may have on $PATH.

+
+ * An element on GIT_CEILING_DIRECTORIES could be a "logical" pathname
+   that uses a symbolic link to point at somewhere else (e.g. /home/me
+   that points at /net/host/export/home/me, and the latter directory
+   is automounted). Earlier when Git saw such a pathname e.g. /home/me
+   on this environment variable, the "ceiling" mechanism did not take
+   effect. With this release (the fix has also been merged to the
+   v1.8.1.x maintenance series), elements on GIT_CEILING_DIRECTORIES
+   are by default checked for such aliasing coming from symbolic
+   links. As this needs to actually resolve symbolic links for each
+   element on the GIT_CEILING_DIRECTORIES, you can disable this
+   mechanism for some elements by listing them after an empty element
+   on the GIT_CEILING_DIRECTORIES. e.g. Setting /home/me::/home/him to
+   GIT_CEILING_DIRECTORIES makes Git resolve symbolic links in
+   /home/me when checking if the current directory is under /home/me,
+   but does not do so for /home/him.
+   (merge 7ec30aa mh/maint-ceil-absolute later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 795203945337296eca8a7c0b30dfd135a1ac22fc..6b96d6addcfaf29273017419ecaa0eabca942af5 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.8.2-rc1
+DEF_VER=v1.8.2-rc2

 
 LF='
 '
 
 LF='
 '