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 * The codepath to call external process filter for smudge/clean 81 operation learned to show the progress meter. 82 83 84Performance, Internal Implementation, Development Support etc. 85 86 * Conversion from uchar[20] to struct object_id continues. 87 88 * Start using selected c99 constructs in small, stable and 89 essentialpart of the system to catch people who care about 90 older compilers that do not grok them. 91 92 * The filter-process interface learned to allow a process with long 93 latency give a "delayed" response. 94 95 * Many uses of comparision callback function the hashmap API uses 96 cast the callback function type when registering it to 97 hashmap_init(), which defeats the compile time type checking when 98 the callback interface changes (e.g. gaining more parameters). 99 The callback implementations have been updated to take "void *" 100 pointers and cast them to the type they expect instead. 101 102 * Because recent Git for Windows do come with a real msgfmt, the 103 build procedure for git-gui has been updated to use it instead of a 104 hand-rolled substitute. 105 106 * "git grep --recurse-submodules" has been reworked to give a more 107 consistent output across submodule boundary (and do its thing 108 without having to fork a separate process). 109 110 * A helper function to read a single whole line into strbuf 111 mistakenly triggered OOM error at EOF under certain conditions, 112 which has been fixed. 113 (merge 642956cf45 rs/strbuf-getwholeline-fix later to maint). 114 115 * The "ref-store" code reorganization continues. 116 117 * "git commit" used to discard the index and re-read from the filesystem 118 just in case the pre-commit hook has updated it in the middle; this 119 has been optimized out when we know we do not run the pre-commit hook. 120 (merge 680ee550d7 kw/commit-keep-index-when-pre-commit-is-not-run later to maint). 121 122 * Updates to the HTTP layer we made recently unconditionally used 123 features of libCurl without checking the existence of them, causing 124 compilation errors, which has been fixed. Also migrate the code to 125 check feature macros, not version numbers, to cope better with 126 libCurl that vendor ships with backported features. 127 128 * The API to start showing progress meter after a short delay has 129 been simplified. 130 (merge 8aade107dd jc/simplify-progress later to maint). 131 132 * Code clean-up to avoid mixing values read from the .gitmodules file 133 and values read from the .git/config file. 134 135 * We used to spend more than necessary cycles allocating and freeing 136 piece of memory while writing each index entry out. This has been 137 optimized. 138 139Also contains various documentation updates and code clean-ups. 140 141 142Fixes since v2.14 143----------------- 144 145 * "%C(color name)" in the pretty print format always produced ANSI 146 color escape codes, which was an early design mistake. They now 147 honor the configuration (e.g. "color.ui = never") and also tty-ness 148 of the output medium. 149 150 * The http.{sslkey,sslCert} configuration variables are to be 151 interpreted as a pathname that honors "~[username]/" prefix, but 152 weren't, which has been fixed. 153 154 * Numerous bugs in walking of reflogs via "log -g" and friends have 155 been fixed. 156 157 * "git commit" when seeing an totally empty message said "you did not 158 edit the message", which is clearly wrong. The message has been 159 corrected. 160 161 * When a directory is not readable, "gitweb" fails to build the 162 project list. Work this around by skipping such a directory. 163 164 * Some versions of GnuPG fails to kill gpg-agent it auto-spawned 165 and such a left-over agent can interfere with a test. Work it 166 around by attempting to kill one before starting a new test. 167 168 * A recently added test for the "credential-cache" helper revealed 169 that EOF detection done around the time the connection to the cache 170 daemon is torn down were flaky. This was fixed by reacting to 171 ECONNRESET and behaving as if we got an EOF. 172 173 * "git log --tag=no-such-tag" showed log starting from HEAD, which 174 has been fixed---it now shows nothing. 175 176 * The "tag.pager" configuration variable was useless for those who 177 actually create tag objects, as it interfered with the use of an 178 editor. A new mechanism has been introduced for commands to enable 179 pager depending on what operation is being carried out to fix this, 180 and then "git tag -l" is made to run pager by default. 181 182 * "git push --recurse-submodules $there HEAD:$target" was not 183 propagated down to the submodules, but now it is. 184 185 * Commands like "git rebase" accepted the --rerere-autoupdate option 186 from the command line, but did not always use it. This has been 187 fixed. 188 189 * "git clone --recurse-submodules --quiet" did not pass the quiet 190 option down to submodules. 191 192 * Test portability fix for OBSD. 193 194 * Portability fix for OBSD. 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 200 * "git svn" used with "--localtime" option did not compute the tz 201 offset for the timestamp in question and instead always used the 202 current time, which has been corrected. 203 204 * Memory leak in an error codepath has been plugged. 205 206 * "git stash -u" used the contents of the committed version of the 207 ".gitignore" file to decide which paths are ignored, even when the 208 file has local changes. The command has been taught to instead use 209 the locally modified contents. 210 211 * bash 4.4 or newer gave a warning on NUL byte in command 212 substitution done in "git stash"; this has been squelched. 213 214 * "git grep -L" and "git grep --quiet -L" reported different exit 215 codes; this has been corrected. 216 217 * When handshake with a subprocess filter notices that the process 218 asked for an unknown capability, Git did not report what program 219 the offending subprocess was running. This has been corrected. 220 221 * "git apply" that is used as a better "patch -p1" failed to apply a 222 taken from a file with CRLF line endings to a file with CRLF line 223 endings. The root cause was because it misused convert_to_git() 224 that tried to do "safe-crlf" processing by looking at the index 225 entry at the same path, which is a nonsense---in that mode, "apply" 226 is not working on the data in (or derived from) the index at all. 227 This has been fixed. 228 229 * Killing "git merge --edit" before the editor returns control left 230 the repository in a state with MERGE_MSG but without MERGE_HEAD, 231 which incorrectly tells the subsequent "git commit" that there was 232 a squash merge in progress. This has been fixed. 233 234 * "git archive" did not work well with pathspecs and the 235 export-ignore attribute. 236 237 * In addition to "cc: <a@dd.re.ss> # cruft", "cc: a@dd.re.ss # cruft" 238 was taught to "git send-email" as a valid way to tell it that it 239 needs to also send a carbon copy to <a@dd.re.ss> in the trailer 240 section. 241 (merge cc90750677 mm/send-email-cc-cruft later to maint). 242 243 * "git branch -M a b" while on a branch that is completely unrelated 244 to either branch a or branch b misbehaved when multiple worktree 245 was in use. This has been fixed. 246 (merge 31824d180d nd/worktree-kill-parse-ref later to maint). 247 248 * Other minor doc, test and build updates and code cleanups. 249 (merge f094b89a4d ma/parse-maybe-bool later to maint). 250 (merge 39b00fa4d4 jk/drop-sha1-entry-pos later to maint). 251 (merge 6cdf8a7929 ma/ts-cleanups later to maint). 252 (merge 7560f547e6 ma/up-to-date later to maint). 253 (merge 0db3dc75f3 rs/apply-epoch later to maint).