diff options
Diffstat (limited to 'Documentation/RelNotes')
| -rw-r--r-- | Documentation/RelNotes/1.7.10.2.txt | 85 | ||||
| -rw-r--r-- | Documentation/RelNotes/1.7.11.txt | 101 |
2 files changed, 125 insertions, 61 deletions
diff --git a/Documentation/RelNotes/1.7.10.2.txt b/Documentation/RelNotes/1.7.10.2.txt new file mode 100644 index 0000000000..7a7e9d6fd1 --- /dev/null +++ b/Documentation/RelNotes/1.7.10.2.txt @@ -0,0 +1,85 @@ +Git v1.7.10.2 Release Notes +=========================== + +Fixes since v1.7.10.1 +--------------------- + + * The test scaffolding for git-daemon was flaky. + + * The test scaffolding for fast-import was flaky. + + * The filesystem boundary was not correctly reported when .git directory + discovery stopped at a mount point. + + * HTTP transport that requires authentication did not work correctly when + multiple connections are used simultaneously. + + * Minor memory leak during unpack_trees (hence "merge" and "checkout" + to check out another branch) has been plugged. + + * In the older days, the header "Conflicts:" in "cherry-pick" and "merge" + was separated by a blank line from the list of paths that follow for + readability, but when "merge" was rewritten in C, we lost it by + mistake. Remove the newline from "cherry-pick" to make them match + again. + + * The command line parser choked "git cherry-pick $name" when $name can + be both revision name and a pathname, even though $name can never be a + path in the context of the command. + + * The "include.path" facility in the configuration mechanism added in + 1.7.10 forgot to interpret "~/path" and "~user/path" as it should. + + * "git config --rename-section" to rename an existing section into a + bogus one did not check the new name. + + * The "diff --no-index" codepath used limited-length buffers, risking + pathnames getting truncated. Update it to use the strbuf API. + + * The report from "git fetch" said "new branch" even for a non branch + ref. + + * The http-backend (the server side of the smart http transfer) used + to overwrite GIT_COMMITTER_NAME and GIT_COMMITTER_EMAIL with the + value obtained from REMOTE_USER unconditionally, making it + impossible for the server side site-specific customization to use + different identity sources to affect the names logged. It now uses + REMOTE_USER only as a fallback value. + + * "log --graph" was not very friendly with "--stat" option and its + output had line breaks at wrong places. + + * Octopus merge strategy did not reduce heads that are recorded in the + final commit correctly. + + * "git push" over smart-http lost progress output a few releases ago; + this release resurrects it. + + * The error and advice messages given by "git push" when it fails due + to non-ff were not very helpful to new users; it has been broken + into three cases, and each is given a separate advice message. + + * The insn sheet given by "rebase -i" did not make it clear that the + insn lines can be re-ordered to affect the order of the commits in + the resulting history. + + * "git repack" used to write out unreachable objects as loose objects + when repacking, even if such loose objects will immediately pruned + due to its age. + + * A contrib script "rerere-train" did not work out of the box unless + user futzed with her $PATH. + + * "git rev-parse --show-prefix" used to emit nothing when run at the + top-level of the working tree, but now it gives a blank line. + + * The i18n of error message "git stash save" was not properly done. + + * "git submodule" used a sed script that some platforms mishandled. + + * When using a Perl script on a system where "perl" found on user's + $PATH could be ancient or otherwise broken, we allow builders to + specify the path to a good copy of Perl with $PERL_PATH. The + gitweb test forgot to use that Perl when running its test. + +Also contains minor fixes and documentation updates. diff --git a/Documentation/RelNotes/1.7.11.txt b/Documentation/RelNotes/1.7.11.txt index 9e50db35ac..37f374bf1d 100644 --- a/Documentation/RelNotes/1.7.11.txt +++ b/Documentation/RelNotes/1.7.11.txt @@ -13,6 +13,9 @@ UI, Workflows & Features name over there. The plan is to make this mode the new default value when push.default is not configured. + * A couple of commands learned the "--column" option to produce + columnar output. + * A third-party tool "git subtree" is distributed in contrib/ * Error messages given when @{u} is used for a branch without its @@ -22,13 +25,15 @@ UI, Workflows & Features tracking. Also "branch" learned the "-q"uiet option to squelch informational message. + * Your build platform may support hardlinks but you may prefer not to + use them, e.g. when installing to DESTDIR to make a tarball and + untarring on a filesystem that has poor support for hardlinks. + There is a Makefile option NO_INSTALL_HARDLINKS for you. + * The smart-http backend used to always override GIT_COMMITTER_* variables with REMOTE_USER and REMOTE_ADDR, but these variables are now preserved when set. - * "include.path" mechanism of the configuration files learned to - understand "~/path" and "~user/path". - * "git am" learned the "--include" option, which is an opposite of existing the "--exclude" option. @@ -40,6 +45,11 @@ UI, Workflows & Features * The output from "diff/log --stat" used to always allocate 4 columns to show the number of modified lines, but not anymore. + * "git difftool" learned the "--dir-diff" option to spawn external + diff tools that can compare two directory hierarchies at a time + after populating two temporary directories, instead of running an + instance of the external tool once per a file pair. + * The "fmt-merge-msg" command learns to list the primary contributors involved in the side topic you are merging. @@ -75,6 +85,9 @@ Performance and Internal Implementation (please report possible regressions) * An experimental "version 4" format of the index file has been introduced to reduce on-disk footprint and I/O overhead. + * "git archive" learned to produce its output without reading the + blob object it writes out in memory in its entirety. + * The code to compute hash values for lines used by the internal diff engine was optimized on little-endian machines, using the same trick the kernel folks came up with. @@ -116,61 +129,27 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance releases are contained in this release (see release notes to them for details). - * When using a Perl script on a system where "perl" found on user's - $PATH could be ancient or otherwise broken, we allow builders to - specify the path to a good copy of Perl with $PERL_PATH. The - gitweb test forgot to use that Perl when running its test. - (merge 0754e08 jk/maint-gitweb-test-use-sane-perl later to maint). - - * A contrib script "rerere-train" did not work out of the box unless - user futzed with her $PATH. - (merge 53876fc jc/rerere-train later to maint). - - * "log --graph" was not very friendly with "--stat" option and its - output had line breaks at wrong places. - (merge bafa16e lp/diffstat-with-graph later to maint). - - * "git config --rename-section" to rename an existing section into a - bogus one did not check the new name. - (merge 94a35b1 jk/maint-config-bogus-section later to maint). - - * The test scaffolding for git-daemon was flaky. - (merge 46e3581 js/daemon-test-race-fix later to maint). - - * The test scaffolding for fast-import was flaky. - (merge 7fb8e16 pw/t5800-import-race-fix later to maint). - - * Octopus merge strategy did not reduce heads that are recorded in the - final commit correctly. - (merge 5802f81 jc/merge-reduce-parents-early later to maint). - - * In the older days, the header "Conflicts:" in "cherry-pick" and - "merge" was separated by a blank line from the list of paths that - follow for readability, but when "merge" was rewritten in C, we lost - it by mistake. Remove the newline from "cherry-pick" to make them - match again. - (merge 5112068 rt/cherry-revert-conflict-summary later to maint). - - * The filesystem boundary was not correctly reported when .git - directory discovery stopped at a mount point. - (merge 2565b43 cb/maint-report-mount-point-correctly-in-setup later to maint). - - * The command line parser choked "git cherry-pick $name" when $name - can be both revision name and a pathname, even though $name can - never be a path in the context of the command. - (merge 6d5b93f cb/cherry-pick-rev-path-confusion later to maint). - - * HTTP transport that requires authentication did not work correctly - when multiple connections are used simultaneously. - (merge 6f4c347 cb/http-multi-curl-auth later to maint). - - * The i18n of error message "git stash save" was not properly done. - (merge ed3c400 rl/maint-stash-i18n-save-error later to maint). - - * The report from "git fetch" said "new branch" even for a non branch - ref. - (merge 0997ada mb/fetch-call-a-non-branch-a-ref later to maint). - - * The "diff --no-index" codepath used limited-length buffers, risking - pathnames getting truncated. Update it to use the strbuf API. - (merge 875b91b jm/maint-strncpy-diff-no-index later to maint). + * When checking out another commit from an already detached state, we + used to report all commits that are not reachable from any of the + refs as lossage, but some of them might be reachable from the new + HEAD, and there is no need to warn about them. + (merge 5d88639 js/checkout-detach-count later to maint). + + * Some time ago, "git clone" lost the progress output for its + "checkout" phase; when run without any "--quiet" option, it should + give progress to the lengthy operation. + (merge 8f63da1 ef/maint-clone-progress-fix later to maint). + + * "git status --porcelain" ignored "--branch" option by mistake. The + output for "git status --branch -z" was also incorrect and did not + terminate the record for the current branch name with NUL as asked. + (merge d4a6bf1 jk/maint-status-porcelain-z-b later to maint). + + * "git diff --stat" used to fully count a binary file with modified + execution bits whose contents is unmodified, which was not quite + right. + + * "log -z --pretty=tformat:..." did not terminate each record with + NUL. The fix is not entirely correct when the output also asks for + --patch and/or --stat, though. + (merge fafd382 jk/maint-tformat-with-z later to maint). |