1Git 2.15 Release Notes 2====================== 3 4Backward compatibility notes and other notable changes. 5 6 * Use of an empty string as a pathspec element that is used for 7 'everything matches' is still warned and Git asks users to use a 8 more explicit '.' for that instead. The hope is that existing 9 users will not mind this change, and eventually the warning can be 10 turned into a hard error, upgrading the deprecation into removal of 11 this (mis)feature. That is now scheduled to happen in the upcoming 12 release. 13 14 * Git now avoids blindly falling back to ".git" when the setup 15 sequence said we are _not_ in Git repository. A corner case that 16 happens to work right now may be broken by a call to die("BUG"). 17 We've tried hard to locate such cases and fixed them, but there 18 might still be cases that need to be addressed--bug reports are 19 greatly appreciated. 20 21 22Updates since v2.14 23------------------- 24 25UI, Workflows & Features 26 27 * An example that is now obsolete has been removed from a sample hook, 28 and an old example in it that added a sign-off manually has been 29 improved to use the interpret-trailers command. 30 31 * The advice message given when "git rebase" stops for conflicting 32 changes has been improved. 33 34 * The "rerere-train" script (in contrib/) learned the "--overwrite" 35 option to allow overwriting existing recorded resolutions. 36 37 * "git contacts" (in contrib/) now lists the address on the 38 "Reported-by:" trailer to its output, in addition to those on 39 S-o-b: and other trailers, to make it easier to notify (and thank) 40 the original bug reporter. 41 42 * "git rebase", especially when it is run by mistake and ends up 43 trying to replay many changes, spent long time in silence. The 44 command has been taught to show progress report when it spends 45 long time preparing these many changes to replay (which would give 46 the user a chance to abort with ^C). 47 48 * "git merge" learned a "--signoff" option to add the Signed-off-by: 49 trailer with the committer's name. 50 51 * "git diff" learned to optionally paint new lines that are the same 52 as deleted lines elsewhere differently from genuinely new lines. 53 54 * "git interpret-trailers" learned to take the trailer specifications 55 from the command line that overrides the configured values. 56 57 * "git interpret-trailers" has been taught a "--parse" and a few 58 other options to make it easier for scripts to grab existing 59 trailer lines from a commit log message. 60 61 * "gitweb" shows a link to visit the 'raw' contents of blbos in the 62 history overview page. 63 64 * "[gc] rerereResolved = 5.days" used to be invalid, as the variable 65 is defined to take an integer counting the number of days. It now 66 is allowed. 67 68 * The code to acquire a lock on a reference (e.g. while accepting a 69 push from a client) used to immediately fail when the reference is 70 already locked---now it waits for a very short while and retries, 71 which can make it succeed if the lock holder was holding it during 72 a read-only operation. 73 74 75Performance, Internal Implementation, Development Support etc. 76 77 * Conversion from uchar[20] to struct object_id continues. 78 79 * Start using selected c99 constructs in small, stable and 80 essentialpart of the system to catch people who care about 81 older compilers that do not grok them. 82 83 * The filter-process interface learned to allow a process with long 84 latency give a "delayed" response. 85 86 * Many uses of comparision callback function the hashmap API uses 87 cast the callback function type when registering it to 88 hashmap_init(), which defeats the compile time type checking when 89 the callback interface changes (e.g. gaining more parameters). 90 The callback implementations have been updated to take "void *" 91 pointers and cast them to the type they expect instead. 92 93 * Because recent Git for Windows do come with a real msgfmt, the 94 build procedure for git-gui has been updated to use it instead of a 95 hand-rolled substitute. 96 97 * "git grep --recurse-submodules" has been reworked to give a more 98 consistent output across submodule boundary (and do its thing 99 without having to fork a separate process). 100 101 * A helper function to read a single whole line into strbuf 102 mistakenly triggered OOM error at EOF under certain conditions, 103 which has been fixed. 104 (merge 642956cf45 rs/strbuf-getwholeline-fix later to maint). 105 106 * The "ref-store" code reorganization continues. 107 108 * "git commit" used to discard the index and re-read from the filesystem 109 just in case the pre-commit hook has updated it in the middle; this 110 has been optimized out when we know we do not run the pre-commit hook. 111 (merge 680ee550d7 kw/commit-keep-index-when-pre-commit-is-not-run later to maint). 112 113 * Updates to the HTTP layer we made recently unconditionally used 114 features of libCurl without checking the existence of them, causing 115 compilation errors, which has been fixed. Also migrate the code to 116 check feature macros, not version numbers, to cope better with 117 libCurl that vendor ships with backported features. 118 119 * The API to start showing progress meter after a short delay has 120 been simplified. 121 (merge 8aade107dd jc/simplify-progress later to maint). 122 123 * Code clean-up to avoid mixing values read from the .gitmodules file 124 and values read from the .git/config file. 125 126 * We used to spend more than necessary cycles allocating and freeing 127 piece of memory while writing each index entry out. This has been 128 optimized. 129 130Also contains various documentation updates and code clean-ups. 131 132 133Fixes since v2.14 134----------------- 135 136 * "%C(color name)" in the pretty print format always produced ANSI 137 color escape codes, which was an early design mistake. They now 138 honor the configuration (e.g. "color.ui = never") and also tty-ness 139 of the output medium. 140 141 * The http.{sslkey,sslCert} configuration variables are to be 142 interpreted as a pathname that honors "~[username]/" prefix, but 143 weren't, which has been fixed. 144 145 * Numerous bugs in walking of reflogs via "log -g" and friends have 146 been fixed. 147 148 * "git commit" when seeing an totally empty message said "you did not 149 edit the message", which is clearly wrong. The message has been 150 corrected. 151 152 * When a directory is not readable, "gitweb" fails to build the 153 project list. Work this around by skipping such a directory. 154 155 * Some versions of GnuPG fails to kill gpg-agent it auto-spawned 156 and such a left-over agent can interfere with a test. Work it 157 around by attempting to kill one before starting a new test. 158 (merge 29ff1f8f74 st/lib-gpg-kill-stray-agent later to maint). 159 160 * A recently added test for the "credential-cache" helper revealed 161 that EOF detection done around the time the connection to the cache 162 daemon is torn down were flaky. This was fixed by reacting to 163 ECONNRESET and behaving as if we got an EOF. 164 165 * "git log --tag=no-such-tag" showed log starting from HEAD, which 166 has been fixed---it now shows nothing. 167 (merge 5d34d1ac06 jk/rev-list-empty-input later to maint). 168 169 * The "tag.pager" configuration variable was useless for those who 170 actually create tag objects, as it interfered with the use of an 171 editor. A new mechanism has been introduced for commands to enable 172 pager depending on what operation is being carried out to fix this, 173 and then "git tag -l" is made to run pager by default. 174 (merge 595d59e2b5 ma/pager-per-subcommand-action later to maint). 175 176 * "git push --recurse-submodules $there HEAD:$target" was not 177 propagated down to the submodules, but now it is. 178 (merge c7be7201a7 bw/push-options-recursively-to-submodules later to maint). 179 180 * Commands like "git rebase" accepted the --rerere-autoupdate option 181 from the command line, but did not always use it. This has been 182 fixed. 183 (merge f826fb799e pw/sequence-rerere-autoupdate later to maint). 184 185 * "git clone --recurse-submodules --quiet" did not pass the quiet 186 option down to submodules. 187 (merge 03c004c581 bw/clone-recursive-quiet later to maint). 188 189 * Test portability fix for OBSD. 190 (merge bed67874e2 rs/obsd-getcwd-workaround later to maint). 191 (merge 4c7fda8fc1 rs/t4062-obsd later to maint). 192 193 * Portability fix for OBSD. 194 (merge 29c2eda80b rs/in-obsd-basename-dirname-take-const later to maint). 195 196 * "git am -s" has been taught that some input may end with a trailer 197 block that is not Signed-off-by: and it should refrain from adding 198 an extra blank line before adding a new sign-off in such a case. 199 (merge 735285b403 pw/am-signoff later to maint). 200 201 * "git svn" used with "--localtime" option did not compute the tz 202 offset for the timestamp in question and instead always used the 203 current time, which has been corrected. 204 (merge 1adc4b9a58 ur/svn-local-zone later to maint). 205 206 * Memory leak in an error codepath has been plugged. 207 (merge 83cd6f9017 rs/fsck-obj-leakfix later to maint). 208 (merge 896dca3ab7 rs/unpack-entry-leakfix later to maint). 209 (merge 149d8cbb2e rs/win32-syslog-leakfix later to maint). 210 211 * "git stash -u" used the contents of the committed version of the 212 ".gitignore" file to decide which paths are ignored, even when the 213 file has local changes. The command has been taught to instead use 214 the locally modified contents. 215 216 * bash 4.4 or newer gave a warning on NUL byte in command 217 substitution done in "git stash"; this has been squelched. 218 (merge 5fc92f8828 kd/stash-with-bash-4.4 later to maint). 219 220 * "git grep -L" and "git grep --quiet -L" reported different exit 221 codes; this has been corrected. 222 (merge e1f68c66d5 as/grep-quiet-no-match-exit-code-fix later to maint). 223 224 * When handshake with a subprocess filter notices that the process 225 asked for an unknown capability, Git did not report what program 226 the offending subprocess was running. This has been corrected. 227 (merge d3ba566342 cc/subprocess-handshake-missing-capabilities later to maint). 228 229 * "git apply" that is used as a better "patch -p1" failed to apply a 230 taken from a file with CRLF line endings to a file with CRLF line 231 endings. The root cause was because it misused convert_to_git() 232 that tried to do "safe-crlf" processing by looking at the index 233 entry at the same path, which is a nonsense---in that mode, "apply" 234 is not working on the data in (or derived from) the index at all. 235 This has been fixed. 236 (merge c24f3abace tb/apply-with-crlf later to maint). 237 238 * Killing "git merge --edit" before the editor returns control left 239 the repository in a state with MERGE_MSG but without MERGE_HEAD, 240 which incorrectly tells the subsequent "git commit" that there was 241 a squash merge in progress. This has been fixed. 242 (merge 9d89b35526 mg/killed-merge later to maint). 243 244 * Other minor doc, test and build updates and code cleanups. 245 (merge dff2813391 ab/ref-filter-no-contains later to maint). 246 (merge f094b89a4d ma/parse-maybe-bool later to maint). 247 (merge 974ce8078c mf/no-dashed-subcommands later to maint). 248 (merge f81935cc4d jc/perl-git-comment-typofix later to maint). 249 (merge 57ea241ef0 rs/t3700-clean-leftover later to maint). 250 (merge 39b00fa4d4 jk/drop-sha1-entry-pos later to maint). 251 (merge 0b006014c8 jk/hashcmp-memcmp later to maint). 252 (merge 1e22a9917b rj/add-chmod-error-message later to maint). 253 (merge 881529c846 rs/apply-lose-prefix-length later to maint). 254 (merge 6355a76802 rs/find-pack-entry-bisection later to maint). 255 (merge de3ce210ed rs/merge-microcleanup later to maint). 256 (merge 7f0a02be2f ah/doc-empty-string-is-false later to maint). 257 (merge 70ec6bd63b rs/t1002-do-not-use-sum later to maint). 258 (merge 2456990dfd sb/sha1-file-cleanup later to maint). 259 (merge 2aac933c62 hv/t5526-andand-chain-fix later to maint). 260 (merge c8d0c4fe9b sb/submodule-parallel-update later to maint). 261 (merge 794b7e1674 mg/format-ref-doc-fix later to maint). 262 (merge 24da8a26a9 rs/commit-h-single-parent-cleanup later to maint). 263 (merge 4e36907fa3 jk/doc-the-this later to maint). 264 (merge 15d1d0951e bc/vcs-svn-cleanup later to maint). 265 (merge b8f43b120b jn/vcs-svn-cleanup later to maint). 266 (merge 4a4becfb23 jt/doc-pack-objects-fix later to maint).