1Git v1.8.0 Release Notes 2======================== 3 4Backward compatibility notes 5---------------------------- 6 7In the next major release, we will change the behavior of the "git 8push" command. When "git push [$there]" does not say what to push, we 9have used the traditional "matching" semantics so far (all your branches were 10sent to the remote as long as there already are branches of the same 11name over there). We will now use the "simple" semantics, that pushes the 12current branch to the branch with the same name only when the current 13branch is set to integrate with that remote branch. There is a user 14preference configuration variable "push.default" to change this, and 15"git push" will warn about the upcoming change until you set this 16variable. 17 18"git branch --set-upstream" is deprecated and may be removed in a 19relatively distant future. "git branch [-u|--set-upstream-to]" has 20been introduced with a saner order of arguments. 21 22 23Updates since v1.7.12 24--------------------- 25 26UI, Workflows & Features 27 28 * A credential helper for Win32 to allow access to the keychain of 29 the logged-in user has been added. 30 31 * An initial port to HP NonStop. 32 33 * A credential helper to allow access to the Gnome keyring has been 34 added. 35 36 * When "git am" sanitizes the "Subject:" line, we strip the prefix from 37 "Re: subject" and also from a less common "re: subject", but left 38 the even less common "RE: subject" intact. We strip that now, too. 39 40 * It was tempting to say "git branch --set-upstream origin/master", 41 but that tells Git to arrange the local branch "origin/master" to 42 integrate with the currently checked out branch, which is highly 43 unlikely what the user meant. The option is deprecated; use the 44 new "--set-upstream-to" (with a short-and-sweet "-u") option 45 instead. 46 47 * "git cherry-pick" learned the "--allow-empty-message" option to 48 allow it to replay a commit without any log message. 49 50 * After "git cherry-pick -s" gave control back to the user asking 51 help to resolve conflicts, concluding "git commit" used to need to 52 be run with "-s" if the user wants to sign it off; now the command 53 leaves the sign-off line in the log template. 54 55 * "git daemon" learned the "--access-hook" option to allow an 56 external command to decline service based on the client address, 57 repository path, etc. 58 59 * "git difftool --dir-diff" learned to use symbolic links to prepare 60 a temporary copy of the working tree when available. 61 62 * "git grep" learned to use a non-standard pattern type by default if 63 a configuration variable tells it to. 64 65 * "git log -g" learned the "--grep-reflog=<pattern>" option to limit 66 its output to commits with a reflog message that matches the given 67 pattern. 68 69 * "git merge-base" learned the "--is-ancestor A B" option to tell if A is 70 an ancestor of B. The result is indicated by its exit status code. 71 72 * "git mergetool" now allows users to override the actual command used 73 with the mergetool.$name.cmd configuration variable even for built-in 74 mergetool backends. 75 76 * The "-Xours" backend option to "git merge -s recursive" now takes 77 effect even on binary files. 78 79 * "git rebase -i" learned the "--edit-todo" option to open an editor 80 to edit the instruction sheet. 81 82 83Foreign Interface 84 85 * "git svn" has been updated to work with SVN 1.7. 86 87 * "git p4" learned the "--conflicts" option to specify what to do when 88 encountering a conflict during "p4 submit". 89 90 91Performance, Internal Implementation, etc. (please report possible regressions) 92 93 * Git ships with a fall-back regexp implementation for platforms with 94 buggy regexp library, but it was easy for people to keep using their 95 platform regexp by mistake. A new test has been added to check this. 96 97 * The "check-docs" build target has been updated and greatly 98 simplified. 99 100 * The test suite is run under MALLOC_CHECK_ when running with a glibc 101 that supports the feature. 102 103 * The documentation in the TeXinfo format was using indented output 104 for materials meant to be examples that are better typeset in 105 monospace. 106 107 * Compatibility wrapper around some mkdir(2) implementations that 108 reject parameters with trailing slash has been introduced. 109 110 * Compatibility wrapper for systems that lack usable setitimer() has 111 been added. 112 113 * The option parsing of "git checkout" had error checking, dwim and 114 defaulting missing options, all mixed in the code, and issuing an 115 appropriate error message with useful context was getting harder. 116 The code has been reorganized to allow giving a proper diagnosis 117 when the user says "git checkout -b -t foo bar" (e.g. "-t" is not a 118 good name for a branch). 119 120 * Many internal uses of a "git merge-base" equivalent were only to see 121 if one commit fast-forwards to the other, which did not need the 122 full set of merge bases to be computed. They have been updated to 123 use less expensive checks. 124 125 * The heuristics to detect and silently convert latin1 to utf8 when 126 we were told to use utf-8 in the log message has been transplanted 127 from "mailinfo" to "commit" and "commit-tree". 128 129 * Messages given by "git <subcommand> -h" from many subcommands have 130 been marked for translation. 131 132 133Also contains minor documentation updates and code clean-ups. 134 135 136Fixes since v1.7.12 137------------------- 138 139Unless otherwise noted, all the fixes since v1.7.12 in the 140maintenance track are contained in this release (see release notes 141to them for details). 142 143 * The attribute system may be asked for a path that itself or its 144 leading directories no longer exists in the working tree, and it is 145 fine if we cannot open .gitattribute file in such a case. Failure 146 to open per-directory .gitattributes with error status other than 147 ENOENT and ENOTDIR should be diagnosed, but it wasn't. 148 149 * When looking for $HOME/.gitconfig etc., it is OK if we cannot read 150 them because they do not exist, but we did not diagnose existing 151 files that we cannot read. 152 153 * When "git am" is fed an input that has multiple "Content-type: ..." 154 header, it did not grok charset= attribute correctly. 155 156 * A patch attached as application/octet-stream (e.g. not text/*) were 157 mishandled, not correctly honoring Content-Transfer-Encoding 158 (e.g. base64). 159 (merge 9d55b2e lt/mailinfo-handle-attachment-more-sanely later to maint). 160 161 * "git blame MAKEFILE" run in a history that has "Makefile" but not 162 "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got 163 confused on a case insensitive filesystem and failed to do so. 164 165 * Even during a conflicted merge, "git blame $path" always meant to 166 blame uncommitted changes to the "working tree" version; make it 167 more useful by showing cleanly merged parts as coming from the other 168 branch that is being merged. 169 170 * It was unclear in the documentation for "git blame" that it is 171 unnecessary for users to use the "--follow" option. 172 (merge e5dce96 jc/blame-follows-renames later to maint). 173 174 * Output from "git branch -v" contains "(no branch)" that could be 175 localized, but the code to align it along with the names of 176 branches was counting in bytes, not in display columns. 177 178 * "git cherry-pick A C B" used to replay changes in A and then B and 179 then C if these three commits had committer timestamps in that 180 order, which is not what the user who said "A C B" naturally 181 expects. 182 183 * A repository created with "git clone --single" had its fetch 184 refspecs set up just like a clone without "--single", leading the 185 subsequent "git fetch" to slurp all the other branches, defeating 186 the whole point of specifying "only this branch". 187 (merge 31b808a rt/maint-clone-single later to maint). 188 189 * Documentation talked about "first line of commit log" when it meant 190 the title of the commit. The description was clarified by defining 191 how the title is decided and rewording the casual mention of "first 192 line" to "title". 193 194 * "git cvsimport" did not thoroughly cleanse tag names that it 195 inferred from the names of the tags it obtained from CVS, which 196 caused "git tag" to barf and stop the import in the middle. 197 198 * Earlier we made the diffstat summary line that shows the number of 199 lines added/deleted localizable, but it was found irritating having 200 to see them in various languages on a list whose discussion language 201 is English, and this change has been reverted. 202 203 * "git fetch --all", when passed "--no-tags", did not honor the 204 "--no-tags" option while fetching from individual remotes (the same 205 issue existed with "--tags", but the combination "--all --tags" makes 206 much less sense than "--all --no-tags"). 207 208 * "git fetch" over http had an old workaround for an unlikely server 209 misconfiguration; it turns out that this hurts debuggability of the 210 configuration in general, and has been reverted. 211 (merge 6ac964a sp/maint-http-info-refs-no-retry later to maint). 212 213 * "git fetch" over http advertised that it supports "deflate", which 214 is much less common, and did not advertise the more common "gzip" on 215 its Accept-Encoding header. 216 (merge aa90b96 sp/maint-http-enable-gzip later to maint). 217 218 * "git gc --auto" notified the user that auto-packing has triggered 219 even under the "--quiet" option. 220 221 * After "gitk" showed the contents of a tag, neither "Reread 222 references" nor "Reload" updated what is shown as the 223 contents of it when the user overwrote the tag with "git tag -f". 224 225 * "git log --all-match --grep=A --grep=B" ought to show commits that 226 mention both A and B, but when these three options are used with 227 --author or --committer, it showed commits that mention either A or 228 B (or both) instead. 229 230 * "git p4", when "--use-client-spec" and "--detect-branches" are used 231 together, misdetected branches. 232 233 * "git receive-pack" (the counterpart to "git push") did not give 234 progress output while processing objects it received to the puser 235 when run over the smart-http protocol. 236 (merge 74eb32d jk/receive-pack-unpack-error-to-pusher later to maint). 237 238 * When you misspell the command name you give to the "exec" action in 239 the "git rebase -i" instruction sheet you were told that 'rebase' is not a 240 git subcommand from "git rebase --continue". 241 242 * The subcommand in "git remote" to remove a defined remote was 243 "rm" and the command did not take a fully-spelled "remove". 244 245 * The interactive prompt that "git send-email" gives was error prone. It 246 asked "What e-mail address do you want to use?" with the address it 247 guessed (correctly) the user would want to use in its prompt, 248 tempting the user to say "y". But the response was taken as "No, 249 please use 'y' as the e-mail address instead", which is most 250 certainly not what the user meant. 251 252 * "git show --format='%ci'" did not give the timestamp correctly for 253 commits created without human readable name on the "committer" line. 254 255 * "git show --quiet" ought to be a synonym for "git show -s", but 256 wasn't. 257 258 * "git submodule frotz" was not diagnosed as "frotz" being an unknown 259 subcommand to "git submodule"; the user instead got a complaint 260 that "git submodule status" was run with an unknown path "frotz". 261 (merge af9c9f9 rr/maint-submodule-unknown-cmd later to maint). 262 263 * "git status" honored the ignore=dirty settings in .gitmodules but 264 "git commit" didn't. 265 (merge 8f6811e os/commit-submodule-ignore later to maint).