1066e100cb · 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 (Jan 2014, #01; Mon, 6)

4 -X-master-at: 932f7e47699993de0f6ad2af92be613994e40afe

5 -X-next-at: 5ca323a946964afa14ca9712a4b3012b36f33b02

3 +Subject: What's cooking in git.git (Jan 2014, #02; Fri, 10)

4 +X-master-at: a25014bc4cef56712f7d005d7b76070d0270f454

5 +X-next-at: 7559984f930784464fd0cfdd0a69e17c779ae117

6

7 -What's cooking in git.git (Jan 2014, #01; Mon, 6)

7 +What's cooking in git.git (Jan 2014, #02; Fri, 10)

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

9

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

@@ -19,123 +19,97 @@ of the repositories listed at

19 --------------------------------------------------

20 [Graduated to "master"]

21

22 -* fc/remote-helper-fixes (2013-12-26) 5 commits

23 - (merged to 'next' on 2013-12-26 at ce5f872)

24 - + remote-hg: test 'shared_path' in a moved clone

25 - (merged to 'next' on 2013-12-17 at aa4dc07)

26 - + remote-hg: add tests for special filenames

27 - + remote-hg: fix 'shared path' path

28 - + remote-helpers: add extra safety checks

29 - + remote-hg: avoid buggy strftime()

30 -

31 -

32 -* jc/push-refmap (2013-12-04) 3 commits

33 - (merged to 'next' on 2013-12-12 at 71e358f)

34 - + push: also use "upstream" mapping when pushing a single ref

35 - + push: use remote.$name.push as a refmap

36 - + builtin/push.c: use strbuf instead of manual allocation

37 -

38 - Make "git push origin master" update the same ref that would be

39 - updated by our 'master' when "git push origin" (no refspecs) is run

40 - while the 'master' branch is checked out, which makes "git push"

41 - more symmetric to "git fetch" and more usable for the triangular

42 - workflow.

43 -

44 -

45 -* jk/cat-file-regression-fix (2013-12-12) 2 commits

46 - (merged to 'next' on 2013-12-13 at 3713e01)

47 - + cat-file: handle --batch format with missing type/size

48 - + cat-file: pass expand_data to print_object_or_die

22 +* ap/path-max (2013-12-16) 1 commit

23 + (merged to 'next' on 2014-01-03 at affc620)

24 + + Prevent buffer overflows when path is too long

25

50 - "git cat-file --batch=", an admittedly useless command, did not

51 - behave very well.

26

27 +* bc/log-decoration (2013-12-20) 1 commit

28 + (merged to 'next' on 2014-01-03 at ff8873f)

29 + + log: properly handle decorations with chained tags

30

54 -* jk/name-pack-after-byte-representation (2013-12-16) 3 commits

55 - (merged to 'next' on 2013-12-17 at 0bc385c)

56 - + pack-objects doc: treat output filename as opaque

57 - (merged to 'next' on 2013-12-09 at 247b2d0)

58 - + pack-objects: name pack files after trailer hash

59 - + sha1write: make buffer const-correct

60 - (this branch is tangled with jk/pack-bitmap.)

31 + "git log --decorate" did not handle a tag pointed by another tag

32 + nicely.

33

62 - Two packfiles that contain the same set of objects have

63 - traditionally been named identically, but that made repacking a

64 - repository that is already fully packed without any cruft with a

65 - different packing parameter cumbersome. Update the convention to

66 - name the packfile after the bytestream representation of the data,

67 - not after the set of objects in it.

34

35 +* bm/merge-base-octopus-dedup (2013-12-30) 2 commits

36 + (merged to 'next' on 2014-01-06 at 355d62b)

37 + + merge-base --octopus: reduce the result from get_octopus_merge_bases()

38 + + merge-base: separate "--independent" codepath into its own helper

39

70 -* jk/pull-rebase-using-fork-point (2013-12-10) 2 commits

71 - (merged to 'next' on 2013-12-13 at 1862c12)

72 - + rebase: use reflog to find common base with upstream

73 - + pull: use merge-base --fork-point when appropriate

40 + "git merge-base --octopus" used to leave cleaning up suboptimal

41 + result to the caller, but now it does the clean-up itself.

42

43

76 -* jk/rev-parse-double-dashes (2013-12-09) 2 commits

77 - (merged to 'next' on 2013-12-13 at d26bac7)

78 - + rev-parse: be more careful with munging arguments

79 - + rev-parse: correctly diagnose revision errors before "--"

44 +* bs/mirbsd (2014-01-02) 1 commit

45 + (merged to 'next' on 2014-01-06 at d5cecbb)

46 + + Add MirBSD support to the build system.

47

81 - "git rev-parse <revs> -- <paths>" did not implement the usual

82 - disambiguation rules the commands in the "git log" family used in

83 - the same way.

48

49 +* cc/replace-object-info (2013-12-30) 11 commits

50 + (merged to 'next' on 2014-01-03 at 4473803)

51 + + replace info: rename 'full' to 'long' and clarify in-code symbols

52 + (merged to 'next' on 2013-12-17 at aeb9e18)

53 + + Documentation/git-replace: describe --format option

54 + + builtin/replace: unset read_replace_refs

55 + + t6050: add tests for listing with --format

56 + + builtin/replace: teach listing using short, medium or full formats

57 + + sha1_file: perform object replacement in sha1_object_info_extended()

58 + + t6050: show that git cat-file --batch fails with replace objects

59 + + sha1_object_info_extended(): add an "unsigned flags" parameter

60 + + sha1_file.c: add lookup_replace_object_extended() to pass flags

61 + + replace_object: don't check read_replace_refs twice

62 + + rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT

63

86 -* js/gnome-keyring (2013-12-16) 1 commit

87 - (merged to 'next' on 2013-12-17 at 422fd61)

88 - + contrib/git-credential-gnome-keyring.c: small stylistic cleanups

64 + read_sha1_file() that is the workhorse to read the contents given

65 + an object name honoured object replacements, but there is no

66 + corresponding mechanism to sha1_object_info() that is used to

67 + obtain the metainfo (e.g. type & size) about the object, leading

68 + callers to weird inconsistencies.

69

90 - Style fix.

70

71 +* jh/rlimit-nofile-fallback (2013-12-18) 1 commit

72 + (merged to 'next' on 2014-01-03 at b56ae0c)

73 + + get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure

74

93 -* tg/diff-no-index-refactor (2013-12-16) 4 commits

94 - (merged to 'next' on 2013-12-17 at 009d8d8)

95 - + diff: avoid some nesting

96 - + diff: add test for --no-index executed outside repo

97 - (merged to 'next' on 2013-12-13 at 523f7c4)

98 - + diff: don't read index when --no-index is given

99 - + diff: move no-index detection to builtin/diff.c

75 + When we figure out how many file descriptors to allocate for

76 + keeping packfiles open, a system with non-working getrlimit() could

77 + cause us to die(), but because we make this call only to get a

78 + rough estimate of how many is available and we do not even attempt

79 + to use up all file descriptors available ourselves, it is nicer to

80 + fall back to a reasonable low value rather than dying.

81

101 - "git diff ../else/where/A ../else/where/B" when ../else/where is

102 - clearly outside the repository, and "git diff --no-index A B", do

103 - not have to look at the index at all, but we used to read the index

104 - unconditionally.

82

83 +* jk/credential-plug-leak (2014-01-02) 1 commit

84 + (merged to 'next' on 2014-01-06 at 88e29a3)

85 + + Revert "prompt: clean up strbuf usage"

86

107 -* zk/difftool-counts (2013-12-16) 2 commits

108 - (merged to 'next' on 2013-12-16 at 0e0d235)

109 - + diff.c: fix some recent whitespace style violations

110 - (merged to 'next' on 2013-12-12 at ba35694)

111 - + difftool: display the number of files in the diff queue in the prompt

87 + An earlier "clean-up" introduced an unnecessary memory leak.

88

113 - Show the total number of paths and the number of paths shown so far

114 - when "git difftool" prompts to launch an external diff tool, which

115 - would give users some sense of progress.

89

117 ---------------------------------------------------

118 -[New Topics]

90 +* jk/http-auth-tests-robustify (2014-01-02) 1 commit

91 + (merged to 'next' on 2014-01-06 at 7e87bba)

92 + + use distinct username/password for http auth tests

93

120 -* ta/format-user-manual-as-an-article (2014-01-06) 1 commit

121 - (merged to 'next' on 2014-01-06 at 37858f6)

122 - + user-manual: improve html and pdf formatting

94 + Using the same username and password during the tests would not

95 + catch a potential breakage of sending one when we should be sending

96 + the other.

97

124 - Update the way the user-manual is formatted via AsciiDoc to save

125 - trees.

98

127 - Will merge to 'master'.

99 +* jk/oi-delta-base (2013-12-26) 2 commits

100 + (merged to 'next' on 2014-01-06 at 8cf3ed2)

101 + + cat-file: provide %(deltabase) batch format

102 + + sha1_object_info_extended: provide delta base sha1s

103

104 + Teach "cat-file --batch" to show delta-base object name for a

105 + packed object that is represented as a delta.

106

130 -* bm/merge-base-octopus-dedup (2013-12-30) 2 commits

131 - (merged to 'next' on 2014-01-06 at 355d62b)

132 - + merge-base --octopus: reduce the result from get_octopus_merge_bases()

133 - + merge-base: separate "--independent" codepath into its own helper

107

135 - "git merge-base --octopus" used to leave cleaning up suboptimal

136 - result to the caller, but now it does the clean-up itself.

108 +* jk/sha1write-void (2013-12-26) 1 commit

109 + (merged to 'next' on 2014-01-06 at d8cd8ff)

110 + + do not pretend sha1write returns errors

111

138 - Will merge to 'master'.

112 + Code clean-up.

113

114

115 * jk/test-framework-updates (2014-01-02) 3 commits

@@ -147,8 +121,6 @@ of the repositories listed at

121 The basic test used to leave unnecessary trash directories in the

122 t/ directory.

123

150 - Will merge to 'master'.

151 -

124

125 * js/lift-parent-count-limit (2013-12-27) 1 commit

126 (merged to 'next' on 2014-01-06 at b74133c)

@@ -157,51 +129,52 @@ of the repositories listed at

129 There is no reason to have a hardcoded upper limit of the number of

130 parents for an octopus merge, created via the graft mechanism.

131

160 - Will merge to 'master'.

161 -

162 -

163 -* ap/remote-hg-skip-null-bookmarks (2014-01-02) 1 commit

164 - - remote-hg: do not fail on invalid bookmarks

132

166 - Reported to break tests ($gmane/240005)

167 - Expecting a reroll.

133 +* km/gc-eperm (2014-01-02) 1 commit

134 + (merged to 'next' on 2014-01-06 at fe107de)

135 + + gc: notice gc processes run by other users

136

137 + A "gc" process running as a different user should be able to stop a

138 + new "gc" process from starting.

139

170 -* bs/mirbsd (2014-01-02) 1 commit

171 - (merged to 'next' on 2014-01-06 at d5cecbb)

172 - + Add MirBSD support to the build system.

140

174 - Will merge to 'master'.

141 +* mh/path-max (2013-12-18) 2 commits

142 + (merged to 'next' on 2014-01-03 at 5227c9b)

143 + + builtin/prune.c: use strbuf to avoid having to worry about PATH_MAX

144 + + prune-packed: use strbuf to avoid having to worry about PATH_MAX

145

146 + A few places where we relied on a fixed length buffer to hold

147 + pathnames in these two programs have been converted to use strbuf.

148

177 -* jk/credential-plug-leak (2014-01-02) 1 commit

178 - (merged to 'next' on 2014-01-06 at 88e29a3)

179 - + Revert "prompt: clean up strbuf usage"

149

181 - An earlier "clean-up" introduced an unnecessary memory leak.

150 +* nd/add-empty-fix (2013-12-26) 1 commit

151 + (merged to 'next' on 2014-01-06 at 88a78c9)

152 + + add: don't complain when adding empty project root

153

183 - Will merge to 'master'.

154 + "git add -A" (no other arguments) in a totally empty working tree

155 + used to emit an error.

156

157

186 -* jk/http-auth-tests-robustify (2014-01-02) 1 commit

187 - (merged to 'next' on 2014-01-06 at 7e87bba)

188 - + use distinct username/password for http auth tests

158 +* nd/commit-tree-constness (2013-12-26) 1 commit

159 + (merged to 'next' on 2014-01-06 at a177c9f)

160 + + commit.c: make "tree" a const pointer in commit_tree*()

161

190 - Using the same username and password during the tests would not

191 - catch a potential breakage of sending one when we should be sending

192 - the other.

162 + Code clean-up.

163

194 - Will merge to 'master'.

164

165 +* nd/daemon-informative-errors-typofix (2013-12-20) 1 commit

166 + (merged to 'next' on 2014-01-03 at 1b87648)

167 + + daemon: be strict at parsing parameters --[no-]informative-errors

168

197 -* km/gc-eperm (2014-01-02) 1 commit

198 - (merged to 'next' on 2014-01-06 at fe107de)

199 - + gc: notice gc processes run by other users

169

201 - A "gc" process running as a different user should be able to stop a

202 - new "gc" process from starting.

170 +* nd/negative-pathspec (2013-12-06) 3 commits

171 + (merged to 'next' on 2013-12-12 at 9f340c8)

172 + + pathspec.c: support adding prefix magic to a pathspec with mnemonic magic

173 + + Support pathspec magic :(exclude) and its short form :!

174 + + glossary-content.txt: rephrase magic signature part

175

204 - Will merge to 'master'.

176 + Introduce "negative pathspec" magic, to allow "git log -- . ':!dir'" to

177 + tell us "I am interested in everything but 'dir' directory".

178

179

180 * rr/completion-branch-config (2014-01-06) 4 commits

@@ -215,7 +188,20 @@ of the repositories listed at

188 hierarchies whose variables are predominantly three-level where not

189 completed by hitting a <TAB> in bash and zsh completions.

190

218 - Will merge to 'master'.

191 +

192 +* rt/bfg-ad-in-filter-branch-doc (2013-12-18) 1 commit

193 + (merged to 'next' on 2014-01-03 at 2a45e3b)

194 + + docs: add filter-branch notes on The BFG

195 +

196 +

197 +* sb/diff-orderfile-config (2013-12-18) 3 commits

198 + (merged to 'next' on 2014-01-03 at 744eba7)

199 + + diff: add diff.orderfile configuration variable

200 + + diff: let "git diff -O" read orderfile from any file and fail properly

201 + + t4056: add new tests for "git diff -O"

202 +

203 + Allow "git diff -O<file>" to be configured with a new configuration

204 + variable.

205

206

207 * ss/builtin-cleanup (2014-01-06) 3 commits

@@ -231,25 +217,147 @@ of the repositories listed at

217 is_in_cmdlist(), were suggested in the discussion, but they can

218 come as follow-ups on top of this series.

219

234 - Will merge to 'master'.

220

221 +* ta/format-user-manual-as-an-article (2014-01-06) 1 commit

222 + (merged to 'next' on 2014-01-06 at 37858f6)

223 + + user-manual: improve html and pdf formatting

224

237 -* ss/safe-create-leading-dir-with-slash (2014-01-06) 1 commit

238 - - safe_create_leading_directories(): on Windows, \ can separate path components

225 + Update the way the user-manual is formatted via AsciiDoc to save

226 + trees.

227 +

228 +

229 +* tm/fetch-prune (2014-01-03) 2 commits

230 + (merged to 'next' on 2014-01-03 at a58c6b4)

231 + + fetch --prune: Run prune before fetching

232 + + fetch --prune: always print header url

233 +

234 + Fetching 'frotz' branch with "git fetch", while having

235 + 'frotz/nitfol' remote-tracking branch from an earlier fetch, would

236 + error out, primarily because the command has not been told to

237 + remove anything on our side. In such a case, "git fetch --prune"

238 + can be used to remove 'frotz/nitfol' to make room to fetch and

239 + store 'frotz' remote-tracking branch.

240

241

242 * vm/octopus-merge-bases-simplify (2014-01-03) 1 commit

243 (merged to 'next' on 2014-01-06 at 35df672)

244 + get_octopus_merge_bases(): cleanup redundant variable

245

246 +--------------------------------------------------

247 +[New Topics]

248 +

249 +* br/sha1-name-40-hex-no-disambiguation (2014-01-07) 1 commit

250 + (merged to 'next' on 2014-01-10 at 2a0973b)

251 + + sha1_name: don't resolve refs when core.warnambiguousrefs is false

252 + (this branch is used by jk/warn-on-object-refname-ambiguity.)

253 +

254 + When parsing a 40-hex string into the object name, the string is

255 + checked to see if it can be interpreted as a ref so that a warning

256 + can be given for ambiguity. The code kicked in even when the

257 + core.warnambiguousrefs is set to false to squelch this warning, in

258 + which case the cycles spent to look at the ref namespace were an

259 + expensive no-op, as the result was discarded without being used.

260 +

261 + Will merge to 'master'.

262 +

263 +

264 +* jl/submodule-mv-checkout-caveat (2014-01-07) 2 commits

265 + (merged to 'next' on 2014-01-10 at 8d3953c)

266 + + rm: better document side effects when removing a submodule

267 + + mv: better document side effects when moving a submodule

268 +

269 + With a submodule that was initialized in an old fashioned way

270 + without gitlinks, switching branches in the superproject between

271 + the one with and without the submodule may leave the submodule

272 + working tree with its embedded repository behind, as there may be

273 + unexpendable state there. Document and warn users about this.

274 +

275 Will merge to 'master'.

276

277

248 -* fp/submodule-checkout-mode (2014-01-06) 2 commits

249 - - DONOTMERGE: needs sign-off

250 - - git-submodule.sh: support 'checkout' as a valid update mode

278 +* jn/pager-lv-default-env (2014-01-07) 1 commit

279 + (merged to 'next' on 2014-01-10 at 22d4755)

280 + + pager: set LV=-c alongside LESS=FRSX

281

252 - Need to pick up a rerolled one.

282 + Just like we give a reasonable default for "less" via the LESS

283 + environment variable, specify a reasonable default for "lv" via the

284 + "LV" environment variable when spawning the pager.

285 +

286 + Will merge to 'master'.

287 +

288 +

289 +* ow/stash-with-ifs (2014-01-07) 1 commit

290 + (merged to 'next' on 2014-01-10 at 4fc9bdb)

291 + + stash: handle specifying stashes with $IFS

292 +

293 + The implementation of 'git stash $cmd "stash@{...}"' did not quote

294 + the stash argument properly and left it split at IFS whitespace.

295 +

296 + Will merge to 'master'.

297 +

298 +

299 +* rr/completion-format-coverletter (2014-01-07) 1 commit

300 + (merged to 'next' on 2014-01-10 at d2dbc9d)

301 + + completion: complete format.coverLetter

302 +

303 + The bash/zsh completion code did not know about format.coverLetter

304 + among many format.* configuration variables.

305 +

306 + Will merge to 'master'.

307 +

308 +

309 +* wk/submodule-on-branch (2014-01-07) 2 commits

310 + - DONTMERGE: RFC will be rerolled with tests ($gmane/239967)

311 + - submodule: respect requested branch on all clones

312 +

313 + Waiting for the discussion to settle.

314 +

315 +

316 +* jk/branch-at-publish (2014-01-09) 5 commits

317 + - implement @{publish} shorthand

318 + - branch_get: provide per-branch pushremote pointers

319 + - branch_get: return early on error

320 + - interpret_branch_name: factor out upstream handling

321 + - sha1_name: refactor upstream_mark

322 +

323 + Give an easier access to the tracking branches from "other" side in

324 + a triangular workflow by introducing B@{publish} that works in a

325 + similar way to how B@{upstream} does.

326 +

327 + Expecting a reroll.

328 +

329 +

330 +* jk/pull-rebase-using-fork-point (2014-01-09) 1 commit

331 + (merged to 'next' on 2014-01-10 at e86e59d)

332 + + rebase: fix fork-point with zero arguments

333 +

334 + Will merge to 'master'.

335 +

336 +

337 +* jk/warn-on-object-refname-ambiguity (2014-01-09) 6 commits

338 + - get_sha1: drop object/refname ambiguity flag

339 + - get_sha1: speed up ambiguous 40-hex test

340 + - FIXUP: teach DO_FOR_EACH_NO_RECURSE to prime_ref_dir()

341 + - refs: teach for_each_ref a flag to avoid recursion

342 + - cat-file: fix a minor memory leak in batch_objects

343 + - cat-file: refactor error handling of batch_objects

344 + (this branch uses br/sha1-name-40-hex-no-disambiguation.)

345 +

346 + Expecting a reroll.

347 +

348 +

349 +* mh/shorten-unambigous-ref (2014-01-09) 3 commits

350 + - shorten_unambiguous_ref(): tighten up pointer arithmetic

351 + - gen_scanf_fmt(): delete function and use snprintf() instead

352 + - shorten_unambiguous_ref(): introduce a new local variable

353 +

354 + Will merge to 'next'.

355 +

356 +

357 +* mm/mv-file-to-no-such-dir-with-slash (2014-01-10) 1 commit

358 + - mv: let 'git mv file no-such-dir/' error out on Windows, too

359 +

360 + Will merge to 'next'.

361

362 --------------------------------------------------

363 [Stalled]

@@ -463,87 +571,26 @@ of the repositories listed at

571 --------------------------------------------------

572 [Cooking]

573

466 -* bc/log-decoration (2013-12-20) 1 commit

467 - (merged to 'next' on 2014-01-03 at ff8873f)

468 - + log: properly handle decorations with chained tags

469 -

470 - "git log --decorate" did not handle a tag pointed by another tag

471 - nicely.

472 -

473 - Will merge to 'master'.

474 -

475 -

476 -* jh/rlimit-nofile-fallback (2013-12-18) 1 commit

477 - (merged to 'next' on 2014-01-03 at b56ae0c)

478 - + get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure

479 -

480 - When we figure out how many file descriptors to allocate for

481 - keeping packfiles open, a system with non-working getrlimit() could

482 - cause us to die(), but because we make this call only to get a

483 - rough estimate of how many is available and we do not even attempt

484 - to use up all file descriptors available ourselves, it is nicer to

485 - fall back to a reasonable low value rather than dying.

486 -

487 - Will merge to 'master'.

488 -

489 -

490 -* rt/bfg-ad-in-filter-branch-doc (2013-12-18) 1 commit

491 - (merged to 'next' on 2014-01-03 at 2a45e3b)

492 - + docs: add filter-branch notes on The BFG

493 -

494 - Will merge to 'master'.

495 -

496 -

497 -* sb/diff-orderfile-config (2013-12-18) 3 commits

498 - (merged to 'next' on 2014-01-03 at 744eba7)

499 - + diff: add diff.orderfile configuration variable

500 - + diff: let "git diff -O" read orderfile from any file and fail properly

501 - + t4056: add new tests for "git diff -O"

502 -

503 - Allow "git diff -O<file>" to be configured with a new configuration

504 - variable.

505 -

506 - Will merge to 'master'.

507 -

508 -

509 -* nd/daemon-informative-errors-typofix (2013-12-20) 1 commit

510 - (merged to 'next' on 2014-01-03 at 1b87648)

511 - + daemon: be strict at parsing parameters --[no-]informative-errors

512 -

513 - Will merge to 'master'.

514 -

515 -

516 -* tm/fetch-prune (2014-01-03) 2 commits

517 - (merged to 'next' on 2014-01-03 at a58c6b4)

518 - + fetch --prune: Run prune before fetching

519 - + fetch --prune: always print header url

520 -

521 - Fetching 'frotz' branch with "git fetch", while having

522 - 'frotz/nitfol' remote-tracking branch from an earlier fetch, would

523 - error out, primarily because the command has not been told to

524 - remove anything on our side. In such a case, "git fetch --prune"

525 - can be used to remove 'frotz/nitfol' to make room to fetch and

526 - store 'frotz' remote-tracking branch.

527 -

528 - Will merge to 'master'.

574 +* ap/remote-hg-skip-null-bookmarks (2014-01-02) 1 commit

575 + - remote-hg: do not fail on invalid bookmarks

576

577 + Reported to break tests ($gmane/240005)

578 + Expecting a reroll.

579

531 -* jk/oi-delta-base (2013-12-26) 2 commits

532 - (merged to 'next' on 2014-01-06 at 8cf3ed2)

533 - + cat-file: provide %(deltabase) batch format

534 - + sha1_object_info_extended: provide delta base sha1s

580

536 - Teach "cat-file --batch" to show delta-base object name for a

537 - packed object that is represented as a delta.

581 +* ss/safe-create-leading-dir-with-slash (2014-01-06) 1 commit

582 + - safe_create_leading_directories(): on Windows, \ can separate path components

583

539 - Will merge to 'master'.

584 + Expecting to be rolled into mh/safe-create-leading-directories

585

586

542 -* jk/sha1write-void (2013-12-26) 1 commit

543 - (merged to 'next' on 2014-01-06 at d8cd8ff)

544 - + do not pretend sha1write returns errors

587 +* fp/submodule-checkout-mode (2014-01-07) 1 commit

588 + (merged to 'next' on 2014-01-10 at 647ba9b)

589 + + git-submodule.sh: 'checkout' is a valid update mode

590

546 - Code clean-up.

591 + "submodule.*.update=checkout", when propagated from .gitmodules to

592 + .git/config, turned into a "submodule.*.update=none", which did not

593 + make much sense.

594

595 Will merge to 'master'.

596

@@ -555,7 +602,7 @@ of the repositories listed at

602 - submodule: teach unpack_trees() to remove submodule contents

603 - submodule: prepare for recursive checkout of submodules

604

558 - What is the doneness of this one???

605 + Expecting a reroll.

606

607

608 * mh/safe-create-leading-directories (2014-01-06) 17 commits

@@ -580,74 +627,41 @@ of the repositories listed at

627 Code clean-up and protection against concurrent write access to the

628 ref namespace.

629

583 - Is ready for 'next', with or without minor nitfix.

584 -

585 -

586 -* nd/add-empty-fix (2013-12-26) 1 commit

587 - (merged to 'next' on 2014-01-06 at 88a78c9)

588 - + add: don't complain when adding empty project root

589 -

590 - "git add -A" (no other arguments) in a totally empty working tree

591 - used to emit an error.

592 -

593 - Will merge to 'master'.

594 -

595 -

596 -* nd/commit-tree-constness (2013-12-26) 1 commit

597 - (merged to 'next' on 2014-01-06 at a177c9f)

598 - + commit.c: make "tree" a const pointer in commit_tree*()

599 -

600 - Code clean-up.

630 + Asked Michael and Sebastian to work together to roll the latter's

631 + "allow passing p\a\t\h to safe_create_leading_dir()" into this.

632

602 - Will merge to 'master'.

633 + Expecting a reroll.

634

635

636 * jk/pack-bitmap (2013-12-30) 21 commits

606 - - pack-bitmap: implement optional name_hash cache

607 - - t/perf: add tests for pack bitmaps

608 - - t: add basic bitmap functionality tests

609 - - count-objects: recognize .bitmap in garbage-checking

610 - - repack: consider bitmaps when performing repacks

611 - - repack: handle optional files created by pack-objects

612 - - repack: turn exts array into array-of-struct

613 - - repack: stop using magic number for ARRAY_SIZE(exts)

614 - - pack-objects: implement bitmap writing

615 - - rev-list: add bitmap mode to speed up object lists

616 - - pack-objects: use bitmaps when packing objects

617 - - pack-objects: split add_object_entry

618 - - pack-bitmap: add support for bitmap indexes

619 - - documentation: add documentation for the bitmap format

620 - - ewah: compressed bitmap implementation

621 - - compat: add endianness helpers

622 - - sha1_file: export `git_open_noatime`

623 - - revision: allow setting custom limiter function

624 - - pack-objects: factor out name_hash

625 - - pack-objects: refactor the packing list

626 - - revindex: export new APIs

637 + (merged to 'next' on 2014-01-10 at bdbe0a4)

638 + + pack-bitmap: implement optional name_hash cache

639 + + t/perf: add tests for pack bitmaps

640 + + t: add basic bitmap functionality tests

641 + + count-objects: recognize .bitmap in garbage-checking

642 + + repack: consider bitmaps when performing repacks

643 + + repack: handle optional files created by pack-objects

644 + + repack: turn exts array into array-of-struct

645 + + repack: stop using magic number for ARRAY_SIZE(exts)

646 + + pack-objects: implement bitmap writing

647 + + rev-list: add bitmap mode to speed up object lists

648 + + pack-objects: use bitmaps when packing objects

649 + + pack-objects: split add_object_entry

650 + + pack-bitmap: add support for bitmap indexes

651 + + documentation: add documentation for the bitmap format

652 + + ewah: compressed bitmap implementation

653 + + compat: add endianness helpers

654 + + sha1_file: export `git_open_noatime`

655 + + revision: allow setting custom limiter function

656 + + pack-objects: factor out name_hash

657 + + pack-objects: refactor the packing list

658 + + revindex: export new APIs

659

660 Borrows the bitmap index into packfiles from JGit to speed up

661 enumeration of objects involved in a commit range without having to

662 fully traverse the history.

663

632 - Will merge to 'next'.

633 -

634 -

635 -* ap/path-max (2013-12-16) 1 commit

636 - (merged to 'next' on 2014-01-03 at affc620)

637 - + Prevent buffer overflows when path is too long

638 -

639 - Will merge to 'master'.

640 -

641 -

642 -* mh/path-max (2013-12-18) 2 commits

643 - (merged to 'next' on 2014-01-03 at 5227c9b)

644 - + builtin/prune.c: use strbuf to avoid having to worry about PATH_MAX

645 - + prune-packed: use strbuf to avoid having to worry about PATH_MAX

646 -

647 - A few places where we relied on a fixed length buffer to hold

648 - pathnames in these two programs have been converted to use strbuf.

649 -

650 - Will merge to 'master'.

664 + Will cook in 'next'.

665

666

667 * nv/commit-gpgsign-config (2013-12-17) 3 commits

@@ -662,32 +676,12 @@ of the repositories listed at

676 "git commit" and "git commit-tree", but I am not convinced that it

677 is a good idea to sprinkle support for --no-gpg-sign everywhere.

678

679 + Will cook in 'next'.

680

666 -* cc/replace-object-info (2013-12-30) 11 commits

667 - (merged to 'next' on 2014-01-03 at 4473803)

668 - + replace info: rename 'full' to 'long' and clarify in-code symbols

669 - (merged to 'next' on 2013-12-17 at aeb9e18)

670 - + Documentation/git-replace: describe --format option

671 - + builtin/replace: unset read_replace_refs

672 - + t6050: add tests for listing with --format

673 - + builtin/replace: teach listing using short, medium or full formats

674 - + sha1_file: perform object replacement in sha1_object_info_extended()

675 - + t6050: show that git cat-file --batch fails with replace objects

676 - + sha1_object_info_extended(): add an "unsigned flags" parameter

677 - + sha1_file.c: add lookup_replace_object_extended() to pass flags

678 - + replace_object: don't check read_replace_refs twice

679 - + rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT

680 -

681 - read_sha1_file() that is the workhorse to read the contents given

682 - an object name honoured object replacements, but there is no

683 - corresponding mechanism to sha1_object_info() that is used to

684 - obtain the metainfo (e.g. type & size) about the object, leading

685 - callers to weird inconsistencies.

686 -

687 - Will merge to 'master'.

681

689 -

690 -* nd/shallow-clone (2014-01-06) 30 commits

682 +* nd/shallow-clone (2014-01-09) 31 commits

683 + (merged to 'next' on 2014-01-09 at 6608634)

684 + + t5537: fix incorrect expectation in test case 10

685 (merged to 'next' on 2014-01-06 at 3dc7fab)

686 + shallow: remove unused code

687 + send-pack.c: mark a file-local function static

@@ -745,26 +739,15 @@ of the repositories listed at

739 tree.

740

741

748 -* nd/negative-pathspec (2013-12-06) 3 commits

749 - (merged to 'next' on 2013-12-12 at 9f340c8)

750 - + pathspec.c: support adding prefix magic to a pathspec with mnemonic magic

751 - + Support pathspec magic :(exclude) and its short form :!

752 - + glossary-content.txt: rephrase magic signature part

753 -

754 - Introduce "negative pathspec" magic, to allow "git log -- . ':!dir'" to

755 - tell us "I am interested in everything but 'dir' directory".

756 -

757 - Will merge to 'master'.

758 -

759 -

742 * cc/starts-n-ends-with-endgame (2013-12-05) 1 commit

761 - - strbuf: remove prefixcmp() and suffixcmp()

743 + (merged to 'next' on 2014-01-07 at 4cdf8d0)

744 + + strbuf: remove prefixcmp() and suffixcmp()

745

746 Endgame for the cc/starts-n-ends-with topic; this needs to be

747 evil-merged with other topics that introduce new uses of

748 prefix/suffix-cmp functions.

749

767 - Will merge to 'next' and cook until Git 2.0.

750 + Will cook in 'next' until Git 2.0.

751

752

753 * gj/push-more-verbose-advice (2013-11-13) 1 commit

What's cooking (2014/01 #02)