1Git v2.1 Release Notes 2====================== 3 4Backward compatibility notes 5---------------------------- 6 7 * The default value we give to the environment variable LESS has been 8 changed from "FRSX" to "FRX", losing "S" (chop long lines instead 9 of wrapping). Existing users who prefer not to see line-wrapped 10 output may want to set 11 12 $ git config core.pager "less -S" 13 14 to restore the traditional behaviour. It is expected that people 15 find output from the most subcommands easier to read with the new 16 default, except for "blame" which tends to produce really long 17 lines. To override the new default only for "git blame", you can 18 do this: 19 20 $ git config pager.blame "less -S" 21 22 * A few disused directories in contrib/ have been retired. 23 24 25Updates since v2.0 26------------------ 27 28UI, Workflows & Features 29 30 * Since the very beginning of Git, we gave the LESS environment a 31 default value "FRSX" when we spawn "less" as the pager. "S" (chop 32 long lines instead of wrapping) has been removed from this default 33 set of options, because it is more or less a personal taste thing, 34 as opposed to others that have good justifications (i.e. "R" is 35 very much justified because many kinds of output we produce are 36 colored and "FX" is justified because output we produce is often 37 shorter than a page). 38 39 * The logic and data used to compute the display width needed for 40 UTF-8 strings have been updated to match Unicode 6.3 better. 41 42 * "git commit --date=<date>" option learned to read from more 43 timestamp formats, including "--date=now". 44 45 * The `core.commentChar` configuration variable is used to specify a 46 custom comment character other than the default "#" to be used in 47 the commit log editor. This can be set to `auto` to attempt to 48 choose a different character that does not conflict with what 49 already starts a line in the message being edited for cases like 50 "git commit --amend". 51 52 * "git grep" learned grep.fullname configuration variable to force 53 "--full-name" to be default. This may cause regressions on 54 scripted users that do not expect this new behaviour. 55 56 * "git imap-send" learned to ask the credential helper for auth 57 material. 58 59 * "git merge" without argument, even when there is an upstream 60 defined for the current branch, refused to run until 61 merge.defaultToUpstream is set to true. Flip the default of that 62 configuration variable to true. 63 64 * "git mergetool" learned to drive the vimdiff3 backend. 65 66 * mergetool.prompt used to default to 'true', always asking "do you 67 really want to run the tool on this path?". Among the two 68 purposes this prompt serves, ignore the use case to confirm that 69 the user wants to view particular path with the named tool, and 70 redefine the meaning of the prompt only to confirm the choice of 71 the tool made by the autodetection (for those who configured the 72 tool explicitly, the prompt shown for the latter purpose is 73 simply annoying). 74 75 Strictly speaking, this is a backward incompatible change and the 76 users need to explicitly set the variable to 'true' if they want 77 to resurrect the now-ignored use case. 78 79 * "git svn" learned to cope with malformed timestamps with only one 80 digit in the hour part, e.g. 2014-01-07T5:01:02.048176Z, emitted 81 by some broken subversion server implementations. 82 83 * "git tag" when editing the tag message shows the name of the tag 84 being edited as a comment in the editor. 85 86 87Performance, Internal Implementation, etc. 88 89 * Build procedure for 'subtree' (in contrib/) has been cleaned up. 90 91 * The `core.deltabasecachelimit` used to default to 16 MiB , but this 92 proved to be too small, and has been bumped to 96 MiB. 93 94 * "git blame" has been optimized greatly by reorganising the data 95 structure that is used to keep track of the work to be done. 96 97 * "git diff" that compares 3-or-more trees (e.g. parents and the 98 result of a merge) have been optimized. 99 100 * The API to update/delete references are being converted to handle 101 updates to multiple references in a transactional way. As an 102 example, "update-ref --stdin [-z]" has been updated to use this 103 API. 104 105 106Also contains various documentation updates and code clean-ups. 107 108 109Fixes since v2.0 110---------------- 111 112Unless otherwise noted, all the fixes since v2.0 in the maintenance 113track are contained in this release (see the maintenance releases' 114notes for details). 115 116 * We used to unconditionally disable the pager in the pager process 117 we spawn to feed out output, but that prevented people who want to 118 run "less" within "less" from doing so. 119 (merge c0459ca je/pager-do-not-recurse later to maint). 120 121 * Tools that read diagnostic output in our standard error stream do 122 not want to see terminal control sequence (e.g. erase-to-eol). 123 Detect them by checking if the standard error stream is connected 124 to a tty. 125 (merge 38de156 mn/sideband-no-ansi later to maint). 126 127 * Mishandling of patterns in .gitignore that has trailing SPs quoted 128 with backslashes (e.g. ones that end with "\ ") have been 129 corrected. 130 (merge e61a6c1 pb/trim-trailing-spaces later to maint). 131 132 * "--ignore-space-change" option of "git apply" ignored the spaces 133 at the beginning of line too aggressively, which is inconsistent 134 with the option of the same name "diff" and "git diff" have. 135 (merge 14d3bb4 jc/apply-ignore-whitespace later to maint). 136 137 * "git blame" miscounted number of columns needed to show localized 138 timestamps, resulting in jaggy left-side-edge of the source code 139 lines in its output. 140 (merge dd75553 jx/blame-align-relative-time later to maint). 141 142 * "git blame" assigned the blame to the copy in the working-tree if 143 the repository is set to core.autocrlf=input and the file used CRLF 144 line endings. 145 (merge 4d4813a bc/blame-crlf-test later to maint). 146 147 * "git commit --allow-empty-messag -C $commit" did not work when the 148 commit did not have any log message. 149 (merge 076cbd6 jk/commit-C-pick-empty later to maint). 150 151 * "git grep -O" to show the lines that hit in the pager did not work 152 well with case insensitive search. We now spawn "less" with its 153 "-I" option when it is used as the pager (which is the default). 154 (merge f7febbe sk/spawn-less-case-insensitively-from-grep-O-i later to maint). 155 156 * We used to disable threaded "git index-pack" on platforms without 157 thread-safe pread(); use a different workaround for such 158 platforms to allow threaded "git index-pack". 159 (merge 3953949 nd/index-pack-one-fd-per-thread later to maint). 160 161 * The error reporting from "git index-pack" has been improved to 162 distinguish missing objects from type errors. 163 (merge 77583e7 jk/index-pack-report-missing later to maint). 164 165 * "git mailinfo" used to read beyond the end of header string while 166 parsing an incoming e-mail message to extract the patch. 167 (merge b1a013d rs/mailinfo-header-cmp later to maint). 168 169 * On a case insensitive filesystem, merge-recursive incorrectly 170 deleted the file that is to be renamed to a name that is the same 171 except for case differences. 172 (merge baa37bf dt/merge-recursive-case-insensitive later to maint). 173 174 * "git rerere forget" did not work well when merge.conflictstyle 175 was set to a non-default value. 176 (merge de3d8bb fc/rerere-conflict-style later to maint). 177 178 * "git log --exclude=<glob> --all | git shortlog" worked as expected, 179 but "git shortlog --exclude=<glob> --all", which is supposed to be 180 identical to the above pipeline, was not accepted at the command 181 line argument parser level. 182 (merge eb07774 jc/shortlog-ref-exclude later to maint). 183 184 * "git show -s" (i.e. show log message only) used to incorrectly emit 185 an extra blank line after a merge commit. 186 (merge ad2f725 mk/show-s-no-extra-blank-line-for-merges later to maint). 187 188 * "git status", even though it is a read-only operation, tries to 189 update the index with refreshed lstat(2) info to optimize future 190 accesses to the working tree opportunistically, but this could 191 race with a "read-write" operation that modify the index while it 192 is running. Detect such a race and avoid overwriting the index. 193 (merge 426ddee ym/fix-opportunistic-index-update-race later to maint). 194 195 * "git update-index --cacheinfo" in 2.0 release crashed on a 196 malformed command line. 197 (merge c8e1ee4 jc/rev-parse-argh-dashed-multi-words later to maint). 198 199 * The mode to run tests with HTTP server tests disabled was broken. 200 (merge afa53fe na/no-http-test-in-the-middle later to maint).