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