From bf5cf766af62e4ee34b1217c6351c6fc48eaf255 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 10 Feb 2012 14:04:20 -0800 Subject: [PATCH 1/2] Update draft release notes to 1.7.9.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.9.1.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Documentation/RelNotes/1.7.9.1.txt b/Documentation/RelNotes/1.7.9.1.txt index d8a0961149..a6c15e5d52 100644 --- a/Documentation/RelNotes/1.7.9.1.txt +++ b/Documentation/RelNotes/1.7.9.1.txt @@ -7,6 +7,11 @@ Fixes since v1.7.9 * Subprocesses spawned from various git programs were often left running to completion even when the top-level process was killed. + * Using "git grep -l/-L" together with options -W or --break may not + make much sense as the output is to only count the number of hits + and there is no place for file breaks, but the latter options made + "-l/-L" to miscount the hits. + * "git log --first-parent $pathspec" did not stay on the first parent chain and veered into side branch from which the whole change to the specified paths came. @@ -16,4 +21,16 @@ Fixes since v1.7.9 * When "git push" fails to update any refs, the client side did not report an error correctly to the end user. + * "git mergetool" now gives an empty file as the common base version + to the backend when dealing with the "both sides added, differently" + case. + + * When asking for a tag to be pulled, "request-pull" did not show the + name of the tag prefixed with "tags/", which would have helped older + clients. + + * "git submodule add $path" forgot to recompute the name to be stored + in .gitmodules when the submodule at $path was once added to the + superproject and already initialized. + Also contains minor fixes and documentation updates. From b6b3b6a01f357922ccd14f2615accc9bd39fc194 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 10 Feb 2012 14:15:38 -0800 Subject: [PATCH 2/2] Update draft release notes to 1.7.10 Document bunch of bugfix topics to be merged down to 'maint' soonish for 1.7.9.1 maintenance release. Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.10.txt | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt index 201e8d5786..e255901356 100644 --- a/Documentation/RelNotes/1.7.10.txt +++ b/Documentation/RelNotes/1.7.10.txt @@ -62,9 +62,30 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance releases are contained in this release (see release notes to them for details). + * "add -e" learned not to show a diff for an otherwise unmodified + submodule that only has uncommitted local changes in the patch + prepared by for the user to edit. + (merge 701825d js/add-e-submodule-fix later to maint). + + * "rebase" and "commit --amend" failed to work on commits with ancient + timestamps near year 1970. + (merge 2c733fb jc/parse-date-raw later to maint). + + * "git merge --ff-only $tag" failed because it cannot record the + required mergetag without creating a merge, but this is so common + operation for branch that is used _only_ to follow the upstream, so + it is allowed to fast-forward without recording the mergetag. + (merge b5c9f1c jc/merge-ff-only-stronger-than-signed-merge later to maint). + + * Typo in "git branch --edit-description my-tpoic" was not diagnosed. + (merge c2d17ba jc/branch-desc-typoavoidance later to maint). + + * rpmbuild noticed an unpackaged but installed *.mo file and failed. + (merge 3a9f58c jn/rpm-spec later to maint). + --- exec >/var/tmp/1 -O=v1.7.9-187-gdc347e9 +O=v1.7.9-208-gee8d52f echo O=$(git describe) git log --first-parent --oneline ^maint $O.. echo