d5617a42b0 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Cc: Eric Wong <normalperson@yhbt.net>,

3 - Paul Mackerras <paulus@samba.org>,

4 - Pat Thoyts <patthoyts@users.sourceforge.net>

2 Bcc: lwn@lwn.net

6 -Subject: What's cooking in git.git (Oct 2014, #05; Mon, 20)

7 -X-master-at: 13da0fc092b8cf082eda2f16971c75903aa5aefc

8 -X-next-at: 72aedf1b35ff671435dd29c2b62e2b2250805689

3 +Subject: What's cooking in git.git (Oct 2014, #06; Fri, 24)

4 +X-master-at: fbecd99861ea5795aeba46faf2ac7a8c1b70d485

5 +X-next-at: 26228e10cc494c2d5b0b4302c361a1870ba75e35

6

10 -What's cooking in git.git (Oct 2014, #05; Mon, 20)

7 +What's cooking in git.git (Oct 2014, #06; Fri, 24)

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

9

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

@@ -15,11 +12,9 @@ Here are the topics that have been cooking. Commits prefixed with

12 '+' are in 'next'.

13

14 According to tinyurl.com/gitCal, the feature freeze for this cycle

18 -is scheduled for the end of this month. What's in the 'next' branch

19 -as of today looks more or less complete picture, I would think. I'd

20 -like to ask area maintainers of git-svn, gitk and git-gui to please

21 -prepare to wrap up the accumulated changes for this cycle and throw

22 -a pull request to me. Thanks.

15 +is scheduled for the end of this month. What's in the 'master'

16 +branch as of today looks more or less complete picture, I would

17 +think.

18

19 You can find the changes described here in the integration branches

20 of the repositories listed at

@@ -29,120 +24,248 @@ of the repositories listed at

24 --------------------------------------------------

25 [Graduated to "master"]

26

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

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

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

35 - + Documentation: adjust document title underlining

36 - (this branch is used by bc/asciidoctor.)

37 -

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

39 - AsciiDoc to grok our documentation.

40 -

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

28 + (merged to 'next' on 2014-10-17 at 00ee553)

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

30

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

43 - (merged to 'next' on 2014-10-17 at ee4519c)

44 - + Documentation: add documentation for 'git interpret-trailers'

45 - + trailer: add tests for commands in config file

46 - + trailer: execute command from 'trailer.<name>.command'

47 - + trailer: add tests for "git interpret-trailers"

48 - + trailer: add interpret-trailers command

49 - + trailer: put all the processing together and print

50 - + trailer: parse trailers from file or stdin

51 - + trailer: process command line trailer arguments

52 - + trailer: read and process config information

53 - + trailer: process trailers from input message and arguments

54 - + trailer: add data structures and basic functions

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

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

33

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

57 - messages.

34

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

36 + (merged to 'next' on 2014-10-17 at 261e74e)

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

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

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

40

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

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

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

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

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

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

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

42 + mergetool" backend.

43

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

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

44

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

46 + (merged to 'next' on 2014-10-17 at 3fb95b5)

47 + + mergetool: use more conservative temporary filenames

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

49

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

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

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

74 - + pass config slots as pointers instead of offsets

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

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

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

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

54

76 - Code cleanup.

55

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

57 + (merged to 'next' on 2014-10-17 at 239fefe)

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

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

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

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

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

63

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

80 - (merged to 'next' on 2014-10-17 at 7ca427f)

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

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

65 + welcome change.

66

67

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

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

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

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

69 + (merged to 'next' on 2014-10-17 at 854654c)

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

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

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

73 + + mergetool: use more conservative temporary filenames

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

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

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

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

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

79

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

81

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

90 - (merged to 'next' on 2014-10-17 at 4b3a1d9)

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

92 - + subtree: add an install-html target

82

83 +* eb/no-pthreads (2014-10-19) 3 commits

84 + (merged to 'next' on 2014-10-21 at c455d39)

85 + + Handle atexit list internaly for unthreaded builds

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

87 + + index-pack: fix compilation with NO_PTHREADS

88

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

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

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

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

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

91 + message.

92

99 ---------------------------------------------------

100 -[New Topics]

93

94 * jk/pack-objects-no-bitmap-when-splitting (2014-10-19) 1 commit

103 - - pack-objects: turn off bitmaps when we split packs

95 + (merged to 'next' on 2014-10-21 at c3c8c2a)

96 + + pack-objects: turn off bitmaps when we split packs

97

98 Splitting pack-objects output into multiple packs is incompatible

99 with the use of reachability bitmap.

100

108 - Will merge to 'next'.

101 +

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

103 + (merged to 'next' on 2014-10-17 at 466de3c)

104 + + completion: silence "fatal: Not a git repository" error

105 +

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

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

108 + refnames.

109 +

110 +

111 +* nd/dir-prep-exclude-cleanup (2014-10-21) 1 commit

112 + (merged to 'next' on 2014-10-21 at c90ba7a)

113 + + dir.c: remove the second declaration of "stk" in prep_exclude()

114 +

115 + Code clean-up.

116

117

118 * po/doc-status-markup (2014-10-19) 1 commit

112 - - doc: fix 'git status --help' character quoting

119 + (merged to 'next' on 2014-10-21 at efca89c)

120 + + doc: fix 'git status --help' character quoting

121

122 Update documentation mark-up.

123

116 - Will merge to 'next'.

124 +

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

126 + (merged to 'next' on 2014-10-17 at 1390624)

127 + + ref_transaction_commit: bail out on failure to remove a ref

128 + + lockfile: remove unable_to_lock_error

129 + + refs.c: do not permit err == NULL

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

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

132 + + refs.c: allow listing and deleting badly named refs

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

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

135 + + branch -d: simplify by using RESOLVE_REF_READING

136 + + branch -d: avoid repeated symref resolution

137 + + reflog test: test interaction with detached HEAD

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

139 + + refs.c: make write_ref_sha1 static

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

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

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

143 + + refs.c: call lock_ref_sha1_basic directly from commit

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

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

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

147 + + refs.c: add an err argument to delete_ref_loose

148 + + wrapper.c: add a new function unlink_or_msg

149 + + refs.c: lock_ref_sha1_basic is used for all refs

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

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

152 +

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

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

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

156

157

158 * rs/run-command-env-array (2014-10-19) 2 commits

120 - - use env_array member of struct child_process

121 - - run-command: add env_array, an optional argv_array for env

159 + (merged to 'next' on 2014-10-21 at 4e56fa2)

160 + + use env_array member of struct child_process

161 + + run-command: add env_array, an optional argv_array for env

162

163 Add managed "env" array to child_process to clarify the lifetime

164 rules.

165

126 - Will merge to 'next'.

166 +

167 +* sb/plug-transport-leak (2014-10-21) 2 commits

168 + (merged to 'next' on 2014-10-21 at 0a462d7)

169 + + .mailmap: add Stefan Bellers corporate mail address

170 + + transport: free leaking head in transport_print_push_status()

171 +

172 + Code clean-up.

173

174

175 * tb/core-filemode-doc (2014-10-19) 1 commit

130 - - core.filemode may need manual action

176 + (merged to 'next' on 2014-10-21 at ad3e63b)

177 + + core.filemode may need manual action

178

179 Doc update.

180

134 - Will merge to 'next'.

135 -

181

182 * wk/t1304-wo-USER (2014-10-19) 1 commit

138 - - t1304: Set LOGNAME even if USER is unset or null

183 + (merged to 'next' on 2014-10-21 at 00fe6d9)

184 + + t1304: Set LOGNAME even if USER is unset or null

185 +

186 +--------------------------------------------------

187 +[New Topics]

188 +

189 +* zk/grep-color-words (2014-10-22) 1 commit

190 + (merged to 'next' on 2014-10-24 at 2d2f8f8)

191 + + grep: fix match highlighting for combined patterns with context lines

192 +

193 + "git grep --color" highlighted matching tokens on non-matching

194 + context lines and function name headers, which was unwanted.

195 +

196 + Will merge to 'master'.

197 +

198 +

199 +* jc/conflict-hint (2014-10-24) 3 commits

200 + - merge & sequencer: turn "Conflicts:" hint into a comment

201 + - merge & sequencer: unify codepaths that write "Conflicts:" hint

202 + - builtin/merge.c: drop a parameter that is never used

203 +

204 +

205 +* jc/diff-b-m (2014-10-23) 1 commit

206 + - diff -B -M: fix output for "copy and then rewrite" case

207 +

208 +

209 +* oc/mergetools-beyondcompare (2014-10-21) 1 commit

210 + (merged to 'next' on 2014-10-24 at e9278e8)

211 + + mergetool: rename bc3 to bc

212 +

213 + Will merge to 'master'.

214 +

215

140 - Will merge to 'next'.

216 +* rs/ref-transaction-reflog (2014-10-22) 15 commits

217 + - refs.c: allow deleting refs with a broken sha1

218 + - refs.c: remove lock_any_ref_for_update

219 + - refs.c: make unlock_ref/close_ref/commit_ref static

220 + - refs.c: rename log_ref_setup to create_reflog

221 + - reflog.c: use a reflog transaction when writing during expire

222 + - refs.c: allow multiple reflog updates during a single transaction

223 + - refs.c: only write reflog update if msg is non-NULL

224 + - refs.c: add a flag to allow reflog updates to truncate the log

225 + - refs.c: add a transaction function to append a reflog entry

226 + - copy.c: make copy_fd preserve meaningful errno

227 + - refs.c: add a function to append a reflog entry to a fd

228 + - refs.c: add a new update_type field to ref_update

229 + - refs.c: rename the transaction functions

230 + - refs.c: make ref_transaction_delete a wrapper for ref_transaction_update

231 + - refs.c make ref_transaction_create a wrapper to ref_transaction_update

232 + (this branch is used by rs/ref-transaction-rename and rs/ref-transaction-send-pack.)

233 +

234 +

235 +* rs/ref-transaction-rename (2014-10-22) 15 commits

236 + - refs.c: add an err argument to pack_refs

237 + - refs.c: make lock_packed_refs take an err argument

238 + - refs.c: make add_packed_ref return an error instead of calling die

239 + - refs.c: replace the onerr argument in update_ref with a strbuf err

240 + - refs.c: make the *_packed_refs functions static

241 + - refs.c: make repack_without_refs static

242 + - remote.c: use a transaction for deleting refs

243 + - refs.c: write updates to packed refs when a transaction has more than one ref

244 + - refs.c: move reflog updates into its own function

245 + - refs.c: rollback the lockfile before we die() in repack_without_refs

246 + - refs.c: update rename_ref to use a transaction

247 + - refs.c: use a stringlist for repack_without_refs

248 + - refs.c: use packed refs when deleting refs during a transaction

249 + - refs.c: return error instead of dying when locking fails during transaction

250 + - refs.c: allow passing raw git_committer_info as email to _update_reflog

251 + (this branch is used by rs/ref-transaction-send-pack; uses rs/ref-transaction-reflog.)

252 +

253 +

254 +* rs/ref-transaction-send-pack (2014-10-22) 8 commits

255 + - refs.c: add an err argument to create_symref

256 + - refs.c: add an err argument to create_reflog

257 + - receive-pack.c: add a receive.preferatomicpush configuration variable

258 + - t5543-atomic-push.sh: add basic tests for atomic pushes

259 + - push.c: add an --atomic-push argument

260 + - receive-pack.c: use a single transaction when atomic-push is negotiated

261 + - send-pack.c: add an --atomic-push command line argument

262 + - receive-pack.c: add protocol support to negotiate atomic-push

263 + (this branch uses rs/ref-transaction-reflog and rs/ref-transaction-rename.)

264

265 --------------------------------------------------

266 [Stalled]

267

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

268 +* je/quiltimport-no-fuzz (2014-10-21) 2 commits

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

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

271

@@ -155,6 +278,72 @@ of the repositories listed at

278 Waiting for an Ack.

279

280

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

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

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

284 +

285 + This is "we could do this if we wanted to", not "we measured and it

286 + improves performance critical codepath".

287 +

288 + Will perhaps drop.

289 +

290 +

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

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

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

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

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

296 + . gc: support prune --worktrees

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

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

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

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

301 + . prune: strategies for linked checkouts

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

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

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

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

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

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

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

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

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

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

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

313 + . $GIT_COMMON_DIR: a new environment variable

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

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

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

317 + . *.sh: respect $GIT_INDEX_FILE

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

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

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

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

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

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

324 +

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

326 + rely on symbolic links and make sharing of objects and refs safer

327 + by making the borrowee and borrowers aware of each other.

328 +

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

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

331 + reroll.

332 +

333 +

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

335 + - patch-id: change default to stable

336 +

337 + Teaches "git patch-id" to compute the patch ID that does not change

338 + when the files in a single patch is reordered. As this new algorithm

339 + is backward incompatible, the last bit to flip it to be the default

340 + is left out of 'master' for now.

341 +

342 + Nobody seems to be jumping up & down requesting this last step,

343 + which makes the result somewhat backward incompatible.

344 + Will perhaps drop.

345 +

346 +

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

348 - log --remerge-diff: show what the conflict resolution changed

349 - name-hash: allow dir hashing even when !ignore_case

@@ -199,19 +388,6 @@ of the repositories listed at

388 Hold, waiting for Karsten's replacement.

389

390

202 -* jk/tag-contains (2014-06-30) 8 commits

203 - . perf: add tests for tag --contains

204 - . tag: use commit_contains

205 - . commit: provide a fast multi-tip contains function

206 - . string-list: add pos to iterator callback

207 - . add functions for memory-efficient bitmaps

208 - . paint_down_to_common: use prio_queue

209 - . tag: factor out decision to stream tags

210 - . tag: allow --sort with -n

211 -

212 - Expecting a reroll.

213 -

214 -

391 * ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits

392 - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks

393 - git-add--interactive: Preserve diff heading when splitting hunks

@@ -242,31 +418,6 @@ of the repositories listed at

418 Expecting a reroll.

419

420

245 -* jk/makefile (2014-02-05) 16 commits

246 - . FIXUP

247 - . move LESS/LV pager environment to Makefile

248 - . Makefile: teach scripts to include make variables

249 - . FIXUP

250 - . Makefile: auto-build C strings from make variables

251 - . Makefile: drop *_SQ variables

252 - . FIXUP

253 - . Makefile: add c-quote helper function

254 - . Makefile: introduce sq function for shell-quoting

255 - . Makefile: always create files via make-var

256 - . Makefile: store GIT-* sentinel files in MAKE/

257 - . Makefile: prefer printf to echo for GIT-*

258 - . Makefile: use tempfile/mv strategy for GIT-*

259 - . Makefile: introduce make-var helper function

260 - . Makefile: fix git-instaweb dependency on gitweb

261 - . Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS

262 -

263 - Simplify the Makefile rules and macros that exist primarily for

264 - quoting purposes, and make it easier to robustly express the

265 - dependency rules.

266 -

267 - Expecting a reroll.

268 -

269 -

421 * rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits

422 - merge: drop unused arg from abort_commit method signature

423 - merge: make prepare_to_commit responsible for write_merge_state

@@ -311,44 +462,6 @@ of the repositories listed at

462 --------------------------------------------------

463 [Cooking]

464

314 -* eb/no-pthreads (2014-10-19) 3 commits

315 - - Handle atexit list internaly for unthreaded builds

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

317 - - index-pack: fix compilation with NO_PTHREADS

318 -

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

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

321 - message.

322 -

323 - Will merge to 'next'.

324 -

325 -

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

327 - (merged to 'next' on 2014-10-17 at 261e74e)

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

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

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

331 -

332 - Allow a temporary directory specified to be used while running "git

333 - mergetool" backend.

334 -

335 - Will merge to 'master'.

336 -

337 -

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

339 - (merged to 'next' on 2014-10-17 at 239fefe)

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

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

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

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

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

345 -

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

347 - welcome change.

348 -

349 - Will merge to 'master'.

350 -

351 -

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

466 (merged to 'next' on 2014-10-17 at 12ce2e2)

467 + Documentation: implement linkgit macro for Asciidoctor

@@ -361,16 +474,6 @@ of the repositories listed at

474 moving this topic forward.

475

476

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

365 - (merged to 'next' on 2014-10-17 at 00ee553)

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

367 -

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

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

370 -

371 - Will merge to 'master'.

372 -

373 -

477 * jk/prune-mtime (2014-10-19) 28 commits

478 (merged to 'next' on 2014-10-20 at fdd7ff6)

479 + drop add_object_array_with_mode

@@ -410,193 +513,57 @@ of the repositories listed at

513 Will merge to 'master'.

514

515

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

414 - (merged to 'next' on 2014-10-17 at 1390624)

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

416 - + lockfile: remove unable_to_lock_error

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

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

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

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

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

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

423 - + branch -d: simplify by using RESOLVE_REF_READING

424 - + branch -d: avoid repeated symref resolution

425 - + reflog test: test interaction with detached HEAD

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

427 - + refs.c: make write_ref_sha1 static

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

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

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

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

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

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

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

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

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

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

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

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

440 -

441 - The API to update refs have been restructured to allow introducing

442 - a true transactional updates later. We would even allow storing

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

444 -

445 - Will merge to 'master'.

446 -

447 -

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

449 - (merged to 'next' on 2014-10-17 at 854654c)

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

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

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

453 - + mergetool: use more conservative temporary filenames

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

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

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

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

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

459 -

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

461 -

462 - Will merge to 'master'.

463 -

464 -

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

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

517 + (merged to 'next' on 2014-10-21 at f636a00)

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

519

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

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

522 full refname) incorrectly said that the upstream is gone.

523

472 - Will merge to 'next'.

473 -

524

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

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

526 + (merged to 'next' on 2014-10-21 at b76ea34)

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

528

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

530

480 -

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

482 - (merged to 'next' on 2014-10-17 at 466de3c)

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

484 -

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

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

487 - refnames.

488 -

489 - Will merge to 'master'.

490 -

491 -

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

493 - (merged to 'next' on 2014-10-17 at 3fb95b5)

494 - + mergetool: use more conservative temporary filenames

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

496 -

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

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

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

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

501 -

502 - Will merge to 'master'.

503 -

504 -

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

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

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

508 -

509 - This is "we could do this if we wanted to", not "we measured and it

510 - improves performance critical codepath".

511 -

512 - Will perhaps drop.

513 -

514 -

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

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

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

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

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

520 - . gc: support prune --worktrees

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

522 - . gc: style change -- no SP before closing parenthesis

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

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

525 - . prune: strategies for linked checkouts

526 - . checkout: support checking out into a new working directory

527 - . use new wrapper write_file() for simple file writing

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

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

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

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

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

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

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

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

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

537 - . $GIT_COMMON_DIR: a new environment variable

538 - . commit: use SEQ_DIR instead of hardcoding "sequencer"

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

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

541 - . *.sh: respect $GIT_INDEX_FILE

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

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

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

545 - . git_snpath(): retire and replace with strbuf_git_path()

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

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

548 -

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

550 - rely on symbolic links and make sharing of objects and refs safer

551 - by making the borrowee and borrowers aware of each other.

552 -

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

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

555 - reroll.

556 -

557 -

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

559 - - patch-id: change default to stable

560 -

561 - Teaches "git patch-id" to compute the patch ID that does not change

562 - when the files in a single patch is reordered. As this new algorithm

563 - is backward incompatible, the last bit to flip it to be the default

564 - is left out of 'master' for now.

565 -

566 - Nobody seems to be jumping up & down requesting this last step,

567 - which makes the result somewhat backward incompatible.

568 - Will perhaps drop.

569 -

531 --------------------------------------------------

532 [Discarded]

533

573 -* rr/mergetool-temporary-filename-tweak (2014-08-21) 1 commit

574 - . Allow the user to change the temporary file name for mergetool

575 -

576 - Needed rerolling (new paragraph in doc seems to be in a wrong place)

577 - for quite some time but without any activity.

578 -

534 +* jk/tag-contains (2014-06-30) 8 commits

535 + . perf: add tests for tag --contains

536 + . tag: use commit_contains

537 + . commit: provide a fast multi-tip contains function

538 + . string-list: add pos to iterator callback

539 + . add functions for memory-efficient bitmaps

540 + . paint_down_to_common: use prio_queue

541 + . tag: factor out decision to stream tags

542 + . tag: allow --sort with -n

543

580 -* cb/mergetool-difftool (2014-07-21) 2 commits

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

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

544 + Expecting a reroll.

545

584 - Rerolled as da/mergetool-tool-help topic.

546

547 +* jk/makefile (2014-02-05) 16 commits

548 + . FIXUP

549 + . move LESS/LV pager environment to Makefile

550 + . Makefile: teach scripts to include make variables

551 + . FIXUP

552 + . Makefile: auto-build C strings from make variables

553 + . Makefile: drop *_SQ variables

554 + . FIXUP

555 + . Makefile: add c-quote helper function

556 + . Makefile: introduce sq function for shell-quoting

557 + . Makefile: always create files via make-var

558 + . Makefile: store GIT-* sentinel files in MAKE/

559 + . Makefile: prefer printf to echo for GIT-*

560 + . Makefile: use tempfile/mv strategy for GIT-*

561 + . Makefile: introduce make-var helper function

562 + . Makefile: fix git-instaweb dependency on gitweb

563 + . Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS

564

587 -* rh/prompt-tests (2014-06-05) 11 commits

588 - . t9904: new __git_ps1 tests for Zsh

589 - . test-lib: make it possible to override how test code is eval'd

590 - . lib-prompt-tests.sh: add variable for string that encodes percent in PS1

591 - . lib-prompt-tests.sh: put all tests inside a function

592 - . t9903: move prompt tests to a new lib-prompt-tests.sh file

593 - . t9903: move PS1 color code variable definitions to lib-bash.sh

594 - . t9903: include "Bash" in test names via new $shellname var

595 - . t9903: run pc mode tests again with PS1 expansion disabled

596 - . t9903: move test name prefix to a separate variable

597 - . t9903: put the Bash pc mode prompt test cases in a function

598 - . t9903: remove Zsh test from the suite of Bash prompt tests

565 + Simplify the Makefile rules and macros that exist primarily for

566 + quoting purposes, and make it easier to robustly express the

567 + dependency rules.

568

600 - Was expecting a reroll to limit the damage to test_eval_; also

601 - reported to be broken with older zsh that are still in the field

602 - ($gmane/251231).

569 + Expecting a reroll.

What's cooking (2014/10 #06)