Git 1.7.12-rc1

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

Junio C Hamano committed Jul 30, 2012 at 13:00 UTC 3b2d763db07f251e424d7f940938d9df1e1d4d09
2 files changed +11 -33
Documentation/RelNotes/1.7.12.txt
+10 -32
@@ -130,6 +130,16 @@ Unless otherwise noted, all the fixes since v1.7.11 in the maintenance
130 releases are contained in this release (see release notes to them for
131 details).
132
133 + * "git grep" stopped spawning an external "grep" long time ago, but a
134 + duplicated test to check internal and external "grep" was left
135 + behind.
136 + (merge 4ca9453 rj/maint-grep-remove-redundant-test later to maint).
137 +
138 + * The code to avoid mistaken attempt to add the object directory
139 + itself as its own alternate could read beyond end of a string while
140 + comparison.
141 + (merge cb2912c hv/link-alt-odb-entry later to maint).
142 +
143 * "git checkout <branchname>" to come back from a detached HEAD state
144 incorrectly computed reachability of the detached HEAD, resulting
145 in unnecessary warnings.
@@ -147,38 +157,6 @@ details).
157 of supported backends, like "git difftool" does.
158 (merge 109859e jc/mergetool-tool-help later to maint).
159
150 - * "$GIT_DIR/COMMIT_EDITMSG" file that is used to hold the commit log
151 - message user edits was not documented.
152 - (merge 41f597d jk/maint-commit-document-editmsg later to maint).
153 -
160 * "git commit --amend" let the user edit the log message and then died
161 when the human-readable committer name was given insufficiently by
162 getpwent(3).
157 - (merge f20f387 jk/maint-commit-check-committer-early later to maint).
158 -
159 - * The advise() function did not use varargs correctly to format
160 - its message.
161 - (merge 447b99c jk/maint-advise-vaddf later to maint).
162 -
163 - * "git commit-tree" learned a more natural "-p <parent> <tree>" order
164 - of arguments long time ago, but recently forgot it by mistake.
165 - (merge 4b7518a kk/maint-commit-tree later to maint).
166 -
167 - * "git diff --no-ext-diff" did not output anything for a typechange
168 - filepair when GIT_EXTERNAL_DIFF is in effect.
169 - (merge c12f82a jv/maint-no-ext-diff later to maint).
170 -
171 - * When "git am" failed, old timers knew to check .git/rebase-apply/patch
172 - to see what went wrong, but we never told the users about it.
173 - (merge 14bf2d5 pg/maint-1.7.9-am-where-is-patch later to maint).
174 -
175 - * When "git submodule add" clones a submodule repository, it can get
176 - confused where to store the resulting submodule repository in the
177 - superproject's .git/ directory when there is a symbolic link in the
178 - path to the current directory.
179 - (merge 6eafa6d jl/maint-1.7.10-recurse-submodules-with-symlink later to maint).
180 -
181 - * In 1.7.9 era, we taught "git rebase" about the raw timestamp format
182 - but we did not teach the same trick to "filter-branch", which rolled
183 - a similar logic on its own.
184 - (merge 44b85e89 jc/maint-filter-branch-epoch-date later to maint).
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v1.7.12-rc0
4 +DEF_VER=v1.7.12-rc1
5
6 LF='
7 '