Skip to content

Commit

Permalink
Sync with 1.7.9.1
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Feb 14, 2012
2 parents 6f5e880 + 90020e3 commit 5f90b6f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
6 changes: 0 additions & 6 deletions Documentation/RelNotes/1.7.10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,10 @@ 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).

* "git merge --no-edit $tag" failed to honor the --no-edit option.
(merge 3adab6f jn/merge-no-edit-fix later to maint).

* The error message emitted when we see an empty loose object was
not phrased correctly.
(merge 33e42de mm/empty-loose-error-message later to maint).

* Many small corner case bugs on "git tag -n" was corrected.
(merge 31fd8d7 jk/maint-tag-show-fixes later to maint).

* "git commit" refused to create a commit when entries added with
"add -N" remained in the index, without telling Git what their content
in the next commit should be. We should have created the commit without
Expand Down
11 changes: 11 additions & 0 deletions Documentation/RelNotes/1.7.9.1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ Git v1.7.9.1 Release Notes
Fixes since v1.7.9
------------------

* The makefile allowed environment variable X seep into it result in
command names suffixed with unnecessary strings.

* The set of included header files in compat/inet-{ntop,pton}
wrappers was updated for Windows some time ago, but in a way that
broke Solaris build.

* rpmbuild noticed an unpackaged but installed *.mo file and failed.

* Subprocesses spawned from various git programs were often left running
Expand All @@ -24,6 +31,8 @@ Fixes since v1.7.9
chain and veered into side branch from which the whole change to the
specified paths came.

* "git merge --no-edit $tag" failed to honor the --no-edit option.

* "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
Expand All @@ -49,4 +58,6 @@ Fixes since v1.7.9
in .gitmodules when the submodule at $path was once added to the
superproject and already initialized.

* Many small corner case bugs on "git tag -n" was corrected.

Also contains minor fixes and documentation updates.
3 changes: 2 additions & 1 deletion Documentation/git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.9/git.html[documentation for release 1.7.9]
* link:v1.7.9.1/git.html[documentation for release 1.7.9.1]

* release notes for
link:RelNotes/1.7.9.1.txt[1.7.9.1],
link:RelNotes/1.7.9.txt[1.7.9].

* link:v1.7.8.4/git.html[documentation for release 1.7.8.4]
Expand Down

0 comments on commit 5f90b6f

Please sign in to comment.