[PATCH] daemon.c and path.enter_repo(): revamp path validation.

diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 7be0cbd620b37e0b3f2dcd09372e7934ed85223c..6e92e4aa66674fa5fde90866c0f2ff9155270dc0 100644 (file)
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -28,11 +28,14 @@ will be in unmerged state when "git-read-tree" returns.
 OPTIONS
 -------
 -m::
-       Perform a merge, not just a read.
+       Perform a merge, not just a read.  The command will
+       refuse to run if your index file has unmerged entries,
+       indicating that you have not finished previous merge you
+       started.
 
 --reset::
-
-        Same as -m except that unmerged entries will be silently ignored.
+        Same as -m, except that unmerged entries are discarded
+        instead of failing.
 
 -u::
        After a successful merge, update the files in the work
@@ -47,7 +50,6 @@ OPTIONS
        trees that are not directly related to the current
        working tree status into a temporary index file.
 
-
 <tree-ish#>::
        The id of the tree object(s) to be read/merged.
 
@@ -237,7 +239,7 @@ This is done to prevent you from losing your work-in-progress
 changes.  To illustrate, suppose you start from what has been
 commited last to your repository:
 
-    $ JC=`cat .git/HEAD`
+    $ JC=`git-rev-parse --verify "HEAD^0"`
     $ git-checkout-index -f -u -a $JC
 
 You do random edits, without running git-update-index.  And then