1Git v1.7.11 Release Notes 2========================= 3 4Updates since v1.7.10 5--------------------- 6 7UI, Workflows & Features 8 9 * A third-party tool "git subtree" is distributed in contrib/ 10 11 * Even with "-q"uiet option, "checkout" used to report setting up 12 tracking. Also "branch" learned the "-q"uiet option to squelch 13 informational message. 14 15 * The smart-http backend used to always override GIT_COMMITTER_* 16 variables with REMOTE_USER and REMOTE_ADDR, but these variables are 17 now preserved when set. 18 19 * "git am" learned the "--include" option, which is an opposite of 20 existing the "--exclude" option. 21 22 * When "git am -3" needs to fall back to an application to a 23 synthesized preimage followed by a 3-way merge, the paths that 24 needed such treatment are now reported to the end user, so that the 25 result in them can be eyeballed with extra care. 26 27 * The "fmt-merge-msg" command learns to list the primary contributors 28 involved in the side topic you are merging. 29 30 * The cases "git push" fails due to non-ff can be broken into three 31 categories; each case is given a separate advise message. 32 33 * A 'snapshot' request to "gitweb" honors If-Modified-Since: header, 34 based on the commit date. 35 36Foreign Interface 37 38 39Performance 40 41 42Internal Implementation (please report possible regressions) 43 44 * Minor memory leak during unpack_trees (hence "merge" and "checkout" 45 to check out another branch) has been plugged. 46 47 * More lower-level commands learned to use the streaming API to read 48 from the object store without keeping everything in core. 49 50 * Because "sh" on the user's PATH may be utterly broken on some 51 systems, run-command API now uses SHELL_PATH, not /bin/sh, when 52 spawning an external command (not applicable to Windows port). 53 54Also contains minor documentation updates and code clean-ups. 55 56 57Fixes since v1.7.10 58------------------- 59 60Unless otherwise noted, all the fixes since v1.7.10 in the maintenance 61releases are contained in this release (see release notes to them for 62details). 63 64 * When PATH contains an unreadable directory, alias expansion code 65 did not kick in, and failed with an error that said "git-subcmd" 66 was not found. 67 (merge 38f865c jk/run-command-eacces later to maint). 68 69 * The 'push to upstream' implementation was broken in some corner 70 cases. "git push $there" without refspec, when the current branch 71 is set to push to a remote different from $there, used to push to 72 $there using the upstream information to a remote unreleated to 73 $there. 74 (merge 135dade jc/push-upstream-sanity later to maint). 75 76 * "git clean -d -f" (not "-d -f -f") is supposed to protect nested 77 working trees of independent git repositories that exist in the 78 current project working tree from getting removed, but the 79 protection applied only to such working trees that are at the 80 top-level of the current project by mistake. 81 (merge ae2f203 jc/maint-clean-nested-worktree-in-subdir later to maint). 82 83 * Rename detection logic used to match two empty files as renames 84 during merge-recursive, leading unnatural mismerges. 85 (merge 4f7cb99 jk/diff-no-rename-empty later to maint). 86 87 * An age-old corner case bug in combine diff (only triggered with -U0 88 and the hunk at the beginning of the file needs to be shown) has 89 been fixed. 90 (merge e5e9b56 rs/combine-diff-zero-context-at-the-beginning later to maint). 91 92 * When "git commit --template F" errors out because the user did not 93 touch the message, it claimed that it aborts due to "empty 94 message", which was utterly wrong. 95 (merge 1f08c2c jc/commit-unedited-template later to maint). 96 97 * "git add -p" is not designed to deal with unmerged paths but did 98 not exclude them and tried to apply funny patches only to fail. 99 (merge 4066bd6 jk/add-p-skip-conflicts later to maint). 100 101 * "git commit --author=$name" did not tell the name that was being 102 recorded in the resulting commit to hooks, even though it does do 103 so when the end user overrode the authorship via the 104 "GIT_AUTHOR_NAME" environment variable. 105 (merge 7dfe8ad jc/commit-hook-authorship later to maint). 106 107 * The regexp configured with diff.wordregex was incorrectly reused 108 across files. 109 (merge 6440d34 tr/maint-word-diff-regex-sticky later to maint). 110 111 * Running "notes merge --commit" failed to perform correctly when run 112 from any directory inside $GIT_DIR/. When "notes merge" stops with 113 conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits 114 to resolve it. 115 (merge dabba59 jh/notes-merge-in-git-dir-worktree later to maint).