c29ffe023d · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

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

4 -X-master-at: 9abc44b681a669c67d071d858c8aad21f65a0956

5 -X-next-at: d6426a0ea3bc6be707b25a6817328703d4883659

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

4 +X-master-at: bbcefffcea9789e4a1a2023a1c778e2c07db77a7

5 +X-next-at: 0ad48deaa29372e974d108b05da375b40a954ec2

6

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

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

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 -The 'next' branch has been rewound and rebuilt on top of 2.2; I

15 -expect this to be a short and light cycle that would not add too

16 -many new things.

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.

18

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

20 of the repositories listed at

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

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

25 [Graduated to "master"]

26

26 -* da/difftool-mergetool-simplify-reporting-status (2014-11-21) 5 commits

27 - (merged to 'next' on 2014-12-04 at c3c329f)

28 - + mergetools: stop setting $status in merge_cmd()

29 - + mergetool: simplify conditionals

30 - + difftool--helper: add explicit exit statement

31 - + mergetool--lib: remove use of $status global

32 - + mergetool--lib: remove no-op assignment to $status from setup_user_tool

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

34 - Code simplification.

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

37 -* jc/unpack-trees-plug-leak (2014-11-17) 1 commit

38 - (merged to 'next' on 2014-12-04 at 9f1df30)

39 - + unpack_trees: plug leakage of o->result

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

55 + everybody made in 2005.

56

57

42 -* jk/colors-fix (2014-11-20) 3 commits

43 - (merged to 'next' on 2014-12-04 at 0d97d69)

44 - + t4026: test "normal" color

45 - + config: fix parsing of "git config --get-color some.key -1"

46 - + docs: describe ANSI 256-color mode

47 - (this branch is used by jk/colors.)

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

50 -* jk/no-perl-tests (2014-11-18) 2 commits

51 - (merged to 'next' on 2014-12-04 at f166620)

52 - + t960[34]: mark cvsimport tests as requiring perl

53 - + t0090: mark add-interactive test with PERL prerequisite

74

55 - Some tests that depend on perl lacked PERL prerequisite to protect

56 - them, breaking build with NO_PERL configuration.

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

59 -* jk/pack-bitmap (2014-11-30) 1 commit

60 - (merged to 'next' on 2014-12-04 at eb457ad)

61 - + pack-bitmap: do not use gcc packed attribute

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

64 -* jk/push-simple (2014-11-30) 1 commit

65 - (merged to 'next' on 2014-12-04 at 00785c7)

66 - + push: truly use "simple" as default, not "upstream"

87 + Remove unused code.

88

68 - Git 2.0 was supposed to make the "simple" mode for the default of

69 - "git push", but it didn't.

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

72 -* jk/rebuild-perl-scripts-with-no-perl-seting-change (2014-11-18) 3 commits

73 - (merged to 'next' on 2014-12-04 at 27382d3)

74 - + Makefile: have python scripts depend on NO_PYTHON setting

75 - + Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macros

76 - + Makefile: have perl scripts depend on NO_PERL setting

95

78 - The build procedure did not bother fixing perl and python scripts

79 - when NO_PERL and NO_PYTHON build-time configuration changed.

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

82 -* mh/config-copy-string-from-git-path (2014-11-17) 1 commit

83 - (merged to 'next' on 2014-12-04 at 9c9518b)

84 - + cmd_config(): make a copy of path obtained from git_path()

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

87 -* po/everyday-doc (2014-11-17) 1 commit

88 - (merged to 'next' on 2014-12-04 at 39d31fb)

89 - + Documentation: change "gitlink" typo in git-push

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

109 + correctly.

110

111

92 -* rt/push-recurse-submodule-usage-string (2014-11-18) 1 commit

93 - (merged to 'next' on 2014-12-04 at c43e23c)

94 - + builtin/push.c: fix description of --recurse-submodules option

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

97 -* sv/typofix-apply-error-message (2014-11-17) 1 commit

98 - (merged to 'next' on 2014-12-04 at de7547a)

99 - + apply: fix typo in an error message

124

101 ---------------------------------------------------

102 -[New Topics]

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

108 - Will merge to 'master'.

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

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

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

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

362

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

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

366

117 - Will merge to 'master'.

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

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

369 + repository creation.

370

371

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

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

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

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

124 - + tests: skip RFC1991 tests for gnupg 2.1

125 - + tests: create gpg homedir on the fly

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

375

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

128 - formatted signatures, breaking our existing tests.

376 +--------------------------------------------------

377 +[New Topics]

378

130 - Will merge to 'master'.

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.

387

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

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

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

388 + Will merge to 'next'.

389

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

138 - possibly contaminating end-user's namespace.

390

140 - Will merge to 'master'.

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

395

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.

404

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

144 - - strbuf.h: reorganize api function grouping headers

145 - - strbuf.h: format asciidoc code blocks as 4-space indent

146 - - strbuf.h: drop asciidoc list formatting from API docs

147 - - strbuf: migrate api-strbuf.txt documentation to strbuf.h

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

406

149 - Resolve the "doc vs header" to favor the latter.

407

151 - Expecting to be rerolled.

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

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

410

411 + Squelch useless compiler warnings on Mac OS X.

412

154 -* mh/reflog-expire (2014-12-12) 24 commits

155 - - refs.c: let fprintf handle the formatting

156 - - refs.c: don't expose the internal struct ref_lock in the header file

157 - - lock_any_ref_for_update(): inline function

158 - - refs.c: remove unlock_ref/close_ref/commit_ref from the refs api

159 - - reflog_expire(): new function in the reference API

160 - - expire_reflog(): treat the policy callback data as opaque

161 - - Move newlog and last_kept_sha1 to "struct expire_reflog_cb"

162 - - expire_reflog(): move rewrite to flags argument

163 - - expire_reflog(): move verbose to flags argument

164 - - expire_reflog(): pass flags through to expire_reflog_ent()

165 - - struct expire_reflog_cb: a new callback data type

166 - - Rename expire_reflog_cb to expire_reflog_policy_cb

167 - - expire_reflog(): move updateref to flags argument

168 - - expire_reflog(): move dry_run to flags argument

169 - - expire_reflog(): add a "flags" argument

170 - - expire_reflog(): extract two policy-related functions

171 - - Extract function should_expire_reflog_ent()

172 - - expire_reflog(): use a lock_file for rewriting the reflog file

173 - - expire_reflog(): return early if the reference has no reflog

174 - - expire_reflog(): rename "ref" parameter to "refname"

175 - - expire_reflog(): it's not an each_ref_fn anymore

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

177 - - refs.c: make ref_transaction_delete a wrapper for ref_transaction_update

178 - - refs.c: make ref_transaction_create a wrapper for ref_transaction_update

413 + Will merge to 'next'.

414

180 - Restructure "reflog expire" to fit the reflogs better with the

181 - recently updated ref API.

415

183 - Looked reasonable (except that ome shortlog entries stood out like

184 - a sore thumb).

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

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

418

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

420

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

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

421 + Will merge to 'next'.

422

190 - Expecting a reroll.

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

427

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

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

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

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

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

430

197 - Will merge to 'master'.

431 + Will merge to 'next'.

432

433

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

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

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

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

204 - stream went away and kept asking.

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

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

446

447 Will merge to 'next'.

448

449

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

210 - - Update documentation occurrences of filename .sh

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

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

452

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

213 - did not name the files correctly.

453 + Will merge to 'next'.

454 +

455 +

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

457 + - t5400: remove dead code

458

459 Will merge to 'next'.

460

461

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

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

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

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

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

464

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

223 - right.

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.

468

469 Will merge to 'next'.

470

@@ -233,13 +477,6 @@ of the repositories listed at

477 Expecting a reroll.

478

479

236 -* ye/http-accept-language (2014-12-03) 2 commits

237 - . SQUASH???

238 - . http: send Accept-Language header if possible

239 -

240 - Breaks various people ($gmane/260903).

241 -

242 -

480 * ms/submodule-update-config-doc (2014-11-03) 1 commit

481 - submodule: clarify documentation for update subcommand

482

@@ -384,177 +621,96 @@ of the repositories listed at

621 --------------------------------------------------

622 [Cooking]

623

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

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

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

390 -

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

392 - everybody made in 2005.

393 -

394 - Will merge to 'master'.

395 -

396 -

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

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

399 - + prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts

400 - + credential: let helpers tell us to quit

401 -

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

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

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

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

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

407 - our built-in prompt mechanism for passwords.

408 -

409 - Will merge to 'master'.

410 -

411 -

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

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

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

415 - + t3200-branch: test -M

416 -

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

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

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

420 - inconsistent.

421 -

422 - Will merge to 'master'.

423 -

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

625 + - http: Add Accept-Language header if possible

626

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

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

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

428 -

429 - Will merge to 'master'.

430 -

431 -

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

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

434 - + completion: add git-tag options

435 -

436 - Will merge to 'master'.

437 -

438 -

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

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

441 - + for_each_reflog_ent_reverse: turn leftover check into assertion

442 - + for_each_reflog_ent_reverse: fix newlines on block boundaries

443 -

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

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

446 - read them correctly.

447 -

448 - Will merge to 'master'.

449 -

450 -

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

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

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

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

455 -

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

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

458 - have to be removed.

459 -

460 - Will merge to 'master'.

461 -

462 -

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

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

465 - + t0027: check the eol conversion warnings

466 -

467 - Will merge to 'master'.

468 -

469 -

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

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

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

473 -

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

475 - correctly.

476 -

477 - Will merge to 'master'.

478 -

479 -

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

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

482 - + commit: always populate GIT_AUTHOR_* variables

483 - + commit: loosen ident checks when generating template

484 -

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

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

487 -

488 - Will merge to 'master'.

489 -

490 -

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

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

493 - + read_packed_refs: use skip_prefix instead of static array

494 - + read_packed_refs: pass strbuf to parse_ref_line

495 - + read_packed_refs: use a strbuf for reading lines

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

628 + retest and comment.

629

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

498 - file.

630

500 - Will merge to 'master'.

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

632 + - strbuf.h: reorganize api function grouping headers

633 + - strbuf.h: format asciidoc code blocks as 4-space indent

634 + - strbuf.h: drop asciidoc list formatting from API docs

635 + - strbuf: migrate api-strbuf.txt documentation to strbuf.h

636

637 + Resolve the "doc vs header" to favor the latter.

638

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

504 - - doc: document error handling functions and conventions

639 + Expecting to be rerolled.

640

506 - For discussion.

641

642 +* mh/reflog-expire (2014-12-22) 24 commits

643 + - refs.c: let fprintf handle the formatting

644 + - refs.c: don't expose the internal struct ref_lock in the header file

645 + - lock_any_ref_for_update(): inline function

646 + - refs.c: remove unlock_ref/close_ref/commit_ref from the refs api

647 + - reflog_expire(): new function in the reference API

648 + - expire_reflog(): treat the policy callback data as opaque

649 + - Move newlog and last_kept_sha1 to "struct expire_reflog_cb"

650 + - expire_reflog(): move rewrite to flags argument

651 + - expire_reflog(): move verbose to flags argument

652 + - expire_reflog(): pass flags through to expire_reflog_ent()

653 + - struct expire_reflog_cb: a new callback data type

654 + - Rename expire_reflog_cb to expire_reflog_policy_cb

655 + - expire_reflog(): move updateref to flags argument

656 + - expire_reflog(): move dry_run to flags argument

657 + - expire_reflog(): add a "flags" argument

658 + - expire_reflog(): extract two policy-related functions

659 + - Extract function should_expire_reflog_ent()

660 + - expire_reflog(): use a lock_file for rewriting the reflog file

661 + - expire_reflog(): return early if the reference has no reflog

662 + - expire_reflog(): rename "ref" parameter to "refname"

663 + - expire_reflog(): it's not an each_ref_fn anymore

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

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

666 + - refs.c: make ref_transaction_create a wrapper for ref_transaction_update

667 + (this branch is used by sb/atomic-push.)

668

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

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

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

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

669 + Restructure "reflog expire" to fit the reflogs better with the

670 + recently updated ref API.

671

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

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

672 + Looked reasonable (except that some shortlog entries stood out like

673 + a sore thumb).

674

517 - Will merge to 'master'.

675

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

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

678

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

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

522 - + test-hashmap: squelch gcc compiler warning

679 + Expecting a reroll.

680

524 - Will merge to 'master'.

681

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

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

684

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

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

529 - + Show number of TODO items for interactive rebase

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

686 + stream went away and kept asking.

687

531 - Will merge to 'master'.

688 + Will merge to 'next'.

689

690

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

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

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

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

692 + - Update documentation occurrences of filename .sh

693

538 - Will merge to 'master'.

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

695 + did not name the files correctly.

696

697 + Will merge to 'next'.

698

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

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

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

699

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

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

700 +* 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

703

548 - Will merge to 'master'.

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

705 + right.

706

707 + Will merge to 'next'.

708

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

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

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

709

555 - Remove unused code.

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

711 + - doc: document error handling functions and conventions

712

557 - Will merge to 'master'.

713 + For discussion.

714

715

716 * jn/rerere-fail-on-auto-update-failure (2014-12-03) 2 commits

@@ -564,25 +720,9 @@ of the repositories listed at

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

721

722

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

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

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

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

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

572 -

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

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

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

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

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

578 -

579 - Will merge to 'master'.

580 -

581 -

723 * jc/push-to-checkout (2014-12-01) 2 commits

724 - receive-pack: support push-to-checkout hook

725 - receive-pack: refactor updateInstead codepath

585 - (this branch uses js/push-to-deploy.)

726

727 Extending the js/push-to-deploy topic, the behaviour of "git push"

728 when updating the working tree and the index with an update to the

@@ -591,17 +731,15 @@ of the repositories listed at

731 Needs docs.

732

733

594 -* lh/send-email-hide-x-mailer (2014-12-11) 4 commits

595 - - SQUASH???

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

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

597 - - SQUASH???

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

737

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

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

740 header to be squelched.

741

604 - Will merge to 'next' after squashing the fixups.

742 + Will merge to 'next'.

743

744

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

@@ -629,42 +767,6 @@ of the repositories listed at

767 whistles.

768

769

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

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

634 - + t3102: style modernization

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

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

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

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

639 -

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

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

642 -

643 - Will merge to 'master'.

644 -

645 -

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

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

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

649 -

650 - Will merge to 'master'.

651 -

652 -

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

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

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

656 -

657 - Will merge to 'master'.

658 -

659 -

660 -* sb/ref-transaction-reflog (2014-12-03) 2 commits

661 - . refs.c: rename transaction.updates to transaction.ref_updates

662 - . refs.c: rename the transaction functions

663 - (this branch uses sb/ref-transaction-unify-to-update.)

664 -

665 - Will be rerolled as a part of a larger series.

666 -

667 -

770 * nd/multiple-work-trees (2014-12-01) 34 commits

771 - git-common-dir: make "modules/" per-working-directory directory

772 - checkout: do not fail if target is an empty directory

@@ -706,178 +808,18 @@ of the repositories listed at

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

809

810

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

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

711 - + parse_color: drop COLOR_BACKGROUND macro

712 - + diff-highlight: allow configurable colors

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

714 - + parse_color: support 24-bit RGB values

715 - + parse_color: refactor color storage

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

717 -

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

719 - to be customized via configuration variables.

720 -

721 - Will merge to 'master'.

722 -

723 -

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

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

726 - + lock_ref_sha1_basic: do not die on locking errors

727 -

728 - Correct an API anomaly.

729 -

730 - Will merge to 'master'.

731 -

732 -

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

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

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

736 -

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

738 - and existing directory now.

739 -

740 - Will merge to 'master'.

741 -

742 -

811 * sb/copy-fd-errno (2014-11-17) 1 commit

812 - copy.c: make copy_fd preserve meaningful errno

813

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

815

816

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

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

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

752 -

753 - Will merge to 'master'.

754 -

755 -

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

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

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

759 -

760 - Will merge to 'master'.

761 -

762 -

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

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

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

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

767 -

768 - Will merge to 'master'.

769 -

770 -

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

777 - (this branch uses pb/send-email-te.)

778 -

779 -

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

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

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

783 -

784 - Will merge to 'master'.

785 -

786 -

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

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

789 - + add: ignore only ignored files

790 -

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

792 - give a file that did not exist.

793 -

794 - Will merge to 'master'.

795 -

796 -

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

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

799 - + sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev

800 -

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

802 - has been optimized when no abbreviation was requested.

803 -

804 - Will merge to 'master'.

805 -

806 -

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

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

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

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

811 - + prune_remote(): rename local variable

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

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

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

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

816 -

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

818 -

819 - Will merge to 'master'.

820 -

821 -

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

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

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

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

826 -

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

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

829 -

830 - Will merge to 'master'.

831 -

832 -

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

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

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

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

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

838 -

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

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

841 -

842 - Will merge to 'master'.

843 -

844 -

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

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

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

848 -

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

850 -

851 - Will merge to 'master'.

852 -

853 -

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

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

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

857 - + mailmap: use higher level string list functions

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

859 -

860 - API simplification.

861 -

862 - Will merge to 'master'.

863 -

864 -

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

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

867 -

868 - Moves a part of function around to add a helper that still only has

869 - one caller. Need to see how this helps in a bigger picture.

870 -

871 -

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

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

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

875 -

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

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

878 - repository creation.

879 -

880 - Will merge to 'master'.

823

824

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

@@ -917,20 +859,6 @@ of the repositories listed at

859 Will cook in 'next'.

860

861

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

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

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

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

924 - + commit: make ignore_non_trailer() non static

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

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

927 -

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

929 - "Conflicts:" block at the end.

930 -

931 - Will merge to 'master'.

932 -

933 -

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

863 (merged to 'next' on 2014-12-15 at 34db9af)

864 + lockfile.c: store absolute path

@@ -993,20 +921,6 @@ of the repositories listed at

921 Comments?

922

923

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

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

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

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

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

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

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

1003 -

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

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

1006 -

1007 - Will cook in 'next'.

1008 -

1009 -

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

925 (merged to 'next' on 2014-12-15 at 59c6636)

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

@@ -1155,3 +1069,17 @@ of the repositories listed at

1069 Code simplification.

1070

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

1072 +

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

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

1075 +

1076 + Moves a part of function around to add a helper that still only has

1077 + one caller. Need to see how this helps in a bigger picture.

1078 +

1079 +

1080 +* sb/ref-transaction-reflog (2014-12-03) 2 commits

1081 + . refs.c: rename transaction.updates to transaction.ref_updates

1082 + . refs.c: rename the transaction functions

1083 + (this branch uses sb/ref-transaction-unify-to-update.)

1084 +

1085 + Will be rerolled as a part of a larger series.

What's cooking (2014/12 #04)