Git 2.7-rc1v2.7.0-rc1

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

2 files changed, 14 insertions, 8 deletions

diff --git a/Documentation/RelNotes/2.7.0.txt b/Documentation/RelNotes/2.7.0.txt
index 29b4cfe..a84caba 100644
--- a/Documentation/RelNotes/2.7.0.txt
+++ b/Documentation/RelNotes/2.7.0.txt
@@ -100,7 +100,6 @@ Performance, Internal Implementation, Development Support etc.
 
  * The debugging infrastructure for pkt-line based communication has
    been improved to mark the side-band communication specifically.
-   (merge fd89433 jk/async-pkt-line later to maint).
 
  * Update "git branch" that list existing branches, using the
    ref-filter API that is shared with "git tag" and "git
@@ -356,12 +355,19 @@ notes for details).
  * A build without NO_IPv6 used to use gethostbyname() when guessing
    user's hostname, instead of getaddrinfo() that is used in other
    codepaths in such a build.
-   (merge 00bce77 ep/ident-with-getaddrinfo later to maint).
 
- * The exit code of git-fsck didnot reflect some types of errors found
-   in packed objects, which has been corrected.
-   (merge 8c24d83 dt/fsck-verify-pack-error later to maint).
+ * The exit code of git-fsck did not reflect some types of errors
+   found in packed objects, which has been corrected.
+
+ * The helper used to iterate over loose object directories to prune
+   stale objects did not closedir() immediately when it is done with a
+   directory--a callback such as the one used for "git prune" may want
+   to do rmdir(), but it would fail on open directory on platforms
+   such as WinXP.
+
+ * "git p4" used to import Perforce CLs that touch only paths outside
+   the client spec as empty commits.  It has been corrected to ignore
+   them instead, with a new configuration git-p4.keepEmptyCommits as a
+   backward compatibility knob.
 
  * Code clean-up, minor fixes etc.
-   (merge 15ed07d jc/rerere later to maint).
-   (merge 147875f sb/submodule-config-parse later to maint).
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 29c43c2..4478007 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.7.0-rc0
+DEF_VER=v2.7.0-rc1
 
 LF='
 '