2fc74f41c5 · matheusbsbs/matheus-bagliano

@@ -23,7 +23,6 @@ UI, Workflows & Features

23 Performance, Internal Implementation, Development Support etc.

24

25 * More perf tests for threaded grep

26 - (merge 7b31b55db1 ab/perf-grep-threads later to maint).

26

27 * "perf" test output can be sent to codespeed server.

28 (merge 19cf57a92e cc/codespeed later to maint).

@@ -79,6 +78,10 @@ Performance, Internal Implementation, Development Support etc.

78

79 * More tests for wildmatch functions.

80

81 + * The code to binary search starting from a fan-out table (which is

82 + how the packfile is indexed with object names) has been refactored

83 + into a reusable helper.

84 +

85 Also contains various documentation updates and code clean-ups.

86

87

@@ -87,7 +90,6 @@ Fixes since v2.16

90

91 * An old regression in "git describe --all $annotated_tag^0" has been

92 fixed.

90 - (merge 1bba00130a dk/describe-all-output-fix later to maint).

93

94 * "git status" after moving a path in the working tree (hence making

95 it appear "removed") and then adding with the -N option (hence

@@ -99,19 +101,15 @@ Fixes since v2.16

101 svn+ssh:// URL with a username@ (typically used for pushing) refers

102 to the same SVN repository without the username@ and failed when

103 svn.pushmergeinfo option is set.

102 - (merge 8aaed892fd jm/svn-pushmergeinfo-fix later to maint).

104

105 * API clean-up around revision traversal.

105 - (merge 6fcec2f9ae rs/lose-leak-pending later to maint).

106

107 * "git merge -Xours/-Xtheirs" learned to use our/their version when

108 resolving a conflicting updates to a symbolic link.

109 - (merge fd48b46474 jc/merge-symlink-ours-theirs later to maint).

109

110 * "git clone $there $here" is allowed even when here directory exists

111 as long as it is an empty directory, but the command incorrectly

112 removed it upon a failure of the operation.

114 - (merge d45420c1c8 jk/abort-clone-with-existing-dest later to maint).

113

114 * "git commit --fixup" did not allow "-m<message>" option to be used

115 at the same time; allow it to annotate resulting commit with more

@@ -124,7 +122,6 @@ Fixes since v2.16

122

123 * "git stash -- <pathspec>" incorrectly blew away untracked files in

124 the directory that matched the pathspec, which has been corrected.

127 - (merge bba067d2fa tg/stash-with-pathspec-fix later to maint).

125

126 * Instead of maintaining home-grown email address parsing code, ship

127 a copy of reasonably recent Mail::Address to be used as a fallback

@@ -134,7 +131,6 @@ Fixes since v2.16

131 * "git add -p" was taught to ignore local changes to submodules as

132 they do not interfere with the partial addition of regular changes

133 anyway.

137 - (merge 12434efc1d nd/add-i-ignore-submodules later to maint).

134

135 * Avoid showing a warning message in the middle of a line of "git

136 diff" output.

@@ -178,11 +174,46 @@ Fixes since v2.16

174 * Test fixes.

175 (merge 63b1a175ee sg/test-i18ngrep later to maint).

176

177 + * Some bugs around "untracked cache" feature have been fixed. This

178 + will notice corrupt data in the untracked cache left by old and

179 + buggy code and issue a warning---the index can be fixed by clearing

180 + the untracked cache from it.

181 + (merge 0cacebf099 nd/fix-untracked-cache-invalidation later to maint).

182 + (merge 7bf0be7501 ab/untracked-cache-invalidation-docs later to maint).

183 +

184 + * "git blame HEAD COPYING" in a bare repository failed to run, while

185 + "git blame HEAD -- COPYING" run just fine. This has been corrected.

186 +

187 + * "git add" files in the same directory, but spelling the directory

188 + path in different cases on case insensitive filesystem, corrupted

189 + the name hash data structure and led to unexpected results. This

190 + has been corrected.

191 + (merge c95525e90d bp/name-hash-dirname-fix later to maint).

192 +

193 + * "git rebase -p" mangled log messages of a merge commit, which is

194 + now fixed.

195 + (merge ed5144d7eb js/fix-merge-arg-quoting-in-rebase-p later to maint).

196 +

197 + * Some low level protocol codepath could crash when they get an

198 + unexpected flush packet, which is now fixed.

199 + (merge bb1356dc64 js/packet-read-line-check-null later to maint).

200 +

201 + * "git check-ignore" with multiple paths got confused when one is a

202 + file and the other is a directory, which has been fixed.

203 + (merge d60771e930 rs/check-ignore-multi later to maint).

204 +

205 + * "git describe $garbage" stopped giving any errors when the garbage

206 + happens to be a string with 40 hexadecimal letters.

207 + (merge a8e7a2bf0f sb/describe-blob later to maint).

208 +

209 + * Code to unquote single-quoted string (used in the parser for

210 + configuration files, etc.) did not diagnose bogus input correctly

211 + and produced bogus results instead.

212 + (merge ddbbf8eb25 jk/sq-dequote-on-bogus-input later to maint).

213 +

214 * Other minor doc, test and build updates and code cleanups.

215 (merge e2a5a028c7 bw/oidmap-autoinit later to maint).

216 (merge f0a6068a9f ys/bisect-object-id-missing-conversion-fix later to maint).

184 - (merge 30221a3389 as/read-tree-prefix-doc-fix later to maint).

185 - (merge 9bd2ce5432 ab/doc-cat-file-e-still-shows-errors later to maint).

217 (merge ec3b4b06f8 cl/t9001-cleanup later to maint).

218 (merge e1b3f3dd38 ks/submodule-doc-updates later to maint).

219 (merge fbac558a9b rs/describe-unique-abbrev later to maint).

@@ -197,3 +228,10 @@ Fixes since v2.16

228 (merge b780e4407d jc/worktree-add-short-help later to maint).

229 (merge ae239fc8e5 rs/cocci-strbuf-addf-to-addstr later to maint).

230 (merge 2e22a85e5c nd/ignore-glob-doc-update later to maint).

231 + (merge 3738031581 jk/gettext-poison later to maint).

232 + (merge 54360a1956 rj/sparse-updates later to maint).

233 + (merge 12e31a6b12 sg/doc-test-must-fail-args later to maint).

234 + (merge 760f1ad101 bc/doc-interpret-trailers-grammofix later to maint).

235 + (merge 4ccf461f56 bp/fsmonitor later to maint).

236 + (merge a6119f82b1 jk/test-hashmap-updates later to maint).

237 + (merge 5aea9fe6cc rd/typofix later to maint).

Fifth batch for 2.17