12887a8d84 · matheusbsbs/matheus-bagliano

@@ -1,10 +1,10 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Nov 2018, #06; Wed, 21)

4 -X-master-at: bb75be6cb916297f271c846f2f9caa3daaaec718

5 -X-next-at: 68bc7959f8dc2d629c09be1a52f1b95b977b3a13

3 +Subject: What's cooking in git.git (Nov 2018, #07; Fri, 30)

4 +X-master-at: 7068cbc4abac53d9c3675dfba81c1e97d25e8eeb

5 +X-next-at: a9faaff8c120bf4783cb892c157871fe524b3608

6

7 -What's cooking in git.git (Nov 2018, #06; Wed, 21)

7 +What's cooking in git.git (Nov 2018, #07; Fri, 30)

8 --------------------------------------------------

9

10 Here are the topics that have been cooking. Commits prefixed with

@@ -12,356 +12,242 @@ Here are the topics that have been cooking. Commits prefixed with

12 '+' are in 'next'. The ones marked with '.' do not appear in any of

13 the integration branches, but I am still holding onto them.

14

15 +The road to the upcoming 2.20 turned out to be a bit rockier as we

16 +had a couple of subcommands with larger importance (rebase and

17 +rebase-i) reimplemented, together with some new and exciting

18 +commands (like range-diff and its integration into format-patch),

19 +each with a few loose ends we needed to tie until the last minute.

20 +I've let -rc1 and -rc2 slip for a few days to make sure we get

21 +closer to a stable point, and I am hoping that a few topics that are

22 +at the bottom of master..pu chain with today's pushout merged to the

23 +'master' branch, I should be able to cut a 2.20-rc2 that is in a

24 +reasonable shape.

25 +

26 You can find the changes described here in the integration branches

27 of the repositories listed at

28

29 http://git-blame.blogspot.com/p/git-public-repositories.html

30

31 --------------------------------------------------

21 -[Graduated to "master"]

22 -

23 -* ab/dynamic-gettext-poison (2018-11-09) 2 commits

24 - (merged to 'next' on 2018-11-18 at 13247a3be6)

25 - + Makefile: ease dynamic-gettext-poison transition

26 - + i18n: make GETTEXT_POISON a runtime option

27 -

28 - Our testing framework uses a special i18n "poisoned localization"

29 - feature to find messages that ought to stay constant but are

30 - incorrectly marked to be translated. This feature has been made

31 - into a runtime option (it used to be a compile-time option).

32 +[New Topics]

33

34 +* gh/diff-raw-has-no-ellipses (2018-11-26) 1 commit

35 + (merged to 'next' on 2018-11-29 at 24a7536f15)

36 + + doc: update diff-format.txt for removed ellipses in --raw

37

34 -* ab/range-diff-no-patch (2018-11-14) 3 commits

35 - (merged to 'next' on 2018-11-17 at c42e0891d0)

36 - + range-diff: make diff option behavior (e.g. --stat) consistent

37 - + range-diff: fix regression in passing along diff options

38 - + range-diff doc: add a section about output stability

38 + "git diff --raw" lost ellipses to adjust the output columns for

39 + some time now, but the documentation still showed them.

40

40 - The "--no-patch" option, which can be used to get a high-level

41 - overview without the actual line-by-line patch difference shown, of

42 - the "range-diff" command was earlier broken, which has been

43 - corrected.

41 + Will cook in 'next'.

42

43

46 -* ab/rebase-in-c-escape-hatch (2018-11-16) 2 commits

47 - (merged to 'next' on 2018-11-17 at a01be221c7)

48 - + tests: add a special setup where rebase.useBuiltin is off

49 - + rebase doc: document rebase.useBuiltin

44 +* mk/http-backend-kill-children-before-exit (2018-11-26) 1 commit

45 + (merged to 'next' on 2018-11-29 at bf2d45062f)

46 + + http-backend: enable cleaning up forked upload/receive-pack on exit

47

51 - The recently merged "rebase in C" has an escape hatch to use the

52 - scripted version when necessary, but it hasn't been documented,

48 + The http-backend CGI process did not correctly clean up the child

49 + processes it spawns to run upload-pack etc. when it dies itself,

50 which has been corrected.

51

52 + Will cook in 'next'.

53

56 -* ag/p3400-force-checkout (2018-11-12) 1 commit

57 - (merged to 'next' on 2018-11-17 at 87ff48d52a)

58 - + p3400: replace calls to `git checkout -b' by `git checkout -B'

59 -

60 - Perf test tweak.

61 -

62 -

63 -* cb/notes-freeing-always-null-fix (2018-11-13) 1 commit

64 - (merged to 'next' on 2018-11-17 at 47aeec5fc9)

65 - + builtin/notes: remove unnecessary free

66 -

67 - Code cleanup.

68 -

69 -

70 -* dd/poll-dot-h (2018-11-14) 1 commit

71 - (merged to 'next' on 2018-11-18 at b6745f3308)

72 - + git-compat-util: prefer poll.h to sys/poll.h

73 -

74 - A build update.

75 -

76 -

77 -* ds/push-squelch-ambig-warning (2018-11-07) 1 commit

78 - (merged to 'next' on 2018-11-18 at 5e8b3db129)

79 - + pack-objects: ignore ambiguous object warnings

80 -

81 - "git push" used to check ambiguities between object-names and

82 - refnames while processing the list of refs' old and new values,

83 - which was unnecessary (as it knew that it is feeding raw object

84 - names). This has been optimized out.

85 -

86 -

87 -* ds/reachable-topo-order (2018-11-02) 7 commits

88 - (merged to 'next' on 2018-11-13 at 4155d01aee)

89 - + t6012: make rev-list tests more interesting

90 - + revision.c: generation-based topo-order algorithm

91 - + commit/revisions: bookkeeping before refactoring

92 - + revision.c: begin refactoring --topo-order logic

93 - + test-reach: add rev-list tests

94 - + test-reach: add run_three_modes method

95 - + prio-queue: add 'peek' operation

96 -

97 - The revision walker machinery learned to take advantage of the

98 - commit generation numbers stored in the commit-graph file.

99 -

100 -

101 -* jk/close-duped-fd-before-unlock-for-bundle (2018-11-17) 1 commit

102 - (merged to 'next' on 2018-11-17 at 2fe598284e)

103 - + bundle: dup() output descriptor closer to point-of-use

104 -

105 - When "git bundle" aborts due to an empty commit ranges

106 - (i.e. resulting in an empty pack), it left a file descriptor to an

107 - lockfile open, which resulted in leftover lockfile on Windows where

108 - you cannot remove a file with an open file descriptor. This has

109 - been corrected.

110 -

111 -

112 -* jk/curl-ldflags (2018-11-05) 1 commit

113 - (merged to 'next' on 2018-11-13 at d1387a3aa0)

114 - + build: link with curl-defined linker flags

115 -

116 - The way -lcurl library gets linked has been simplified by taking

117 - advantage of the fact that we can just ask curl-config command how.

118 -

119 -

120 -* jk/unused-parameter-fixes (2018-11-06) 14 commits

121 - (merged to 'next' on 2018-11-13 at 8d3625b4ae)

122 - + midx: double-check large object write loop

123 - + assert NOARG/NONEG behavior of parse-options callbacks

124 - + parse-options: drop OPT_DATE()

125 - + apply: return -1 from option callback instead of calling exit(1)

126 - + cat-file: report an error on multiple --batch options

127 - + tag: mark "--message" option with NONEG

128 - + show-branch: mark --reflog option as NONEG

129 - + format-patch: mark "--no-numbered" option with NONEG

130 - + status: mark --find-renames option with NONEG

131 - + cat-file: mark batch options with NONEG

132 - + pack-objects: mark index-version option as NONEG

133 - + ls-files: mark exclude options as NONEG

134 - + am: handle --no-patch-format option

135 - + apply: mark include/exclude options as NONEG

136 -

137 - Various functions have been audited for "-Wunused-parameter" warnings

138 - and bugs in them got fixed.

139 -

140 -

141 -* jk/verify-sig-merge-into-void (2018-11-07) 3 commits

142 - (merged to 'next' on 2018-11-13 at a207be60ed)

143 - + pull: handle --verify-signatures for unborn branch

144 - + merge: handle --verify-signatures for unborn branch

145 - + merge: extract verify_merge_signature() helper

146 -

147 - "git merge" and "git pull" that merges into an unborn branch used

148 - to completely ignore "--verify-signatures", which has been

149 - corrected.

150 -

151 -

152 -* js/apply-recount-allow-noop (2018-11-13) 1 commit

153 - (merged to 'next' on 2018-11-17 at e413fa105f)

154 - + apply --recount: allow "no-op hunks"

155 -

156 - When editing a patch in a "git add -i" session, a hunk could be

157 - made to no-op. The "git apply" program used to reject a patch with

158 - such a no-op hunk to catch user mistakes, but it is now updated to

159 - explicitly allow a no-op hunk in an edited patch.

160 -

161 -

162 -* js/builtin-rebase-perf-fix (2018-11-13) 3 commits

163 - (merged to 'next' on 2018-11-17 at 9e9db8c8e1)

164 - + built-in rebase: reinstate `checkout -q` behavior where appropriate

165 - + rebase: prepare reset_head() for more flags

166 - + rebase: consolidate clean-up code before leaving reset_head()

167 -

168 - Code clean-up with correction to make the reimplemented "git

169 - rebase" a more faithful rewrite of the original, which also regains

170 - performance.

171 -

172 -

173 -* js/config-sequence (2018-11-16) 1 commit

174 - (merged to 'next' on 2018-11-17 at fefca0bbe8)

175 - + config: report a bug if git_dir exists without commondir

176 -

177 - A sanity check for start-up sequence has been added in the config

178 - API codepath.

54

55 +* ab/replace-graft-with-replace-advice (2018-11-29) 1 commit

56 + (merged to 'next' on 2018-11-30 at c5d658e075)

57 + + advice: don't pointlessly suggest --convert-graft-file

58

181 -* js/fuzz-cxxflags (2018-11-16) 1 commit

182 - (merged to 'next' on 2018-11-17 at 5e589a5237)

183 - + Makefile: use FUZZ_CXXFLAGS for linking fuzzers

59 + The advice message to tell the user to migrate an existing graft

60 + file to the replace system when a graft file was read was shown

61 + even when "git replace --convert-graft-file" command, which is the

62 + way the message suggests to use, was running, which made little

63 + sense.

64

185 - The build procedure to link for fuzzing test has been made

186 - customizable with a new Makefile variable.

65 + Will merge to 'master'.

66

67

189 -* js/mailmap (2018-11-12) 1 commit

190 - (merged to 'next' on 2018-11-17 at 673bfc4cfa)

191 - + Update .mailmap

68 +* ma/reset-doc-rendering-fix (2018-11-29) 2 commits

69 + (merged to 'next' on 2018-11-30 at be718c19e2)

70 + + git-reset.txt: render literal examples as monospace

71 + + git-reset.txt: render tables correctly under Asciidoctor

72

193 - Update the mailmap to unify multiple entries for the authors with

194 - commits since v2.10.

73 + Doc updates.

74

75 + Will merge to 'master'.

76

197 -* js/mingw-create-hard-link (2018-11-14) 1 commit

198 - (merged to 'next' on 2018-11-17 at 27f866db16)

199 - + mingw: use `CreateHardLink()` directly

77

201 - Windows update.

78 +* sg/daemon-test-signal-fix (2018-11-27) 1 commit

79 + (merged to 'next' on 2018-11-30 at b3f7fdf727)

80 + + t/lib-git-daemon: fix signal checking

81

82 + Test fix.

83

204 -* js/mingw-msdn-url (2018-11-16) 1 commit

205 - (merged to 'next' on 2018-11-17 at a6a9afddbf)

206 - + mingw: replace an obsolete link with the superseding one

84 + Will merge to 'master'.

85

208 - The URL to an MSDN page in a comment has been updated.

86

87 +* tb/log-G-binary (2018-11-29) 1 commit

88 + - log -G: ignore binary files

89

211 -* js/mingw-res-rebuild (2018-11-07) 1 commit

212 - (merged to 'next' on 2018-11-13 at fb736827d1)

213 - + Windows: force-recompile git.res for differing architectures

90 + "git log -G<regex>" looked for a hunk in the "git log -p" patch

91 + output that contained a string that matches the given pattern.

92 + Optimize this code to ignore binary files, which by default will

93 + not show any hunk that would match any pattern (unless textconv or

94 + the --text option is in effect, that is).

95

215 - Windows build update.

96 + Expecting an update to the tests.

97

98

218 -* js/rebase-am-options (2018-11-16) 2 commits

219 - (merged to 'next' on 2018-11-17 at f956d9b948)

220 - + rebase: validate -C<n> and --whitespace=<mode> parameters early

221 - + rebase: really just passthru the `git am` options

99 +* jc/format-patch-range-diff-fix (2018-11-30) 1 commit

100 + (merged to 'next' on 2018-11-30 at 26290b1ec1)

101 + + format-patch: do not let its diff-options affect --range-diff

102

223 - The way "git rebase" parses and forwards the command line options

224 - meant for underlying "git am" has been revamped, which fixed for

225 - options with parameters that were not passed correctly.

103 + "git format-patch --range-diff" by mistake passed the diff options

104 + used to generate the primary output of the command to the

105 + range-diff machinery, which caused the range-diff in the cover

106 + letter to include fairly useless "--stat" output. This has been

107 + corrected by forcing a non-customizable default formatting options

108 + on the range-diff machinery when driven by format-patch.

109

110 + Will merge to 'master'.

111

228 -* js/rebase-autostash-detach-fix (2018-11-08) 2 commits

229 - (merged to 'next' on 2018-11-17 at 15957b4a5a)

230 - + built-in rebase --autostash: leave the current branch alone if possible

231 - + built-in rebase: demonstrate regression with --autostash

112

233 - "git rebase --autostash" did not correctly re-attach the HEAD at times.

113 +* js/rebase-reflog-action-fix (2018-11-30) 1 commit

114 + (merged to 'next' on 2018-11-30 at 93fd2fb920)

115 + + rebase: fix GIT_REFLOG_ACTION regression

116

117 + "git rebase" reimplemented recently in C accidentally changed the

118 + way reflog entries are recorded (earlier "rebase -i" identified the

119 + entries it leaves with "rebase -i", but the new version always

120 + marks them with "rebase"). This has been corrected.

121

236 -* js/rebase-r-and-merge-head (2018-11-13) 5 commits

237 - (merged to 'next' on 2018-11-17 at 6bb27df7b1)

238 - + status: rebase and merge can be in progress at the same time

239 - + built-in rebase --skip/--abort: clean up stale .git/<name> files

240 - + rebase -i: include MERGE_HEAD into files to clean up

241 - + rebase -r: do not write MERGE_HEAD unless needed

242 - + rebase -r: demonstrate bug with conflicting merges

122 + Will merge to 'master'.

123

244 - Bugfix for the recently graduated "git rebase --rebase-merges".

124

125 +* js/rebase-stat-unrelated-fix (2018-11-30) 1 commit

126 + (merged to 'next' on 2018-11-30 at a9faaff8c1)

127 + + rebase --stat: fix when rebasing to an unrelated history

128

247 -* js/test-git-installed (2018-11-16) 5 commits

248 - (merged to 'next' on 2018-11-18 at 61474ba19e)

249 - + tests: explicitly use `git.exe` on Windows

250 - + tests: do not require Git to be built when testing an installed Git

251 - + t/lib-gettext: test installed git-sh-i18n if GIT_TEST_INSTALLED is set

252 - + tests: respect GIT_TEST_INSTALLED when initializing repositories

253 - + tests: fix GIT_TEST_INSTALLED's PATH to include t/helper/

129 + "git rebase --stat" to transplant a piece of history onto a totally

130 + unrelated history were not working before and silently showed wrong

131 + result. With the recent reimplementation in C, it started to instead

132 + die with an error message, as the original logic was not prepared

133 + to cope with this case. This has now been fixed.

134

255 - Update the "test installed Git" mode of our test suite to work better.

135 + Will merge to 'master'.

136

137 +--------------------------------------------------

138 +[Graduated to "master"]

139

258 -* lj/mingw-pthread-cond (2018-11-14) 1 commit

259 - (merged to 'next' on 2018-11-17 at 46abe4100d)

260 - + win32: replace pthread_cond_*() with much simpler code

140 +* cc/delta-islands (2018-11-21) 3 commits

141 + (merged to 'next' on 2018-11-21 at 3bac399f83)

142 + + pack-objects: fix off-by-one in delta-island tree-depth computation

143 + + pack-objects: zero-initialize tree_depth/layer arrays

144 + + pack-objects: fix tree_depth and layer invariants

145

262 - Code simplification.

146 + A few issues in the implementation of "delta-islands" feature has

147 + been corrected.

148

149

265 -* mg/gpg-fingerprint-test (2018-11-05) 2 commits

266 - (merged to 'next' on 2018-11-13 at 71f11020c4)

267 - + t/t7510-signed-commit.sh: add signing subkey to Eris Discordia key

268 - + t/t7510-signed-commit.sh: Add %GP to custom format checks

150 +* cc/shared-index-permbits (2018-11-19) 1 commit

151 + (merged to 'next' on 2018-11-19 at 79df716844)

152 + + read-cache: make the split index obey umask settings

153

270 - Add a few tests for a topic already in 'master'.

154 + The way .git/index and .git/sharedindex* files were initially

155 + created gave these files different perm bits until they were

156 + adjusted for shared repository settings. This was made consistent.

157

158

273 -* nd/command-list-gen-fix (2018-11-12) 1 commit

274 - (merged to 'next' on 2018-11-17 at a6ff6baa0b)

275 - + build: fix broken command-list.h generation with core.autocrlf

159 +* jk/t5562-perl-path-fix (2018-11-24) 1 commit

160 + (merged to 'next' on 2018-11-24 at 2d8dca3544)

161 + + t5562: fix perl path

162

277 - Build tweak.

163 + Hotfix for test breakage on platforms whose Perl is not at

164 + /usr/bin/perl

165

166

280 -* nd/doc-extensions (2018-11-16) 1 commit

281 - (merged to 'next' on 2018-11-17 at 09306064d5)

282 - + doc: move extensions.worktreeConfig to the right place

167 +* jn/eoie-ieot (2018-11-21) 3 commits

168 + (merged to 'next' on 2018-11-21 at 9eb98a38f0)

169 + + index: make index.threads=true enable ieot and eoie

170 + + ieot: default to not writing IEOT section

171 + + eoie: default to not writing EOIE section

172 + (this branch is used by jn/unknown-index-extensions.)

173

284 - Doc update.

174 + As the warning message shown by existing versions of Git for

175 + unknown index extensions is a bit too alarming, two new extensions

176 + are held back and not written by default for the upcoming release.

177

178

287 -* nd/format-patch-cover-letter-stat-width (2018-11-13) 1 commit

288 - (merged to 'next' on 2018-11-18 at 65a464977d)

289 - + format-patch: respect --stat in cover letter's diffstat

179 +* js/builtin-rebase-perf-fix-err-fix (2018-11-21) 1 commit

180 + (merged to 'next' on 2018-11-21 at 9c351cfc4a)

181 + + rebase: warn about the correct tree's OID

182

291 - "git format-patch --stat=<width>" can be used to specify the width

292 - used by the diffstat (shown in the cover letter).

183 + The object name of the tree reported in a recently added error

184 + message was wrong, which has been corrected.

185

186

295 -* nd/pthreads (2018-11-05) 14 commits

296 - (merged to 'next' on 2018-11-13 at bb6914b3f8)

297 - + Clean up pthread_create() error handling

298 - + read-cache.c: initialize copy_len to shut up gcc 8

299 - + read-cache.c: reduce branching based on HAVE_THREADS

300 - + read-cache.c: remove #ifdef NO_PTHREADS

301 - + pack-objects: remove #ifdef NO_PTHREADS

302 - + preload-index.c: remove #ifdef NO_PTHREADS

303 - + grep: clean up num_threads handling

304 - + grep: remove #ifdef NO_PTHREADS

305 - + attr.c: remove #ifdef NO_PTHREADS

306 - + name-hash.c: remove #ifdef NO_PTHREADS

307 - + index-pack: remove #ifdef NO_PTHREADS

308 - + send-pack.c: move async's #ifdef NO_PTHREADS back to run-command.c

309 - + run-command.h: include thread-utils.h instead of pthread.h

310 - + thread-utils: macros to unconditionally compile pthreads API

187 +* js/rebase-am-options-fix (2018-11-21) 1 commit

188 + (merged to 'next' on 2018-11-21 at 4da85e17c2)

189 + + legacy-rebase: backport -C<n> and --whitespace=<option> checks

190

312 - The codebase has been cleaned up to reduce "#ifndef NO_PTHREADS".

191 + Recently, built-in "rebase" tightened the error checking for a few

192 + options that are passed to underlying "am", but we forgot to make

193 + the matching change to the scripted version, which has been

194 + corrected.

195

196

315 -* ra/rev-parse-exclude-glob (2018-11-13) 2 commits

316 - (merged to 'next' on 2018-11-17 at 396dd7a2c2)

317 - + refs: fix some exclude patterns being ignored

318 - + refs: show --exclude failure with --branches/tags/remotes=glob

197 +* nd/clone-case-smashing-warning (2018-11-21) 1 commit

198 + (merged to 'next' on 2018-11-21 at 68bc7959f8)

199 + + clone: fix colliding file detection on APFS

200

320 - "rev-parse --exclude=<pattern> --branches=<pattern>" etc. did not

321 - quite work, which has been corrected.

201 + Recently added check for case smashing filesystems did not

202 + correctly utilize the cached stat information, leading to false

203 + breakage detected by our test suite, which has been corrected.

204

205

324 -* sb/cocci-pending (2018-11-14) 1 commit

325 - (merged to 'next' on 2018-11-18 at dd271722d3)

326 - + coccicheck: introduce 'pending' semantic patches

206 +* nd/per-worktree-ref-iteration (2018-11-26) 1 commit

207 + (merged to 'next' on 2018-11-26 at b7c39e5946)

208 + + files-backend.c: fix build error on Solaris

209

328 - A coding convention around the Coccinelle semantic patches to have

329 - two classes to ease code migration process has been proposed and

330 - its support has been added to the Makefile.

210 + Build fix.

211

212

333 -* sg/ref-filter-wo-repository (2018-11-16) 1 commit

334 - (merged to 'next' on 2018-11-17 at c0bec63990)

335 - + ref-filter: don't look for objects when outside of a repository

213 +* tb/clone-case-smashing-warning-test (2018-11-24) 1 commit

214 + (merged to 'next' on 2018-11-24 at 37f0d3b920)

215 + + t5601-99: Enable colliding file detection for MINGW

216

337 - "git ls-remote --sort=<thing>" can feed an object that is not yet

338 - available into the comparison machinery and segfault, which has

339 - been corrected to check such a request upfront and reject it.

217 + The code recently added to "git clone" to see if the platform's

218 + filesystem is adequate to check out and use the project code

219 + correctly (e.g. a case smashing filesystem cannot be used for a

220 + project with two files whose paths are different only in case) was

221 + meant to help Windows users, but the test for it was not enabled

222 + for that platform, which has been corrected.

223

224

342 -* tb/print-size-t-with-uintmax-format (2018-11-12) 1 commit

343 - (merged to 'next' on 2018-11-18 at 752e51c7ed)

344 - + Upcast size_t variables to uintmax_t when printing

225 +* tz/build-tech-midx-doc (2018-11-21) 1 commit

226 + (merged to 'next' on 2018-11-21 at 15dd462db0)

227 + + Documentation: build technical/multi-pack-index

228

346 - Code preparation to replace ulong vars with size_t vars where

347 - appropriate.

229 + A documentation page that is referred to by other pages was not

230 + built by mistake, which has been corrected.

231

232 +--------------------------------------------------

233 +[Stalled]

234

350 -* tb/xcurl-off-t (2018-11-12) 1 commit

351 - (merged to 'next' on 2018-11-18 at ac2a4bc14a)

352 - + remote-curl.c: xcurl_off_t is not portable (on 32 bit platfoms)

235 +* lt/date-human (2018-07-09) 1 commit

236 + - Add 'human' date format

237

354 - The xcurl_off_t() helper function is used to cast size_t to

355 - curl_off_t, but some compilers gave warnings against the code to

356 - ensure the casting is done without wraparound, when size_t is

357 - narrower than curl_off_t. This warning has been squelched.

238 + A new date format "--date=human" that morphs its output depending

239 + on how far the time is from the current time has been introduced.

240 + "--date=auto" can be used to use this new format when the output is

241 + goint to the pager or to the terminal and otherwise the default

242 + format.

243

244 --------------------------------------------------

360 -[New Topics]

245 +[Cooking]

246

247 * dl/merge-cleanup-scissors-fix (2018-11-21) 2 commits

363 - - merge: add scissors line on merge conflict

364 - - t7600: clean up 'merge --squash c3 with c7' test

248 + (merged to 'next' on 2018-11-21 at 217be06acb)

249 + + merge: add scissors line on merge conflict

250 + + t7600: clean up 'merge --squash c3 with c7' test

251

252 The list of conflicted paths shown in the editor while concluding a

253 conflicted merge was shown above the scissors line when the

@@ -369,7 +255,7 @@ of the repositories listed at

255 out just like the list of updated paths and other information to

256 help the user explain the merge better.

257

372 - Will merge to 'next'.

258 + Will cook in 'next'.

259

260

261 * aw/pretty-trailers (2018-11-19) 5 commits

@@ -401,61 +287,37 @@ of the repositories listed at

287

288

289 * sg/test-BUG (2018-11-20) 1 commit

404 - - tests: send "bug in the test script" errors to the script's stderr

290 + (merged to 'next' on 2018-11-21 at bb81013952)

291 + + tests: send "bug in the test script" errors to the script's stderr

292

293 test framework has been updated to make a bug in the test script

294 (as opposed to bugs in Git that are discovered by running the

295 tests) stand out more prominently.

296

410 - Will merge to 'next'.

297 + Will cook in 'next'.

298

299

300 * sg/test-cmp-rev (2018-11-20) 1 commit

414 - - test-lib-functions: make 'test_cmp_rev' more informative on failure

301 + (merged to 'next' on 2018-11-21 at 5d65cb2a76)

302 + + test-lib-functions: make 'test_cmp_rev' more informative on failure

303

304 Test framework update.

305

418 - Will merge to 'next'.

306 + Will cook in 'next'.

307

308

309 * ss/msvc-strcasecmp (2018-11-20) 1 commit

422 - - msvc: directly use MS version (_stricmp) of strcasecmp

310 + (merged to 'next' on 2018-11-21 at 9e45649e6e)

311 + + msvc: directly use MS version (_stricmp) of strcasecmp

312

313 MSVC update.

314

426 - Will merge to 'next'.

427 -

428 -

429 -* cc/delta-islands (2018-11-21) 3 commits

430 - (merged to 'next' on 2018-11-21 at 3bac399f83)

431 - + pack-objects: fix off-by-one in delta-island tree-depth computation

432 - + pack-objects: zero-initialize tree_depth/layer arrays

433 - + pack-objects: fix tree_depth and layer invariants

434 -

435 - A few issues in the implementation of "delta-islands" feature has

436 - been corrected.

437 -

438 - Will merge to 'master'.

439 -

440 -

441 -* jn/eoie-ieot (2018-11-21) 3 commits

442 - (merged to 'next' on 2018-11-21 at 9eb98a38f0)

443 - + index: make index.threads=true enable ieot and eoie

444 - + ieot: default to not writing IEOT section

445 - + eoie: default to not writing EOIE section

446 - (this branch is used by jn/unknown-index-extensions.)

447 -

448 - As the warning message shown by existing versions of Git for

449 - unknown index extensions is a bit too alarming, two new extensions

450 - are held back and not written by default for the upcoming release.

451 -

452 - Will merge to 'master'.

315 + Will cook in 'next'.

316

317

318 * jn/unknown-index-extensions (2018-11-21) 2 commits

319 - index: offer advice for unknown index extensions

320 - index: do not warn about unrecognized extensions

458 - (this branch uses jn/eoie-ieot.)

321

322 A bit too alarming warning given when unknown index extensions

323 exist is getting revamped.

@@ -463,63 +325,6 @@ of the repositories listed at

325 Expecting a reroll.

326

327

466 -* js/builtin-rebase-perf-fix-err-fix (2018-11-21) 1 commit

467 - (merged to 'next' on 2018-11-21 at 9c351cfc4a)

468 - + rebase: warn about the correct tree's OID

469 -

470 - The object name of the tree reported in a recently added error

471 - message was wrong, which has been corrected.

472 -

473 - Will merge to 'master'.

474 -

475 -

476 -* js/rebase-am-options-fix (2018-11-21) 1 commit

477 - (merged to 'next' on 2018-11-21 at 4da85e17c2)

478 - + legacy-rebase: backport -C<n> and --whitespace=<option> checks

479 -

480 - Recently, built-in "rebase" tightened the error checking for a few

481 - options that are passed to underlying "am", but we forgot to make

482 - the matching change to the scripted version, which has been

483 - corrected.

484 -

485 - Will merge to 'master'.

486 -

487 -

488 -* nd/clone-case-smashing-warning (2018-11-21) 1 commit

489 - (merged to 'next' on 2018-11-21 at 68bc7959f8)

490 - + clone: fix colliding file detection on APFS

491 -

492 - Recently added check for case smashing filesystems did not

493 - correctly utilize the cached stat information, leading to false

494 - breakage detected by our test suite, which has been corrected.

495 -

496 - Will merge to 'master'.

497 -

498 -

499 -* tz/build-tech-midx-doc (2018-11-21) 1 commit

500 - (merged to 'next' on 2018-11-21 at 15dd462db0)

501 - + Documentation: build technical/multi-pack-index

502 -

503 - A documentation page that is referred to by other pages was not

504 - built by mistake, which has been corrected.

505 -

506 - Will merge to 'master'.

507 -

508 ---------------------------------------------------

509 -[Stalled]

510 -

511 -* lt/date-human (2018-07-09) 1 commit

512 - - Add 'human' date format

513 -

514 - A new date format "--date=human" that morphs its output depending

515 - on how far the time is from the current time has been introduced.

516 - "--date=auto" can be used to use this new format when the output is

517 - goint to the pager or to the terminal and otherwise the default

518 - format.

519 -

520 ---------------------------------------------------

521 -[Cooking]

522 -

328 * ab/push-example-in-doc (2018-11-14) 1 commit

329 (merged to 'next' on 2018-11-18 at 8fd935a19c)

330 + push: change needlessly ambiguous example in error

@@ -586,17 +391,6 @@ of the repositories listed at

391 Will cook in 'next'.

392

393

589 -* cc/shared-index-permbits (2018-11-19) 1 commit

590 - (merged to 'next' on 2018-11-19 at 79df716844)

591 - + read-cache: make the split index obey umask settings

592 -

593 - The way .git/index and .git/sharedindex* files were initially

594 - created gave these files different perm bits until they were

595 - adjusted for shared repository settings. This was made consistent.

596 -

597 - Will merge to 'master'.

598 -

599 -

394 * en/rebase-merge-on-sequencer (2018-11-08) 2 commits

395 - rebase: implement --merge via git-rebase--interactive

396 - git-rebase, sequencer: extend --quiet option for the interactive machinery

@@ -624,7 +418,9 @@ of the repositories listed at

418 the URL field with a new value.

419

420

627 -* jk/loose-object-cache (2018-11-13) 9 commits

421 +* jk/loose-object-cache (2018-11-24) 10 commits

422 + (merged to 'next' on 2018-11-24 at 5f4f22707d)

423 + + odb_load_loose_cache: fix strbuf leak

424 (merged to 'next' on 2018-11-18 at 276691a21b)

425 + fetch-pack: drop custom loose object cache

426 + sha1-file: use loose object cache for quick existence check

@@ -706,7 +502,9 @@ of the repositories listed at

502 Will cook in 'next'.

503

504

709 -* ot/ref-filter-object-info (2018-11-12) 5 commits

505 +* ot/ref-filter-object-info (2018-11-24) 6 commits

506 + (merged to 'next' on 2018-11-24 at f8505762e3)

507 + + ref-filter: replace unportable `%lld` format with %PRIdMAX

508 (merged to 'next' on 2018-11-18 at ad4c086678)

509 + ref-filter: add docs for new options

510 + ref-filter: add tests for deltabase

@@ -962,7 +760,7 @@ of the repositories listed at

760 cf. <e5b2900a-0558-d3bf-8ea1-d526b078bbc2@talktalk.net>

761

762

965 -* ps/stash-in-c (2018-10-15) 21 commits

763 +* ps/stash-in-c (2018-11-26) 22 commits

764 . stash: replace all `write-tree` child processes with API calls

765 . stash: optimize `get_untracked_files()` and `check_changes()`

766 . stash: convert `stash--helper.c` into `stash.c`

@@ -982,14 +780,15 @@ of the repositories listed at

780 . stash: rename test cases to be more descriptive

781 . t3903: modernize style

782 . stash: improve option parsing test coverage

783 + . strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`

784 . strbuf.c: add `strbuf_join_argv()`

785 . sha1-name.c: add `get_oidf()` which acts like `get_oid()`

786

787 "git stash" rewritten in C.

788

789 Expecting a reroll, probably on top of the sd/stash-wo-user-name

991 - topic after it stabilizes. The series is almost there.

992 - cf. <20181015221040.GD4883@hank.intra.tgummerer.com>

790 + topic after it stabilizes, with an escape hatch like the one in

791 + "rebase in C".

792

793

794 * pw/add-p-select (2018-07-26) 4 commits

@@ -1044,3 +843,25 @@ of the repositories listed at

843

844 Retracted; reverted out of next.

845 cf. <20181114195142.GI126896@google.com>

846 +

847 +

848 +* ab/format-patch-rangediff-not-stat (2018-11-24) 1 commit

849 + (merged to 'next' on 2018-11-26 at d9c84916b3)

850 + + format-patch: don't include --stat with --range-diff output

851 +

852 + The "--rangediff" option recently added to "format-patch"

853 + interspersed a bogus and useless "--stat" information by mistake,

854 + which is being corrected.

855 +

856 + Reverted out of 'next'.

857 +

858 +

859 +* jc/postpone-rebase-in-c (2018-11-26) 1 commit

860 + (merged to 'next' on 2018-11-26 at c6ae45110f)

861 + + rebase: mark the C reimplementation as an experimental opt-in feature

862 +

863 + People seem to be still finding latent bugs in the "rebase in C"

864 + reimplementation. For the upcoming release, use the scripted

865 + version by default and adjust the documentation accordingly.

866 +

867 + Reverted out of 'next'.

What's cooking (2018/11 #07)