985de313fe · 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 (Aug 2017, #03; Mon, 14)

3 +Subject: What's cooking in git.git (Aug 2017, #04; Fri, 18)

4 X-master-at: b3622a4ee94e4916cd05e6d96e41eeb36b941182

5 -X-next-at: 24db08a6e8fed761d3bace7f2d5997806e20b9f7

5 +X-next-at: d436f9bbced11cd7ed9d109ea30eb62b4ef69635

6

7 -What's cooking in git.git (Aug 2017, #03; Mon, 14)

7 +What's cooking in git.git (Aug 2017, #04; Fri, 18)

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

9

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

@@ -24,361 +24,207 @@ of the repositories listed at

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

25

26 --------------------------------------------------

27 -[Graduated to "master"]

28 -

29 -* ah/doc-wserrorhighlight (2017-07-25) 1 commit

30 - (merged to 'next' on 2017-07-27 at cd1bb28d95)

31 - + doc: add missing values "none" and "default" for diff.wsErrorHighlight

32 -

33 - Doc update.

34 -

27 +[New Topics]

28

36 -* bc/object-id (2017-07-17) 12 commits

37 - (merged to 'next' on 2017-07-18 at fd161056e4)

38 - + sha1_name: convert uses of 40 to GIT_SHA1_HEXSZ

39 - + sha1_name: convert GET_SHA1* flags to GET_OID*

40 - + sha1_name: convert get_sha1* to get_oid*

41 - + Convert remaining callers of get_sha1 to get_oid.

42 - + builtin/unpack-file: convert to struct object_id

43 - + bisect: convert bisect_checkout to struct object_id

44 - + builtin/update_ref: convert to struct object_id

45 - + sequencer: convert to struct object_id

46 - + remote: convert struct push_cas to struct object_id

47 - + submodule: convert submodule config lookup to use object_id

48 - + builtin/merge-tree: convert remaining caller of get_sha1 to object_id

49 - + builtin/fsck: convert remaining caller of get_sha1 to object_id

50 - (this branch is used by bw/submodule-config-cleanup; uses sb/object-id.)

29 +* cc/subprocess-handshake-missing-capabilities (2017-08-16) 1 commit

30 + - sub-process: print the cmd when a capability is unsupported

31

52 - Conversion from uchar[20] to struct object_id continues.

32 + When handshake with a subprocess filter notices that the process

33 + asked for an unknown capability, Git did not report what program

34 + the offending subprocess was running. This has been corrected.

35

36 + Will merge to 'next'.

37

55 -* bw/object-id (2017-07-17) 3 commits

56 - (merged to 'next' on 2017-07-18 at 90d27c0e7c)

57 - + receive-pack: don't access hash of NULL object_id pointer

58 - + notes: don't access hash of NULL object_id pointer

59 - + tree-diff: don't access hash of NULL object_id pointer

38 + We may want a follow-up fix to tighten the error checking, though.

39

61 - Conversion from uchar[20] to struct object_id continues.

40

41 +* tb/apply-with-crlf (2017-08-17) 3 commits

42 + - SQUASH???

43 + - apply: file commited with CRLF should roundtrip diff and apply

44 + - convert: add SAFE_CRLF_KEEP_CRLF

45 + (this branch is tangled with jc/apply-with-crlf.)

46

64 -* cc/ref-is-hidden-microcleanup (2017-07-24) 1 commit

65 - (merged to 'next' on 2017-07-27 at 37af544e1c)

66 - + refs: use skip_prefix() in ref_is_hidden()

47 + "git apply" that is used as a better "patch -p1" failed to apply a

48 + taken from a file with CRLF line endings to a file with CRLF line

49 + endings. The root cause was because it misused convert_to_git()

50 + that tried to do "safe-crlf" processing by looking at the index

51 + entry at the same path, which is a nonsense---in that mode, "apply"

52 + is not working on the data in (or derived from) the index at all.

53 + This has been fixed.

54

68 - Code cleanup.

55 + Will merge to 'next' after squashing the fix in.

56

57

71 -* dc/fmt-merge-msg-microcleanup (2017-07-25) 1 commit

72 - (merged to 'next' on 2017-07-27 at 6df06eb788)

73 - + fmt-merge-msg: fix coding style

58 +* rs/t1002-do-not-use-sum (2017-08-15) 1 commit

59 + - t1002: stop using sum(1)

60

75 - Code cleanup.

61 + Test simplification.

62

63 + Will merge to 'next'.

64

78 -* dl/credential-cache-socket-in-xdg-cache (2017-07-27) 1 commit

79 - (merged to 'next' on 2017-08-01 at 87687ae1d4)

80 - + credential-cache: interpret an ECONNRESET as an EOF

65

82 - A recently added test for the "credential-cache" helper revealed

83 - that EOF detection done around the time the connection to the cache

84 - daemon is torn down were flaky. This was fixed by reacting to

85 - ECONNRESET and behaving as if we got an EOF.

66 +* sb/sha1-file-cleanup (2017-08-15) 1 commit

67 + - sha1_file: make read_info_alternates static

68

69 + Code clean-up.

70

88 -* eb/contacts-reported-by (2017-07-27) 1 commit

89 - (merged to 'next' on 2017-08-01 at cca9972d6b)

90 - + git-contacts: also recognise "Reported-by:"

71 + Will merge to 'next'.

72

92 - "git contacts" (in contrib/) now lists the address on the

93 - "Reported-by:" trailer to its output, in addition to those on

94 - S-o-b: and other trailers, to make it easier to notify (and thank)

95 - the original bug reporter.

73

74 +* as/grep-quiet-no-match-exit-code-fix (2017-08-17) 1 commit

75 + - git-grep: correct exit code with --quiet and -L

76

98 -* hb/gitweb-project-list (2017-07-18) 1 commit

99 - (merged to 'next' on 2017-07-27 at c25d65ca25)

100 - + gitweb: skip unreadable subdirectories

77 + "git grep -L" and "git grep --quiet -L" reported different exit

78 + codes; this has been corrected.

79

102 - When a directory is not readable, "gitweb" fails to build the

103 - project list. Work this around by skipping such a directory.

80 + Will merge to 'next'.

81

105 - It might end up hiding a problem under the rug and a better

106 - solution might be to loudly complain to the administrator pointing

107 - out the problematic directory, but this will at least make it

108 - "work".

82

83 +* hv/t5526-andand-chain-fix (2017-08-17) 1 commit

84 + - t5526: fix some broken && chains

85

111 -* jb/t8008-cleanup (2017-07-26) 1 commit

112 - (merged to 'next' on 2017-08-01 at f979c9340d)

113 - + t8008: rely on rev-parse'd HEAD instead of sha1 value

86 + Test fix.

87

115 - Code clean-up.

88 + Will merge to 'next'.

89

90

118 -* jc/http-sslkey-and-ssl-cert-are-paths (2017-07-20) 1 commit

119 - (merged to 'next' on 2017-07-20 at 5489304b99)

120 - + http.c: http.sslcert and http.sslkey are both pathnames

121 -

122 - The http.{sslkey,sslCert} configuration variables are to be

123 - interpreted as a pathname that honors "~[username]/" prefix, but

124 - weren't, which has been fixed.

125 -

126 -

127 -* jk/c99 (2017-07-18) 2 commits

128 - (merged to 'next' on 2017-07-18 at 1cfc30f7c1)

129 - + clean.c: use designated initializer

130 - + strbuf: use designated initializers in STRBUF_INIT

131 -

132 - Start using selected c99 constructs in small, stable and

133 - essentialpart of the system to catch people who care about

134 - older compilers that do not grok them.

135 -

136 -

137 -* jk/ref-filter-colors (2017-07-13) 15 commits

138 - (merged to 'next' on 2017-07-18 at 75d4eb7ecf)

139 - + ref-filter: consult want_color() before emitting colors

140 - + pretty: respect color settings for %C placeholders

141 - + rev-list: pass diffopt->use_colors through to pretty-print

142 - + for-each-ref: load config earlier

143 - + color: check color.ui in git_default_config()

144 - + ref-filter: pass ref_format struct to atom parsers

145 - + ref-filter: factor out the parsing of sorting atoms

146 - + ref-filter: make parse_ref_filter_atom a private function

147 - + ref-filter: provide a function for parsing sort options

148 - + ref-filter: move need_color_reset_at_eol into ref_format

149 - + ref-filter: abstract ref format into its own struct

150 - + ref-filter: simplify automatic color reset

151 - + t: use test_decode_color rather than literal ANSI codes

152 - + docs/for-each-ref: update pointer to color syntax

153 - + check return value of verify_ref_format()

154 -

155 - "%C(color name)" in the pretty print format always produced ANSI

156 - color escape codes, which was an early design mistake. They now

157 - honor the configuration (e.g. "color.ui = never") and also tty-ness

158 - of the output medium.

159 -

160 -

161 -* jk/reflog-walk (2017-07-09) 9 commits

162 - (merged to 'next' on 2017-07-09 at 7449e964c6)

163 - + reflog-walk: apply --since/--until to reflog dates

164 - + reflog-walk: stop using fake parents

165 - + rev-list: check reflog_info before showing usage

166 - + get_revision_1(): replace do-while with an early return

167 - + log: do not free parents when walking reflog

168 - + log: clarify comment about reflog cycles

169 - + revision: disallow reflog walking with revs->limited

170 - + t1414: document some reflog-walk oddities

171 - + Merge branch 'jk/reflog-walk-maint' into jk/reflog-walk

172 -

173 - Numerous bugs in walking of reflogs via "log -g" and friends have

174 - been fixed.

175 -

176 -

177 -* jk/rev-list-empty-input (2017-08-02) 4 commits

178 - (merged to 'next' on 2017-08-04 at cb4f9b84e0)

179 - + revision: do not fallback to default when rev_input_given is set

180 - + rev-list: don't show usage when we see empty ref patterns

181 - + revision: add rev_input_given flag

182 - + t6018: flesh out empty input/output rev-list tests

183 -

184 - "git log --tag=no-such-tag" showed log starting from HEAD, which

185 - has been fixed---it now shows nothing.

186 -

187 -

188 -* js/git-gui-msgfmt-on-windows (2017-07-25) 7 commits

189 - (merged to 'next' on 2017-08-01 at 219577a73e)

190 - + Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-windows

191 - + git-gui (MinGW): make use of MSys2's msgfmt

192 - + Merge remote-tracking branch 'philoakley/dup-gui'

193 - + git gui: allow for a long recentrepo list

194 - + git gui: de-dup selected repo from recentrepo history

195 - + git gui: cope with duplicates in _get_recentrepo

196 - + git-gui: remove duplicate entries from .gitconfig's gui.recentrepo

197 -

198 - Because recent Git for Windows do come with a real msgfmt, the

199 - build procedure for git-gui has been updated to use it instead of a

200 - hand-rolled substitute.

201 -

202 -

203 -* js/run-process-parallel-api-fix (2017-07-21) 1 commit

204 - (merged to 'next' on 2017-07-27 at 4b54b69172)

205 - + run_processes_parallel: change confusing task_cb convention

206 -

207 - API fix.

208 -

209 -

210 -* jt/fsck-code-cleanup (2017-07-26) 3 commits

211 - (merged to 'next' on 2017-07-26 at 7a17e279da)

212 - + fsck: cleanup unused variable

213 - (merged to 'next' on 2017-07-20 at f7045a8c47)

214 - + object: remove "used" field from struct object

215 - + fsck: remove redundant parse_tree() invocation

91 +* jc/diff-sane-truncate-no-more (2017-08-17) 1 commit

92 + - diff: retire sane_truncate_fn

93

94 Code clean-up.

95

96 + Will merge to 'next'.

97

220 -* jt/subprocess-handshake (2017-07-26) 3 commits

221 - (merged to 'next' on 2017-08-01 at a0f78deffd)

222 - + sub-process: refactor handshake to common function

223 - + Documentation: migrate sub-process docs to header

224 - + Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake

225 - (this branch uses ls/filter-process-delayed.)

226 -

227 - Code cleanup.

228 -

229 -

230 -* jt/t1450-fsck-corrupt-packfile (2017-07-28) 1 commit

231 - (merged to 'next' on 2017-08-04 at 44d09da2fc)

232 - + tests: ensure fsck fails on corrupt packfiles

98

234 - A test update.

99 +* ks/branch-set-upstream (2017-08-17) 3 commits

100 + - branch: quote branch/ref names to improve readability

101 + - builtin/branch: stop supporting the "--set-upstream" option

102 + - t3200: cleanup cruft of a test

103

104 + "branch --set-upstream" that has been deprecated in Git 1.8 has

105 + finally been retired.

106

237 -* ks/commit-abort-on-empty-message-fix (2017-07-17) 1 commit

238 - (merged to 'next' on 2017-07-27 at e81ad4c1dc)

239 - + commit: check for empty message before the check for untouched template

107 + Will merge to 'next'.

108

241 - "git commit" when seeing an totally empty message said "you did not

242 - edit the message", which is clearly wrong. The message has been

243 - corrected.

109

110 +* mg/format-ref-doc-fix (2017-08-18) 2 commits

111 + - Documentation/git-for-each-ref: clarify peeling of tags for --format

112 + - Documentation: use proper wording for ref format strings

113

246 -* ks/prepare-commit-msg-sample (2017-07-12) 4 commits

247 - (merged to 'next' on 2017-07-18 at 48d9650a30)

248 - + hook: add a simple first example

249 - + hook: add sign-off using "interpret-trailers"

250 - + hook: name the positional variables

251 - + hook: cleanup script

114 + Doc fix.

115

253 - Remove an example that is now obsolete from a sample hook,

254 - and improve an old example in it that added a sign-off manually

255 - to use the interpret-trailers command.

116 + Will merge to 'next'.

117

118

258 -* ls/filter-process-delayed (2017-06-30) 7 commits

259 - (merged to 'next' on 2017-07-05 at a35e644082)

260 - + convert: add "status=delayed" to filter process protocol

261 - + convert: refactor capabilities negotiation

262 - + convert: move multiple file filter error handling to separate function

263 - + convert: put the flags field before the flag itself for consistent style

264 - + t0021: write "OUT <size>" only on success

265 - + t0021: make debug log file name configurable

266 - + t0021: keep filter log files on comparison

267 - (this branch is used by jt/subprocess-handshake.)

119 +* po/read-graft-line (2017-08-18) 4 commits

120 + - commit: rewrite read_graft_line

121 + - commit: allocate array using object_id size

122 + - commit: replace the raw buffer with strbuf in read_graft_line

123 + - sha1_file: fix definition of null_sha1

124

269 - The filter-process interface learned to allow a process with long

270 - latency give a "delayed" response.

125 + Conversion from uchar[20] to struct object_id continues; this is to

126 + ensure that we do not assume sizeof(struct object_id) is the same

127 + as the length of SHA-1 hash (or length of longest hash we support).

128

129 + Will merge to 'next'.

130

273 -* ma/pager-per-subcommand-action (2017-08-03) 7 commits

274 - (merged to 'next' on 2017-08-04 at 0f760bcf5d)

275 - + git.c: ignore pager.* when launching builtin as dashed external

276 - + tag: change default of `pager.tag` to "on"

277 - + tag: respect `pager.tag` in list-mode only

278 - + t7006: add tests for how git tag paginates

279 - + git.c: provide setup_auto_pager()

280 - + git.c: let builtins opt for handling `pager.foo` themselves

281 - + builtin.h: take over documentation from api-builtin.txt

131

283 - The "tag.pager" configuration variable was useless for those who

284 - actually create tag objects, as it interfered with the use of an

285 - editor. A new mechanism has been introduced for commands to enable

286 - pager depending on what operation is being carried out to fix this,

287 - and then "git tag -l" is made to run pager by default.

132 +* sb/submodule-parallel-update (2017-08-17) 1 commit

133 + - submodule.sh: remove unused variable

134

289 - If this works out OK, I think there are low-hanging fruits in

290 - other commands like "git branch" that outputs long list in one mode

291 - while taking input in another.

135 + Code clean-up.

136

137 + Will merge to 'next'.

138

294 -* rg/rerere-train-overwrite (2017-07-26) 1 commit

295 - (merged to 'next' on 2017-08-01 at 7fcd42974c)

296 - + contrib/rerere-train: optionally overwrite existing resolutions

139

298 - The "rerere-train" script (in contrib/) learned the "--overwrite"

299 - option to allow overwriting existing recorded resolutions.

140 +* jc/apply-with-crlf (2017-08-16) 6 commits

141 + . apply: clarify read_old_data() is about no-index case

142 + . apply: localize the CRLF business to read_old_data()

143 + . apply: only pay attention to CRLF in the preimage

144 + . apply: remove unused field apply_state.flags

145 + . apply: file commited with CRLF should roundtrip diff and apply

146 + - convert: add SAFE_CRLF_KEEP_CRLF

147 + (this branch is tangled with tb/apply-with-crlf.)

148

149 + Will discard as it now is part of the tb/apply-with-crlf topic.

150

302 -* rs/bswap-ubsan-fix (2017-07-17) 2 commits

303 - (merged to 'next' on 2017-07-20 at ce6bad07b0)

304 - + bswap: convert get_be16, get_be32 and put_be32 to inline functions

305 - + bswap: convert to unsigned before shifting in get_be32

151 +--------------------------------------------------

152 +[Stalled]

153

307 - Code clean-up.

154 +* mg/status-in-progress-info (2017-05-10) 2 commits

155 + - status --short --inprogress: spell it as --in-progress

156 + - status: show in-progress info for short status

157

158 + "git status" learns an option to report various operations

159 + (e.g. "merging") that the user is in the middle of.

160

310 -* rs/move-array (2017-07-17) 4 commits

311 - (merged to 'next' on 2017-07-20 at f3086cd20e)

312 - + ls-files: don't try to prune an empty index

313 - + apply: use COPY_ARRAY and MOVE_ARRAY in update_image()

314 - + use MOVE_ARRAY

315 - + add MOVE_ARRAY

161 + cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>

162

317 - Code clean-up.

163

164 +* nd/worktree-move (2017-04-20) 6 commits

165 + - worktree remove: new command

166 + - worktree move: refuse to move worktrees with submodules

167 + - worktree move: accept destination as directory

168 + - worktree move: new command

169 + - worktree.c: add update_worktree_location()

170 + - worktree.c: add validate_worktree()

171

320 -* rs/pack-objects-pbase-cleanup (2017-07-20) 1 commit

321 - (merged to 'next' on 2017-07-20 at a6b618559b)

322 - + pack-objects: remove unnecessary NULL check

172 + "git worktree" learned move and remove subcommands.

173

324 - Code clean-up.

174 + Expecting a reroll.

175 + cf. <20170420101024.7593-1-pclouds@gmail.com>

176 + cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>

177 + cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>

178

179

327 -* rs/stat-data-unaligned-reads-fix (2017-07-17) 1 commit

328 - (merged to 'next' on 2017-07-20 at e7d3782823)

329 - + dir: support platforms that require aligned reads

180 +* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits

181 + - Documentation/clone: document ignored configuration variables

182 + - clone: respect additional configured fetch refspecs during initial fetch

183 + (this branch is used by sg/remote-no-string-refspecs.)

184

331 - Code clean-up.

185 + "git clone -c var=val" is a way to set configuration variables in

186 + the resulting repository, but it is more useful to also make these

187 + variables take effect while the initial clone is happening,

188 + e.g. these configuration variables could be fetch refspecs.

189

190 + Waiting for a response.

191 + cf. <20170617112228.vugswym4o4owf6wj@sigill.intra.peff.net>

192 + cf. <xmqqmv8zhdap.fsf@gitster.mtv.corp.google.com>

193

334 -* sb/hashmap-cleanup (2017-07-05) 10 commits

335 - (merged to 'next' on 2017-07-12 at ce31d06165)

336 - + t/helper/test-hashmap: use custom data instead of duplicate cmp functions

337 - + name-hash.c: drop hashmap_cmp_fn cast

338 - + submodule-config.c: drop hashmap_cmp_fn cast

339 - + remote.c: drop hashmap_cmp_fn cast

340 - + patch-ids.c: drop hashmap_cmp_fn cast

341 - + convert/sub-process: drop cast to hashmap_cmp_fn

342 - + config.c: drop hashmap_cmp_fn cast

343 - + builtin/describe: drop hashmap_cmp_fn cast

344 - + builtin/difftool.c: drop hashmap_cmp_fn cast

345 - + attr.c: drop hashmap_cmp_fn cast

346 -

347 - Many uses of comparision callback function the hashmap API uses

348 - cast the callback function type when registering it to

349 - hashmap_init(), which defeats the compile time type checking when

350 - the callback interface changes (e.g. gaining more parameters).

351 - The callback implementations have been updated to take "void *"

352 - pointers and cast them to the type they expect instead.

353 -

354 -

355 -* sb/object-id (2017-07-13) 2 commits

356 - (merged to 'next' on 2017-07-18 at e4df0ba3b1)

357 - + tag: convert gpg_verify_tag to use struct object_id

358 - + commit: convert lookup_commit_graft to struct object_id

359 - (this branch is used by bc/object-id and bw/submodule-config-cleanup.)

194

361 - Conversion from uchar[20] to struct object_id continues.

195 +* js/rebase-i-final (2017-07-27) 10 commits

196 + - rebase -i: rearrange fixup/squash lines using the rebase--helper

197 + - t3415: test fixup with wrapped oneline

198 + - rebase -i: skip unnecessary picks using the rebase--helper

199 + - rebase -i: check for missing commits in the rebase--helper

200 + - t3404: relax rebase.missingCommitsCheck tests

201 + - rebase -i: also expand/collapse the SHA-1s via the rebase--helper

202 + - rebase -i: do not invent onelines when expanding/collapsing SHA-1s

203 + - rebase -i: remove useless indentation

204 + - rebase -i: generate the script via rebase--helper

205 + - t3415: verify that an empty instructionFormat is handled as before

206

207 + The final batch to "git rebase -i" updates to move more code from

208 + the shell script to C.

209

364 -* st/lib-gpg-kill-stray-agent (2017-07-20) 1 commit

365 - (merged to 'next' on 2017-07-20 at 8ea68c483f)

366 - + t: lib-gpg: flush gpg agent on startup

210 + Expecting a reroll.

211

368 - Some versions of GnuPG fails to kill gpg-agent it auto-spawned

369 - and such a left-over agent can interfere with a test. Work it

370 - around by attempting to kill one before starting a new test.

212

213 +* bp/fsmonitor (2017-06-12) 6 commits

214 + - fsmonitor: add a sample query-fsmonitor hook script for Watchman

215 + - fsmonitor: add documentation for the fsmonitor extension.

216 + - fsmonitor: add test cases for fsmonitor extension

217 + - fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.

218 + - dir: make lookup_untracked() available outside of dir.c

219 + - bswap: add 64 bit endianness helper get_be64

220

373 -* wd/rebase-conflict-guide (2017-07-17) 1 commit

374 - (merged to 'next' on 2017-07-20 at c78e758b23)

375 - + rebase: make resolve message clearer for inexperienced users

221 + We learned to talk to watchman to speed up "git status".

222

377 - The advice message given when "git rebase" stops for conflicting

378 - changes has been improved.

223 + Expecting a reroll.

224 + cf. <bade1166-e646-b05a-f65b-adb8da8ba0a7@gmail.com>

225

226 --------------------------------------------------

381 -[New Topics]

227 +[Cooking]

228

229 * ks/prepare-commit-msg-sample-fix (2017-08-14) 1 commit

230 - hook: use correct logical variable

@@ -389,32 +235,35 @@ of the repositories listed at

235

236

237 * ab/ref-filter-no-contains (2017-08-07) 1 commit

392 - - tests: don't give unportable ">" to "test" built-in, use -gt

238 + (merged to 'next' on 2017-08-18 at 7ec9d3d3a2)

239 + + tests: don't give unportable ">" to "test" built-in, use -gt

240

241 A test fix.

242

396 - Will merge to 'next'.

243 + Will merge to 'master'.

244

245

246 * ma/parse-maybe-bool (2017-08-07) 6 commits

400 - - parse_decoration_style: drop unused argument `var`

401 - - treewide: deprecate git_config_maybe_bool, use git_parse_maybe_bool

402 - - config: make git_{config,parse}_maybe_bool equivalent

403 - - config: introduce git_parse_maybe_bool_text

404 - - t5334: document that git push --signed=1 does not work

405 - - Doc/git-{push,send-pack}: correct --sign= to --signed=

247 + (merged to 'next' on 2017-08-18 at ba22bb836c)

248 + + parse_decoration_style: drop unused argument `var`

249 + + treewide: deprecate git_config_maybe_bool, use git_parse_maybe_bool

250 + + config: make git_{config,parse}_maybe_bool equivalent

251 + + config: introduce git_parse_maybe_bool_text

252 + + t5334: document that git push --signed=1 does not work

253 + + Doc/git-{push,send-pack}: correct --sign= to --signed=

254

255 Code clean-up.

256

409 - Will merge to 'next'.

257 + Will merge to 'master'.

258

259

260 * mf/no-dashed-subcommands (2017-08-07) 1 commit

413 - - scripts: use "git foo" not "git-foo"

261 + (merged to 'next' on 2017-08-18 at 05365af2ff)

262 + + scripts: use "git foo" not "git-foo"

263

264 Code clean-up.

265

417 - Will merge to 'next'.

266 + Will merge to 'master'.

267

268

269 * mk/diff-delta-uint-may-be-shorter-than-ulong (2017-08-10) 1 commit

@@ -429,35 +278,39 @@ of the repositories listed at

278

279

280 * rs/obsd-getcwd-workaround (2017-08-07) 1 commit

432 - - t0001: skip test with restrictive permissions if getpwd(3) respects them

281 + (merged to 'next' on 2017-08-18 at adb98cfe0c)

282 + + t0001: skip test with restrictive permissions if getpwd(3) respects them

283

284 Test portability fix for BSDs.

285

436 - Will merge to 'next'.

286 + Will merge to 'master'.

287

288

289 * rs/in-obsd-basename-dirname-take-const (2017-08-07) 1 commit

440 - - test-path-utils: handle const parameter of basename and dirname

290 + (merged to 'next' on 2017-08-18 at c739077e3b)

291 + + test-path-utils: handle const parameter of basename and dirname

292

293 Portability fix.

294

444 - Will merge to 'next'.

295 + Will merge to 'master'.

296

297

298 * rs/t3700-clean-leftover (2017-08-08) 1 commit

448 - - t3700: fix broken test under !POSIXPERM

299 + (merged to 'next' on 2017-08-18 at 12232a8cd3)

300 + + t3700: fix broken test under !POSIXPERM

301

302 A test fix.

303

452 - Will merge to 'next'.

304 + Will merge to 'master'.

305

306

307 * jc/perl-git-comment-typofix (2017-08-07) 1 commit

456 - - perl/Git.pm: typofix in a comment

308 + (merged to 'next' on 2017-08-18 at b2ad043e6a)

309 + + perl/Git.pm: typofix in a comment

310

311 A comment fix.

312

460 - Will merge to 'next'.

313 + Will merge to 'master'.

314

315

316 * jk/drop-ancient-curl (2017-08-09) 5 commits

@@ -467,6 +320,10 @@ of the repositories listed at

320 - http: drop support for curl < 7.16.0

321 - http: drop support for curl < 7.11.1

322

323 + Some code in http.c that has bitrot is being removed.

324 +

325 + What is the status of the discussion around this area????

326 +

327

328 * tc/curl-with-backports (2017-08-11) 2 commits

329 - http: use a feature check to enable GSSAPI delegation control

@@ -478,26 +335,33 @@ of the repositories listed at

335 check feature macros, not version numbers, to cope better with

336 libCurl that vendor ships with backported features.

337

338 + What is the doneness of this topic????

339 +

340

341 * jk/drop-sha1-entry-pos (2017-08-09) 1 commit

483 - - sha1_file: drop experimental GIT_USE_LOOKUP search

342 + (merged to 'next' on 2017-08-18 at 3a4d9bcf12)

343 + + sha1_file: drop experimental GIT_USE_LOOKUP search

344

345 Code clean-up.

346

487 - Will merge to 'next'.

347 + Will merge to 'master'.

348

349

350 * jk/hashcmp-memcmp (2017-08-09) 1 commit

491 - - hashcmp: use memcmp instead of open-coded loop

351 + (merged to 'next' on 2017-08-18 at 27c4aa5520)

352 + + hashcmp: use memcmp instead of open-coded loop

353

354 Code clean-up.

355

495 - Will merge to 'next'.

356 + Will merge to 'master'.

357

358

498 -* jk/trailers-parse (2017-08-10) 5 commits

359 +* jk/trailers-parse (2017-08-15) 8 commits

360 + - pretty: support normalization options for %(trailers)

361 + - t4205: refactor %(trailers) tests

362 + - pretty: move trailer formatting to trailer.c

363 - interpret-trailers: add --parse convenience option

500 - - interpret-trailers: add an option to normalize output

364 + - interpret-trailers: add an option to unfold values

365 - interpret-trailers: add an option to show only existing trailers

366 - interpret-trailers: add an option to show only the trailers

367 - trailer: put process_trailers() options into a struct

@@ -523,105 +387,117 @@ of the repositories listed at

387

388

389 * pw/am-signoff (2017-08-08) 1 commit

526 - - am: fix signoff when other trailers are present

390 + (merged to 'next' on 2017-08-18 at 7678ed822c)

391 + + am: fix signoff when other trailers are present

392

393 "git am -s" has been taught that some input may end with a trailer

394 block that is not Signed-off-by: and it should refrain from adding

395 an extra blank line before adding a new sign-off in such a case.

396

532 - Will merge to 'next'.

397 + Will merge to 'master'.

398

399

400 * rj/add-chmod-error-message (2017-08-09) 1 commit

536 - - builtin/add: add detail to a 'cannot chmod' error message

401 + (merged to 'next' on 2017-08-18 at ba2afb696a)

402 + + builtin/add: add detail to a 'cannot chmod' error message

403

404 Message fix.

405

540 - Will merge to 'next'.

406 + Will merge to 'master'.

407

408

409 * rs/apply-lose-prefix-length (2017-08-09) 1 commit

544 - - apply: remove prefix_length member from apply_state

410 + (merged to 'next' on 2017-08-18 at 6ce0dbb3f0)

411 + + apply: remove prefix_length member from apply_state

412

413 Code clean-up.

414

548 - Will merge to 'next'.

415 + Will merge to 'master'.

416

417

418 * rs/find-pack-entry-bisection (2017-08-09) 1 commit

552 - - sha1_file: avoid comparison if no packed hash matches the first byte

419 + (merged to 'next' on 2017-08-18 at b4130177a9)

420 + + sha1_file: avoid comparison if no packed hash matches the first byte

421

422 Code clean-up.

423

556 - Will merge to 'next'.

424 + Will merge to 'master'.

425

426

427 * rs/fsck-obj-leakfix (2017-08-10) 1 commit

560 - - fsck: free buffers on error in fsck_obj()

428 + (merged to 'next' on 2017-08-18 at 77e3d111ef)

429 + + fsck: free buffers on error in fsck_obj()

430

431 Memory leak in an error codepath has been plugged.

432

564 - Will merge to 'next'.

433 + Will merge to 'master'.

434

435

436 * rs/merge-microcleanup (2017-08-10) 1 commit

568 - - merge: use skip_prefix()

437 + (merged to 'next' on 2017-08-18 at 79ba7d301d)

438 + + merge: use skip_prefix()

439

440 Code clean-up.

441

572 - Will merge to 'next'.

442 + Will merge to 'master'.

443

444

445 * rs/strbuf-getwholeline-fix (2017-08-10) 1 commit

576 - - strbuf: clear errno before calling getdelim(3)

446 + (merged to 'next' on 2017-08-18 at 5f879d8261)

447 + + strbuf: clear errno before calling getdelim(3)

448

449 A helper function to read a single whole line into strbuf

450 mistakenly triggered OOM error at EOF under certain conditions,

451 which has been fixed.

452

582 - Will merge to 'next'.

453 + Will merge to 'master'.

454

455

456 * rs/t4062-obsd (2017-08-09) 1 commit

586 - - t4062: use less than 256 repetitions in regex

457 + (merged to 'next' on 2017-08-18 at 02bff42d86)

458 + + t4062: use less than 256 repetitions in regex

459

460 Test portability fix.

461

590 - Will merge to 'next'.

462 + Will merge to 'master'.

463

464

465 * rs/unpack-entry-leakfix (2017-08-10) 1 commit

594 - - sha1_file: release delta_stack on error in unpack_entry()

466 + (merged to 'next' on 2017-08-18 at 1e7d8f54b1)

467 + + sha1_file: release delta_stack on error in unpack_entry()

468

469 Memory leak in an error codepath has been plugged.

470

598 - Will merge to 'next'.

471 + Will merge to 'master'.

472

473

474 * rs/win32-syslog-leakfix (2017-08-10) 1 commit

602 - - win32: plug memory leak on realloc() failure in syslog()

475 + (merged to 'next' on 2017-08-18 at 011eccb7bd)

476 + + win32: plug memory leak on realloc() failure in syslog()

477

478 Memory leak in an error codepath has been plugged.

479

606 - Will merge to 'next'.

480 + Will merge to 'master'.

481

482

483 * sb/retire-t1200 (2017-08-10) 1 commit

610 - - t1200: remove t1200-tutorial.sh

484 + (merged to 'next' on 2017-08-18 at d436f9bbce)

485 + + t1200: remove t1200-tutorial.sh

486

487 A test script that outlived its usefulness has been removed.

488

614 - Will merge to 'next'.

489 + Will merge to 'master'.

490

491

492 * ur/svn-local-zone (2017-08-08) 1 commit

618 - - git svn fetch: Create correct commit timestamp when using --localtime

493 + (merged to 'next' on 2017-08-18 at f222bb6db0)

494 + + git svn fetch: Create correct commit timestamp when using --localtime

495

496 "git svn" used with "--localtime" option did not compute the tz

497 offset for the timestamp in question and instead always used the

498 current time, which has been corrected.

499

624 - Will merge to 'next'.

500 + Will merge to 'master'.

501

502

503 * jt/sha1-file-cleanup (2017-08-11) 2 commits

@@ -684,13 +560,15 @@ of the repositories listed at

560 Will merge to 'next'.

561

562

687 -* jt/diff-color-move-fix (2017-08-14) 3 commits

688 - - diff: check MIN_BLOCK_LENGTH at start of new block

563 +* jt/diff-color-move-fix (2017-08-16) 3 commits

564 + - diff: define block by number of alphanumeric chars

565 - diff: respect MIN_BLOCK_LENGTH for last block

566 - diff: avoid redundantly clearing a flag

567 (this branch uses sb/diff-color-move.)

568

693 - A handful of bugfixes to "diff --color-moved".

569 + A handful of bugfixes and an improvement to "diff --color-moved".

570 +

571 + Will merge to 'next'.

572

573

574 * kd/stash-with-bash-4.4 (2017-08-14) 1 commit

@@ -702,7 +580,7 @@ of the repositories listed at

580 Will merge to 'next'.

581

582

705 -* kw/commit-keep-index-when-pre-commit-is-not-run (2017-08-14) 1 commit

583 +* kw/commit-keep-index-when-pre-commit-is-not-run (2017-08-16) 1 commit

584 - commit: skip discarding the index if there is no pre-commit hook

585

586 "git commit" used to discard the index and re-read from the filesystem

@@ -719,83 +597,6 @@ of the repositories listed at

597 "make style" runs git-clang-format to help developers by pointing

598 out coding style issues.

599

722 ---------------------------------------------------

723 -[Stalled]

724 -

725 -* mg/status-in-progress-info (2017-05-10) 2 commits

726 - - status --short --inprogress: spell it as --in-progress

727 - - status: show in-progress info for short status

728 -

729 - "git status" learns an option to report various operations

730 - (e.g. "merging") that the user is in the middle of.

731 -

732 - cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>

733 -

734 -

735 -* nd/worktree-move (2017-04-20) 6 commits

736 - - worktree remove: new command

737 - - worktree move: refuse to move worktrees with submodules

738 - - worktree move: accept destination as directory

739 - - worktree move: new command

740 - - worktree.c: add update_worktree_location()

741 - - worktree.c: add validate_worktree()

742 -

743 - "git worktree" learned move and remove subcommands.

744 -

745 - Expecting a reroll.

746 - cf. <20170420101024.7593-1-pclouds@gmail.com>

747 - cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>

748 - cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>

749 -

750 -

751 -* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits

752 - - Documentation/clone: document ignored configuration variables

753 - - clone: respect additional configured fetch refspecs during initial fetch

754 - (this branch is used by sg/remote-no-string-refspecs.)

755 -

756 - "git clone -c var=val" is a way to set configuration variables in

757 - the resulting repository, but it is more useful to also make these

758 - variables take effect while the initial clone is happening,

759 - e.g. these configuration variables could be fetch refspecs.

760 -

761 - Waiting for a response.

762 - cf. <20170617112228.vugswym4o4owf6wj@sigill.intra.peff.net>

763 - cf. <xmqqmv8zhdap.fsf@gitster.mtv.corp.google.com>

764 -

765 -

766 -* js/rebase-i-final (2017-07-27) 10 commits

767 - - rebase -i: rearrange fixup/squash lines using the rebase--helper

768 - - t3415: test fixup with wrapped oneline

769 - - rebase -i: skip unnecessary picks using the rebase--helper

770 - - rebase -i: check for missing commits in the rebase--helper

771 - - t3404: relax rebase.missingCommitsCheck tests

772 - - rebase -i: also expand/collapse the SHA-1s via the rebase--helper

773 - - rebase -i: do not invent onelines when expanding/collapsing SHA-1s

774 - - rebase -i: remove useless indentation

775 - - rebase -i: generate the script via rebase--helper

776 - - t3415: verify that an empty instructionFormat is handled as before

777 -

778 - The final batch to "git rebase -i" updates to move more code from

779 - the shell script to C.

780 -

781 - Expecting a reroll.

782 -

783 -

784 -* bp/fsmonitor (2017-06-12) 6 commits

785 - - fsmonitor: add a sample query-fsmonitor hook script for Watchman

786 - - fsmonitor: add documentation for the fsmonitor extension.

787 - - fsmonitor: add test cases for fsmonitor extension

788 - - fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.

789 - - dir: make lookup_untracked() available outside of dir.c

790 - - bswap: add 64 bit endianness helper get_be64

791 -

792 - We learned to talk to watchman to speed up "git status".

793 -

794 - Expecting a reroll.

795 - cf. <bade1166-e646-b05a-f65b-adb8da8ba0a7@gmail.com>

796 -

797 ---------------------------------------------------

798 -[Cooking]

600

601 * pw/sequence-rerere-autoupdate (2017-08-02) 6 commits

602 (merged to 'next' on 2017-08-14 at 010cbb0cbe)

@@ -829,6 +630,8 @@ of the repositories listed at

630 "git merge" learned a "--signoff" option to add the Signed-off-by:

631 trailer with the committer's name.

632

633 + Will merge to 'next'.

634 +

635

636 * pb/trailers-from-command-line (2017-08-14) 4 commits

637 - interpret-trailers: fix documentation typo

@@ -839,6 +642,8 @@ of the repositories listed at

642 "git interpret-trailers" learned to take the trailer specifications

643 from the command line that overrides the configured values.

644

645 + Will merge to 'next'.

646 +

647

648 * sb/submodule-recursive-checkout-detach-head (2017-07-28) 2 commits

649 - Documentation/checkout: clarify submodule HEADs to be detached

@@ -854,15 +659,16 @@ of the repositories listed at

659 this is better than rejecting recursive checkout, for example.

660

661

857 -* ti/external-sha1dc (2017-07-25) 1 commit

858 - - hash: allow building with the external sha1dc library

662 +* ti/external-sha1dc (2017-08-16) 2 commits

663 + - sha1dc: allow building with the external sha1dc library

664 + - sha1dc: build git plumbing code more explicitly

665

666 Platforms that ship with a separate sha1 with collision detection

667 library can link to it instead of using the copy we ship as part of

668 our source tree.

669

864 - Waiting for review to conclude

865 - cf. <CACBZZX7M=H8tNkZXpHBvv0rbY58EJk4dkoUzGKMftWoKUqF8sA@mail.gmail.com>

670 + Waiting for reviews.

671 + cf. <20170815120417.31616-1-tiwai@suse.de>

672

673

674 * bw/submodule-config-cleanup (2017-08-03) 17 commits

@@ -902,8 +708,9 @@ of the repositories listed at

708 * jk/check-ref-format-oor-fix (2017-07-14) 1 commit

709 - check-ref-format: require a repository for --branch

710

905 - Objected...

711 + Discussion slowly continues...

712 cf. <20170717172709.GL93855@aiede.mtv.corp.google.com>

713 + cf. <20170817102217.3yw7uxnkupdy3lh5@sigill.intra.peff.net>

714

715

716 * bw/grep-recurse-submodules (2017-08-02) 10 commits

@@ -947,7 +754,7 @@ of the repositories listed at

754 by users who know what they are doing. This would pave the way to

755 possibly turn `--force` into `--force-with-lease`.

756

950 - Undecided.

757 + Will discard.

758 Independent from disabling the feature by default, this stirred up

759 a discussion to replace the DWIM heuristics with a better one, which

760 deserves to be its own topic.

@@ -970,7 +777,9 @@ of the repositories listed at

777 Will cook in 'next'.

778

779

973 -* mh/packed-ref-store (2017-07-27) 31 commits

780 +* mh/packed-ref-store (2017-08-17) 32 commits

781 + (merged to 'next' on 2017-08-18 at 14c58936e1)

782 + + files-backend: cheapen refname_available check when locking refs

783 (merged to 'next' on 2017-08-14 at 987b76d302)

784 + packed_ref_store: handle a packed-refs file that is a symlink

785 + read_packed_refs(): die if `packed-refs` contains bogus data

@@ -1056,15 +865,12 @@ of the repositories listed at

865 the same as deleted lines elsewhere differently from genuinely new

866 lines.

867

868 + Will merge to 'next'.

869 + ... again.

870 +

871 --------------------------------------------------

872 [Discarded]

873

1062 -* mh/packed-ref-store-prep-extra (2017-06-18) 1 commit

1063 - . prefix_ref_iterator_advance(): relax the check of trim length

1064 -

1065 - Split out of mh/packed-ref-store-prep.

1066 -

1067 -

874 * nd/prune-in-worktree (2017-04-24) 12 commits

875 . rev-list: expose and document --single-worktree

876 . revision.c: --reflog add HEAD reflog from all worktrees

What's cooking (2017/08 #04)