623b719872 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Oct 2014, #03; Tue, 14)

4 -X-master-at: 670a3c1d5a27bfb1cc6b526559c6f5874f00042f

5 -X-next-at: 1f81b4665aea1209bb138fc973dd7b28b6696920

3 +Subject: What's cooking in git.git (Oct 2014, #04; Thu, 16)

4 +X-master-at: 98349e5364da6164add4ede3e63ceba2cc39159b

5 +X-next-at: 26a8a7df7daa247250ed7881245ac01138463bad

6

7 -What's cooking in git.git (Oct 2014, #03; Tue, 14)

7 +What's cooking in git.git (Oct 2014, #04; Thu, 16)

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

9

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

@@ -19,232 +19,108 @@ of the repositories listed at

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

20 [Graduated to "master"]

21

22 -* bc/asciidoc-pretty-formats-fix (2014-10-08) 1 commit

23 - (merged to 'next' on 2014-10-13 at 8208335)

24 - + Documentation: fix misrender of pretty-formats in Asciidoctor

25 -

26 -

27 -* da/completion-show-signature (2014-10-07) 1 commit

28 - (merged to 'next' on 2014-10-07 at 2467c19)

29 - + completion: add --show-signature for log and show

22 +* bw/trace-no-inline-getnanotime (2014-09-29) 1 commit

23 + (merged to 'next' on 2014-10-14 at 19facbb)

24 + + trace.c: do not mark getnanotime() as "inline"

25

26 + No file-scope static variables in an inlined function, please.

27

32 -* da/include-compat-util-first-in-c (2014-09-15) 1 commit

33 - (merged to 'next' on 2014-10-07 at ea5bcb4)

34 - + cleanups: ensure that git-compat-util.h is included first

28

36 - Code clean-up.

29 +* jc/completion-no-chdir (2014-10-09) 1 commit

30 + (merged to 'next' on 2014-10-14 at 1cf12e1)

31 + + completion: use "git -C $there" instead of (cd $there && git ...)

32

33

39 -* dt/cache-tree-repair (2014-09-30) 1 commit

40 - (merged to 'next' on 2014-10-07 at 923bd93)

41 - + t0090: avoid passing empty string to printf %d

42 - (this branch is used by jk/prune-mtime.)

34 +* po/everyday-doc (2014-10-10) 3 commits

35 + (merged to 'next' on 2014-10-13 at daf1d03)

36 + + doc: add 'everyday' to 'git help'

37 + + doc: Makefile regularise OBSOLETE_HTML list building

38 + + doc: modernise everyday.txt wording and format in man page style

39

44 - This fixes a topic that has graduated to 'master'.

45 -

46 -

47 -* mh/lockfile (2014-10-01) 38 commits

48 - (merged to 'next' on 2014-10-08 at 39cb6da)

49 - + lockfile.h: extract new header file for the functions in lockfile.c

50 - + hold_locked_index(): move from lockfile.c to read-cache.c

51 - + hold_lock_file_for_append(): restore errno before returning

52 - + get_locked_file_path(): new function

53 - + lockfile.c: rename static functions

54 - + lockfile: rename LOCK_NODEREF to LOCK_NO_DEREF

55 - + commit_lock_file_to(): refactor a helper out of commit_lock_file()

56 - + trim_last_path_component(): replace last_path_elm()

57 - + resolve_symlink(): take a strbuf parameter

58 - + resolve_symlink(): use a strbuf for internal scratch space

59 - + lockfile: change lock_file::filename into a strbuf

60 - + commit_lock_file(): use a strbuf to manage temporary space

61 - + try_merge_strategy(): use a statically-allocated lock_file object

62 - + try_merge_strategy(): remove redundant lock_file allocation

63 - + struct lock_file: declare some fields volatile

64 - + lockfile: avoid transitory invalid states

65 - + git_config_set_multivar_in_file(): avoid call to rollback_lock_file()

66 - + dump_marks(): remove a redundant call to rollback_lock_file()

67 - + api-lockfile: document edge cases

68 - + commit_lock_file(): rollback lock file on failure to rename

69 - + close_lock_file(): if close fails, roll back

70 - + commit_lock_file(): die() if called for unlocked lockfile object

71 - + commit_lock_file(): inline temporary variable

72 - + remove_lock_file(): call rollback_lock_file()

73 - + lock_file(): exit early if lockfile cannot be opened

74 - + prepare_index(): declare return value to be (const char *)

75 - + delete_ref_loose(): don't muck around in the lock_file's filename

76 - + cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN

77 - + lockfile.c: document the various states of lock_file objects

78 - + lock_file(): always initialize and register lock_file object

79 - + hold_lock_file_for_append(): release lock on errors

80 - + lockfile: unlock file if lockfile permissions cannot be adjusted

81 - + rollback_lock_file(): set fd to -1

82 - + rollback_lock_file(): exit early if lock is not active

83 - + rollback_lock_file(): do not clear filename redundantly

84 - + close_lock_file(): exit (successfully) if file is already closed

85 - + api-lockfile: revise and expand the documentation

86 - + unable_to_lock_die(): rename function from unable_to_lock_index_die()

87 - (this branch is used by mh/lockfile-stdio.)

88 -

89 - The lockfile API and its users have been cleaned up.

90 -

91 -

92 -* mh/lockfile-stdio (2014-10-01) 3 commits

93 - (merged to 'next' on 2014-10-08 at e56cebc)

94 - + commit_packed_refs(): reimplement using fdopen_lock_file()

95 - + dump_marks(): reimplement using fdopen_lock_file()

96 - + fdopen_lock_file(): access a lockfile using stdio

97 - (this branch uses mh/lockfile.)

98 -

99 -

100 -* rs/daemon-fixes (2014-10-01) 3 commits

101 - (merged to 'next' on 2014-10-07 at 4171e10)

102 - + daemon: remove write-only variable maxfd

103 - + daemon: fix error message after bind()

104 - + daemon: handle gethostbyname() error

105 -

106 - "git daemon" (with NO_IPV6 build configuration) used to incorrectly

107 - use the hostname even when gethostbyname() reported that the given

108 - hostname is not found.

109 -

110 -

111 -* rs/mailsplit (2014-10-07) 1 commit

112 - (merged to 'next' on 2014-10-08 at 58b053e)

113 - + mailsplit: remove unnecessary unlink(2) call

114 -

115 -

116 -* rs/more-uses-of-skip-prefix (2014-10-07) 1 commit

117 - (merged to 'next' on 2014-10-08 at cd153c0)

118 - + use skip_prefix() to avoid more magic numbers

119 -

120 -

121 -* rs/plug-leak-in-bundle (2014-10-07) 1 commit

122 - (merged to 'next' on 2014-10-08 at 5539cd7)

123 - + bundle: plug minor memory leak in is_tag_in_date_range()

124 -

125 -

126 -* rs/sha1-array-test (2014-10-01) 2 commits

127 - (merged to 'next' on 2014-10-08 at 5960711)

128 - + sha1-lookup: handle duplicates in sha1_pos()

129 - + sha1-array: add test-sha1-array and basic tests

130 -

131 -

132 -* sk/tag-contains-wo-recursion (2014-09-23) 1 commit

133 - (merged to 'next' on 2014-10-08 at e425f54)

134 - + t7004: give the test a bit more stack space

135 -

136 -

137 -* so/rebase-doc-fork-point (2014-09-29) 1 commit

138 - (merged to 'next' on 2014-10-07 at 03d8ed6)

139 - + Documentation/git-rebase.txt: document when --fork-point is auto-enabled

40 + "git help everyday" to show the Everyday Git document.

41

42 --------------------------------------------------

43 [New Topics]

44

144 -* bc/asciidoc (2014-10-13) 2 commits

145 - (merged to 'next' on 2014-10-14 at d9ff206)

146 - + Documentation: fix mismatched delimiters in git-imap-send

147 - + Documentation: adjust document title underlining

148 -

149 - Formatting nitpicks to help a (pickier) reimplementation of

150 - AsciiDoc to grok our documentation.

45 +* da/mergetool-temporary-directory (2014-10-16) 2 commits

46 + - t7610-mergetool: add test cases for mergetool.writeToTemp

47 + - mergetool: add an option for writing to a temporary directory

48 + (this branch uses da/mergetool-temporary-filename and da/mergetool-tests; is tangled with da/mergetool-tool-help.)

49

152 - Will merge to 'master'.

50 + Allow a temporary directory specified to be used while running "git

51 + mergetool" backend.

52

53 + Will merge to 'next'.

54

155 -* da/mergetool-tool-help (2014-10-13) 4 commits

156 - - difftool: don't assume that default sh is sane

157 - - mergetool: don't require a work tree for --tool-help

158 - - git-sh-setup: move GIT_DIR initialization into a function

159 - - mergetool: use more conservative temporary filenames

160 - (this branch is tangled with da/mergetool-temporary-filename.)

55

162 - Allow "git mergetool --help" to run outside a Git repository.

56 +* da/mergetool-tests (2014-10-16) 4 commits

57 + - test-lib-functions: adjust style to match CodingGuidelines

58 + - t7610-mergetool: use test_config to isolate tests

59 + - t7610-mergetool: add missing && and remove commented-out code

60 + - t7610-mergetool: use tabs instead of a mix of tabs and spaces

61 + (this branch is used by da/mergetool-temporary-directory and da/mergetool-temporary-filename; is tangled with da/mergetool-tool-help.)

62

164 - May want some tests before merging down.

63 + The clean-up of this test script was long overdue and is a very

64 + welcome change.

65

66 + Will merge to 'next'.

67

167 -* eb/no-pthreads (2014-10-13) 2 commits

168 - - pack-objects: set number of threads before checking and warning

169 - - index-pack: fix compilation with NO_PTHREADS

68

171 - Allow us build with NO_PTHREADS=NoThanks compilation option. The

172 - last change (not queued) needs a bit more explanation in its log

173 - message.

69 +* bc/asciidoctor (2014-10-15) 2 commits

70 + - Documentation: implement linkgit macro for Asciidoctor

71 + - Documentation: move some AsciiDoc parameters into variables

72 + (this branch uses bc/asciidoc.)

73

74 + Add machinery to alternatively use AsciiDoctor to format our

75 + documentation.

76

176 -* jk/test-shell-trace (2014-10-13) 3 commits

177 - (merged to 'next' on 2014-10-14 at 9118506)

178 - + test-lib.sh: support -x option for shell-tracing

179 - + t5304: use helper to report failure of "test foo = bar"

180 - + t5304: use test_path_is_* instead of "test -f"

77 + Will merge to 'next'.

78

182 - Test scripts were taught to notice "-x" option to show shell trace,

183 - as if the tests were run under "sh -x".

79

185 - Will merge to 'master'.

80 +* da/mergetool-meld (2014-10-16) 1 commit

81 + - mergetools/meld: make usage of `--output` configurable and more robust

82

83 + Newer versions of 'meld' breaks the auto-detection we use to see if

84 + they are new enough to support the `--output` option.

85

188 -* rs/receive-pack-argv-leak-fix (2014-10-13) 1 commit

189 - (merged to 'next' on 2014-10-14 at e64654d)

190 - + receive-pack: plug minor memory leak in unpack()

191 -

192 - Will merge to 'master'.

193 -

86 + Will merge to 'next'.

87

195 -* ta/config-set (2014-10-13) 1 commit

196 - (merged to 'next' on 2014-10-14 at ed660e4)

197 - + t1308: fix broken here document in test script

88

199 - Will merge to 'master'.

89 +* rm/gitweb-start-form (2014-10-16) 1 commit

90 + - gitweb: use start_form, not startform that was removed in CGI.pm 4.04

91

92 + Will merge to 'next'.

93

202 -* jc/checkout-local-track-report (2014-10-14) 1 commit

203 - - checkout: report upstream correctly even with loosely defined branch.*.merge

94

205 - The report from "git checkout" on a branch that builds on another

206 - local branch by setting its branch.*.merge to branch name (not a

207 - full refname) incorrectly said that the upstream is gone.

95 +* ss/contrib-subtree-contacts (2014-10-15) 2 commits

96 + - contacts: add a Makefile to generate docs and install

97 + - subtree: add an install-html target

98

99 + Will merge to 'next'.

100

210 -* jc/clone-borrow (2014-10-14) 1 commit

211 - - clone: --dissociate option to mark that reference is only temporary

101 +--------------------------------------------------

102 +[Stalled]

103

213 - Allow "git clone --reference" to be used more safely.

104 +* je/quiltimport-no-fuzz (2014-09-26) 2 commits

105 + - git-quiltimport: flip the default not to allow fuzz

106 + - git-quiltimport.sh: allow declining fuzz with --exact option

107

108 + "quiltimport" drove "git apply" always with -C1 option to reduce

109 + context of the patch in order to give more chance to somewhat stale

110 + patches to apply. Add an "--exact" option to disable, and also

111 + "-C$n" option to customize this behaviour. The top patch

112 + optionally flips the default to "--exact".

113

216 -* js/completion-hide-not-a-repo (2014-10-14) 1 commit

217 - - completion: silence "fatal: Not a git repository" error

114 + Waiting for an Ack.

115

219 - Some internal error messages leaked out of the bash completion when

220 - typing "git cmd <TAB>" and the machinery tried to complete

221 - refnames.

116

223 ---------------------------------------------------

224 -[Stalled]

117 +* eb/no-pthreads (2014-10-13) 2 commits

118 + - pack-objects: set number of threads before checking and warning

119 + - index-pack: fix compilation with NO_PTHREADS

120

226 -* rs/ref-transaction (2014-09-10) 19 commits

227 - . ref_transaction_commit: bail out on failure to remove a ref

228 - . lockfile: remove unable_to_lock_error

229 - . refs.c: do not permit err == NULL

230 - . for-each-ref.c: improve message before aborting on broken ref

231 - . refs.c: fix handling of badly named refs

232 - . branch -d: avoid repeated symref resolution

233 - . refs.c: change resolve_ref_unsafe reading argument to be a flags field

234 - . refs.c: make write_ref_sha1 static

235 - . fetch.c: change s_update_ref to use a ref transaction

236 - . refs.c: ref_transaction_commit: distinguish name conflicts from other errors

237 - . refs.c: pass a skip list to name_conflict_fn

238 - . refs.c: call lock_ref_sha1_basic directly from commit

239 - . refs.c: move the check for valid refname to lock_ref_sha1_basic

240 - . rename_ref: don't ask read_ref_full where the ref came from

241 - . refs.c: pass the ref log message to _create/delete/update instead of _commit

242 - . refs.c: add an err argument to delete_ref_loose

243 - . wrapper.c: add a new function unlink_or_msg

244 - . wrapper.c: remove/unlink_or_warn: simplify, treat ENOENT as success

245 - . mv test: recreate mod/ directory instead of relying on stale copy

246 -

247 - Expecting the final reroll.

121 + Allow us build with NO_PTHREADS=NoThanks compilation option. The

122 + last change (not queued) needs a bit more explanation in its log

123 + message.

124

125

126 * tr/remerge-diff (2014-09-08) 8 commits

@@ -403,79 +279,171 @@ of the repositories listed at

279 --------------------------------------------------

280 [Cooking]

281

406 -* jk/prune-mtime (2014-10-04) 18 commits

407 - . write_sha1_file: freshen existing objects

408 - . pack-objects: match prune logic for discarding objects

409 - . pack-objects: refactor unpack-unreachable expiration check

410 - . prune: keep objects reachable from recent objects

411 - . sha1_file: add for_each iterators for loose and packed objects

412 - . count-objects: use for_each_loose_file_in_objdir

413 - . count-objects: do not use xsize_t when counting object size

414 - . prune: factor out loose-object directory traversal

415 - . t5304: use helper to report failure of "test foo = bar"

416 - . t5304: use test_path_is_* instead of "test -f"

417 - . reachable: clear pending array after walking it

418 - . clean up name allocation in prepare_revision_walk

419 - . object_array: add a "clear" function

420 - . object_array: factor out slopbuf-freeing logic

421 - . isxdigit: cast input to unsigned char

422 - . foreach_alt_odb: propagate return value from callback

423 - . Merge branch 'dt/cache-tree-repair' into jk/prune-mtime

424 - . Merge branch 'jc/reopen-lock-file' into jk/prune-mtime

282 +* jk/prune-mtime (2014-10-16) 25 commits

283 + - pack-objects: double-check options before discarding objects

284 + - repack: pack objects mentioned by the index

285 + - pack-objects: use argv_array

286 + - reachable: use revision machinery's --index-objects code

287 + - rev-list: add --index-objects option

288 + - rev-list: document --reflog option

289 + - traverse_commit_list: support pending blobs/trees with paths

290 + - make add_object_array_with_context interface more sane

291 + - write_sha1_file: freshen existing objects

292 + - pack-objects: match prune logic for discarding objects

293 + - pack-objects: refactor unpack-unreachable expiration check

294 + - prune: keep objects reachable from recent objects

295 + - sha1_file: add for_each iterators for loose and packed objects

296 + - count-objects: use for_each_loose_file_in_objdir

297 + - count-objects: do not use xsize_t when counting object size

298 + - prune-packed: use for_each_loose_file_in_objdir

299 + - reachable: mark index blobs as SEEN

300 + - prune: factor out loose-object directory traversal

301 + - reachable: reuse revision.c "add all reflogs" code

302 + - reachable: use traverse_commit_list instead of custom walk

303 + - clean up name allocation in prepare_revision_walk

304 + - object_array: add a "clear" function

305 + - object_array: factor out slopbuf-freeing logic

306 + - isxdigit: cast input to unsigned char

307 + - foreach_alt_odb: propagate return value from callback

308 + (this branch uses jk/test-shell-trace.)

309 +

310 + Looked mostly sensible modulo minor nits (and I wasn't looking for

311 + typos very carefully). Object enumeration is broken.

312 +

313 +

314 +* rs/ref-transaction (2014-10-15) 25 commits

315 + - ref_transaction_commit: bail out on failure to remove a ref

316 + - lockfile: remove unable_to_lock_error

317 + - refs.c: do not permit err == NULL

318 + - remote rm/prune: print a message when writing packed-refs fails

319 + - for-each-ref: skip and warn about broken ref names

320 + - refs.c: allow listing and deleting badly named refs

321 + - test: put tests for handling of bad ref names in one place

322 + - packed-ref cache: forbid dot-components in refnames

323 + - branch -d: simplify by using RESOLVE_REF_READING

324 + - branch -d: avoid repeated symref resolution

325 + - reflog test: test interaction with detached HEAD

326 + - refs.c: change resolve_ref_unsafe reading argument to be a flags field

327 + - refs.c: make write_ref_sha1 static

328 + - fetch.c: change s_update_ref to use a ref transaction

329 + - refs.c: ref_transaction_commit: distinguish name conflicts from other errors

330 + - refs.c: pass a list of names to skip to is_refname_available

331 + - refs.c: call lock_ref_sha1_basic directly from commit

332 + - refs.c: refuse to lock badly named refs in lock_ref_sha1_basic

333 + - rename_ref: don't ask read_ref_full where the ref came from

334 + - refs.c: pass the ref log message to _create/delete/update instead of _commit

335 + - refs.c: add an err argument to delete_ref_loose

336 + - wrapper.c: add a new function unlink_or_msg

337 + - refs.c: lock_ref_sha1_basic is used for all refs

338 + - wrapper.c: remove/unlink_or_warn: simplify, treat ENOENT as success

339 + - mv test: recreate mod/ directory instead of relying on stale copy

340 +

341 + The API to update refs have been restructured to allow introducing

342 + a true transactional updates later. We would even allow storing

343 + refs in backends other than the traditional filesystem-based one.

344

426 - Expecting a reroll.

345 + Will merge to 'next'.

346

347

429 -* jn/parse-config-slot (2014-10-14) 2 commits

430 - (merged to 'next' on 2014-10-14 at 7f0a3ad)

431 - + color_parse: do not mention variable name in error message

432 - + pass config slots as pointers instead of offsets

348 +* bc/asciidoc (2014-10-13) 2 commits

349 + (merged to 'next' on 2014-10-14 at d9ff206)

350 + + Documentation: fix mismatched delimiters in git-imap-send

351 + + Documentation: adjust document title underlining

352 + (this branch is used by bc/asciidoctor.)

353

434 - Code cleanup.

354 + Formatting nitpicks to help a (pickier) reimplementation of

355 + AsciiDoc to grok our documentation.

356

357 Will merge to 'master'.

358

359

439 -* da/mergetool-temporary-filename (2014-10-13) 2 commits

440 - - mergetool: add an option for writing to a temporary directory

360 +* da/mergetool-tool-help (2014-10-15) 8 commits

361 + - difftool: don't assume that default sh is sane

362 + - mergetool: don't require a work tree for --tool-help

363 + - git-sh-setup: move GIT_DIR initialization into a function

364 - mergetool: use more conservative temporary filenames

442 - (this branch is tangled with da/mergetool-tool-help.)

365 + - test-lib-functions: adjust style to match CodingGuidelines

366 + - t7610-mergetool: prefer test_config over git config

367 + - t7610-mergetool: add missing && and remove commented-out code

368 + - t7610-mergetool: use tabs instead of a mix of tabs and spaces

369 + (this branch is tangled with da/mergetool-temporary-directory, da/mergetool-temporary-filename and da/mergetool-tests.)

370

444 - Tweak the names of the three throw-away files "git mergetool" comes

445 - up with to feed the merge tool backend, so that a file with a

446 - single dot in its name in the original (e.g. "hello.c") will have

447 - only one dot in these variants (e.g. "hello_BASE_4321.c").

371 + Allow "git mergetool --help" to run outside a Git repository.

372

373 Will merge to 'next'.

374

375

452 -* jc/completion-no-chdir (2014-10-09) 1 commit

453 - (merged to 'next' on 2014-10-14 at 1cf12e1)

454 - + completion: use "git -C $there" instead of (cd $there && git ...)

376 +* jk/test-shell-trace (2014-10-13) 3 commits

377 + (merged to 'next' on 2014-10-14 at 9118506)

378 + + test-lib.sh: support -x option for shell-tracing

379 + + t5304: use helper to report failure of "test foo = bar"

380 + + t5304: use test_path_is_* instead of "test -f"

381 + (this branch is used by jk/prune-mtime.)

382 +

383 + Test scripts were taught to notice "-x" option to show shell trace,

384 + as if the tests were run under "sh -x".

385

386 Will merge to 'master'.

387

388

459 -* bw/trace-no-inline-getnanotime (2014-09-29) 1 commit

460 - (merged to 'next' on 2014-10-14 at 19facbb)

461 - + trace.c: do not mark getnanotime() as "inline"

389 +* rs/receive-pack-argv-leak-fix (2014-10-13) 1 commit

390 + (merged to 'next' on 2014-10-14 at e64654d)

391 + + receive-pack: plug minor memory leak in unpack()

392 +

393 + Will merge to 'master'.

394

463 - No file-scope static variables in an inlined function, please.

395 +

396 +* ta/config-set (2014-10-13) 1 commit

397 + (merged to 'next' on 2014-10-14 at ed660e4)

398 + + t1308: fix broken here document in test script

399

400 Will merge to 'master'.

401

402

468 -* po/everyday-doc (2014-10-10) 3 commits

469 - (merged to 'next' on 2014-10-13 at daf1d03)

470 - + doc: add 'everyday' to 'git help'

471 - + doc: Makefile regularise OBSOLETE_HTML list building

472 - + doc: modernise everyday.txt wording and format in man page style

403 +* jc/checkout-local-track-report (2014-10-14) 1 commit

404 + - checkout: report upstream correctly even with loosely defined branch.*.merge

405

474 - "git help everyday" to show the Everyday Git document.

406 + The report from "git checkout" on a branch that builds on another

407 + local branch by setting its branch.*.merge to branch name (not a

408 + full refname) incorrectly said that the upstream is gone.

409 +

410 +

411 +* jc/clone-borrow (2014-10-15) 1 commit

412 + - clone: --dissociate option to mark that reference is only temporary

413 +

414 + Allow "git clone --reference" to be used more safely.

415 +

416 +

417 +* js/completion-hide-not-a-repo (2014-10-14) 1 commit

418 + - completion: silence "fatal: Not a git repository" error

419 +

420 + Some internal error messages leaked out of the bash completion when

421 + typing "git cmd <TAB>" and the machinery tried to complete

422 + refnames.

423 +

424 +

425 +* jn/parse-config-slot (2014-10-14) 2 commits

426 + (merged to 'next' on 2014-10-14 at 7f0a3ad)

427 + + color_parse: do not mention variable name in error message

428 + + pass config slots as pointers instead of offsets

429 +

430 + Code cleanup.

431

432 Will merge to 'master'.

433

434

435 +* da/mergetool-temporary-filename (2014-10-16) 1 commit

436 + - mergetool: use more conservative temporary filenames

437 + (this branch is used by da/mergetool-temporary-directory; uses da/mergetool-tests; is tangled with da/mergetool-tool-help.)

438 +

439 + Tweak the names of the three throw-away files "git mergetool" comes

440 + up with to feed the merge tool backend, so that a file with a

441 + single dot in its name in the original (e.g. "hello.c") will have

442 + only one dot in these variants (e.g. "hello_BASE_4321.c").

443 +

444 + Will merge to 'next'.

445 +

446 +

447 * jc/push-cert-hmac-optim (2014-09-25) 2 commits

448 - receive-pack: truncate hmac early and convert only necessary bytes

449 - sha1_to_hex: split out "hex-format n bytes" helper and use it

@@ -486,58 +454,47 @@ of the repositories listed at

454 Will perhaps drop.

455

456

489 -* je/quiltimport-no-fuzz (2014-09-26) 2 commits

490 - - git-quiltimport: flip the default not to allow fuzz

491 - - git-quiltimport.sh: allow declining fuzz with --exact option

492 -

493 - "quiltimport" drove "git apply" always with -C1 option to reduce

494 - context of the patch in order to give more chance to somewhat stale

495 - patches to apply. Add an "--exact" option to disable, and also

496 - "-C$n" option to customize this behaviour. The top patch

497 - optionally flips the default to "--exact".

498 -

499 - Waiting for an Ack.

500 -

501 -

457 * nd/multiple-work-trees (2014-09-27) 32 commits

503 - - t2025: add a test to make sure grafts is working from a linked checkout

504 - - checkout: don't require a work tree when checking out into a new one

505 - - git_path(): keep "info/sparse-checkout" per work-tree

506 - - count-objects: report unused files in $GIT_DIR/worktrees/...

507 - - gc: support prune --worktrees

508 - - gc: factor out gc.pruneexpire parsing code

509 - - gc: style change -- no SP before closing parenthesis

510 - - checkout: clean up half-prepared directories in --to mode

511 - - checkout: reject if the branch is already checked out elsewhere

512 - - prune: strategies for linked checkouts

513 - - checkout: support checking out into a new working directory

514 - - use new wrapper write_file() for simple file writing

515 - - wrapper.c: wrapper to open a file, fprintf then close

516 - - setup.c: support multi-checkout repo setup

517 - - setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()

518 - - setup.c: convert check_repository_format_gently to use strbuf

519 - - setup.c: detect $GIT_COMMON_DIR in is_git_directory()

520 - - setup.c: convert is_git_directory() to use strbuf

521 - - git-stash: avoid hardcoding $GIT_DIR/logs/....

522 - - *.sh: avoid hardcoding $GIT_DIR/hooks/...

523 - - git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects

524 - - $GIT_COMMON_DIR: a new environment variable

525 - - commit: use SEQ_DIR instead of hardcoding "sequencer"

526 - - fast-import: use git_path() for accessing .git dir instead of get_git_dir()

527 - - reflog: avoid constructing .lock path with git_path

528 - - *.sh: respect $GIT_INDEX_FILE

529 - - git_path(): be aware of file relocation in $GIT_DIR

530 - - path.c: group git_path(), git_pathdup() and strbuf_git_path() together

531 - - path.c: rename vsnpath() to do_git_path()

532 - - git_snpath(): retire and replace with strbuf_git_path()

533 - - path.c: make get_pathname() call sites return const char *

534 - - path.c: make get_pathname() return strbuf instead of static buffer

458 + . t2025: add a test to make sure grafts is working from a linked checkout

459 + . checkout: don't require a work tree when checking out into a new one

460 + . git_path(): keep "info/sparse-checkout" per work-tree

461 + . count-objects: report unused files in $GIT_DIR/worktrees/...

462 + . gc: support prune --worktrees

463 + . gc: factor out gc.pruneexpire parsing code

464 + . gc: style change -- no SP before closing parenthesis

465 + . checkout: clean up half-prepared directories in --to mode

466 + . checkout: reject if the branch is already checked out elsewhere

467 + . prune: strategies for linked checkouts

468 + . checkout: support checking out into a new working directory

469 + . use new wrapper write_file() for simple file writing

470 + . wrapper.c: wrapper to open a file, fprintf then close

471 + . setup.c: support multi-checkout repo setup

472 + . setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()

473 + . setup.c: convert check_repository_format_gently to use strbuf

474 + . setup.c: detect $GIT_COMMON_DIR in is_git_directory()

475 + . setup.c: convert is_git_directory() to use strbuf

476 + . git-stash: avoid hardcoding $GIT_DIR/logs/....

477 + . *.sh: avoid hardcoding $GIT_DIR/hooks/...

478 + . git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects

479 + . $GIT_COMMON_DIR: a new environment variable

480 + . commit: use SEQ_DIR instead of hardcoding "sequencer"

481 + . fast-import: use git_path() for accessing .git dir instead of get_git_dir()

482 + . reflog: avoid constructing .lock path with git_path

483 + . *.sh: respect $GIT_INDEX_FILE

484 + . git_path(): be aware of file relocation in $GIT_DIR

485 + . path.c: group git_path(), git_pathdup() and strbuf_git_path() together

486 + . path.c: rename vsnpath() to do_git_path()

487 + . git_snpath(): retire and replace with strbuf_git_path()

488 + . path.c: make get_pathname() call sites return const char *

489 + . path.c: make get_pathname() return strbuf instead of static buffer

490

491 A replacement for contrib/workdir/git-new-workdir that does not

492 rely on symbolic links and make sharing of objects and refs safer

493 by making the borrowee and borrowers aware of each other.

494

495 A few tests need some tweaks for MinGW ($gmane/{257756,257757}).

496 + Conflicts with rs/ref-transaction so ejected for now, waiting for a

497 + reroll.

498

499

500 * cc/interpret-trailers (2014-10-13) 11 commits

@@ -556,8 +513,6 @@ of the repositories listed at

513 A new filter to programatically edit the tail end of the commit log

514 messages.

515

559 - Is this ready for 'next' now?

560 -

516

517 * mt/patch-id-stable (2014-06-10) 1 commit

518 - patch-id: change default to stable

What's cooking (2014/10 #04)