d8f3a899b5 · 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 (Oct 2016, #04; Mon, 17)

3 +Subject: What's cooking in git.git (Oct 2016, #05; Thu, 20)

4 X-master-at: 659889482ac63411daea38b2c3d127842ea04e4d

5 -X-next-at: 6021889cc14df07d4366829367d2c4a11d1eaa56

5 +X-next-at: ffd0de042c0ecacbb6661b2f7becf79fe3cf1d4b

6

7 -What's cooking in git.git (Oct 2016, #04; Mon, 17)

7 +What's cooking in git.git (Oct 2016, #05; Thu, 20)

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

9

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

@@ -18,144 +18,234 @@ of the repositories listed at

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

19

20 --------------------------------------------------

21 -[Graduated to "master"]

22 -

23 -* da/mergetool-diff-order (2016-10-11) 4 commits

24 - (merged to 'next' on 2016-10-11 at 3d1b98c16d)

25 - + mergetool: honor -O<orderfile>

26 - + mergetool: honor diff.orderFile

27 - + mergetool: move main program flow into a main() function

28 - + mergetool: add copyright

29 -

30 - "git mergetool" learned to honor "-O<orderfile>" to control the

31 - order of paths to present to the end user.

21 +[New Topics]

22

23 +* jc/merge-base-fp-only (2016-10-19) 8 commits

24 + . merge-base: fp experiment

25 + - merge: allow to use only the fp-only merge bases

26 + - merge-base: limit the output to bases that are on first-parent chain

27 + - merge-base: mark bases that are on first-parent chain

28 + - merge-base: expose get_merge_bases_many_0() a bit more

29 + - merge-base: stop moving commits around in remove_redundant()

30 + - sha1_name: remove ONELINE_SEEN bit

31 + - commit: simplify fastpath of merge-base

32

34 -* dt/http-empty-auth (2016-10-04) 1 commit

35 - (merged to 'next' on 2016-10-10 at 10b7b0a6a5)

36 - + http: http.emptyauth should allow empty (not just NULL) usernames

33 + An experiment of merge-base that ignores common ancestors that are

34 + not on the first parent chain.

35

38 - http.emptyauth configuration is a way to allow an empty username to

39 - pass when attempting to authenticate using mechanisms like

40 - Kerberos. We took an unspecified (NULL) username and sent ":"

41 - (i.e. no username, no password) to CURLOPT_USERPWD, but did not do

42 - the same when the username is explicitly set to an empty string.

36

37 +* bw/submodule-branch-dot-doc (2016-10-19) 1 commit

38 + - submodules doc: update documentation for "." used for submodule branches

39

45 -* jk/alt-odb-cleanup (2016-10-10) 18 commits

46 - (merged to 'next' on 2016-10-10 at d2ed6b6d21)

47 - + alternates: use fspathcmp to detect duplicates

48 - + sha1_file: always allow relative paths to alternates

49 - + count-objects: report alternates via verbose mode

50 - + fill_sha1_file: write into a strbuf

51 - + alternates: store scratch buffer as strbuf

52 - + fill_sha1_file: write "boring" characters

53 - + alternates: use a separate scratch space

54 - + alternates: encapsulate alt->base munging

55 - + alternates: provide helper for allocating alternate

56 - + alternates: provide helper for adding to alternates list

57 - + link_alt_odb_entry: refactor string handling

58 - + link_alt_odb_entry: handle normalize_path errors

59 - + t5613: clarify "too deep" recursion tests

60 - + t5613: do not chdir in main process

61 - + t5613: whitespace/style cleanups

62 - + t5613: use test_must_fail

63 - + t5613: drop test_valid_repo function

64 - + t5613: drop reachable_via function

65 - (this branch is used by jk/quarantine-received-objects.)

40 + Recent git allows submodule.<name>.branch to use a special token

41 + "." instead of the branch name; the documentation has been updated

42 + to describe it.

43

67 - Codepaths involved in interacting alternate object store have

68 - been cleaned up.

44 + Will merge to 'next'.

45

46

71 -* jk/clone-copy-alternates-fix (2016-10-05) 1 commit

72 - (merged to 'next' on 2016-10-10 at 8154134c8c)

73 - + clone: detect errors in normalize_path_copy

47 +* tg/add-chmod+x-fix (2016-10-20) 1 commit

48 + - t3700: fix broken test under !SANITY

49

75 - "git clone" of a local repository can be done at the filesystem

76 - level, but the codepath did not check errors while copying and

77 - adjusting the file that lists alternate object stores.

50 + A hot-fix for a test added by a recent topic that went to both

51 + 'master' and 'maint' already.

52

53 + Will merge to 'next'.

54

80 -* jk/quarantine-received-objects (2016-10-10) 5 commits

81 - (merged to 'next' on 2016-10-10 at 0fd3e3b2ef)

82 - + tmp-objdir: do not migrate files starting with '.'

83 - + tmp-objdir: put quarantine information in the environment

84 - + receive-pack: quarantine objects until pre-receive accepts

85 - + tmp-objdir: introduce API for temporary object directories

86 - + check_connected: accept an env argument

87 - (this branch uses jk/alt-odb-cleanup.)

55

89 - In order for the receiving end of "git push" to inspect the

90 - received history and decide to reject the push, the objects sent

91 - from the sending end need to be made available to the hook and

92 - the mechanism for the connectivity check, and this was done

93 - traditionally by storing the objects in the receiving repository

94 - and letting "git gc" to expire it. Instead, store the newly

95 - received objects in a temporary area, and make them available by

96 - reusing the alternate object store mechanism to them only while we

97 - decide if we accept the check, and once we decide, either migrate

98 - them to the repository or purge them immediately.

56 +* jk/diff-submodule-diff-inline (2016-10-20) 1 commit

57 + - rev-list: use hdr_termination instead of a always using a newline

58

59 + A recently graduated topic regressed "git rev-list --header"

60 + output, breaking "gitweb". This has been fixed.

61

101 -* jk/ref-symlink-loop (2016-10-10) 2 commits

102 - (merged to 'next' on 2016-10-11 at ac5c35f87f)

103 - + files_read_raw_ref: prevent infinite retry loops in general

104 - + files_read_raw_ref: avoid infinite loop on broken symlinks

62 + Will merge to 'next'.

63

106 - A stray symbolic link in $GIT_DIR/refs/ directory could make name

107 - resolution loop forever, which has been corrected.

64

65 +* jk/no-looking-at-dotgit-outside-repo (2016-10-20) 8 commits

66 + - setup_git_env: avoid blind fall-back to ".git"

67 + - diff: handle sha1 abbreviations outside of repository

68 + - diff_aligned_abbrev: use "struct oid"

69 + - diff_unique_abbrev: rename to diff_aligned_abbrev

70 + - find_unique_abbrev: use 4-buffer ring

71 + - test-*-cache-tree: setup git dir

72 + - read info/{attributes,exclude} only when in repository

73 + - Merge branch 'jc/diff-unique-abbrev-comments' into jk/no-looking-at-dotgit-outside-repo

74 + (this branch uses jc/diff-unique-abbrev-comments.)

75 +

76 + Update "git diff --no-index" codepath not to try to peek into .git/

77 + directory that happens to be under the current directory, when we

78 + know we are operating outside any repository.

79 +

80 + Will wait until 'jc/diff-unique-abbrev-comments' graduates, rebase

81 + onto 'master' and then cook in 'next'.

82 +

83 +

84 +* pt/gitgui-updates (2016-10-20) 35 commits

85 + - Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui

86 + - git-gui: set version 0.21

87 + - Merge branch 'as/bulgarian' into pu

88 + - git-gui: Mark 'All' in remote.tcl for translation

89 + - git-gui i18n: Updated Bulgarian translation (565,0f,0u)

90 + - Merge branch 'os/preserve-author' into pu

91 + - git-gui: avoid persisting modified author identity

92 + - git-gui: Do not reset author details on amend

93 + - Merge branch 'kb/unicode' into pu

94 + - git-gui: handle the encoding of Git's output correctly

95 + - git-gui: unicode file name support on windows

96 + - Merge branch 'dr/ru' into pu

97 + - git-gui: Update Russian translation

98 + - git-gui: maintain backwards compatibility for merge syntax

99 + - Merge branch 'va/i18n_2' into pu

100 + - git-gui i18n: mark string in lib/error.tcl for translation

101 + - git-gui: fix incorrect use of Tcl append command

102 + - git-gui i18n: mark "usage:" strings for translation

103 + - git-gui i18n: internationalize use of colon punctuation

104 + - Merge branch 'pt/non-mouse-usage' into pu

105 + - Amend tab ordering and text widget border and highlighting.

106 + - Allow keyboard control to work in the staging widgets.

107 + - Merge branch 'pt/git4win-mods' into pu

108 + - git-gui (Windows): use git-gui.exe in `Create Desktop Shortcut`

109 + - git-gui: fix detection of Cygwin

110 + - Merge branch 'patches' into pu

111 + - git-gui: ensure the file in the diff pane is in the list of selected files

112 + - git-gui: support for $FILENAMES in tool definitions

113 + - git-gui: fix initial git gui message encoding

114 + - git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution

115 + - Merge branch 'va/i18n' into pu

116 + - Merge branch 'rs/use-modern-git-merge-syntax' into pu

117 + - Merge branch 'js/commit-gpgsign' into pu

118 + - Merge branch 'sy/i18n' into pu

119 + - git-gui: sort entries in tclIndex

120

110 -* js/regexec-buf (2016-10-10) 1 commit

111 - (merged to 'next' on 2016-10-11 at 466a26548c)

112 - + configure.ac: improve description of NO_REGEX test

121 + Will merge to 'master'.

122 + Parked here temporarily as I didn't have chance to double-check.

123

114 - A follow-up to an already graduated topic.

124

125 +* yk/git-tag-remove-mention-of-old-layout-in-doc (2016-10-20) 1 commit

126 + - doc: remove reference to the traditional layout in git-tag.txt

127

117 -* js/reset-usage (2016-10-11) 1 commit

118 - (merged to 'next' on 2016-10-11 at 61ad4a7c0e)

119 - + reset: fix usage

128 + Shorten description of auto-following in "git tag" by removing a

129 + mention of historical remotes layout which is not relevant to the

130 + main topic.

131

121 - Message fix-up.

132 + Will merge to 'next'.

133

134 +--------------------------------------------------

135 +[Stalled]

136

124 -* nd/commit-p-doc (2016-10-05) 1 commit

125 - (merged to 'next' on 2016-10-10 at 5a9996dd7b)

126 - + git-commit.txt: clarify --patch mode with pathspec

137 +* jc/bundle (2016-03-03) 6 commits

138 + - index-pack: --clone-bundle option

139 + - Merge branch 'jc/index-pack' into jc/bundle

140 + - bundle v3: the beginning

141 + - bundle: keep a copy of bundle file name in the in-core bundle header

142 + - bundle: plug resource leak

143 + - bundle doc: 'verify' is not about verifying the bundle

144

128 - Documentation for "git commit" was updated to clarify that "commit

129 - -p <paths>" adds to the current contents of the index to come up

130 - with what to commit.

145 + The beginning of "split bundle", which could be one of the

146 + ingredients to allow "git clone" traffic off of the core server

147 + network to CDN.

148

149 + While I think it would make it easier for people to experiment and

150 + build on if the topic is merged to 'next', I am at the same time a

151 + bit reluctant to merge an unproven new topic that introduces a new

152 + file format, which we may end up having to support til the end of

153 + time. It is likely that to support a "prime clone from CDN", it

154 + would need a lot more than just "these are the heads and the pack

155 + data is over there", so this may not be sufficient.

156

133 -* rs/cocci (2016-10-10) 2 commits

134 - (merged to 'next' on 2016-10-11 at bbd6a88402)

135 - + use strbuf_add_unique_abbrev() for adding short hashes, part 3

136 - + remove unnecessary NULL check before free(3)

157 + Will discard.

158

138 - Code cleanup.

159

160 +* mh/connect (2016-06-06) 10 commits

161 + - connect: [host:port] is legacy for ssh

162 + - connect: move ssh command line preparation to a separate function

163 + - connect: actively reject git:// urls with a user part

164 + - connect: change the --diag-url output to separate user and host

165 + - connect: make parse_connect_url() return the user part of the url as a separate value

166 + - connect: group CONNECT_DIAG_URL handling code

167 + - connect: make parse_connect_url() return separated host and port

168 + - connect: re-derive a host:port string from the separate host and port variables

169 + - connect: call get_host_and_port() earlier

170 + - connect: document why we sometimes call get_port after get_host_and_port

171

141 -* rs/pretty-format-color-doc-fix (2016-10-11) 1 commit

142 - (merged to 'next' on 2016-10-11 at f0ae64bcbd)

143 - + pretty: fix document link for color specification

172 + Rewrite Git-URL parsing routine (hopefully) without changing any

173 + behaviour.

174

145 - Small doc update.

175 + It has been two months without any support. We may want to discard

176 + this.

177

178

148 -* sb/submodule-config-doc-drop-path (2016-10-11) 1 commit

149 - (merged to 'next' on 2016-10-11 at 28fc3e53f9)

150 - + documentation: improve submodule.<name>.{url, path} description

179 +* kn/ref-filter-branch-list (2016-05-17) 17 commits

180 + - branch: implement '--format' option

181 + - branch: use ref-filter printing APIs

182 + - branch, tag: use porcelain output

183 + - ref-filter: allow porcelain to translate messages in the output

184 + - ref-filter: add `:dir` and `:base` options for ref printing atoms

185 + - ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()

186 + - ref-filter: introduce symref_atom_parser() and refname_atom_parser()

187 + - ref-filter: introduce refname_atom_parser_internal()

188 + - ref-filter: make "%(symref)" atom work with the ':short' modifier

189 + - ref-filter: add support for %(upstream:track,nobracket)

190 + - ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams

191 + - ref-filter: introduce format_ref_array_item()

192 + - ref-filter: move get_head_description() from branch.c

193 + - ref-filter: modify "%(objectname:short)" to take length

194 + - ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)

195 + - ref-filter: include reference to 'used_atom' within 'atom_value'

196 + - ref-filter: implement %(if), %(then), and %(else) atoms

197

152 - The "submodule.<name>.path" stored in .gitmodules is never copied

153 - to .git/config and such a key in .git/config has no meaning, but

154 - the documentation described it and submodule.<name>.url next to

155 - each other as if both belong to .git/config. This has been fixed.

198 + The code to list branches in "git branch" has been consolidated

199 + with the more generic ref-filter API.

200 +

201 + Rerolled.

202 + Needs review.

203 +

204 +

205 +* ec/annotate-deleted (2015-11-20) 1 commit

206 + - annotate: skip checking working tree if a revision is provided

207 +

208 + Usability fix for annotate-specific "<file> <rev>" syntax with deleted

209 + files.

210 +

211 + Has been waiting for a review for too long without seeing anything.

212 +

213 + Will discard.

214 +

215 +

216 +* dk/gc-more-wo-pack (2016-01-13) 4 commits

217 + - gc: clean garbage .bitmap files from pack dir

218 + - t5304: ensure non-garbage files are not deleted

219 + - t5304: test .bitmap garbage files

220 + - prepare_packed_git(): find more garbage

221 +

222 + Follow-on to dk/gc-idx-wo-pack topic, to clean up stale

223 + .bitmap and .keep files.

224 +

225 + Has been waiting for a reroll for too long.

226 + cf. <xmqq60ypbeng.fsf@gitster.mtv.corp.google.com>

227 +

228 + Will discard.

229 +

230 +

231 +* jc/diff-b-m (2015-02-23) 5 commits

232 + . WIPWIP

233 + . WIP: diff-b-m

234 + - diffcore-rename: allow easier debugging

235 + - diffcore-rename.c: add locate_rename_src()

236 + - diffcore-break: allow debugging

237 +

238 + "git diff -B -M" produced incorrect patch when the postimage of a

239 + completely rewritten file is similar to the preimage of a removed

240 + file; such a resulting file must not be expressed as a rename from

241 + other place.

242 +

243 + The fix in this patch is broken, unfortunately.

244 +

245 + Will discard.

246

247 --------------------------------------------------

158 -[New Topics]

248 +[Cooking]

249

250 * dk/worktree-dup-checkout-with-bare-is-ok (2016-10-14) 1 commit

251 (merged to 'next' on 2016-10-17 at 24594d3e56)

@@ -196,46 +286,52 @@ of the repositories listed at

286

287

288 * jk/ambiguous-short-object-names (2016-10-12) 1 commit

199 - - t1512: become resilient to GETTEXT_POISON build

289 + (merged to 'next' on 2016-10-19 at e7c55a9da5)

290 + + t1512: become resilient to GETTEXT_POISON build

291

292 A test fixup to recently graduated topic.

293

203 - Will merge to 'next'.

294 + Will merge to 'master'.

295

296

297 * jk/merge-base-fork-point-without-reflog (2016-10-12) 1 commit

207 - - merge-base: handle --fork-point without reflog

298 + (merged to 'next' on 2016-10-19 at 00a6797f62)

299 + + merge-base: handle --fork-point without reflog

300

301 "git rebase" immediately after "git clone" failed to find the fork

302 point from the upstream.

303

212 - Will merge to 'next'.

304 + Will merge to 'master'.

305

306

307 * jk/upload-pack-use-prio-queue (2016-10-11) 1 commit

216 - - upload-pack: use priority queue in reachable() check

308 + (merged to 'next' on 2016-10-19 at 1d6efb07ac)

309 + + upload-pack: use priority queue in reachable() check

310

311 Code clean-up and performance improvement to reduce use of

312 timestamp-ordered commit-list by replacing it with a priority

313 queue.

314

222 - Will merge to 'next'.

315 + Will merge to 'master'.

316

317

318 * jk/fetch-quick-tag-following (2016-10-14) 1 commit

226 - - fetch: use "quick" has_sha1_file for tag following

319 + (merged to 'next' on 2016-10-19 at d7718dcdf5)

320 + + fetch: use "quick" has_sha1_file for tag following

321

322 When fetching from a remote that has many tags that are irrelevant

229 - to branches we are following, we used to waste way too many cycles

323 + to branches we are following, we used to waste way too many cycles

324 when checking if the object pointed at by a tag (that we are not

325 going to fetch!) exists in our repository too carefully.

326

233 - Will merge to 'next'.

327 + Will merge to 'master'.

328

329

236 -* jt/trailer-with-cruft (2016-10-14) 6 commits

330 +* jt/trailer-with-cruft (2016-10-20) 8 commits

331 - trailer: support values folded to multiple lines

332 + - trailer: forbid leading whitespace in trailers

333 - trailer: allow non-trailers in trailer block

334 + - trailer: clarify failure modes in parse_trailer

335 - trailer: make args have their own struct

336 - trailer: streamline trailer item create and add

337 - trailer: use list.h for doubly-linked list

@@ -250,164 +346,52 @@ of the repositories listed at

346

347

348 * mm/send-email-cc-cruft-after-address (2016-10-14) 1 commit

253 - - parse_mailboxes: accept extra text after <...> address

349 + (merged to 'next' on 2016-10-19 at 41e3f876cd)

350 + + parse_mailboxes: accept extra text after <...> address

351

352 "git send-email" attempts to pick up valid e-mails from the

353 trailers, but people in real world write non-addresses there, like

354 "Cc: Stable <add@re.ss> # 4.8+", which broke the output depending

355 on the availability and vintage of Mail::Address perl module.

356

260 - Will merge to 'next'.

357 + Will merge to 'master'.

358

359

360 * va/i18n (2016-10-17) 7 commits

264 - - i18n: diff: mark warnings for translation

265 - - i18n: credential-cache--daemon: mark advice for translation

266 - - i18n: convert mark error messages for translation

267 - - i18n: apply: mark error message for translation

268 - - i18n: apply: mark error messages for translation

269 - - i18n: apply: mark info messages for translation

270 - - i18n: apply: mark plural string for translation

361 + (merged to 'next' on 2016-10-19 at b7d733698b)

362 + + i18n: diff: mark warnings for translation

363 + + i18n: credential-cache--daemon: mark advice for translation

364 + + i18n: convert mark error messages for translation

365 + + i18n: apply: mark error message for translation

366 + + i18n: apply: mark error messages for translation

367 + + i18n: apply: mark info messages for translation

368 + + i18n: apply: mark plural string for translation

369

370 More i18n.

371

274 - Will merge to 'next'.

372 + Will merge to 'master'.

373

374

375 * jk/tighten-alloc (2016-10-17) 2 commits

278 - - inline xalloc_flex() into FLEXPTR_ALLOC_MEM

279 - - avoid pointer arithmetic involving NULL in FLEX_ALLOC_MEM

376 + (merged to 'next' on 2016-10-19 at 548522a520)

377 + + inline xalloc_flex() into FLEXPTR_ALLOC_MEM

378 + + avoid pointer arithmetic involving NULL in FLEX_ALLOC_MEM

379

380 Protect our code from over-eager compilers.

381

283 - Will merge to 'next'.

382 + Will merge to 'master'.

383

384

385 * pb/test-parse-options-expect (2016-10-17) 1 commit

287 - - t0040: convert all possible tests to use `test-parse-options --expect`

386 + (merged to 'next' on 2016-10-19 at d3517d592f)

387 + + t0040: convert all possible tests to use `test-parse-options --expect`

388

389 Test clean-up.

390

291 - Will merge to 'next'.

292 -

293 ---------------------------------------------------

294 -[Stalled]

295 -

296 -* jc/bundle (2016-03-03) 6 commits

297 - - index-pack: --clone-bundle option

298 - - Merge branch 'jc/index-pack' into jc/bundle

299 - - bundle v3: the beginning

300 - - bundle: keep a copy of bundle file name in the in-core bundle header

301 - - bundle: plug resource leak

302 - - bundle doc: 'verify' is not about verifying the bundle

303 -

304 - The beginning of "split bundle", which could be one of the

305 - ingredients to allow "git clone" traffic off of the core server

306 - network to CDN.

307 -

308 - While I think it would make it easier for people to experiment and

309 - build on if the topic is merged to 'next', I am at the same time a

310 - bit reluctant to merge an unproven new topic that introduces a new

311 - file format, which we may end up having to support til the end of

312 - time. It is likely that to support a "prime clone from CDN", it

313 - would need a lot more than just "these are the heads and the pack

314 - data is over there", so this may not be sufficient.

315 -

316 - Will discard.

317 -

318 -

319 -* mh/connect (2016-06-06) 10 commits

320 - - connect: [host:port] is legacy for ssh

321 - - connect: move ssh command line preparation to a separate function

322 - - connect: actively reject git:// urls with a user part

323 - - connect: change the --diag-url output to separate user and host

324 - - connect: make parse_connect_url() return the user part of the url as a separate value

325 - - connect: group CONNECT_DIAG_URL handling code

326 - - connect: make parse_connect_url() return separated host and port

327 - - connect: re-derive a host:port string from the separate host and port variables

328 - - connect: call get_host_and_port() earlier

329 - - connect: document why we sometimes call get_port after get_host_and_port

330 -

331 - Rewrite Git-URL parsing routine (hopefully) without changing any

332 - behaviour.

333 -

334 - It has been two months without any support. We may want to discard

335 - this.

336 -

337 -

338 -* kn/ref-filter-branch-list (2016-05-17) 17 commits

339 - - branch: implement '--format' option

340 - - branch: use ref-filter printing APIs

341 - - branch, tag: use porcelain output

342 - - ref-filter: allow porcelain to translate messages in the output

343 - - ref-filter: add `:dir` and `:base` options for ref printing atoms

344 - - ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()

345 - - ref-filter: introduce symref_atom_parser() and refname_atom_parser()

346 - - ref-filter: introduce refname_atom_parser_internal()

347 - - ref-filter: make "%(symref)" atom work with the ':short' modifier

348 - - ref-filter: add support for %(upstream:track,nobracket)

349 - - ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams

350 - - ref-filter: introduce format_ref_array_item()

351 - - ref-filter: move get_head_description() from branch.c

352 - - ref-filter: modify "%(objectname:short)" to take length

353 - - ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)

354 - - ref-filter: include reference to 'used_atom' within 'atom_value'

355 - - ref-filter: implement %(if), %(then), and %(else) atoms

356 -

357 - The code to list branches in "git branch" has been consolidated

358 - with the more generic ref-filter API.

359 -

360 - Rerolled.

361 - Needs review.

362 -

363 -

364 -* ec/annotate-deleted (2015-11-20) 1 commit

365 - - annotate: skip checking working tree if a revision is provided

366 -

367 - Usability fix for annotate-specific "<file> <rev>" syntax with deleted

368 - files.

369 -

370 - Has been waiting for a review for too long without seeing anything.

371 -

372 - Will discard.

373 -

374 -

375 -* dk/gc-more-wo-pack (2016-01-13) 4 commits

376 - - gc: clean garbage .bitmap files from pack dir

377 - - t5304: ensure non-garbage files are not deleted

378 - - t5304: test .bitmap garbage files

379 - - prepare_packed_git(): find more garbage

380 -

381 - Follow-on to dk/gc-idx-wo-pack topic, to clean up stale

382 - .bitmap and .keep files.

383 -

384 - Has been waiting for a reroll for too long.

385 - cf. <xmqq60ypbeng.fsf@gitster.mtv.corp.google.com>

386 -

387 - Will discard.

388 -

389 -

390 -* jc/diff-b-m (2015-02-23) 5 commits

391 - . WIPWIP

392 - . WIP: diff-b-m

393 - - diffcore-rename: allow easier debugging

394 - - diffcore-rename.c: add locate_rename_src()

395 - - diffcore-break: allow debugging

396 -

397 - "git diff -B -M" produced incorrect patch when the postimage of a

398 - completely rewritten file is similar to the preimage of a removed

399 - file; such a resulting file must not be expressed as a rename from

400 - other place.

401 -

402 - The fix in this patch is broken, unfortunately.

391 + Will merge to 'master'.

392

404 - Will discard.

393

406 ---------------------------------------------------

407 -[Cooking]

408 -

409 -* pb/bisect (2016-10-14) 28 commits

410 - - SQUASH???

394 +* pb/bisect (2016-10-18) 27 commits

395 - bisect--helper: remove the dequote in bisect_start()

396 - bisect--helper: retire `--bisect-auto-next` subcommand

397 - bisect--helper: retire `--bisect-autostart` subcommand

@@ -436,7 +420,9 @@ of the repositories listed at

420 - bisect: rewrite `check_term_format` shell function in C

421 - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

422

439 - GSoC "bisect" topic.

423 + Move more parts of "git bisect" to C.

424 +

425 + Waiting for review.

426

427

428 * ab/gitweb-abbrev-links (2016-10-14) 3 commits

@@ -485,7 +471,8 @@ of the repositories listed at

471 Waiting for review.

472

473

488 -* sb/submodule-ignore-trailing-slash (2016-10-10) 2 commits

474 +* sb/submodule-ignore-trailing-slash (2016-10-18) 3 commits

475 + . submodule--helper: normalize funny urls

476 (merged to 'next' on 2016-10-11 at e37425ed17)

477 + submodule: ignore trailing slash in relative url

478 + submodule: ignore trailing slash on superproject URL

@@ -497,6 +484,7 @@ of the repositories listed at

484 the resolution of the issue.

485

486 cf. <alpine.DEB.2.20.1610131255001.197091@virtualbox>

487 + cf. <CAGZ79kYrKGLEOO72aWuX5OOM-AecdFZFXRqBkRzhdAM-VbPFxA@mail.gmail.com>

488

489

490 * st/verify-tag (2016-10-10) 7 commits

@@ -511,7 +499,8 @@ of the repositories listed at

499 "git tag" and "git verify-tag" learned to put GPG verification

500 status in their "--format=<placeholders>" output format.

501

514 - Is this ready for 'next'?

502 + Waiting for review.

503 + cf. <20161007210721.20437-1-santiago@nyu.edu>

504

505

506 * mm/credential-libsecret (2016-10-11) 1 commit

@@ -617,13 +606,14 @@ of the repositories listed at

606 * jc/diff-unique-abbrev-comments (2016-09-30) 1 commit

607 (merged to 'next' on 2016-10-17 at c7fb286102)

608 + diff_unique_abbrev(): document its assumption and limitation

609 + (this branch is used by jk/no-looking-at-dotgit-outside-repo.)

610

611 A bit more comments in a tricky code.

612

613 Will merge to 'master'.

614

615

626 -* va/i18n-perl-scripts (2016-10-10) 14 commits

616 +* va/i18n-perl-scripts (2016-10-20) 14 commits

617 - i18n: difftool: mark warnings for translation

618 - i18n: send-email: mark string with interpolation for translation

619 - i18n: send-email: mark warnings and errors for translation

@@ -703,20 +693,21 @@ of the repositories listed at

693

694

695 * ls/filter-process (2016-10-17) 14 commits

706 - - contrib/long-running-filter: add long running filter example

707 - - convert: add filter.<driver>.process option

708 - - convert: prepare filter.<driver>.process option

709 - - convert: make apply_filter() adhere to standard Git error handling

710 - - pkt-line: add functions to read/write flush terminated packet streams

711 - - pkt-line: add packet_write_gently()

712 - - pkt-line: add packet_flush_gently()

713 - - pkt-line: add packet_write_fmt_gently()

714 - - pkt-line: extract set_packet_header()

715 - - pkt-line: rename packet_write() to packet_write_fmt()

716 - - run-command: add clean_on_exit_handler

717 - - run-command: move check_pipe() from write_or_die to run_command

718 - - convert: modernize tests

719 - - convert: quote filter names in error messages

696 + (merged to 'next' on 2016-10-19 at ffd0de042c)

697 + + contrib/long-running-filter: add long running filter example

698 + + convert: add filter.<driver>.process option

699 + + convert: prepare filter.<driver>.process option

700 + + convert: make apply_filter() adhere to standard Git error handling

701 + + pkt-line: add functions to read/write flush terminated packet streams

702 + + pkt-line: add packet_write_gently()

703 + + pkt-line: add packet_flush_gently()

704 + + pkt-line: add packet_write_fmt_gently()

705 + + pkt-line: extract set_packet_header()

706 + + pkt-line: rename packet_write() to packet_write_fmt()

707 + + run-command: add clean_on_exit_handler

708 + + run-command: move check_pipe() from write_or_die to run_command

709 + + convert: modernize tests

710 + + convert: quote filter names in error messages

711

712 The smudge/clean filter API expect an external process is spawned

713 to filter the contents for each path that has a filter defined. A

@@ -725,6 +716,8 @@ of the repositories listed at

716 all filtering need is served by this single process for multiple

717 paths, reducing the process creation overhead.

718

719 + Will merge to 'master'.

720 +

721

722 * hv/submodule-not-yet-pushed-fix (2016-10-10) 3 commits

723 - batch check whether submodule needs pushing into one call

What's cooking (2016/10 #05)