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 * Error messages given when @{u} is used for a branch without its 12 upstream configured have been clatified. 13 14 * Even with "-q"uiet option, "checkout" used to report setting up 15 tracking. Also "branch" learned the "-q"uiet option to squelch 16 informational message. 17 18 * The smart-http backend used to always override GIT_COMMITTER_* 19 variables with REMOTE_USER and REMOTE_ADDR, but these variables are 20 now preserved when set. 21 22 * "git am" learned the "--include" option, which is an opposite of 23 existing the "--exclude" option. 24 25 * When "git am -3" needs to fall back to an application to a 26 synthesized preimage followed by a 3-way merge, the paths that 27 needed such treatment are now reported to the end user, so that the 28 result in them can be eyeballed with extra care. 29 30 * The "fmt-merge-msg" command learns to list the primary contributors 31 involved in the side topic you are merging. 32 33 * The cases "git push" fails due to non-ff can be broken into three 34 categories; each case is given a separate advise message. 35 36 * "git push --recurse-submodules" learned to optionally look into the 37 histories of submodules bound to the superproject and push them 38 out. 39 40 * A 'snapshot' request to "gitweb" honors If-Modified-Since: header, 41 based on the commit date. 42 43 * "gitweb" learned to highlight the patch it outputs even more. 44 45Foreign Interface 46 47 * "git svn" used to die with unwanted SIGPIPE when talking with HTTP 48 server that uses keep-alive. 49 50 * "git p4" has been moved out of contrib/ area. 51 52Performance 53 54 * "git apply" had some memory leaks plugged. 55 56 * Setting up a revision traversal with many starting points was 57 inefficient as these were placed in a date-order priority queue 58 one-by-one. Now they are collected in the queue unordered first, 59 and sorted immediately before getting used. 60 61Internal Implementation (please report possible regressions) 62 63 * "git rev-parse --show-prefix" used to emit nothing when run at the 64 top-level of the working tree, but now it gives a blank line. 65 66 * Minor memory leak during unpack_trees (hence "merge" and "checkout" 67 to check out another branch) has been plugged. 68 69 * More lower-level commands learned to use the streaming API to read 70 from the object store without keeping everything in core. 71 72 * Because "sh" on the user's PATH may be utterly broken on some 73 systems, run-command API now uses SHELL_PATH, not /bin/sh, when 74 spawning an external command (not applicable to Windows port). 75 76 * The API to iterate over refs/ hierarchy has been tweaked to allow 77 walking only a subset of it more efficiently. 78 79Also contains minor documentation updates and code clean-ups. 80 81 82Fixes since v1.7.10 83------------------- 84 85Unless otherwise noted, all the fixes since v1.7.10 in the maintenance 86releases are contained in this release (see release notes to them for 87details). 88 89 * Octopus merge strategy did not reduce heads that are recorded in the 90 final commit correctly. 91 (merge 5802f81 jc/merge-reduce-parents-early later to maint). 92 93 * In the older days, the header "Conflicts:" in "cherry-pick" and 94 "merge" was separated by a blank line from the list of paths that 95 follow for readability, but when "merge" was rewritten in C, we lost 96 it by mistake. Remove the newline from "cherry-pick" to make them 97 match again. 98 (merge 5112068 rt/cherry-revert-conflict-summary later to maint). 99 100 * The filesystem boundary was not correctly reported when .git 101 directory discovery stopped at a mount point. 102 (merge 2565b43 cb/maint-report-mount-point-correctly-in-setup later to maint). 103 104 * The command line parser choked "git cherry-pick $name" when $name 105 can be both revision name and a pathname, even though $name can 106 never be a path in the context of the command. 107 (merge 6d5b93f cb/cherry-pick-rev-path-confusion later to maint). 108 109 * HTTP transport that requires authentication did not work correctly 110 when multiple connections are used simultaneously. 111 (merge 6f4c347 cb/http-multi-curl-auth later to maint). 112 113 * The i18n of error message "git stash save" was not properly done. 114 (merge ed3c400 rl/maint-stash-i18n-save-error later to maint). 115 116 * The report from "git fetch" said "new branch" even for a non branch 117 ref. 118 (merge 0997ada mb/fetch-call-a-non-branch-a-ref later to maint). 119 120 * The "diff --no-index" codepath used limited-length buffers, risking 121 pathnames getting truncated. Update it to use the strbuf API. 122 (merge 875b91b jm/maint-strncpy-diff-no-index later to maint). 123 124 * The parser in "fast-import" did not diagnose ":9" style references 125 that is not followed by required SP/LF as an error. 126 (merge 06454cb pw/fast-import-dataref-parsing later to maint). 127 128 * When "git fetch" encounters repositories with too many references, 129 the command line of "fetch-pack" that is run by a helper 130 e.g. remote-curl, may fail to hold all of them. Now such an 131 internal invocation can feed the references through the standard 132 input of "fetch-pack". 133 (merge 7103d25 it/fetch-pack-many-refs later to maint). 134 135 * "git fetch" that recurses into submodules on demand did not check 136 if it needs to go into submodules when non branches (most notably, 137 tags) are fetched. 138 (merge a6801ad jl/maint-submodule-recurse-fetch later to maint). 139 140 * "git blame" started missing quite a few changes from the origin 141 since we stopped using the diff minimalization by default in v1.7.2 142 era. 143 (merge 059a500 jc/maint-blame-minimal later to maint). 144 145 * "log -p --graph" used with "--stat" had a few formatting error. 146 (merge e2c5966 lp/maint-diff-three-dash-with-graph later to maint). 147 148 * Giving "--continue" to a conflicted "rebase -i" session skipped a 149 commit that only results in changes to submodules. 150 (merge a6754cd jk/rebase-i-submodule-conflict-only later to maint).