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