c091518f30 · matheusbsbs/matheus-bagliano

@@ -1,26 +1,20 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jan 2015, #02; Mon, 12)

4 -X-master-at: addfb21a94fb4e6b9d07b270f7bb3748767a8f38

5 -X-next-at: e64df63be2ed715bed73607afec1eb4bd0a8f3ce

3 +Subject: What's cooking in git.git (Jan 2015, #03; Wed, 14)

4 +X-master-at: 563d4e59bd167fe2eecc5480e3841d878b1c8c2b

5 +X-next-at: cfa011ed84d39e514c6604f2af14259d9ad5483a

6

7 -What's cooking in git.git (Jan 2015, #02; Mon, 12)

7 +What's cooking in git.git (Jan 2015, #03; Wed, 14)

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 "preview" release candidate 2.3-rc0 has been tagged. With the

15 -slowness from the end-of-year holiday, this cycle turns out to be a

16 -relatively lean one as I predicted (just 200 changes since 2.2, as

17 -opposed to ~500 changes in an normal cycle), but that is fine. From

18 -time to time it is OK to have a release that does not add many new

19 -things but just fixes niggles here and there.

20 -

21 -A new maintenance release 2.2.2 is also out, which backports many

22 -fixes that were not in 2.2.1 that have been used on 'master' for the

23 -past few weeks.

14 +Many small low-impact topics have been merged to 'master' in

15 +preparation for 2.3-rc1 later in the week. I see nothing pressing

16 +that remain in 'next' other than a few bugfixes I am hoping that we

17 +can merge and ship in the 2.3 final.

18

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

20 of the repositories listed at

@@ -30,264 +24,88 @@ of the repositories listed at

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

25 [Graduated to "master"]

26

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

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

35 - + update_unicode.sh: delete the command group

36 - + update_unicode.sh: make the output structure visible

37 - + update_unicode.sh: shorten uniset invocation path

38 - + update_unicode.sh: set UNICODE_DIR only once

39 - + update_unicode.sh: simplify output capture

40 -

41 - Simplify the procedure to generate unicode table.

42 -

43 -

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

45 - (merged to 'next' on 2015-01-07 at 60f9ada)

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

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

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

49 -

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

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

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

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

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

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

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

57 - option to rev-list.

58 -

59 -

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

61 - (merged to 'next' on 2014-12-15 at 504af0b)

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

63 - (this branch is used by br/imap-send-via-libcurl and km/imap-send-libcurl-options.)

64 -

65 - "git imap-send" learned to take "-v" (verbose) and "-q" (quiet)

66 - command line options.

67 -

68 -

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

70 - (merged to 'next' on 2014-12-15 at 90db637)

71 - + git-imap-send: use libcurl for implementation

72 - (this branch is used by km/imap-send-libcurl-options; uses br/imap-send-verbosity.)

73 -

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

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

76 -

77 -

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

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

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

81 -

82 -

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

84 - (merged to 'next' on 2015-01-07 at 7b76eed)

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

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

87 -

88 - The logic in "git bisect bad HEAD" etc. to avoid forcing the test

89 - of the common ancestor of bad and good commits was broken.

90 -

91 -

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

93 - (merged to 'next' on 2015-01-07 at d45c06d)

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

95 - + t2004: demonstrate broken relative path printing

96 - + t2004: standardize file naming in symlink test

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

98 - + t2004: modernize style

99 -

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

101 - for paths outside the current subdirectory in the project.

102 -

103 -

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

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

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

107 -

108 - Squelch useless compiler warnings on Mac OS X.

109 -

110 -

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

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

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

114 -

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

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

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

118 -

119 -

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

121 - (merged to 'next' on 2014-12-15 at 08fdf77)

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

123 -

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

125 -

126 -

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

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

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

130 -

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

132 -

133 -

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

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

136 - + get_merge_bases(): always clean-up object flags

137 - + bisect: clean flags after checking merge bases

138 -

139 - The get_merge_bases*() API was easy to misuse by careless

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

141 - needed to be traversed.

142 -

143 -

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

145 - (merged to 'next' on 2014-12-15 at b499889)

146 - + strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines

147 -

148 - The commented output used to blindly add a SP before the payload

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

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

151 -

152 -

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

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

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

156 -

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

158 -

159 -

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

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

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

163 -

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

165 - stream went away and kept asking.

166 -

167 -

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

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

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

171 - + pass TIME_DATE_NOW to approxidate future-check

172 -

173 - Traditionally we tried to avoid interpreting date strings given by

174 - the user as future dates, e.g. GIT_COMMITTER_DATE=2014-12-10 when

175 - used early November 2014 was taken as "October 12, 2014" because it

176 - is likely that a date in the future, December 10, is a mistake.

177 -

178 - This heuristics has been loosened to allow people to express future

179 - dates (most notably, --until=<date> may want to be far in the

180 - future) and we no longer tiebreak by future-ness of the date when

181 -

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

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

184 -

185 - Git may still have to use the heuristics to tiebreak between dd/mm/yy

186 - and mm/dd/yy, though.

187 -

188 -

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

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

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

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

193 -

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

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

196 - header to be squelched.

197 -

198 -

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

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

201 - + lockfile.c: store absolute path

202 -

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

204 - process moved the $cwd after creating a lockfile.

205 -

206 -

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

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

209 - + Update documentation occurrences of filename .sh

210 -

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

212 - did not name the files correctly.

213 -

214 -

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

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

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

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

219 -

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

221 - right.

27 +* ak/doc-add-v-n-options (2015-01-09) 1 commit

28 + (merged to 'next' on 2015-01-12 at 0888edf)

29 + + Documentation: list long options for -v and -n

30

31

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

225 - (merged to 'next' on 2015-01-07 at 4d4a600)

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

32 +* ak/fewer-includes (2015-01-09) 2 commits

33 + (merged to 'next' on 2015-01-12 at d425e96)

34 + + cat-file: remove unused includes

35 + + git.c: remove unnecessary #includes

36

37

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

230 - (merged to 'next' on 2015-01-07 at 2cb8cea)

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

38 +* ak/show-branch-usage-string (2015-01-08) 1 commit

39 + (merged to 'next' on 2015-01-12 at 3a0de03)

40 + + show-branch: line-wrap show-branch usage

41

42

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

235 - (merged to 'next' on 2015-01-07 at 51446e0)

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

43 +* aw/doc-smtp-ssl-cert-path (2015-01-07) 1 commit

44 + (merged to 'next' on 2015-01-12 at 61d0b22)

45 + + correct smtp-ssl-cert-path description

46

47 + A long overdue documentation update to match an age-old code

48 + update.

49

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

240 - (merged to 'next' on 2015-01-07 at cd27fc8)

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

50

51 +* jk/prune-packed-server-info (2015-01-06) 2 commits

52 + (merged to 'next' on 2015-01-12 at 5e789e2)

53 + + update-server-info: create info/* with mode 0666

54 + + t1301: set umask in reflog sharedrepository=group test

55

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

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

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

56 + Fix recent breakage in Git 2.2 that started creating info/refs and

57 + objects/info/packs files with permission bits tighter than user's

58 + umask.

59

60

249 -* sb/doc-submitting-patches-keep-notes (2015-01-07) 1 commit

250 - (merged to 'next' on 2015-01-07 at c362440)

251 - + SubmittingPatches: explain rationale for using --notes with format-patch

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

62 + (merged to 'next' on 2015-01-12 at ccff14f)

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

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

65

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

67 + is already defined.

68

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

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

256 - + t5400: remove dead code

69

70 +* km/imap-send-libcurl-options (2015-01-06) 2 commits

71 + (merged to 'next' on 2015-01-12 at 5bb8802)

72 + + imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY

73 + + imap-send.c: support GIT_CURL_VERBOSE

74

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

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

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

75 + Now imap-send learned to talk to the server using cURL library,

76 + allow the same GIT_CURL_VERBOSE environment variable to control the

77 + verbosity of the chattering.

78

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

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

265 - function stomped on the exit status.

79

267 ---------------------------------------------------

268 -[New Topics]

80 +* km/log-usage-string-i18n (2015-01-06) 1 commit

81 + (merged to 'next' on 2015-01-12 at 437bf8a)

82 + + log.c: fix translation markings

83

270 -* lf/blame-commit-label (2015-01-12) 1 commit

271 - . blame.c: fix garbled error message

84

273 - Needs fixing.

85 +* mm/complete-rebase-autostash (2015-01-07) 1 commit

86 + (merged to 'next' on 2015-01-12 at edcdead)

87 + + git-completion: add --autostash for 'git rebase'

88

89

276 -* aw/doc-smtp-ssl-cert-path (2015-01-07) 1 commit

277 - (merged to 'next' on 2015-01-12 at 61d0b22)

278 - + correct smtp-ssl-cert-path description

90 +* po/doc-core-ignorestat (2015-01-12) 2 commits

91 + (merged to 'next' on 2015-01-12 at c660a71)

92 + + doc: core.ignoreStat update, and clarify the --assume-unchanged effect

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

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

95

280 - A long overdue documentation update to match an age-old code

281 - update.

96

283 - Will merge to 'master'.

97 +* rc/for-each-ref-tracking (2015-01-12) 1 commit

98 + (merged to 'next' on 2015-01-12 at 94eef27)

99 + + for-each-ref: always check stat_tracking_info()'s return value

100

101

286 -* mm/complete-rebase-autostash (2015-01-07) 1 commit

287 - (merged to 'next' on 2015-01-12 at edcdead)

288 - + git-completion: add --autostash for 'git rebase'

102 +* rh/autoconf-rhel3 (2015-01-09) 3 commits

103 + (merged to 'next' on 2015-01-12 at 57f125c)

104 + + configure.ac: check for HMAC_CTX_cleanup

105 + + configure.ac: check for clock_gettime and CLOCK_MONOTONIC

106 + + configure.ac: check 'tv_nsec' field in 'struct stat'

107

290 - Will merge to 'master'.

108 + Build update for older RHEL.

109

110

111 * rh/hide-prompt-in-ignored-directory (2015-01-07) 2 commits

@@ -295,87 +113,65 @@ of the repositories listed at

113 + git-prompt.sh: allow to hide prompt for ignored pwd

114 + git-prompt.sh: if pc mode, immediately set PS1 to a plain prompt

115

298 - Will merge to 'master'.

299 -

300 -

301 -* bc/http-fallback-to-password-after-krb-fails (2015-01-07) 1 commit

302 - (merged to 'next' on 2015-01-12 at 4c67038)

303 - + remote-curl: fall back to Basic auth if Negotiate fails

304 -

305 - After attempting and failing a password-less authentication

306 - (e.g. kerberos), libcURL refuses to fall back to password based

307 - Basic authentication without a bit of help/encouragement.

308 -

309 - Will cook in 'next'.

310 -

311 -

312 -* bp/diff-relative-config (2015-01-07) 2 commits

313 - - diff: teach diff.relative to give default to --relative=<value>

314 - - diff: teach --no-relative to override earlier --relative

315 -

116

317 -* dk/format-patch-ignore-diff-submodule (2015-01-07) 2 commits

318 - (merged to 'next' on 2015-01-12 at 6b4605b)

319 - + format-patch: ignore diff.submodule setting

320 - + t4255: test am submodule with diff.submodule

321 -

322 - Setting diff.submodule to 'log' made "git format-patch" produce

323 - broken patches.

117 +* rh/test-color-avoid-terminfo-in-original-home (2015-01-07) 2 commits

118 + (merged to 'next' on 2015-01-12 at eac0b93)

119 + + test-lib.sh: do tests for color support after changing HOME

120 + + test-lib: use 'test ...' instead of '[ ... ]'

121

325 - Will cook in 'next'.

122 + We try to see if "tput" gives a useful result before switching TERM

123 + to dumb and moving HOME to point to our fake location for stability

124 + of the tests, and then use the command when coloring the output

125 + from the tests, but there is no guarantee "tput" works after

126 + switching HOME.

127

128

328 -* nd/attr-optim (2014-12-29) 3 commits

329 - - attr: avoid heavy work when we know the specified attr is not defined

330 - - attr: do not attempt to expand when we know it's not a macro

331 - - attr.c: rename arg name attr_nr to avoid shadowing the global one

129 +* sp/subtree-doc (2015-01-06) 1 commit

130 + (merged to 'next' on 2015-01-12 at 7c488d6)

131 + + subtree: fix AsciiDoc list item continuation

132

133 +--------------------------------------------------

134 +[New Topics]

135

334 -* ak/doc-add-v-n-options (2015-01-09) 1 commit

335 - (merged to 'next' on 2015-01-12 at 0888edf)

336 - + Documentation: list long options for -v and -n

136 +* ah/usage-strings (2015-01-14) 1 commit

137 + - standardize usage info string format

138

338 - Will merge to 'master'.

139 + Will merge to and cook in 'next'.

140

141

341 -* ak/fewer-includes (2015-01-09) 2 commits

342 - (merged to 'next' on 2015-01-12 at d425e96)

343 - + cat-file: remove unused includes

344 - + git.c: remove unnecessary #includes

142 +* ak/cat-file-clean-up (2015-01-13) 1 commit

143 + - cat-file: use "type" and "size" from outer scope

144

346 - Will merge to 'master'.

145 + Will merge to 'next'.

146

147

349 -* ak/show-branch-usage-string (2015-01-08) 1 commit

350 - (merged to 'next' on 2015-01-12 at 3a0de03)

351 - + show-branch: line-wrap show-branch usage

148 +* ak/stash-store-create-help (2015-01-13) 1 commit

149 + - stash: show "create" and "store" subcommands in usage-help

150

353 - Will merge to 'master'.

151 + Undecided.

152

153

356 -* cj/log-invert-grep (2015-01-12) 1 commit

357 - (merged to 'next' on 2015-01-12 at 4589ca2)

358 - + log: teach --invert-grep option

154 +* jk/blame-commit-label (2015-01-13) 5 commits

155 + - blame.c: fix garbled error message

156 + - use xstrdup_or_null to replace ternary conditionals

157 + - builtin/commit.c: use xstrdup_or_null instead of envdup

158 + - builtin/apply.c: use xstrdup_or_null instead of null_strdup

159 + - git-compat-util: add xstrdup_or_null helper

160

360 - Will cook in 'next'.

161 + Will merge to 'next'.

162

163

363 -* km/gettext-n (2015-01-12) 1 commit

364 - (merged to 'next' on 2015-01-12 at 0cbbf4a)

365 - + gettext.h: add parentheses around N_ expansion if supported

164 +* jk/http-push-symref-fix (2015-01-14) 1 commit

165 + - http-push: trim trailing newline from remote symref

166

367 - Will cook in 'next'.

167 + Will merge to 'next'.

168

169

370 -* rh/autoconf-rhel3 (2015-01-09) 3 commits

371 - (merged to 'next' on 2015-01-12 at 57f125c)

372 - + configure.ac: check for HMAC_CTX_cleanup

373 - + configure.ac: check for clock_gettime and CLOCK_MONOTONIC

374 - + configure.ac: check 'tv_nsec' field in 'struct stat'

170 +* js/t1050 (2015-01-14) 1 commit

171 + - t1050-large: generate large files without dd

172

376 - Build update for older RHEL.

173 + Will merge to 'next'.

174

378 - Will merge to 'master'.

175 --------------------------------------------------

176 [Stalled]

177

@@ -529,88 +325,73 @@ of the repositories listed at

325 --------------------------------------------------

326 [Cooking]

327

532 -* jn/rerere-fail-on-auto-update-failure (2015-01-08) 1 commit

533 - (merged to 'next' on 2015-01-12 at 313c449)

534 - + rerere: error out on autoupdate failure

535 -

536 - "git rerere" (invoked internally from many mergy operations) did

537 - not correctly signal errors when told to update the working tree

538 - files and failed to do so for whatever reason.

539 -

540 - Will cook in 'next'.

541 -

542 -

543 -* jk/prune-packed-server-info (2015-01-06) 2 commits

544 - (merged to 'next' on 2015-01-12 at 5e789e2)

545 - + update-server-info: create info/* with mode 0666

546 - + t1301: set umask in reflog sharedrepository=group test

328 +* lf/blame-commit-label (2015-01-12) 1 commit

329 + . blame.c: fix garbled error message

330

548 - Fix recent breakage in Git 2.2 that started creating info/refs and

549 - objects/info/packs files with permission bits tighter than user's

550 - umask.

331 + Needs fixing.

332

552 - Will merge to 'master'.

333

334 +* bc/http-fallback-to-password-after-krb-fails (2015-01-07) 1 commit

335 + (merged to 'next' on 2015-01-12 at 4c67038)

336 + + remote-curl: fall back to Basic auth if Negotiate fails

337

555 -* km/imap-send-libcurl-options (2015-01-06) 2 commits

556 - (merged to 'next' on 2015-01-12 at 5bb8802)

557 - + imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY

558 - + imap-send.c: support GIT_CURL_VERBOSE

338 + After attempting and failing a password-less authentication

339 + (e.g. kerberos), libcURL refuses to fall back to password based

340 + Basic authentication without a bit of help/encouragement.

341

560 - Now imap-send learned to talk to the server using cURL library,

561 - allow the same GIT_CURL_VERBOSE environment variable to control the

562 - verbosity of the chattering.

342 + Will cook in 'next'.

343

564 - Will merge to 'master'.

344

345 +* bp/diff-relative-config (2015-01-07) 2 commits

346 + - diff: teach diff.relative to give default to --relative=<value>

347 + - diff: teach --no-relative to override earlier --relative

348

567 -* km/log-usage-string-i18n (2015-01-06) 1 commit

568 - (merged to 'next' on 2015-01-12 at 437bf8a)

569 - + log.c: fix translation markings

349

571 - Will merge to 'master'.

350 +* dk/format-patch-ignore-diff-submodule (2015-01-07) 2 commits

351 + (merged to 'next' on 2015-01-12 at 6b4605b)

352 + + format-patch: ignore diff.submodule setting

353 + + t4255: test am submodule with diff.submodule

354

355 + Setting diff.submodule to 'log' made "git format-patch" produce

356 + broken patches.

357

574 -* rc/for-each-ref-tracking (2015-01-12) 1 commit

575 - (merged to 'next' on 2015-01-12 at 94eef27)

576 - + for-each-ref: always check stat_tracking_info()'s return value

358 + Will cook in 'next'.

359

578 - Will merge to 'master'.

360

361 +* nd/attr-optim (2014-12-29) 3 commits

362 + - attr: avoid heavy work when we know the specified attr is not defined

363 + - attr: do not attempt to expand when we know it's not a macro

364 + - attr.c: rename arg name attr_nr to avoid shadowing the global one

365

581 -* rh/test-color-avoid-terminfo-in-original-home (2015-01-07) 2 commits

582 - (merged to 'next' on 2015-01-12 at eac0b93)

583 - + test-lib.sh: do tests for color support after changing HOME

584 - + test-lib: use 'test ...' instead of '[ ... ]'

366

586 - We try to see if "tput" gives a useful result before switching TERM

587 - to dumb and moving HOME to point to our fake location for stability

588 - of the tests, and then use the command when coloring the output

589 - from the tests, but there is no guarantee "tput" works after

590 - switching HOME.

367 +* cj/log-invert-grep (2015-01-13) 1 commit

368 + (merged to 'next' on 2015-01-13 at c908e99)

369 + + log: teach --invert-grep option

370

592 - Will merge to 'master'.

371 + Will cook in 'next'.

372

373

595 -* sp/subtree-doc (2015-01-06) 1 commit

596 - (merged to 'next' on 2015-01-12 at 7c488d6)

597 - + subtree: fix AsciiDoc list item continuation

374 +* km/gettext-n (2015-01-12) 1 commit

375 + (merged to 'next' on 2015-01-12 at 0cbbf4a)

376 + + gettext.h: add parentheses around N_ expansion if supported

377

599 - Will merge to 'master'.

378 + Will cook in 'next'.

379

380

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

603 - (merged to 'next' on 2015-01-12 at ccff14f)

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

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

381 +* jn/rerere-fail-on-auto-update-failure (2015-01-08) 1 commit

382 + (merged to 'next' on 2015-01-12 at 313c449)

383 + + rerere: error out on autoupdate failure

384

607 - "git remote add $name $URL" is now allowed when "url.$URL.insteadOf"

608 - is already defined.

385 + "git rerere" (invoked internally from many mergy operations) did

386 + not correctly signal errors when told to update the working tree

387 + files and failed to do so for whatever reason.

388

610 - Will merge to 'master'.

389 + Will cook in 'next'.

390

391

613 -* sb/atomic-push (2015-01-07) 10 commits

392 +* sb/atomic-push (2015-01-14) 11 commits

393 + (merged to 'next' on 2015-01-14 at 12c4e28)

394 + + Document receive.advertiseatomic

395 (merged to 'next' on 2015-01-12 at 411c6a6)

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

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

@@ -667,15 +448,6 @@ of the repositories listed at

448 Will cook in 'next'.

449

450

670 -* po/doc-core-ignorestat (2015-01-12) 2 commits

671 - (merged to 'next' on 2015-01-12 at c660a71)

672 - + doc: core.ignoreStat update, and clarify the --assume-unchanged effect

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

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

675 -

676 - Will merge to 'master'.

677 -

678 -

451 * jc/push-to-checkout (2015-01-08) 2 commits

452 (merged to 'next' on 2015-01-12 at e64df63)

453 + receive-pack: support push-to-checkout hook

What's cooking (2015/01 #03)