|
|
|
@ -130,43 +130,14 @@ Fixes since v1.7.6
@@ -130,43 +130,14 @@ Fixes since v1.7.6
|
|
|
|
|
Unless otherwise noted, all fixes in the 1.7.6.X maintenance track are |
|
|
|
|
included in this release. |
|
|
|
|
|
|
|
|
|
* The error reporting logic of "git am" when the command is fed a file |
|
|
|
|
whose mail-storage format is unknown was fixed. |
|
|
|
|
(merge dff4b0e gb/maint-am-patch-format-error-message later to 'maint'). |
|
|
|
|
|
|
|
|
|
* "git branch --set-upstream @{-1} foo" did not expand @{-1} correctly. |
|
|
|
|
(merge e9d4f74 mg/branch-set-upstream-previous later to 'maint'). |
|
|
|
|
|
|
|
|
|
* "git branch -m" and "git checkout -b" incorrectly allowed the tip |
|
|
|
|
of the branch that is currently checked out updated. |
|
|
|
|
(merge 55c4a67 ci/forbid-unwanted-current-branch-update later to 'maint'). |
|
|
|
|
|
|
|
|
|
* "git check-ref-format --print" used to parrot a candidate string that |
|
|
|
|
began with a slash (e.g. /refs/heads/master) without stripping it, to make |
|
|
|
|
the result a suitably normalized string the caller can append to "$GIT_DIR/". |
|
|
|
|
(merge f3738c1 mh/check-ref-format-print-normalize later to 'maint'). |
|
|
|
|
|
|
|
|
|
* "git clone" failed to clone locally from a ".git" file that itself |
|
|
|
|
is not a directory but is a pointer to one. |
|
|
|
|
(merge 9b0ebc7 nd/maint-clone-gitdir later to 'maint'). |
|
|
|
|
|
|
|
|
|
* "git clone" from a local repository that borrows from another |
|
|
|
|
object store using a relative path in its objects/info/alternates |
|
|
|
|
file did not adjust the alternates in the resulting repository. |
|
|
|
|
(merge e6baf4a1 jc/maint-clone-alternates later to 'maint'). |
|
|
|
|
|
|
|
|
|
* "git describe --dirty" did not refresh the index before checking the |
|
|
|
|
state of the working tree files. |
|
|
|
|
(cherry-pick bb57148 ac/describe-dirty-refresh later to 'maint'). |
|
|
|
|
|
|
|
|
|
* "git ls-files ../$path" that is run from a subdirectory reported errors |
|
|
|
|
incorrectly when there is no such path that matches the given pathspec. |
|
|
|
|
(merge 0f64bfa cb/maint-ls-files-error-report later to 'maint'). |
|
|
|
|
|
|
|
|
|
-- |
|
|
|
|
exec >/var/tmp/1 |
|
|
|
|
echo O=$(git describe master) |
|
|
|
|
O=v1.7.7-rc2 |
|
|
|
|
O=v1.7.7-rc3 |
|
|
|
|
git log --first-parent --oneline $O..master |
|
|
|
|
echo |
|
|
|
|
git shortlog --no-merges ^maint ^$O master |
|
|
|
|