00504aeac9 · matheusbsbs/matheus-bagliano

@@ -1,19 +1,19 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Oct 2015, #01; Mon, 5)

4 -X-master-at: 24a00ef646974be49ef7138239c3803805400797

5 -X-next-at: 70ec07ec915776bb723966160671950e8d4a56c2

3 +Subject: What's cooking in git.git (Oct 2015, #02; Wed, 7)

4 +X-master-at: f5b6079871904ba5b0a8548f91545f126caf898b

5 +X-next-at: 19af20e0b28da5dcbe194ac407afe5175cc4fb85

6

7 -What's cooking in git.git (Oct 2015, #01; Mon, 5)

7 +What's cooking in git.git (Oct 2015, #02; Wed, 7)

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

9

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

11 '-' are only in 'pu' (proposed updates) while commits prefixed with

12 '+' are in 'next'.

13

14 -A set of releases for a handful of maintenance tracks have been

15 -tagged (v2.6.1, v2.5.4, v2.4.10 and v2.3.10), thanks to Blake

16 -Burkhart and Jeff King.

14 +The tip of 'next' has been rewound and rebuilt. I plan to start

15 +merging the topics that have been cooking just above 'next' down in

16 +the coming days.

17

18 With somewhat reduced review bandwidth, I'd expect that the upcoming

19 cycle would be slower than usual. At tinyurl.com/gitCal, I

@@ -30,370 +30,86 @@ of the repositories listed at

30 --------------------------------------------------

31 [Graduated to "master"]

32

33 -* ad/bisect-terms (2015-08-03) 4 commits

34 - (merged to 'next' on 2015-09-01 at ede6e64)

35 - + bisect: allow setting any user-specified in 'git bisect start'

36 - + bisect: add 'git bisect terms' to view the current terms

37 - + bisect: add the terms old/new

38 - + bisect: sanity check on terms

39 -

40 - The use of 'good/bad' in "git bisect" made it confusing to use when

41 - hunting for a state change that is not a regression (e.g. bugfix).

42 - The command learned 'old/new' and then allows the end user to

43 - say e.g. "bisect start --term-old=fast --term=new=slow" to find a

44 - performance regression.

45 -

46 - Michael's idea to make 'good/bad' more intelligent does have

47 - certain attractiveness ($gname/272867), and may make some of

48 - the work on this topic a moot point, though.

49 -

50 -

51 -* as/subtree-with-spaces (2015-09-08) 2 commits

52 - (merged to 'next' on 2015-09-09 at f3d763d)

53 - + contrib/subtree: respect spaces in a repository path

54 - + t7900-subtree: test the "space in a subdirectory name" case

55 -

56 - Update "git subtree" (in contrib/) so that it can take whitespaces

57 - in the pathnames, not only in the in-tree pathname but the name of

58 - the directory that the repository is in.

59 -

60 -

61 -* bb/remote-get-url (2015-09-17) 1 commit

62 - (merged to 'next' on 2015-09-21 at c07a1e8)

63 - + remote: add get-url subcommand

64 -

65 - "git remote" learned "get-url" subcommand to show the URL for a

66 - given remote name used for fetching and pushing.

67 -

33 +* gb/filter-branch-progress (2015-09-21) 2 commits

34 + (merged to 'next' on 2015-09-21 at 15e698d)

35 + + filter-branch: make report-progress more readable

36 + + filter-branch: add passed/remaining seconds on progress

37

69 -* dt/refs-bisection (2015-09-01) 3 commits

70 - (merged to 'next' on 2015-09-08 at 2b66bad)

71 - + refs: make refs/bisect/* per-worktree

72 - + path: optimize common dir checking

73 - + refs: clean up common_list

74 - (this branch is used by dt/refs-backend-lmdb.)

38 + Give progress meter to "git filter-branch".

39

76 - Move the refs used during a "git bisect" session to per-worktree

77 - hierarchy refs/worktree/* so that independent bisect sessions can

78 - be done in different worktrees.

40

80 - The second commit may or may not want to be reverted.

41 +* ls/p4-path-encoding (2015-09-21) 3 commits

42 + (merged to 'next' on 2015-09-21 at 0772d82)

43 + + git-p4: use replacement character for non UTF-8 characters in paths

44 + (merged to 'next' on 2015-09-17 at 7f8b9e0)

45 + + git-p4: improve path encoding verbose output

46 + (merged to 'next' on 2015-09-08 at 56514f9)

47 + + git-p4: add config git-p4.pathEncoding

48

49 + "git p4" learned to reencode the pathname it uses to communicate

50 + with the p4 depot with a new option.

51

83 -* jc/rerere (2015-07-24) 21 commits

84 - (merged to 'next' on 2015-08-26 at 8ae15ef)

85 - + rerere: un-nest merge() further

86 - + rerere: use "struct rerere_id" instead of "char *" for conflict ID

87 - + rerere: call conflict-ids IDs

88 - + rerere: further clarify do_rerere_one_path()

89 - + rerere: further de-dent do_plain_rerere()

90 - + rerere: refactor "replay" part of do_plain_rerere()

91 - + rerere: explain the remainder

92 - + rerere: explain "rerere forget" codepath

93 - + rerere: explain the primary codepath

94 - + rerere: explain MERGE_RR management helpers

95 - + rerere: fix benign off-by-one non-bug and clarify code

96 - + rerere: explain the rerere I/O abstraction

97 - + rerere: do not leak mmfile[] for a path with multiple stage #1 entries

98 - + rerere: stop looping unnecessarily

99 - + rerere: drop want_sp parameter from is_cmarker()

100 - + rerere: report autoupdated paths only after actually updating them

101 - + rerere: write out each record of MERGE_RR in one go

102 - + rerere: lift PATH_MAX limitation

103 - + rerere: plug conflict ID leaks

104 - + rerere: handle conflicts with multiple stage #1 entries

105 - + rerere: fix an off-by-one non-bug

106 - (this branch is used by jc/rerere-multi.)

52

108 - Code clean-up and minor fixes.

53 +* nd/ignore-then-not-ignore (2015-09-21) 2 commits

54 + (merged to 'next' on 2015-09-21 at 2182591)

55 + + dir.c: don't exclude whole dir prematurely if neg pattern may match

56 + + dir.c: make last_exclude_matching_from_list() run til the end

57

58 + Allow a later "!/abc/def" to override an earlier "/abc" that

59 + appears in the same .gitignore file to make it easier to express

60 + "everything in /abc directory is ignored, except for ...".

61

111 -* jh/quiltimport-explicit-series-file (2015-09-01) 1 commit

112 - (merged to 'next' on 2015-09-02 at 1129ca4)

113 - + git-quiltimport: add commandline option --series <file>

62

115 - "quiltimport" allows to specify the series file by honoring the

116 - $QUILT_SERIES environment and also --series command line option.

63 +* ti/glibc-stdio-mutex-from-signal-handler (2015-09-04) 1 commit

64 + (merged to 'next' on 2015-09-08 at c8047ba)

65 + + pager: don't use unsafe functions in signal handlers

66

67 + Allocation related functions and stdio are unsafe things to call

68 + inside a signal handler, and indeed killing the pager can cause

69 + glibc to deadlock waiting on allocation mutex as our signal handler

70 + tries to free() some data structures in wait_for_pager(). Reduce

71 + these unsafe calls.

72

119 -* jk/async-pkt-line (2015-09-01) 2 commits

120 - (merged to 'next' on 2015-09-02 at e185717)

121 - + pkt-line: show packets in async processes as "sideband"

122 - + run-command: provide in_async query function

73 +--------------------------------------------------

74 +[New Topics]

75

124 - The debugging infrastructure for pkt-line based communication has

125 - been improved to mark the side-band communication specifically.

126 -

127 -

128 -* jk/blame-first-parent (2015-09-16) 1 commit

129 - (merged to 'next' on 2015-09-21 at 7580f6b)

130 - + blame: handle --first-parent

131 -

132 - "git blame --first-parent v1.0..v2.0" was not rejected but did not

133 - limit the blame to commits on the first parent chain.

134 -

135 -

136 -* jk/connect-clear-env (2015-09-08) 2 commits

137 - (merged to 'next' on 2015-09-08 at 86b64f7)

138 - + git_connect: clarify conn->use_shell flag

139 - (merged to 'next' on 2015-09-06 at 9ddbed8)

140 - + git_connect: clear GIT_* environment for ssh

141 -

142 - The ssh transport, just like any other transport over the network,

143 - did not clear GIT_* environment variables, but it is possible to

144 - use SendEnv and AcceptEnv to leak them to the remote invocation of

145 - Git, which is not a good idea at all. Explicitly clear them just

146 - like we do for the local transport.

147 -

148 -

149 -* jk/date-local (2015-09-03) 11 commits

150 - (merged to 'next' on 2015-09-08 at 66781d9)

151 - + t6300: add tests for "-local" date formats

152 - + t6300: make UTC and local dates different

153 - + date: make "local" orthogonal to date format

154 - + date: check for "local" before anything else

155 - + t6300: add test for "raw" date format

156 - + t6300: introduce test_date() helper

157 - + fast-import: switch crash-report date to iso8601

158 - + Documentation/rev-list: don't list date formats

159 - + Documentation/git-for-each-ref: don't list date formats

160 - + Documentation/config: don't list date formats

161 - + Documentation/blame-options: don't list date formats

162 -

163 - "git log --date=local" used to only show the normal (default)

164 - format in the local timezone. The command learned to take 'local'

165 - as an instruction to use the local timezone with other formats,

166 - e.g. "git show --date=rfc-local".

167 -

168 -

169 -* jk/interpret-trailers-outside-a-repository (2015-09-08) 1 commit

170 - (merged to 'next' on 2015-09-09 at a75fce3)

171 - + interpret-trailers: allow running outside a repository

172 -

173 - Allow "git interpret-trailers" to run outside of a Git repository.

174 -

175 -

176 -* jk/make-findstring-makeflags-fix (2015-09-10) 1 commit

177 - (merged to 'next' on 2015-09-21 at 26ea6e0)

178 - + Makefile: fix MAKEFLAGS tests with multiple flags

179 -

180 - Customization to change the behaviour with "make -w" and "make -s"

181 - in our Makefile was broken when they were used together.

182 -

183 -

184 -* jk/rebase-no-autostash (2015-09-10) 2 commits

185 - (merged to 'next' on 2015-09-21 at 034d726)

186 - + Documentation/git-rebase: fix --no-autostash formatting

187 - + rebase: support --no-autostash

188 -

189 - There was no way to defeat a configured rebase.autostash variable

190 - from the command line, as "git rebase --no-autostash" was missing.

191 -

192 -

193 -* jk/test-lint-forbid-when-finished-in-subshell (2015-09-08) 5 commits

194 - (merged to 'next' on 2015-09-09 at 74ede61)

195 - + test-lib-functions: detect test_when_finished in subshell

196 - + t7800: don't use test_config in a subshell

197 - + test-lib-functions: support "test_config -C <dir> ..."

198 - + t5801: don't use test_when_finished in a subshell

199 - + t7610: don't use test_config in a subshell

200 -

201 - Because "test_when_finished" in our test framework queues the

202 - clean-up tasks to be done in a shell variable, it should not be

203 - used inside a subshell. Add a mechanism to allow 'bash' to catch

204 - such uses, and fix the ones that were found.

76 +* cc/quote-comments (2015-10-07) 2 commits

77 + - quote: move comment before sq_quote_buf()

78 + - quote: fix broken sq_quote_buf() related comment

79

80 + A no-op code-health maintenance.

81

207 -* jw/make-arflags-customizable (2015-09-10) 1 commit

208 - (merged to 'next' on 2015-09-21 at cb3892c1)

209 - + Makefile: allow $(ARFLAGS) specified from the command line

210 -

211 - The Makefile always runs the library archiver with hardcoded "crs"

212 - options, which was inconvenient for exotic platforms on which

213 - people want to use programs with totally different set of command

214 - line options.

215 -

216 -

217 -* kn/for-each-tag (2015-09-17) 17 commits

218 - (merged to 'next' on 2015-09-17 at 1980952)

219 - + tag.c: implement '--merged' and '--no-merged' options

220 - + tag.c: implement '--format' option

221 - + tag.c: use 'ref-filter' APIs

222 - + tag.c: use 'ref-filter' data structures

223 - + ref-filter: add option to match literal pattern

224 - + ref-filter: add support to sort by version

225 - + ref-filter: add support for %(contents:lines=X)

226 - + ref-filter: add option to filter out tags, branches and remotes

227 - + ref-filter: implement an `align` atom

228 - + ref-filter: introduce match_atom_name()

229 - + ref-filter: introduce handler function for each atom

230 - + utf8: add function to align a string into given strbuf

231 - + ref-filter: introduce ref_formatting_state and ref_formatting_stack

232 - + ref-filter: move `struct atom_value` to ref-filter.c

233 - + strtoul_ui: reject negative values

234 - + Merge 'jk/git-path' into kn/for-each-tag

235 - + Merge 'kn/for-each-tag-branch' into kn/for-each-tag

236 - (this branch is used by dt/refs-backend-lmdb, kn/for-each-branch and kn/for-each-branch-remainder; uses kn/for-each-tag-branch.)

237 -

238 - The "ref-filter" code was taught about many parts of what "tag -l"

239 - does and then "tag -l" is being reimplemented in terms of "ref-filter".

240 -

241 -

242 -* kn/for-each-tag-branch (2015-08-03) 11 commits

243 - (merged to 'next' on 2015-08-03 at d9e94b9)

244 - + for-each-ref: add '--contains' option

245 - + ref-filter: implement '--contains' option

246 - + parse-options.h: add macros for '--contains' option

247 - + parse-option: rename parse_opt_with_commit()

248 - + for-each-ref: add '--merged' and '--no-merged' options

249 - + ref-filter: implement '--merged' and '--no-merged' options

250 - + ref-filter: add parse_opt_merge_filter()

251 - + for-each-ref: add '--points-at' option

252 - + ref-filter: implement '--points-at' option

253 - + tag: libify parse_opt_points_at()

254 - + t6302: for-each-ref tests for ref-filter APIs

255 - (this branch is used by dt/refs-backend-lmdb, kn/for-each-branch, kn/for-each-branch-remainder and kn/for-each-tag.)

256 -

257 - Originally merged to 'next' on 2015-07-15

258 -

259 - Some features from "git tag -l" and "git branch -l" have been made

260 - available to "git for-each-ref" so that eventually the unified

261 - implementation can be shared across all three, in a follow-up

262 - series or two.

263 -

264 -

265 -* ld/p4-import-labels (2015-08-28) 3 commits

266 - (merged to 'next' on 2015-09-01 at cf9f1d6)

267 - + git-p4: fix P4 label import for unprocessed commits

268 - + git-p4: do not terminate creating tag for unknown commit

269 - + git-p4: failing test for ignoring invalid p4 labels

270 -

271 - Correct "git p4 --detect-labels" so that it does not fail to create

272 - a tag that points at a commit that is also being imported.

273 -

274 -

275 -* mm/keyid-docs (2015-09-21) 3 commits

276 - (merged to 'next' on 2015-09-21 at f50ccab)

277 - + Documentation: explain optional arguments better

278 - + Documentation/grep: fix documentation of -O

279 - + Documentation: use 'keyid' consistently, not 'key-id'

280 -

281 - Very small number of options take a parameter that is optional

282 - (which is not a great UI element as they can only appear at the end

283 - of the command line). Add notice to documentation of each and

284 - every one of them.

285 -

286 -

287 -* nk/stash-show-config (2015-08-31) 1 commit

288 - (merged to 'next' on 2015-09-08 at 90dd06f)

289 - + stash: allow "stash show" diff output configurable

290 -

291 - Users who are too busy to type three extra keystrokes to ask for

292 - "git stash show -p" can now set stash.showPatch configuration

293 - varible to true to always see the actual patch, not just the list

294 - of paths affected with feel for the extent of damage via diffstat.

295 -

296 -

297 -* sb/submodule-helper (2015-09-08) 4 commits

298 - (merged to 'next' on 2015-09-21 at 9354b31)

299 - + submodule: rewrite `module_clone` shell function in C

300 - + submodule: rewrite `module_name` shell function in C

301 - + submodule: rewrite `module_list` shell function in C

302 - + Merge 'hv/submodule-config' to 'sb/submodule-helper'

303 - (this branch is used by dt/refs-backend-lmdb and sb/submodule-parallel-fetch.)

304 -

305 - The infrastructure to rewrite "git submodule" in C is being built

306 - incrementally. Let's polish these early parts well enough and make

307 - them graduate to 'next' and 'master', so that the more involved

308 - follow-up can start cooking on a solid ground.

82 + Will merge to 'next'.

83

310 ---------------------------------------------------

311 -[New Topics]

84

313 -* dt/refs-backend-lmdb (2015-10-05) 45 commits

314 - - SQUASH???

315 - - refs: tests for db backend

316 - - refs: add LMDB refs backend

317 - - refs: add register_refs_backend

318 - - refs: allow ref backend to be set for clone

319 - - refs: break out a ref conflict check

320 - - refs: make some files backend functions public

321 - - refs: move some defines from refs-be-files.c to refs.h

322 - - run-command: track total number of commands run

323 - - refs-be-files.c: add method to rename refs

324 - - refs.c: make struct ref_transaction generic

325 - - refs.c: add method for initializing refs db

326 - - initdb: move safe_create_dir into common code

327 - - refs.c: add method for initial ref transaction commit

328 - - refs-be-files.c: add method to expire reflogs

329 - - refs.c: add methods for reflog

330 - - refs.c: add ref backend init function

331 - - refs.c: move should_autocreate_reflog to common code

332 - - refs.c: move peel_object to the common code

333 - - refs.c: move copy_msg to the common code

334 - - refs.h: document make refname_is_safe and add it to header

335 - - refs.c: move refname_is_safe to the common code

336 - - refs-be-files.c: add do_for_each_per_worktree_ref

337 - - refs-be-files.c: add method for for_each_reftype_...

338 - - refs-be-files.c: add methods for the ref iterators

339 - - refs-be-files.c: add methods for misc ref operations

340 - - refs-be-files.c: add a backend method structure with transaction functions

341 - - refs.c: move head_ref_namespaced to the common code

342 - - refs.c: move ref iterators to the common code

343 - - refs.c: move prettify_refname to the common code

344 - - refs.c: move is_branch to the common code

345 - - refs.c: move check_refname_format to the common code

346 - - refs.c: move resolve_refdup to common

347 - - refs.c: move read_ref, read_ref_full and ref_exists to the common code

348 - - refs.c: move warn_if_dangling_symref* to the common code

349 - - refs.c: move dwim and friend functions to the common refs code

350 - - refs.c: move the hidden refs functions to the common code

351 - - refs.c: move read_ref_at to the common refs file

352 - - refs.c: move delete_ref and delete_refs to the common code

353 - - refs.c: move update_ref to refs.c

354 - - refs.c: add a new refs.c file to hold all common refs code

355 - - refs-be-files.c: rename refs to refs-be-files

356 - - refs: make repack_without_refs and is_branch public

357 - - refs.c: create a public version of verify_refname_available

358 - - Merge branch 'jk/war-on-sprintf' into HEAD

359 - (this branch uses jk/war-on-sprintf.)

85 +* dt/log-follow-config (2015-10-07) 1 commit

86 + - log: Update log.follow doc and add to config.txt

87

361 - Pluggable ref backend.

88 + Description of the "log.follow" configuration variable in "git log"

89 + documentation is now also copied to "git config" documentation.

90

363 - Expecting a reroll.

364 - ($gmane/278757).

91 + Will merge to 'next'.

92

93

367 -* gr/rebase-i-drop-warn (2015-10-02) 2 commits

368 - - rebase-i: loosen over-eager check_bad_cmd check

369 - - rebase-i: explicitly accept tab as separator in commands

94 +* es/worktree-add-cleanup (2015-10-07) 1 commit

95 + - t2026: rename worktree prune test

96

371 - "git rebase -i" had a minor regression recently, which stopped

372 - considering a line that begins with an indented '#' in its insn

373 - sheet not a comment, which is now fixed.

97 + A no-op code-health maintenance.

98

99 Will merge to 'next'.

100

101

378 -* kn/for-each-branch-remainder (2015-10-02) 9 commits

379 - - branch: implement '--format' option

380 - - branch: use ref-filter printing APIs

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

382 - - ref-filter: introduce format_ref_array_item()

383 - - ref-filter: adopt get_head_description() from branch.c

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

385 - - ref-filter: add support for %(path) atom

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

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

388 - (this branch uses kn/for-each-branch.)

102 +* sg/pretty-more-date-mode-format (2015-10-07) 1 commit

103 + - pretty: add format specifiers for short and raw date formats

104

390 - More unification among "branch -l", "tag -l" and "for-each-ref --format".

105 + Introduce "%as" and "%aR" placeholders for "log --format" to show

106 + the author date in the short and raw formats.

107

392 - Expecting a reroll.

393 - ($gmane/278926)

108 + I have a feeling that that this is a step in a wrong direction.

109

395 -* pt/pull-builtin (2015-10-02) 1 commit

396 - - merge: grammofix in please-commit-before-merge message

110 +

111 +* tk/doc-interpret-trailers-grammo (2015-10-07) 1 commit

112 + - Documentation/interpret-trailers: Grammar fix

113

114 Will merge to 'next'.

115

@@ -435,7 +151,8 @@ of the repositories listed at

151 ($gmane/277574)

152

153

438 -* mr/worktree-list (2015-10-02) 7 commits

154 +* mr/worktree-list (2015-10-05) 8 commits

155 + - fixup! worktree: add a function to get worktree details

156 - SQUASH???

157 - worktree: add 'list' command

158 - worktree: add details to the worktree struct

@@ -447,7 +164,7 @@ of the repositories listed at

164 Add the "list" subcommand to "git worktree".

165

166 Waiting for a reroll.

450 - ($gmane/278529).

167 + ($gmane/278529, $gmane/279113).

168

169

170 * mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits

@@ -512,12 +229,103 @@ of the repositories listed at

229 --------------------------------------------------

230 [Cooking]

231

515 -* jk/asciidoctor-section-heading-markup-fix (2015-09-25) 1 commit

516 - - Documentation: fix section header mark-up

232 +* dt/refs-backend-lmdb (2015-10-05) 45 commits

233 + - SQUASH???

234 + - refs: tests for db backend

235 + - refs: add LMDB refs backend

236 + - refs: add register_refs_backend

237 + - refs: allow ref backend to be set for clone

238 + - refs: break out a ref conflict check

239 + - refs: make some files backend functions public

240 + - refs: move some defines from refs-be-files.c to refs.h

241 + - run-command: track total number of commands run

242 + - refs-be-files.c: add method to rename refs

243 + - refs.c: make struct ref_transaction generic

244 + - refs.c: add method for initializing refs db

245 + - initdb: move safe_create_dir into common code

246 + - refs.c: add method for initial ref transaction commit

247 + - refs-be-files.c: add method to expire reflogs

248 + - refs.c: add methods for reflog

249 + - refs.c: add ref backend init function

250 + - refs.c: move should_autocreate_reflog to common code

251 + - refs.c: move peel_object to the common code

252 + - refs.c: move copy_msg to the common code

253 + - refs.h: document make refname_is_safe and add it to header

254 + - refs.c: move refname_is_safe to the common code

255 + - refs-be-files.c: add do_for_each_per_worktree_ref

256 + - refs-be-files.c: add method for for_each_reftype_...

257 + - refs-be-files.c: add methods for the ref iterators

258 + - refs-be-files.c: add methods for misc ref operations

259 + - refs-be-files.c: add a backend method structure with transaction functions

260 + - refs.c: move head_ref_namespaced to the common code

261 + - refs.c: move ref iterators to the common code

262 + - refs.c: move prettify_refname to the common code

263 + - refs.c: move is_branch to the common code

264 + - refs.c: move check_refname_format to the common code

265 + - refs.c: move resolve_refdup to common

266 + - refs.c: move read_ref, read_ref_full and ref_exists to the common code

267 + - refs.c: move warn_if_dangling_symref* to the common code

268 + - refs.c: move dwim and friend functions to the common refs code

269 + - refs.c: move the hidden refs functions to the common code

270 + - refs.c: move read_ref_at to the common refs file

271 + - refs.c: move delete_ref and delete_refs to the common code

272 + - refs.c: move update_ref to refs.c

273 + - refs.c: add a new refs.c file to hold all common refs code

274 + - refs-be-files.c: rename refs to refs-be-files

275 + - refs: make repack_without_refs and is_branch public

276 + - refs.c: create a public version of verify_refname_available

277 + - Merge branch 'jk/war-on-sprintf' into HEAD

278 + (this branch uses jk/war-on-sprintf.)

279 +

280 + Pluggable ref backend.

281 +

282 + Expecting a reroll.

283 + ($gmane/278757).

284 +

285 +

286 +* gr/rebase-i-drop-warn (2015-10-05) 2 commits

287 + - rebase-i: loosen over-eager check_bad_cmd check

288 + - rebase-i: explicitly accept tab as separator in commands

289 +

290 + "git rebase -i" had a minor regression recently, which stopped

291 + considering a line that begins with an indented '#' in its insn

292 + sheet not a comment, which is now fixed.

293

294 Will merge to 'next'.

295

296

297 +* kn/for-each-branch-remainder (2015-10-02) 9 commits

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

299 + - branch: use ref-filter printing APIs

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

301 + - ref-filter: introduce format_ref_array_item()

302 + - ref-filter: adopt get_head_description() from branch.c

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

304 + - ref-filter: add support for %(path) atom

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

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

307 + (this branch uses kn/for-each-branch.)

308 +

309 + More unification among "branch -l", "tag -l" and "for-each-ref --format".

310 +

311 + Expecting a reroll.

312 + ($gmane/278926)

313 +

314 +

315 +* pt/pull-builtin (2015-10-02) 1 commit

316 + (merged to 'next' on 2015-10-07 at 19af20e)

317 + + merge: grammofix in please-commit-before-merge message

318 +

319 + Will merge to 'master'.

320 +

321 +

322 +* jk/asciidoctor-section-heading-markup-fix (2015-09-25) 1 commit

323 + (merged to 'next' on 2015-10-07 at 8bbff49)

324 + + Documentation: fix section header mark-up

325 +

326 + Will merge to 'master'.

327 +

328 +

329 * jk/war-on-sprintf (2015-10-05) 70 commits

330 - name-rev: use strip_suffix to avoid magic numbers

331 - use strbuf_complete to conditionally append slash

@@ -624,12 +432,13 @@ of the repositories listed at

432

433

434 * tk/typofix-connect-unknown-proto-error (2015-09-25) 1 commit

627 - - connect: fix typo in result string of prot_name()

435 + (merged to 'next' on 2015-10-07 at cc3430e)

436 + + connect: fix typo in result string of prot_name()

437

629 - Will merge to 'next'.

438 + Will merge to 'master'.

439

440

632 -* js/clone-dissociate (2015-10-05) 4 commits

441 +* js/clone-dissociate (2015-10-07) 4 commits

442 - clone --dissociate: avoid locking pack files

443 - sha1_file.c: add a function to release all packs

444 - sha1_file: consolidate code to close a pack's file descriptor

@@ -668,9 +477,10 @@ of the repositories listed at

477

478

479 * nd/ls-remote-does-not-have-u-option (2015-09-28) 1 commit

671 - - ls-remote.txt: delete unsupported option

480 + (merged to 'next' on 2015-10-07 at 0790a76)

481 + + ls-remote.txt: delete unsupported option

482

673 - Will merge to 'next'.

483 + Will merge to 'master'.

484

485

486 * pt/am-builtin (2015-09-30) 1 commit

@@ -704,12 +514,13 @@ of the repositories listed at

514

515

516 * jk/notes-dwim-doc (2015-09-22) 1 commit

707 - - notes: correct documentation of DWIMery for notes references

517 + (merged to 'next' on 2015-10-07 at c4341d1)

518 + + notes: correct documentation of DWIMery for notes references

519

520 The way how --ref/--notes to specify the notes tree reference are

521 DWIMmed was not clearly documented.

522

712 - Will merge to 'next'.

523 + Will merge to 'master'.

524

525

526 * kn/for-each-branch (2015-09-25) 8 commits

@@ -768,18 +579,6 @@ of the repositories listed at

579 ($gmane/278326)

580

581

771 -* nd/ignore-then-not-ignore (2015-09-21) 2 commits

772 - (merged to 'next' on 2015-09-21 at 2182591)

773 - + dir.c: don't exclude whole dir prematurely if neg pattern may match

774 - + dir.c: make last_exclude_matching_from_list() run til the end

775 -

776 - Allow a later "!/abc/def" to override an earlier "/abc" that

777 - appears in the same .gitignore file to make it easier to express

778 - "everything in /abc directory is ignored, except for ...".

779 -

780 - Will merge to 'master'.

781 -

782 -

582 * sb/submodule-parallel-fetch (2015-10-02) 8 commits

583 - submodules: allow parallel fetching, add tests and documentation

584 - fetch_populated_submodules: use new parallel job processing

@@ -809,29 +608,6 @@ of the repositories listed at

608 Will merge to 'next'.

609

610

812 -* ti/glibc-stdio-mutex-from-signal-handler (2015-09-04) 1 commit

813 - (merged to 'next' on 2015-09-08 at c8047ba)

814 - + pager: don't use unsafe functions in signal handlers

815 -

816 - Allocation related functions and stdio are unsafe things to call

817 - inside a signal handler, and indeed killing the pager can cause

818 - glibc to deadlock waiting on allocation mutex as our signal handler

819 - tries to free() some data structures in wait_for_pager(). Reduce

820 - these unsafe calls.

821 -

822 - Will merge to 'master'.

823 -

824 -

825 -* gb/filter-branch-progress (2015-09-21) 2 commits

826 - (merged to 'next' on 2015-09-21 at 15e698d)

827 - + filter-branch: make report-progress more readable

828 - + filter-branch: add passed/remaining seconds on progress

829 -

830 - Give progress meter to "git filter-branch".

831 -

832 - Will merge to 'master'.

833 -

834 -

611 * ls/p4-lfs (2015-10-03) 7 commits

612 - git-p4: add Git LFS backend for large file system

613 - git-p4: add support for large file systems

@@ -861,20 +637,6 @@ of the repositories listed at

637 Will merge to 'next'.

638

639

864 -* ls/p4-path-encoding (2015-09-21) 3 commits

865 - (merged to 'next' on 2015-09-21 at 0772d82)

866 - + git-p4: use replacement character for non UTF-8 characters in paths

867 - (merged to 'next' on 2015-09-17 at 7f8b9e0)

868 - + git-p4: improve path encoding verbose output

869 - (merged to 'next' on 2015-09-08 at 56514f9)

870 - + git-p4: add config git-p4.pathEncoding

871 -

872 - "git p4" learned to reencode the pathname it uses to communicate

873 - with the p4 depot with a new option.

874 -

875 - Will merge to 'master'.

876 -

877 -

640 * ad/cygwin-wants-rename (2015-08-07) 1 commit

641 - config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES

642

@@ -897,7 +659,7 @@ of the repositories listed at

659

660

661 * jc/merge-drop-old-syntax (2015-04-29) 1 commit

900 - (merged to 'next' on 2015-08-03 at a52c2b2)

662 + (merged to 'next' on 2015-10-07 at 50fed71)

663 + merge: drop 'git merge <message> HEAD <commit>' syntax

664

665 Originally merged to 'next' on 2015-05-28

What's cooking (2015/10 #02)