0399c6cbd7 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Dec 2014, #04; Mon, 22)

4 -X-master-at: bbcefffcea9789e4a1a2023a1c778e2c07db77a7

5 -X-next-at: 0ad48deaa29372e974d108b05da375b40a954ec2

3 +Subject: What's cooking in git.git (Dec 2014, #05; Mon, 29)

4 +X-master-at: c5b9256360b06efb9453c1627b78b14598e288b8

5 +X-next-at: cc831f245cfe79ce0a9b574baf3c07960f338270

6

7 -What's cooking in git.git (Dec 2014, #04; Mon, 22)

7 +What's cooking in git.git (Dec 2014, #05; Mon, 29)

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

9

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

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

12 '+' are in 'next'.

13

14 -Quite a few topics have been merged to 'master' as the third batch

15 -for this cycle, on top of the recent "case sensitive .Git" fix that

16 -has been publicized very widely. The next release which is expected

17 -to be a small one is taking shape.

14 +It has been understandably somewhat a slow week, and this will be

15 +the last issue of "What's cooking" report for this year. See you

16 +all in the new year.

17

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

19 of the repositories listed at

@@ -24,447 +23,90 @@ of the repositories listed at

23 --------------------------------------------------

24 [Graduated to "master"]

25

27 -* cc/interpret-trailers-more (2014-11-10) 4 commits

28 - (merged to 'next' on 2014-12-15 at 77f6c6a)

29 - + trailer: add test with an old style conflict block

30 - + trailer: reuse ignore_non_trailer() to ignore conflict lines

31 - + commit: make ignore_non_trailer() non static

32 - + Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more

33 - (this branch uses jc/conflict-hint.)

34 -

35 - "git interpret-trailers" learned to properly handle the

36 - "Conflicts:" block at the end.

37 -

38 -

39 -* ch/new-gpg-drops-rfc-1991 (2014-12-12) 4 commits

40 - (merged to 'next' on 2014-12-15 at 32d7d50)

41 - + tests: squelch noise from GPG machinery set-up

42 - + tests: replace binary GPG keyrings with ASCII-armored keys

43 - + tests: skip RFC1991 tests for gnupg 2.1

44 - + tests: create gpg homedir on the fly

45 -

46 - Recent GPG changes the keyring format and drops support for RFC1991

47 - formatted signatures, breaking our existing tests.

48 -

49 -

50 -* dm/compat-s-ifmt-for-zos (2014-12-04) 1 commit

51 - (merged to 'next' on 2014-12-15 at 0eb2fe6)

52 - + compat: convert modes to use portable file type values

53 -

54 - Long overdue departure from the assumption that S_IFMT is shared by

55 - everybody made in 2005.

56 -

57 -

58 -* dw/shell-basename-dashdash-before-stripping-leading-dash-from-login (2014-11-25) 1 commit

59 - (merged to 'next' on 2014-12-15 at 42937b7)

60 - + git-sh-setup.sh: use dashdash with basename call

61 -

62 -

63 -* jc/conflict-hint (2014-10-28) 4 commits

64 - (merged to 'next' on 2014-12-15 at b72475f)

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

66 - + builtin/commit.c: extract ignore_non_trailer() helper function

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

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

69 - (this branch is used by cc/interpret-trailers-more.)

70 -

71 - Unlike all the other hints given in the commit log editor, the list

72 - of conflicted paths were appended at the end without commented out.

73 -

74 -

75 -* jc/exec-cmd-system-path-leak-fix (2014-11-30) 1 commit

76 - (merged to 'next' on 2014-12-15 at f926ee5)

77 - + system_path(): always return free'able memory to the caller

78 -

79 - The function sometimes returned a non-freeable memory and some

80 - other times returned a piece of memory that must be freed.

81 -

82 -

83 -* jc/hook-cleanup (2014-12-01) 1 commit

84 - (merged to 'next' on 2014-12-15 at f5759d0)

85 - + run-command.c: retire unused run_hook_with_custom_index()

86 -

87 - Remove unused code.

88 -

89 -

90 -* jc/refer-to-t-readme-from-submitting-patches (2014-11-24) 2 commits

91 - (merged to 'next' on 2014-12-15 at 0e88699)

92 - + t/README: justify why "! grep foo" is sufficient

93 - + SubmittingPatches: refer to t/README for tests

94 -

95 -

96 -* jg/prompt-localize-temporary (2014-12-12) 1 commit

97 - (merged to 'next' on 2014-12-15 at bb9cac9)

98 - + git-prompt.sh: make $f local to __git_eread()

99 -

100 - "git-prompt" (in contrib/) used a variable from the global scope,

101 - possibly contaminating end-user's namespace.

102 -

103 -

104 -* jk/always-allow-large-packets (2014-12-10) 1 commit

105 - (merged to 'next' on 2014-12-15 at c3fb2c8)

106 - + pkt-line: allow writing of LARGE_PACKET_MAX buffers

107 -

108 - "git push" and "git fetch" did not communicate an overlong refname

109 - correctly.

110 -

111 -

112 -* jk/colors (2014-12-09) 6 commits

113 - (merged to 'next' on 2014-12-15 at 20b045f)

114 - + parse_color: drop COLOR_BACKGROUND macro

115 - + diff-highlight: allow configurable colors

116 - + parse_color: recognize "no$foo" to clear the $foo attribute

117 - + parse_color: support 24-bit RGB values

118 - + parse_color: refactor color storage

119 - + Merge branch 'jn/parse-config-slot' into jk/colors

120 -

121 - "diff-highlight" filter (in contrib/) allows its color output

122 - to be customized via configuration variables.

123 -

124 -

125 -* jk/commit-date-approxidate (2014-12-11) 2 commits

126 - (merged to 'next' on 2014-12-15 at 047530e)

127 - + commit: always populate GIT_AUTHOR_* variables

128 - + commit: loosen ident checks when generating template

129 -

130 - Recent update to "git commit" broke amending an existing commit

131 - with bogus author/committer lines without a valid e-mail address.

132 -

133 -

134 -* jk/credential-quit (2014-12-04) 2 commits

135 - (merged to 'next' on 2014-12-15 at 4cfd999)

136 - + prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts

137 - + credential: let helpers tell us to quit

138 -

139 - Credential helpers are asked in turn until one of them give

140 - positive response, which is cumbersome to turn off when you need to

141 - run Git in an automated setting. The credential helper interface

142 - learned to allow a helper to say "stop, don't ask other helpers."

143 - Also GIT_TERMINAL_PROMPT environment can be set to false to disable

144 - our built-in prompt mechanism for passwords.

145 -

146 -

147 -* jk/for-each-reflog-ent-reverse (2014-12-05) 2 commits

148 - (merged to 'next' on 2014-12-15 at de71f08)

149 - + for_each_reflog_ent_reverse: turn leftover check into assertion

150 - + for_each_reflog_ent_reverse: fix newlines on block boundaries

151 -

152 - The code that reads the reflog from the newer to the older entries

153 - did not handle an entry that crosses a boundary of block it uses to

154 - read them correctly.

155 -

156 -

157 -* jk/lock-ref-sha1-basic-return-errors (2014-11-20) 1 commit

158 - (merged to 'next' on 2014-12-15 at c48b110)

159 - + lock_ref_sha1_basic: do not die on locking errors

160 -

161 - Correct an API anomaly.

162 -

163 -

164 -* jk/read-packed-refs-without-path-max (2014-12-10) 3 commits

165 - (merged to 'next' on 2014-12-15 at c6d6f56)

166 - + read_packed_refs: use skip_prefix instead of static array

167 - + read_packed_refs: pass strbuf to parse_ref_line

168 - + read_packed_refs: use a strbuf for reading lines

169 -

170 - Git did not correctly read an overlong refname from a packed refs

171 - file.

172 -

173 -

174 -* jk/test-asan (2014-12-11) 1 commit

175 - (merged to 'next' on 2014-12-15 at d24cb92)

176 - + t: support clang/gcc AddressSanitizer

177 -

178 -

179 -* js/fsck-tag-validation (2014-12-09) 2 commits

180 - (merged to 'next' on 2014-12-15 at 455f26c)

181 - + index-pack: terminate object buffers with NUL

182 - + fsck: properly bound "invalid tag name" error message

183 -

184 - New tag object format validation added in 2.2 showed garbage

185 - after a tagname it reported in its error message.

186 -

187 -

188 -* js/push-to-deploy (2014-11-30) 2 commits

189 - (merged to 'next' on 2014-12-15 at ef8c99f)

190 - + t5516: more tests for receive.denyCurrentBranch=updateInstead

191 - + receive-pack: add another option for receive.denyCurrentBranch

192 - (this branch is used by jc/push-to-checkout.)

193 -

194 - "git push" into a repository with a working tree normally refuses

195 - to modify the branch that is checked out. The command learned to

196 - optionally do an equivalent of "git reset --hard" only when there

197 - is no change to the working tree and the index instead, which would

198 - be useful to "deploy" by pushing into a repository.

199 -

200 -

201 -* js/t5000-dont-copy-bin-sh (2014-11-24) 1 commit

202 - (merged to 'next' on 2014-12-15 at 65ffd05)

203 - + t5000 on Windows: do not mistake "sh.exe" as "sh"

204 -

205 -

206 -* js/test-hashmap-squelch-gcc (2014-12-09) 1 commit

207 - (merged to 'next' on 2014-12-15 at a8da691)

208 - + test-hashmap: squelch gcc compiler warning

209 -

210 -

211 -* mg/add-ignore-errors (2014-11-21) 1 commit

212 - (merged to 'next' on 2014-12-15 at 3834789)

213 - + add: ignore only ignored files

214 -

215 - "git add --ignore-errors ..." did not ignore an error to

216 - give a file that did not exist.

217 -

218 -

219 -* mg/branch-d-m-f (2014-12-09) 2 commits

220 - (merged to 'next' on 2014-12-15 at 8366f2c)

221 - + branch: allow -f with -m and -d

222 - + t3200-branch: test -M

223 -

224 - "git branch -d" (delete) and "git branch -m" (move) learned to

225 - honor "-f" (force) flag; unlike many other subcommands, the way to

226 - force these have been with separate "-D/-M" options, which was

227 - inconsistent.

228 -

229 -

230 -* mg/doc-check-ignore-tracked-are-not-ignored (2014-12-04) 1 commit

231 - (merged to 'next' on 2014-12-15 at c50f748)

232 - + check-ignore: clarify treatment of tracked files

233 -

234 -

235 -* mh/find-uniq-abbrev (2014-11-26) 1 commit

236 - (merged to 'next' on 2014-12-15 at e3b2b62)

237 - + sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev

238 -

239 - The code to abbreviate an object name to its short unique prefix

240 - has been optimized when no abbreviation was requested.

241 -

242 -

243 -* mh/simplify-repack-without-refs (2014-11-25) 7 commits

244 - (merged to 'next' on 2014-12-15 at 351e03e)

245 - + sort_string_list(): rename to string_list_sort()

246 - + prune_remote(): iterate using for_each_string_list_item()

247 - + prune_remote(): rename local variable

248 - + repack_without_refs(): make the refnames argument a string_list

249 - + prune_remote(): sort delete_refs_list references en masse

250 - + prune_remote(): initialize both delete_refs lists in a single loop

251 - + prune_remote(): exit early if there are no stale references

252 -

253 - "git remote update --prune" to drop many refs has been optimized.

254 -

255 -

256 -* nd/ls-tree-pathspec (2014-12-01) 5 commits

257 - (merged to 'next' on 2014-12-15 at 8da6e09)

258 - + t3102: style modernization

259 - + t3102: document that ls-tree does not yet support negated pathspec

260 - + ls-tree: disable negative pathspec because it's not supported

261 - + ls-tree: remove path filtering logic in show_tree

262 - + tree.c: update read_tree_recursive callback to pass strbuf as base

263 -

264 - "git ls-tree" does not support path selection based on negative

265 - pathspecs, but did not error out when negative pathspecs are given.

266 -

267 -

268 -* nd/split-index (2014-12-11) 1 commit

269 - (merged to 'next' on 2014-12-15 at ed6490c)

270 - + index-format.txt: add a missing closing quote

271 -

272 - A typofix to the documentation of a feature already in the release.

273 -

274 -

275 -* ok/rebase-i-count-todo (2014-12-10) 1 commit

276 - (merged to 'next' on 2014-12-15 at 4a1f7ed)

277 - + Show number of TODO items for interactive rebase

278 -

279 -

280 -* pb/am-message-id-footer (2014-11-25) 2 commits

281 - (merged to 'next' on 2014-12-15 at b44b6bd)

282 - + git-am: add --message-id/--no-message-id

283 - + git-mailinfo: add --message-id

284 -

285 - "git am" learned "--message-id" option to copy the message ID of

286 - the incoming e-mail to the log message of resulting commit.

287 -

288 -

289 -* pb/send-email-te (2014-11-25) 2 commits

290 - (merged to 'next' on 2014-12-15 at 38c2810)

291 - + git-send-email: add --transfer-encoding option

292 - + git-send-email: delay creation of MIME headers

293 - (this branch is used by jc/t9001-modernise.)

294 -

295 - "git send-email" learned "--transfer-encoding" option to force

296 - a non-fault Content-Transfer-Encoding header (e.g. base64).

297 -

298 -

299 -* po/doc-assume-unchanged (2014-12-09) 2 commits

300 - (merged to 'next' on 2014-12-15 at 646e77e)

301 - + gitignore.txt: do not suggest assume-unchanged

302 - + doc: make clear --assume-unchanged's user contract

303 -

304 - Fixes long-standing misunderstanding of what assume-unchanged is

305 - about. Some text near what is removed by the bottom patch may also

306 - have to be removed.

307 -

308 -

309 -* ps/new-workdir-into-empty-directory (2014-12-03) 1 commit

310 - (merged to 'next' on 2014-12-15 at 0787b56)

311 - + git-new-workdir: don't fail if the target directory is empty

312 -

313 - "git new-workdir" (in contrib/) can be used to populate an empty

314 - and existing directory now.

315 -

316 -

317 -* rj/no-xopen-source-for-cygwin (2014-11-24) 1 commit

318 - (merged to 'next' on 2014-12-15 at 6e8e9ff)

319 - + git-compat-util.h: don't define _XOPEN_SOURCE on cygwin

320 -

321 - Avoid compilation warnings on recent gcc toolchain on Cygwin.

322 -

323 -

324 -* rj/t0050-passes (2014-11-30) 1 commit

325 - (merged to 'next' on 2014-12-15 at f56c339)

326 - + t0050-*.sh: mark the rename (case change) test as passing

327 -

328 -

329 -* rs/use-strbuf-complete-line (2014-12-12) 1 commit

330 - (merged to 'next' on 2014-12-15 at d6426a0)

331 - + use strbuf_complete_line() for adding a newline if needed

332 -

333 -

334 -* rt/completion-tag (2014-12-04) 1 commit

335 - (merged to 'next' on 2014-12-15 at b03ee39)

336 - + completion: add git-tag options

337 -

338 -

339 -* rt/for-each-ref-spell-tcl-as-Tcl (2014-11-30) 1 commit

340 - (merged to 'next' on 2014-12-15 at c0fcefb)

341 - + for-each-ref: correct spelling of Tcl in option description

342 -

343 -

344 -* rw/apply-does-not-take-ignore-date (2014-12-09) 1 commit

345 - (merged to 'next' on 2014-12-15 at ded2f99)

346 - + git-am.txt: --ignore-date flag is not passed to git-apply

347 -

348 -

349 -* sb/string-list (2014-12-04) 3 commits

350 - (merged to 'next' on 2014-12-15 at 8bb8ddd)

351 - + string_list: remove string_list_insert_at_index() from its API

352 - + mailmap: use higher level string list functions

353 - + string_list: document string_list_(insert,lookup)

354 -

355 - API simplification.

356 -

357 -

358 -* sv/doc-stripspace (2014-12-04) 1 commit

359 - (merged to 'next' on 2014-12-15 at e86f8ba)

360 - + Documentation/git-stripspace: add synopsis for --comment-lines

361 -

362 -

363 -* tb/config-core-filemode-check-on-broken-fs (2014-11-21) 1 commit

364 - (merged to 'next' on 2014-12-15 at 3e5490b)

365 - + init-db: improve the filemode trustability check

26 +* jc/t9001-modernise (2014-11-25) 5 commits

27 + (merged to 'next' on 2014-12-23 at 3a2ec87)

28 + + t9001: style modernisation phase #5

29 + + t9001: style modernisation phase #4

30 + + t9001: style modernisation phase #3

31 + + t9001: style modernisation phase #2

32 + + t9001: style modernisation phase #1

33

367 - Some filesystems assign filemodes in a strange way, fooling then

368 - automatic "filemode trustability" check done during a new

369 - repository creation.

34

35 +* mh/update-ref-verify (2014-12-11) 2 commits

36 + (merged to 'next' on 2014-12-23 at 3aa9a62)

37 + + update-ref: fix "verify" command with missing <oldvalue>

38 + + t1400: add some more tests of "update-ref --stdin"'s verify command

39

372 -* tb/t0027-eol-conversion (2014-12-05) 1 commit

373 - (merged to 'next' on 2014-12-15 at ba24e75)

374 - + t0027: check the eol conversion warnings

40 + "git update-ref --stdin"'s verify command did not work well when

41 + <oldvalue>, which is documented as optional, was missing.

42

43 --------------------------------------------------

44 [New Topics]

45

379 -* bb/update-unicode-table (2014-12-22) 5 commits

380 - - update_unicode.sh: delete the command group

381 - - update_unicode.sh: make the output structure visible

382 - - update_unicode.sh: shorten uniset invocation path

383 - - update_unicode.sh: set UNICODE_DIR only once

384 - - update_unicode.sh: simplify output capture

385 -

386 - Simplify the procedure to generate unicode table.

46 +* bw/maint-0090-awk-tweak (2014-12-23) 1 commit

47 + (merged to 'next' on 2014-12-29 at 9301c36)

48 + + t0090: tweak awk statement for Solaris /usr/xpg4/bin/awk

49

388 - Will merge to 'next'.

50 + Will merge to 'master'.

51

52

391 -* bc/fetch-thin-less-aggressive-in-normal-repository (2014-12-22) 3 commits

392 - - pack-objects: use --objects-edge-aggressive only for shallow repos

393 - - rev-list: add an option to mark fewer edges as uninteresting

394 - - Documentation: add missing article in rev-list-options.txt

53 +* cc/bisect-rev-parsing (2014-12-29) 2 commits

54 + - bisect: add test to check that revs are properly parsed

55 + - bisect: parse revs before passing them to check_expected_revs()

56

396 - Earlier we made "rev-list --object-edge" more aggressively list the

397 - objects at the edge commits, in order to reduce number of objects

398 - fetched into a shallow repository, but the change affected cases

399 - other than "fetching into a shallow repository" and made it

400 - unusably slow (e.g. fetching into a normal repository should not

401 - have to suffer the overhead from extra processing). Limit it to a

402 - more specific case by introducing --objects-edge-aggressive, a new

403 - option to rev-list.

57 + The logic in "git bisect bad HEAD" etc. to avoid forcing the test

58 + of the common ancestor of bad and good commits was broken.

59

405 - Seems to break t5500 when merged to 'pu'.

60 + Will merge to 'next'.

61

62

408 -* es/squelch-openssl-warnings-on-macosx (2014-12-18) 1 commit

409 - - git-compat-util: suppress unavoidable Apple-specific deprecation warnings

63 +* es/checkout-index-temp (2014-12-29) 5 commits

64 + - checkout-index: fix --temp relative path mangling

65 + - t2004: demonstrate broken relative path printing

66 + - t2004: standardize file naming in symlink test

67 + - t2004: drop unnecessary write-tree/read-tree

68 + - t2004: modernize style

69

411 - Squelch useless compiler warnings on Mac OS X.

70 + "git checkout-index --temp=$target $path" did not work correctly

71 + for paths outside the current subdirectory in the project.

72

73 Will merge to 'next'.

74

75

416 -* jh/pre-push-sample-no-custom-ifs (2014-12-22) 1 commit

417 - - pre-push.sample: remove unnecessary and misleading IFS=' '

76 +* js/remote-add-with-insteadof (2014-12-23) 2 commits

77 + - Add a regression test for 'git remote add <existing> <same-url>'

78 + - git remote: allow adding remotes agreeing with url.<...>.insteadOf

79

419 - The sample pre-push hook used customized IFS=' ' for no good reason.

80 + "git remote add $name $URL" is now allowed when "url.$URL.insteadOf"

81 + is already defined.

82

421 - Will merge to 'next'.

422 -

423 -

424 -* mh/update-ref-verify (2014-12-11) 2 commits

425 - - update-ref: fix "verify" command with missing <oldvalue>

426 - - t1400: add some more tests of "update-ref --stdin"'s verify command

83

428 - "git update-ref --stdin"'s verify command did not work well when

429 - <oldvalue>, which is documented as optional, was missing.

84 +* rs/plug-strbuf-leak-in-lock-ref (2014-12-29) 1 commit

85 + - refs: plug strbuf leak in lock_ref_sha1_basic()

86

87 Will merge to 'next'.

88

89

434 -* sb/atomic-push (2014-12-22) 7 commits

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

436 - - push.c: add an --atomic argument

437 - - receive-pack: move execute_commands_non_atomic before execute_commands

438 - - receive-pack.c: receive-pack.c: use a single ref_transaction for atomic pushes

439 - - send-pack.c: add --atomic command line argument

440 - - send-pack: rename ref_update_to_be_sent to check_to_send_update

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

442 - (this branch uses mh/reflog-expire.)

443 -

444 - "git push" has been taught a "--atomic" option that makes push to

445 - update more than one ref an "all-or-none" affair.

90 +* rs/plug-strbuf-leak-in-merge (2014-12-29) 1 commit

91 + - merge: release strbuf after use in suggest_conflicts()

92

93 Will merge to 'next'.

94

95

450 -* sb/dco-indentation-fix (2014-12-22) 1 commit

451 - - Documentation/SubmittingPatches: unify whitespace/tabs for the DCO

96 +* rs/simplify-parsing-commit-tree-S (2014-12-29) 1 commit

97 + - commit-tree: simplify parsing of option -S using skip_prefix()

98

99 Will merge to 'next'.

100

101

456 -* sb/t5400-remove-unused (2014-12-16) 1 commit

457 - - t5400: remove dead code

102 +* rs/simplify-transport-get (2014-12-29) 1 commit

103 + - transport: simplify duplicating a substring in transport_get() using xmemdupz()

104

105 Will merge to 'next'.

106

107

462 -* tf/prompt-preserve-exit-status (2014-12-22) 1 commit

463 - - git-prompt: preserve value of $? inside shell prompt

464 -

465 - Using the exit status of the last command in the prompt, e.g.

466 - PS1='$(__git_ps1) $? ', did not work well because the helper

467 - function stomped on the exit status.

108 +* sb/doc-submitting-patches-keep-notes (2014-12-29) 1 commit

109 + - Documentation/SubmittingPatches: Explain the rationale of git notes

110

111 Will merge to 'next'.

112

@@ -621,11 +263,97 @@ of the repositories listed at

263 --------------------------------------------------

264 [Cooking]

265

266 +* bb/update-unicode-table (2014-12-22) 5 commits

267 + (merged to 'next' on 2014-12-23 at b4ce669)

268 + + update_unicode.sh: delete the command group

269 + + update_unicode.sh: make the output structure visible

270 + + update_unicode.sh: shorten uniset invocation path

271 + + update_unicode.sh: set UNICODE_DIR only once

272 + + update_unicode.sh: simplify output capture

273 +

274 + Simplify the procedure to generate unicode table.

275 +

276 + Will merge to 'master'.

277 +

278 +

279 +* bc/fetch-thin-less-aggressive-in-normal-repository (2014-12-29) 3 commits

280 + - pack-objects: use --objects-edge-aggressive for shallow repos

281 + - rev-list: add an option to mark fewer edges as uninteresting

282 + - Documentation: add missing article in rev-list-options.txt

283 +

284 + Earlier we made "rev-list --object-edge" more aggressively list the

285 + objects at the edge commits, in order to reduce number of objects

286 + fetched into a shallow repository, but the change affected cases

287 + other than "fetching into a shallow repository" and made it

288 + unusably slow (e.g. fetching into a normal repository should not

289 + have to suffer the overhead from extra processing). Limit it to a

290 + more specific case by introducing --objects-edge-aggressive, a new

291 + option to rev-list.

292 +

293 + Will merge to 'next'.

294 +

295 +

296 +* es/squelch-openssl-warnings-on-macosx (2014-12-18) 1 commit

297 + (merged to 'next' on 2014-12-23 at e88cf6a)

298 + + git-compat-util: suppress unavoidable Apple-specific deprecation warnings

299 +

300 + Squelch useless compiler warnings on Mac OS X.

301 +

302 + Will merge to 'master'.

303 +

304 +

305 +* jh/pre-push-sample-no-custom-ifs (2014-12-22) 1 commit

306 + (merged to 'next' on 2014-12-29 at c516021)

307 + + pre-push.sample: remove unnecessary and misleading IFS=' '

308 +

309 + The sample pre-push hook used customized IFS=' ' for no good reason.

310 +

311 + Will merge to 'master'.

312 +

313 +

314 +* sb/atomic-push (2014-12-22) 7 commits

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

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

317 + - receive-pack: move execute_commands_non_atomic before execute_commands

318 + - receive-pack.c: receive-pack.c: use a single ref_transaction for atomic pushes

319 + - send-pack.c: add --atomic command line argument

320 + - send-pack: rename ref_update_to_be_sent to check_to_send_update

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

322 + (this branch uses mh/reflog-expire.)

323 +

324 + "git push" has been taught a "--atomic" option that makes push to

325 + update more than one ref an "all-or-none" affair.

326 +

327 +

328 +* sb/dco-indentation-fix (2014-12-22) 1 commit

329 + (merged to 'next' on 2014-12-23 at c865690)

330 + + Documentation/SubmittingPatches: unify whitespace/tabs for the DCO

331 +

332 + Will merge to 'master'.

333 +

334 +

335 +* sb/t5400-remove-unused (2014-12-16) 1 commit

336 + (merged to 'next' on 2014-12-23 at a992011)

337 + + t5400: remove dead code

338 +

339 + Will merge to 'master'.

340 +

341 +

342 +* tf/prompt-preserve-exit-status (2014-12-22) 1 commit

343 + (merged to 'next' on 2014-12-23 at dfcd89f)

344 + + git-prompt: preserve value of $? inside shell prompt

345 +

346 + Using the exit status of the last command in the prompt, e.g.

347 + PS1='$(__git_ps1) $? ', did not work well because the helper

348 + function stomped on the exit status.

349 +

350 + Will merge to 'master'.

351 +

352 +

353 * ye/http-accept-language (2014-12-22) 1 commit

354 - http: Add Accept-Language header if possible

355

627 - An earlier iteration broke various people ($gmane/260903). Please

628 - retest and comment.

356 + Expecting a reroll ($gmane/261810).

357

358

359 * jk/strbuf-doc-to-header (2014-12-12) 4 commits

@@ -674,37 +402,41 @@ of the repositories listed at

402

403

404 * po/doc-core-ignorestat (2014-12-12) 1 commit

677 - - doc: core.ignoreStat clarify the --assume-unchanged effect

405 + (merged to 'next' on 2014-12-23 at d2b3e84)

406 + + doc: core.ignoreStat clarify the --assume-unchanged effect

407

679 - Expecting a reroll.

408 + Will merge to 'master'.

409

410

411 * jk/add-i-read-error (2014-12-15) 1 commit

683 - - add--interactive: leave main loop on read error

412 + (merged to 'next' on 2014-12-23 at 9b76001)

413 + + add--interactive: leave main loop on read error

414

415 "git add -i" did not notice when the interactive command input

416 stream went away and kept asking.

417

688 - Will merge to 'next'.

418 + Will merge to 'master'.

419

420

421 * pd/completion-filenames-fix (2014-12-15) 1 commit

692 - - Update documentation occurrences of filename .sh

422 + (merged to 'next' on 2014-12-23 at e2b10ab)

423 + + Update documentation occurrences of filename .sh

424

425 The top-of-the-file instruction for completion scripts (in contrib/)

426 did not name the files correctly.

427

697 - Will merge to 'next'.

428 + Will merge to 'master'.

429

430

431 * rd/send-email-2047-fix (2014-12-15) 2 commits

701 - - send-email: handle adjacent RFC 2047-encoded words properly

702 - - send-email: align RFC 2047 decoding more closely with the spec

432 + (merged to 'next' on 2014-12-23 at 2b101ce)

433 + + send-email: handle adjacent RFC 2047-encoded words properly

434 + + send-email: align RFC 2047 decoding more closely with the spec

435

436 "git send-email" did not handle RFC 2047 encoded headers quite

437 right.

438

707 - Will merge to 'next'.

439 + Will merge to 'master'.

440

441

442 * jn/doc-api-errors (2014-12-04) 1 commit

@@ -732,14 +464,15 @@ of the repositories listed at

464

465

466 * lh/send-email-hide-x-mailer (2014-12-15) 2 commits

735 - - test/send-email: --[no-]xmailer tests

736 - - send-email: add --[no-]xmailer option

467 + (merged to 'next' on 2014-12-23 at fc16c68)

468 + + test/send-email: --[no-]xmailer tests

469 + + send-email: add --[no-]xmailer option

470

471 "git send-email" normally identifies itself via X-Mailer: header

472 in the message it sends out. A new command line flag allows the

473 header to be squelched.

474

742 - Will merge to 'next'.

475 + Will merge to 'master'.

476

477

478 * nd/list-files (2014-12-01) 19 commits

@@ -814,14 +547,6 @@ of the repositories listed at

547 Will be rerolled as a part of a larger series.

548

549

817 -* jc/t9001-modernise (2014-11-25) 5 commits

818 - - t9001: style modernisation phase #5

819 - - t9001: style modernisation phase #4

820 - - t9001: style modernisation phase #3

821 - - t9001: style modernisation phase #2

822 - - t9001: style modernisation phase #1

823 -

824 -

550 * jk/approxidate-avoid-y-d-m-over-future-dates (2014-11-13) 2 commits

551 (merged to 'next' on 2014-12-15 at 397e986)

552 + approxidate: allow ISO-like dates far in the future

@@ -837,7 +562,7 @@ of the repositories listed at

562 (1) ISO-like format is used, and

563 (2) the string can make sense interpreted as both y-m-d and y-d-m.

564

840 - Will cook in 'next'.

565 + Will merge to 'master'.

566

567

568 * br/imap-send-verbosity (2014-11-05) 1 commit

@@ -845,7 +570,7 @@ of the repositories listed at

570 + imap-send: use parse options API to determine verbosity

571 (this branch is used by br/imap-send-via-libcurl.)

572

848 - Will cook in 'next'.

573 + Will merge to 'master'.

574

575

576 * br/imap-send-via-libcurl (2014-11-10) 1 commit

@@ -856,7 +581,7 @@ of the repositories listed at

581 Newer libCurl knows how to talk IMAP; "git imap-send" has been

582 updated to use this instead of a hand-rolled OpenSSL calls.

583

859 - Will cook in 'next'.

584 + Will merge to 'master'.

585

586

587 * nd/lockfile-absolute (2014-11-03) 1 commit

@@ -866,7 +591,7 @@ of the repositories listed at

591 The lockfile API can get confused which file to clean up when the

592 process moved the $cwd after creating a lockfile.

593

869 - Will cook in 'next'.

594 + Will merge to 'master'.

595

596

597 * jc/merge-bases (2014-10-30) 2 commits

@@ -878,7 +603,7 @@ of the repositories listed at

603 copy&paste coders, leaving object flags tainted in the commits that

604 needed to be traversed.

605

881 - Will cook in 'next'.

606 + Will merge to 'master'.

607

608

609 * jc/strbuf-add-lines-avoid-sp-ht-sequence (2014-10-27) 1 commit

@@ -889,7 +614,7 @@ of the repositories listed at

614 line, resulting in "# \t<indented text>\n" when the payload began

615 with a HT. Instead, produce "#\t<indented text>\n".

616

892 - Will cook in 'next'.

617 + Will merge to 'master'.

618

619

620 * nd/untracked-cache (2014-12-15) 24 commits

@@ -927,7 +652,7 @@ of the repositories listed at

652

653 Fix long-standing bug in "diff -B -M" output.

654

930 - Will cook in 'next'.

655 + Will merge to 'master'.

656

657

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

@@ -938,7 +663,7 @@ of the repositories listed at

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

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

665

941 - Will cook in 'next'.

666 + Will merge to 'master'.

667

668

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

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

672

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

674

950 - Will cook in 'next'.

675 + Will merge to 'master'.

676

677 --------------------------------------------------

678 [Discarded]

@@ -1070,6 +795,7 @@ of the repositories listed at

795

796 Will be rerolled as a part of a larger series.

797

798 +

799 * sb/write-sha1-update-reflog (2014-11-24) 1 commit

800 . refs.c: move reflog updates into its own function

801

What's cooking (2014/12 #05)