Merge branch 'master' into next

* master:
  Git 1.7.2.2
  t9155: fix compatibility with older SVN

Documentation/RelNotes-1.7.2.2.txt

@@ -0,0 +1,22 @@
+Git v1.7.2.2 Release Notes
+==========================
+
+Fixes since v1.7.2.1
+--------------------
+
+ * Object transfer over smart http transport deadlocked the client when
+   the remote HTTP server returned a failure, instead of erroring it out.
+
+ * git-gui honors custom textconv filters when showing diff and blame;
+
+ * git diff --relative=subdir (without the necessary trailing /) did not
+   work well;
+
+ * "git diff-files -p --submodule" was recently broken;
+
+ * "git checkout -b n ':/token'" did not work;
+
+ * "git index-pack" (hence "git fetch/clone/pull/push") enabled the object
+   replacement machinery by mistake (it never should have);
+
+And other minor fixes and documentation updates.

Documentation/git.txt

@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.7.2.1/git.html[documentation for release 1.7.2.1]
+* link:v1.7.2.2/git.html[documentation for release 1.7.2.2]
 
 * release notes for
+  link:RelNotes-1.7.2.2.txt[1.7.2.2],
   link:RelNotes-1.7.2.1.txt[1.7.2.1],
   link:RelNotes-1.7.2.txt[1.7.2].
 

RelNotes

@@ -1 +1 @@
-Documentation/RelNotes-1.7.2.1.txt
+Documentation/RelNotes-1.7.2.2.txt

t/t9155-git-svn-fetch-deleted-tag.sh

@@ -12,7 +12,7 @@ test_expect_success 'setup svn repo' '
 	svn_cmd import -m "import for git svn" import "$svnrepo" &&
 	rm -rf import &&
 
-	svn_cmd mkdir --parents -m "create mybranch directory" "$svnrepo/branches/mybranch" &&
+	svn_cmd mkdir -m "create mybranch directory" "$svnrepo/branches/mybranch" &&
 	svn_cmd cp -m "create branch mybranch" "$svnrepo/trunk" "$svnrepo/branches/mybranch/trunk" &&
 
 	svn_cmd co "$svnrepo/trunk" svn_project &&