5662eaa5aa · matheusbsbs/matheus-bagliano

@@ -1,28 +1,21 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jun 2013, #01; Sun, 2)

4 -X-master-at: b2edae0ab6d8188d6cd912ba5c8d1f2086c2cb9a

5 -X-next-at: 88ee588a4065fc39b2b849219c7dd2eb139932c5

3 +Subject: What's cooking in git.git (Jun 2013, #02; Tue, 4)

4 +X-master-at: 2fe2458370d9bfcc9a00ade21181dd8ac65ca0f0

5 +X-next-at: da085a372bc80f6746d0649a2d0bf281e853a7a2

6

7 -What's cooking in git.git (Jun 2013, #01; Sun, 2)

7 +What's cooking in git.git (Jun 2013, #02; Tue, 4)

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 -Many topics that have been cooking in 'next' from the previous cycle

15 -have now graduated to 'master', so the RelNotes have been updated

16 -again.

17 -

18 -Nothing really new in 'next' except for one, and it has not been

19 -rewound yet, which will hopefully happen tomorrow, and after that

20 -post 1.8.3 cycle really starts. I haven't caught up all the series

21 -posted during the past few days.

22 -

23 -Also a rather serious regression on path-exclusion logic (most

24 -notably seen in .gitignore) has been found and quickly patched (it

25 -hasn't been merged to 'master' yet, though).

14 +We are in the post-1.8.3 cycle. As promised, 'next' has been

15 +rewound. A few stalled topics have been ejected and bunch of new

16 +topics that have been cooking are now in it. I expect these on

17 +'next' to graduate to 'master' soonish, as I picked relatively easy

18 +ones in this round.

19

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

21 of the repositories listed at

@@ -32,247 +25,168 @@ of the repositories listed at

25 --------------------------------------------------

26 [Graduated to "master"]

27

35 -* an/diff-index-doc (2013-05-20) 1 commit

36 - (merged to 'next' on 2013-05-21 at 6e1459b)

37 - + Documentation/diff-index: mention two modes of operation

38 -

39 -

40 -* da/darwin (2013-05-21) 4 commits

41 - (merged to 'next' on 2013-05-21 at 0497edb)

42 - + imap-send: eliminate HMAC deprecation warnings on Mac OS X

43 - + cache.h: eliminate SHA-1 deprecation warnings on Mac OS X

44 - + Makefile: add support for Apple CommonCrypto facility

45 - + Makefile: fix default regex settings on Darwin

46 -

47 - Newer MacOS X encourages the programs to compile and link with

48 - their CommonCrypto, not with OpenSSL.

49 -

50 -

51 -* fc/completion (2013-04-27) 9 commits

52 - (merged to 'next' on 2013-05-21 at aba6ef1)

53 - + completion: remove __git_index_file_list_filter()

54 - + completion: add space after completed filename

55 - + completion: add hack to enable file mode in bash < 4

56 - + completion: refactor __git_complete_index_file()

57 - + completion: refactor diff_index wrappers

58 - + completion: use __gitcompadd for __gitcomp_file

59 - + completion; remove unuseful comments

60 - + completion: document tilde expansion failure in tests

61 - + completion: add file completion tests

62 -

63 -

64 -* fc/fast-export-persistent-marks (2013-05-07) 3 commits

65 - (merged to 'next' on 2013-05-21 at 10b8214)

66 - + fast-{import,export}: use get_sha1_hex() to read from marks file

67 - + fast-export: don't parse commits while reading marks file

68 - + fast-export: do not parse non-commit objects while reading marks file

69 -

70 - Optimization for fast-export by avoiding unnecessarily resolving

71 - arbitrary object name and parsing object when only presence and

72 - type information is necessary, etc.

73 -

74 -

75 -* fc/macos-x-clipped-write (2013-05-17) 1 commit

76 - (merged to 'next' on 2013-05-21 at 510b0dd)

77 - + compate/clipped-write.c: large write(2) fails on Mac OS X/XNU

78 -

79 - Mac OS X does not like to write(2) more than INT_MAX number of

80 - bytes.

81 -

82 -

83 -* fc/zsh-leftover-bits (2013-05-29) 3 commits

84 - (merged to 'next' on 2013-05-29 at b367b4e)

85 - + completion: zsh: improve bash script loading

86 - (merged to 'next' on 2013-05-21 at 1b84ec1)

87 - + completion: synchronize zsh wrapper

88 - + completion: cleanup zsh wrapper

89 -

90 -

91 -* jc/strbuf-branchname-fix (2013-05-16) 1 commit

92 - (merged to 'next' on 2013-05-21 at 5db8872)

93 - + strbuf_branchname(): do not double-expand @{-1}~22

94 -

95 - "git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22"

96 - incorrectly when your previous branch was "frotz" (it should be

97 - rewritten to "git merge frotz~22" instead).

98 -

99 -

100 -* jc/t5551-posix-sed-bre (2013-05-12) 1 commit

101 - (merged to 'next' on 2013-05-21 at d597ca1)

102 - + t5551: do not use unportable sed '\+'

103 -

104 - POSIX fix for a test script.

105 -

28 +* kb/status-ignored-optim-2 (2013-06-02) 1 commit

29 + (merged to 'next' on 2013-06-02 at 88ee588)

30 + + dir.c: fix ignore processing within not-ignored directories

31

107 -* jk/fetch-always-update-tracking (2013-05-28) 5 commits

108 - (merged to 'next' on 2013-05-28 at c6abf3f)

109 - + fetch: don't try to update unfetched tracking refs

110 - (merged to 'next' on 2013-05-21 at f7e4b16)

111 - + fetch: opportunistically update tracking refs

112 - + refactor "ref->merge" flag

113 - + fetch/pull doc: untangle meaning of bare <ref>

114 - + t5510: start tracking-ref tests from a known state

32 + Fix 1.8.3 regressions in the .gitignore path exclusion logic.

33

116 - "git fetch origin master" unlike "git fetch origin" or "git fetch"

117 - does not update "refs/remotes/origin/master" and it was an early

118 - design decision to keep the update of remote tracking branches

119 - predictable, but in practice it turns out that people find it more

120 - convenient to opportunisticly update them whenever we have a

121 - chance, and we have been updating them when we run "git push" which

122 - already breaks the original "predictability" anyway.

34 +--------------------------------------------------

35 +[New Topics]

36

37 +* ar/wildmatch-foldcase (2013-06-02) 1 commit

38 + (merged to 'next' on 2013-06-04 at 3180bcc)

39 + + wildmatch: properly fold case everywhere

40

125 -* kb/ancestry-path-threedots (2013-05-16) 2 commits

126 - (merged to 'next' on 2013-05-21 at 5d75bd3)

127 - + revision.c: treat A...B merge bases as if manually specified

128 - + t6019: demonstrate --ancestry-path A...B breakage

129 - (this branch is used by kb/full-history-compute-treesame-carefully-2.)

41 + The wildmatch engine did not honor WM_CASEFOLD option correctly.

42

131 - "git log --ancestry-path A...B" did not work as expected, as it did

132 - not pay attention to the fact that the merge base between A and B

133 - was the bottom of the range being specified.

43 + Will merge to 'master'.

44

45 +* cr/git-work-tree-sans-git-dir (2013-06-03) 1 commit

46 + (merged to 'next' on 2013-06-04 at bebedca)

47 + + git.txt: remove stale comment regarding GIT_WORK_TREE

48

136 -* mc/describe-first-parent (2013-05-20) 1 commit

137 - (merged to 'next' on 2013-05-21 at 2e02ffc)

138 - + describe: Add --first-parent option

49 + These days, "git --work-tree=there cmd" without specifying an

50 + explicit --git-dir=here will do the usual discovery, but we had a

51 + description of older behaviour in the documentation.

52

53 + Will merge to 'master'.

54

141 -* mk/combine-diff-context-horizon-fix (2013-05-15) 1 commit

142 - (merged to 'next' on 2013-05-21 at f462c02)

143 - + combine-diff.c: Fix output when changes are exactly 3 lines apart

55

145 - "git diff -c -p" was not showing a deleted line from a hunk when

146 - another hunk immediately begins where the earlier one ends.

56 +* fc/do-not-use-the-index-in-add-to-index (2013-06-03) 2 commits

57 + (merged to 'next' on 2013-06-04 at 94e7b60)

58 + + read-cache: trivial style cleanups

59 + + read-cache: fix wrong 'the_index' usage

60

61 + Will merge to 'master'.

62

149 -* nd/clone-local-with-colon (2013-05-07) 1 commit

150 - (merged to 'next' on 2013-05-21 at 3e293bd)

151 - + clone: allow cloning local paths with colons in them

63

153 - "git clone foo/bar:baz" cannot be a request to clone from a remote

154 - over git-over-ssh specified in the scp style. Detect this case and

155 - clone from a local repository at "foo/bar:baz".

64 +* fc/sequencer-skip-quiet (2013-06-03) 8 commits

65 + - revert/cherry-pick: add --skip option

66 + - revert/cherry-pick: add --quiet option

67 + - sequencer: run post-rewrite hook

68 + - cherry-pick: store rewritten commits

69 + - SQUASH???

70 + - cherry-pick: add --skip-empty option

71 + - sequencer: trivial fix

72 + - sequencer: remove useless indentation

73

74 + I think the post-rewrite hook should not apply to revert, and

75 + revert should be taught about --skip-empty. The "copy-notes"

76 + change was nak'ed, and I agree with Thomas that the external

77 + interface to the mechanism should be aligned with existing

78 + notes.rewrite.<command>.

79

158 -* rh/merge-options-doc-fix (2013-05-16) 1 commit

159 - (merged to 'next' on 2013-05-21 at f76baf3)

160 - + Documentation/merge-options.txt: restore `-e` option

80 + Waiting for a reroll.

81

82 + $gmane/225676, $gmane/226263, $gmane/226271

83

163 -* rs/empty-archive (2013-05-09) 2 commits

164 - (merged to 'next' on 2013-05-21 at 3e9e288)

165 - + t5004: resurrect original empty tar archive test

166 - + t5004: avoid using tar for checking emptiness of archive

84

168 - Fixes tests added in 1.8.2 era that are broken on BSDs.

85 +* js/test-ln-s-add (2013-06-02) 11 commits

86 + - t6035: use test_ln_s_add to remove SYMLINKS prerequisite

87 + - t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite

88 + - t3100: use test_ln_s_add to remove SYMLINKS prerequisite

89 + - t3030: use test_ln_s_add to remove SYMLINKS prerequisite

90 + - t2100: use test_ln_s_add to remove SYMLINKS prerequisite

91 + - t0000: use test_ln_s_add to remove SYMLINKS prerequisite

92 + - tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)

93 + - tests: introduce test_ln_s and test_ln_s_add

94 + - t3010: modernize style

95 + - t2100: modernize style and unroll a loop of test cases

96 + - test-chmtime: Fix exit code on Windows

97

98 + Many tests that check the behaviour of symbolic links stored in the

99 + index or the tree objects do not have to be skipped on a filesystem

100 + that lack symbolic link support.

101

171 -* rs/tar-tests (2013-05-20) 6 commits

172 - (merged to 'next' on 2013-05-21 at aed12a7)

173 - + t5000: test long filenames

174 - + t5000: simplify tar-tree tests

175 - + t5000: use check_tar for prefix test

176 - + t5000: factor out check_tar

177 - + t5000, t5003: create directories for extracted files lazily

178 - + t5000: integrate export-subst tests into regular tests

102 + There seem to be some misconversion, mostly around the use of the

103 + new test_ln_s helper.

104

105 + Waiting for responses to reviews.

106 + $gmane/226417 and others.

107

181 -* tr/coverage (2013-05-13) 4 commits

182 - (merged to 'next' on 2013-05-21 at 8480007)

183 - + coverage: build coverage-untested-functions by default

184 - + coverage: set DEFAULT_TEST_TARGET to avoid using prove

185 - + coverage: do not delete .gcno files before building

186 - + coverage: split build target into compile and test

108

188 - Update the test coverage support that was left to bitrot for some

189 - time.

109 +* mt/send-email-cc-match-fix (2013-06-03) 6 commits

110 + - t/send-email: test suppress-cc=self with non-ascii

111 + - t/send-email: add test with quoted sender

112 + - send-email: make --suppress-cc=self sanitize input

113 + - t/send-email: test suppress-cc=self on cccmd

114 + - send-email: fix suppress-cc=self on cccmd

115 + - t/send-email.sh: add test for suppress-cc=self

116

117 + It may want to have an additional test case for --from='"A U. Thor"

118 + <author@example.xz>' to make sure we do not doubly escape what is

119 + already escaped.

120

192 -* tr/line-log (2013-04-22) 13 commits

193 - (merged to 'next' on 2013-04-22 at 8f2c1de)

194 - + git-log(1): remove --full-line-diff description

195 - (merged to 'next' on 2013-04-21 at cd92620)

196 - + line-log: fix documentation formatting

197 - (merged to 'next' on 2013-04-15 at 504559e)

198 - + log -L: improve comments in process_all_files()

199 - + log -L: store the path instead of a diff_filespec

200 - + log -L: test merge of parallel modify/rename

201 - + t4211: pass -M to 'git log -M -L...' test

202 - (merged to 'next' on 2013-04-05 at 5afb00c)

203 - + log -L: fix overlapping input ranges

204 - + log -L: check range set invariants when we look it up

205 - (merged to 'next' on 2013-04-01 at 5be920c)

206 - + Speed up log -L... -M

207 - + log -L: :pattern:file syntax to find by funcname

208 - + Implement line-history search (git log -L)

209 - + Export rewrite_parents() for 'log -L'

210 - + Refactor parse_loc

121 + Some changes in patch 2/6 and a later patch may need to be flipped

122 + around.

123

124

213 -* vv/help-unknown-ref (2013-05-08) 2 commits

214 - (merged to 'next' on 2013-05-21 at 77a2941)

215 - + merge: use help_unknown_ref()

216 - + help: add help_unknown_ref()

125 +* rr/complete-difftool (2013-06-03) 2 commits

126 + (merged to 'next' on 2013-06-04 at 01c7611)

127 + + completion: clarify ls-tree, archive, show completion

128 + + completion: difftool takes both revs and files

129

218 - Detect "git merge foo" that might have meant "git merge origin/foo"

219 - and give an error message that is more specific than "foo is not

220 - something we can merge".

130 + Update command line completion (in contrib/) to use a better named

131 + completion helper function for commands that take revisions and

132 + paths.

133

222 ---------------------------------------------------

223 -[New Topics]

134 + Will merge to 'master'.

135

225 -* ap/wildmatch-foldcase (2013-06-02) 1 commit

226 - - wildmatch: properly fold case everywhere

136

137 +* rr/diffcore-pickaxe-doc (2013-06-03) 2 commits

138 + (merged to 'next' on 2013-06-04 at 67d1fc7)

139 + + diffcore-pickaxe doc: document -S and -G properly

140 + + diffcore-pickaxe: make error messages more consistent

141

229 -* fc/completion-less-ls-remote (2013-06-02) 1 commit

230 - - completion: avoid ls-remote in certain scenarios

142 + Update the low-level diffcore documentation on -S/-G and --pickaxe-all.

143

144 + Will merge to 'master'.

145

233 -* jk/test-exit-code-by-signal (2013-06-02) 1 commit

234 - - t0005: test git exit code from signal death

146

147 +* tr/sha1-file-silence-loose-object-info-under-prune-race (2013-06-03) 1 commit

148 + (merged to 'next' on 2013-06-04 at e891bb8)

149 + + sha1_file: silence sha1_loose_object_info

150

237 -* nd/make-wildmatch-default (2013-06-02) 1 commit

238 - - Makefile: promote wildmatch to be the default fnmatch implementation

151 + Will merge to 'master'.

152

153

241 -* rr/remove-contrib-some (2013-06-02) 1 commit

242 - - contrib: remove continuous/ and patches/

154 +* bp/mediawiki-credential (2013-06-04) 1 commit

155 + - git-remote-mediawiki: use git.pm functions for credentials

156

157 + The bridge to MediaWiki has been updated to use the credential

158 + helper interface in Git.pm, losing its own and the original

159 + implementation the former was based on.

160

245 -* rs/unpack-trees-plug-leak (2013-06-02) 7 commits

246 - - unpack-trees: free cache_entry array members for merges

247 - - diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const

248 - - diff-lib, read-tree, unpack-trees: mark cache_entry pointers const

249 - - unpack-trees: create working copy of merge entry in merged_entry

250 - - unpack-trees: factor out dup_entry

251 - - read-cache: mark cache_entry pointers const

252 - - cache: mark cache_entry pointers const

161 + Minor review comments sent.

162

163

255 -* tr/test-commit-only-on-orphan (2013-06-02) 1 commit

256 - - Test 'commit --only' after 'checkout --orphan'

164 +* mz/rebase-tests (2013-06-03) 7 commits

165 + - tests: move test for rebase messages from t3400 to t3406

166 + - t3406: modernize style

167 + - add tests for rebasing merged history

168 + - add tests for rebasing root

169 + - add tests for rebasing of empty commits

170 + - add tests for rebasing with patch-equivalence present

171 + - add simple tests of consistency across rebase types

172

173 --------------------------------------------------

174 [Stalled]

175

176 * mg/more-textconv (2013-05-10) 7 commits

262 - (merged to 'next' on 2013-05-21 at 701cdb7)

263 - + grep: honor --textconv for the case rev:path

264 - + grep: allow to use textconv filters

265 - + t7008: demonstrate behavior of grep with textconv

266 - + cat-file: do not die on --textconv without textconv filters

267 - + show: honor --textconv for blobs

268 - + diff_opt: track whether flags have been set explicitly

269 - + t4030: demonstrate behavior of show with textconv

177 + - grep: honor --textconv for the case rev:path

178 + - grep: allow to use textconv filters

179 + - t7008: demonstrate behavior of grep with textconv

180 + - cat-file: do not die on --textconv without textconv filters

181 + - show: honor --textconv for blobs

182 + - diff_opt: track whether flags have been set explicitly

183 + - t4030: demonstrate behavior of show with textconv

184

185 Make "git grep" and "git show" pay attention to --textconv when

186 dealing with blob objects.

187

188 I thought this was pretty well designed and executed, but it seems

275 - there are some doubts on the list.

189 + there are some doubts on the list; kicking back to 'pu'.

190

191

192 * mh/multimail (2013-04-21) 1 commit

@@ -306,9 +220,8 @@ of the repositories listed at

220

221 Various fixes to gitweb.

222

309 - Waiting for a reroll after a review.

310 - Will discard unless we hear from anybody who is interested in

311 - tying its loose ends.

223 + Drew Northup volunteered to take a look into this.

224 + $gmane/226216

225

226

227 * jk/commit-info-slab (2013-04-19) 3 commits

@@ -320,9 +233,66 @@ of the repositories listed at

233 Technology demonstration to show a way we could use unbound number

234 of flag bits on commit objects.

235

236 +

237 +* jc/show-branch (2013-05-21) 5 commits

238 + - show-branch: use commit slab to represent bitflags of arbitrary width

239 + - show-branch.c: remove "all_mask"

240 + - show-branch.c: abstract out "flags" operation

241 + - show-branch.c: lift all_mask/all_revs to a global static

242 + - show-branch.c: update comment style

243 + (this branch uses jk/commit-info-slab.)

244 +

245 + Waiting for the final step to lift the hard-limit before sending it out.

246 +

247 --------------------------------------------------

248 [Cooking]

249

250 +* fc/completion-less-ls-remote (2013-06-02) 1 commit

251 + (merged to 'next' on 2013-06-03 at 6624f0b)

252 + + completion: avoid ls-remote in certain scenarios

253 +

254 + Will merge to 'master'.

255 +

256 +

257 +* jk/test-exit-code-by-signal (2013-06-02) 1 commit

258 + (merged to 'next' on 2013-06-03 at 25af892)

259 + + t0005: test git exit code from signal death

260 +

261 + Will merge to 'master'.

262 +

263 +

264 +* nd/make-wildmatch-default (2013-06-02) 1 commit

265 + - Makefile: promote wildmatch to be the default fnmatch implementation

266 +

267 + Will merge to 'next'.

268 +

269 +

270 +* rr/remove-contrib-some (2013-06-02) 1 commit

271 + - contrib: remove continuous/ and patches/

272 +

273 + Will merge to 'next'.

274 +

275 +

276 +* rs/unpack-trees-plug-leak (2013-06-02) 7 commits

277 + (merged to 'next' on 2013-06-03 at 97e7b6d)

278 + + unpack-trees: free cache_entry array members for merges

279 + + diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const

280 + + diff-lib, read-tree, unpack-trees: mark cache_entry pointers const

281 + + unpack-trees: create working copy of merge entry in merged_entry

282 + + unpack-trees: factor out dup_entry

283 + + read-cache: mark cache_entry pointers const

284 + + cache: mark cache_entry pointers const

285 +

286 + Will merge to 'master'.

287 +

288 +

289 +* tr/test-commit-only-on-orphan (2013-06-02) 1 commit

290 + (merged to 'next' on 2013-06-03 at b1864fd)

291 + + Test 'commit --only' after 'checkout --orphan'

292 +

293 + Will merge to 'master'.

294 +

295 +

296 * ap/diff-ignore-blank-lines (2013-05-29) 1 commit

297 - diff: add --ignore-blank-lines option

298

@@ -330,105 +300,111 @@ of the repositories listed at

300 only of additions and removals of blank lines, which is the same as

301 "diff -B" (ignore blank lines) of GNU diff.

302

303 + Will be rerolled.

304 + $gmane/226394

305 +

306

307 * fc/show-branch-in-rebase-am (2013-05-29) 1 commit

335 - - prompt: fix for simple rebase

308 + (merged to 'next' on 2013-06-03 at 176f6b7)

309 + + prompt: fix for simple rebase

310

311 The bash prompt code (in contrib/) displayed the name of the branch

312 being rebased when "rebase -i/-m/-p" modes are in use, but not the

313 plain vanilla "rebase".

314

341 - Will merge to 'next'.

342 -

343 -

344 -* kb/status-ignored-optim-2 (2013-06-02) 1 commit

345 - (merged to 'next' on 2013-06-02 at 88ee588)

346 - + dir.c: fix ignore processing within not-ignored directories

347 -

348 - Fix 1.8.3 regressions in the .gitignore path exclusion logic.

349 -

315 Will merge to 'master'.

316

317

318 * ks/difftool-dir-diff-copy-fix (2013-05-29) 1 commit

354 - - difftool --dir-diff: allow changing any clean working tree file

319 + (merged to 'next' on 2013-06-03 at ca0cae0)

320 + + difftool --dir-diff: allow changing any clean working tree file

321

322 "difftool --dir-diff" did not copy back changes made by the

323 end-user in the diff tool backend to the working tree in some

324 cases.

325

326 + Will merge to 'master'.

327 +

328

329 * rr/push-head (2013-05-29) 3 commits

362 - - push: make push.default = current use resolved HEAD

363 - - push: fail early with detached HEAD and current

364 - - push: factor out the detached HEAD error message

330 + (merged to 'next' on 2013-06-03 at ecd5be7)

331 + + push: make push.default = current use resolved HEAD

332 + + push: fail early with detached HEAD and current

333 + + push: factor out the detached HEAD error message

334

335 "git push $there HEAD:branch" did not resolve HEAD early enough, so

336 it was easy to flip it around while push is still going on and push

337 out a branch that the user did not originally intended when the

338 command was started.

339

371 - Will merge to 'next'.

340 + Will merge to 'master'.

341

342

343 * sb/archive-zip-double-assignment-fix (2013-05-29) 1 commit

375 - - archive-zip:write_zip_entry: Remove second reset of size variable to zero.

344 + (merged to 'next' on 2013-06-03 at c316eec)

345 + + archive-zip:write_zip_entry: Remove second reset of size variable to zero.

346

377 - Will merge to 'next'.

347 + Will merge to 'master'.

348

349

350 * rj/mingw-cygwin (2013-05-08) 2 commits

381 - - cygwin: Remove the CYGWIN_V15_WIN32API build variable

382 - - mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE

351 + (merged to 'next' on 2013-06-04 at 308fdb4)

352 + + cygwin: Remove the CYGWIN_V15_WIN32API build variable

353 + + mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE

354

355 Update build for Cygwin 1.[57]. Torsten Bögershausen reports that

356 this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it

357 ahead.

358

388 - Will merge to 'next'.

359 + Will merge to 'master'.

360

361

362 * rr/rebase-autostash (2013-05-29) 7 commits

392 - - rebase: implement --[no-]autostash and rebase.autostash

393 - - rebase --merge: return control to caller, for housekeeping

394 - - rebase -i: return control to caller, for housekeeping

395 - - am: return control to caller, for housekeeping

396 - - rebase: prepare to do generic housekeeping

397 - - rebase -i: don't error out if $state_dir already exists

398 - - am: tighten a conditional that checks for $dotest

363 + (merged to 'next' on 2013-06-04 at 16f7c54)

364 + + rebase: implement --[no-]autostash and rebase.autostash

365 + + rebase --merge: return control to caller, for housekeeping

366 + + rebase -i: return control to caller, for housekeeping

367 + + am: return control to caller, for housekeeping

368 + + rebase: prepare to do generic housekeeping

369 + + rebase -i: don't error out if $state_dir already exists

370 + + am: tighten a conditional that checks for $dotest

371

400 - Will merge to 'next'.

372 + Will merge to 'master'.

373

374

375 * nd/urls-doc-no-file-hyperlink-fix (2013-05-24) 1 commit

404 - - urls.txt: avoid auto converting to hyperlink

376 + (merged to 'next' on 2013-06-03 at 54903b2)

377 + + urls.txt: avoid auto converting to hyperlink

378

406 - Will merge to 'next'.

379 + Will merge to 'master'.

380

381

382 * cb/log-follow-with-combined (2013-05-28) 1 commit

410 - - fix segfault with git log -c --follow

383 + (merged to 'next' on 2013-06-04 at d5bf4f3)

384 + + fix segfault with git log -c --follow

385

412 - Will merge to 'next'.

386 + Will merge to 'master'.

387

388

389 * fc/cleanups (2013-05-28) 3 commits

416 - - test: rebase: fix --interactive test

417 - - test: trivial cleanups

418 - - remote: trivial style cleanup

390 + (merged to 'next' on 2013-06-03 at 527cf93)

391 + + test: rebase: fix --interactive test

392 + + test: trivial cleanups

393 + + remote: trivial style cleanup

394

420 - Will merge to 'next'.

395 + Will merge to 'master'.

396

397

398 * fc/makefile (2013-05-26) 5 commits

424 - - build: do not install git-remote-testpy

425 - - build: add NO_INSTALL variable

426 - - build: cleanup using $<

427 - - build: cleanup using $^

428 - - build: trivial simplification

399 + (merged to 'next' on 2013-06-03 at d1074e4)

400 + + build: do not install git-remote-testpy

401 + + build: add NO_INSTALL variable

402 + + build: cleanup using $<

403 + + build: cleanup using $^

404 + + build: trivial simplification

405 (this branch is used by fc/remote-helpers-use-specified-python.)

406

431 - Will merge to 'next'.

407 + Will merge to 'master'.

408

409

410 * fc/remote-helpers-use-specified-python (2013-05-28) 4 commits

@@ -440,58 +416,57 @@ of the repositories listed at

416

417 I do not particularly think the second from the bottom is a good

418 change, but it takes the remainder of the series hostage.

443 - Will hopefully be rerolled without it.

419 +

420 + Waiting for a reroll.

421

422

423 * fc/send-email-chainreplyto-warning (2013-05-28) 1 commit

447 - - send-email: remove warning about unset chainreplyto

424 + (merged to 'next' on 2013-06-03 at e04764f)

425 + + send-email: remove warning about unset chainreplyto

426

427 An overdue removal od "behaviour changed at 1.7.0; if you were

428 living in a cave, here is what you can adjust to it" message.

429

452 - Will merge to 'next'.

453 -

454 -

455 -* ks/difftool-dirdiff-copy-all (2013-05-28) 1 commit

456 - - difftool --dir-diff: always use identical working tree file

457 -

458 - "difftool --dir-diff" populates a temporary directory with files,

459 - inviting the user to modify them in place, but in some cases we

460 - weren't expecting the user to modify them and did not take the

461 - change back to the working tree.

462 -

463 - Will merge to 'next'.

430 + Will merge to 'master'.

431

432

433 * nd/prune-packed-dryrun-verbose (2013-05-28) 1 commit

467 - - prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()

434 + (merged to 'next' on 2013-06-03 at 3445b27)

435 + + prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()

436

469 - Will merge to 'next'.

437 + Will merge to 'master'.

438

439

440 * rj/mingw-compat-st-mode-bits (2013-05-29) 1 commit

473 - - path: Fix a sparse warning

441 + (merged to 'next' on 2013-06-03 at 2efe84c)

442 + + path: Fix a sparse warning

443

475 - Will merge to 'next'.

444 + Will merge to 'master'.

445

446

447 * rs/commit-m-no-edit (2013-05-28) 1 commit

479 - - commit: don't start editor if empty message is given with -m

448 + (merged to 'next' on 2013-06-03 at 14329fa)

449 + + commit: don't start editor if empty message is given with -m

450

481 - Will merge to 'next'.

451 + "git commit --allow-empty-message -m ''" should not start an

452 + editor.

453 +

454 + Will merge to 'master'.

455

456

457 * xq/credential-osxkeychain (2013-05-28) 1 commit

485 - - credential-osxkeychain: support more protocols

458 + (merged to 'next' on 2013-06-04 at a4ee0e0)

459 + + credential-osxkeychain: support more protocols

460

487 - Will merge to 'next'.

461 + Will merge to 'master'.

462

463

464 * jc/core-checkstat (2013-05-06) 1 commit

491 - - deprecate core.statinfo at Git 2.0 boundary

465 + (merged to 'next' on 2013-06-03 at 2166cb3)

466 + + deprecate core.statinfo at Git 2.0 boundary

467 (this branch is used by jc/core-checkstat-2.0.)

468

494 - Will merge to 'next'.

469 + Will merge to 'master'.

470

471

472 * mh/reflife (2013-06-02) 25 commits

@@ -529,53 +504,59 @@ of the repositories listed at

504

505

506 * th/bisect-skip-report-range-fix (2013-05-22) 1 commit

532 - - bisect: Fix log output for multi-parent skip ranges

507 + (merged to 'next' on 2013-06-03 at 7bd4656)

508 + + bisect: Fix log output for multi-parent skip ranges

509

510 Fix for an additional bisect log comments.

511

536 - Will merge to 'next'.

512 + Will merge to 'master'.

513

514

515 * mm/mediawiki-https-fail-message (2013-05-29) 1 commit

540 - - git-remote-mediawiki: better error message when HTTP(S) access fails

516 + (merged to 'next' on 2013-06-04 at fb2671c)

517 + + git-remote-mediawiki: better error message when HTTP(S) access fails

518

519 Hint users when https:// connection failed to check the

520 certificate; it is a good hint if we assumie that it is common

521 error for the end users to make.

522

546 - Will merge to 'next'.

523 + Will merge to 'master'.

524

525

526 * tg/maint-zsh-svn-remote-prompt (2013-05-22) 1 commit

550 - - prompt: fix show upstream with svn and zsh

527 + (merged to 'next' on 2013-06-03 at 32a45c0)

528 + + prompt: fix show upstream with svn and zsh

529

530 zsh prompt script that borrowed from bash prompt script did not

531 work due to slight differences in array variable notation between

532 these two shells.

533

556 - Will merge to 'next'.

534 + Will merge to 'master'.

535

536

537 * tr/push-no-verify-doc (2013-05-23) 1 commit

560 - - Document push --no-verify

538 + (merged to 'next' on 2013-06-03 at 01737d6)

539 + + Document push --no-verify

540

541 "git push --[no-]verify" was not documented.

542

564 - Will merge to 'next'.

543 + Will merge to 'master'.

544

545

546 * dm/unbash-subtree (2013-05-21) 1 commit

568 - - contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash

547 + (merged to 'next' on 2013-06-03 at 2c9d2fb)

548 + + contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash

549

550 It turns out that git-subtree script does not have to be run with

551 bash.

552

573 - Will merge to 'next'.

553 + Will merge to 'master'.

554

555

556 * fc/transport-helper-no-refspec (2013-05-21) 2 commits

577 - - transport-helper: check if the dry-run is supported

578 - - transport-helper: barf when user tries old:new

557 + (merged to 'next' on 2013-06-03 at 8763bda)

558 + + transport-helper: check if the dry-run is supported

559 + + transport-helper: barf when user tries old:new

560

561 With "export" remote-helper protocol, (1) a push that tries to

562 update a remote ref whose name is different from the pushing side

@@ -583,44 +564,35 @@ of the repositories listed at

564 --dry-run, so detect such problematic cases and disable them for

565 now.

566

586 - Will merge to 'next'.

567 + Will merge to 'master'.

568

569

570 * rr/die-on-missing-upstream (2013-06-02) 2 commits

590 - - sha1_name: fix error message for @{<N>}, @{<date>}

591 - - sha1_name: fix error message for @{u}

571 + (merged to 'next' on 2013-06-03 at 00847ea)

572 + + sha1_name: fix error message for @{<N>}, @{<date>}

573 + + sha1_name: fix error message for @{u}

574

575 When a reflog notation is used for implicit "current branch", we

576 did not say which branch and worse said "branch ''".

577

596 - Will merge to 'next'.

597 -

598 -

599 -* jc/show-branch (2013-05-21) 5 commits

600 - - show-branch: use commit slab to represent bitflags of arbitrary width

601 - - show-branch.c: remove "all_mask"

602 - - show-branch.c: abstract out "flags" operation

603 - - show-branch.c: lift all_mask/all_revs to a global static

604 - - show-branch.c: update comment style

605 - (this branch uses jk/commit-info-slab.)

606 -

607 - Waiting for the final step to lift the hard-limit before sending it out.

578 + Will merge to 'master'.

579

580

581 * fc/remote-bzr (2013-05-28) 8 commits

611 - - remote-bzr: add fallback check for a partial clone

612 - - remote-bzr: reorganize the way 'wanted' works

613 - - remote-bzr: trivial cleanups

614 - - remote-bzr: change global repo

615 - - remote-bzr: delay cloning/pulling

616 - - remote-bzr: simplify get_remote_branch()

617 - - remote-bzr: fix for files with spaces

618 - - remote-bzr: recover from failed clones

582 + (merged to 'next' on 2013-06-04 at a603082)

583 + + remote-bzr: add fallback check for a partial clone

584 + + remote-bzr: reorganize the way 'wanted' works

585 + + remote-bzr: trivial cleanups

586 + + remote-bzr: change global repo

587 + + remote-bzr: delay cloning/pulling

588 + + remote-bzr: simplify get_remote_branch()

589 + + remote-bzr: fix for files with spaces

590 + + remote-bzr: recover from failed clones

591

620 - Will merge to 'next'.

592 + Will merge to 'master'.

593

594

623 -* jx/clean-interactive (2013-05-22) 15 commits

595 +* jx/clean-interactive (2013-06-03) 15 commits

596 - test: add t7301 for git-clean--interactive

597 - git-clean: add documentation for interactive git-clean

598 - git-clean: add ask each interactive action

@@ -637,8 +609,6 @@ of the repositories listed at

609 - path.c: refactor relative_path(), not only strip prefix

610 - test: add test cases for relative_path

611

640 - Still under discussion, e.g. $gmane/225139.

641 -

612

613 * tr/test-v-and-v-subtest-only (2013-05-16) 6 commits

614 - test-lib: support running tests under valgrind in parallel

@@ -656,74 +626,81 @@ of the repositories listed at

626 There seem to be some miscounting by toggling the verbose/valgrind

627 mode at wrong places? Cf. $gmane/225735

628

629 + Waiting for a reroll.

630 +

631

632 * rr/zsh-color-prompt (2013-05-17) 3 commits

661 - - prompt: colorize ZSH prompt

662 - - prompt: factor out gitstring coloring logic

663 - - prompt: introduce GIT_PS1_STATESEPARATOR

633 + (merged to 'next' on 2013-06-03 at d011a76)

634 + + prompt: colorize ZSH prompt

635 + + prompt: factor out gitstring coloring logic

636 + + prompt: introduce GIT_PS1_STATESEPARATOR

637

665 - Will merge to 'next'.

638 + Will merge to 'master'.

639

640

668 -* fc/contrib-related (2013-05-20) 1 commit

641 +* fc/contrib-related (2013-06-03) 4 commits

642 + - contrib: related: parse committish like format-patch

643 + - contrib: related: add option to parse from committish

644 + - contrib: related: add support for multiple patches

645 - Add new git-related helper to contrib

646

671 - Waiting the design review for this earliest part to settle.

647 + Waiting for the design review to settle.

648

649

650 * fc/remote-hg (2013-05-28) 50 commits

675 - - remote-hg: add support for --force

676 - - remote-hg: add support for --dry-run

677 - - remote-hg: check if a fetch is needed

678 - - remote-hg: trivial cleanup

679 - - remote-helpers: improve marks usage

680 - - remote-hg: add check_push() helper

681 - - remote-hg: add setup_big_push() helper

682 - - remote-hg: remove files before modifications

683 - - remote-hg: improve lightweight tag author

684 - - remote-hg: use remote 'default' not local one

685 - - remote-hg: improve branch listing

686 - - remote-hg: simplify branch_tip()

687 - - remote-hg: check diverged bookmarks

688 - - remote-hg: pass around revision refs

689 - - remote-hg: implement custom checkheads()

690 - - remote-hg: implement custom push()

691 - - remote-hg: only update necessary revisions

692 - - remote-hg: force remote bookmark push selectively

693 - - remote-hg: reorganize bookmark handling

694 - - remote-hg: add test for failed double push

695 - - remote-hg: add test for big push

696 - - remote-hg: add test for new bookmark special

697 - - remote-hg: add test for bookmark diverge

698 - - remote-hg: add test for diverged push

699 - - remote-hg: add test to push new bookmark

700 - - remote-hg: add remote tests

701 - - remote-hg: update bookmarks when using a remote

702 - - remote-hg: add check_bookmark() test helper

703 - - remote-bzr: simplify test checks

704 - - remote-hg: add tests for 'master' bookmark

705 - - remote-hg: always point HEAD to master

706 - - remote-hg: improve progress calculation

707 - - remote-hg: trivial cleanups

708 - - remote-hg: ensure remote rebasing works

709 - - remote-hg: upgrade version 1 marks

710 - - remote-hg: switch from revisions to SHA-1 noteids

711 - - remote-hg: add version checks to the marks

712 - - remote-hg: improve node traversing

713 - - remote-hg: shuffle some code

714 - - remote-hg: use a shared repository store

715 - - remote-hg: load all extensions

716 - - remote-hg: test: simplify previous branch checkout

717 - - remote-helpers: test: simplify remote URLs

718 - - remote-helpers: tests: general improvements

719 - - remote-helpers: test: cleanup style

720 - - remote-helpers: test: cleanup white-spaces

721 - - remote-hg: trivial reorganization

722 - - remote-hg: test: be a little more quiet

723 - - remote-hg: tests: fix hg merge

724 - - remote-helpers: tests: use python directly

651 + (merged to 'next' on 2013-06-04 at 9ee7dab)

652 + + remote-hg: add support for --force

653 + + remote-hg: add support for --dry-run

654 + + remote-hg: check if a fetch is needed

655 + + remote-hg: trivial cleanup

656 + + remote-helpers: improve marks usage

657 + + remote-hg: add check_push() helper

658 + + remote-hg: add setup_big_push() helper

659 + + remote-hg: remove files before modifications

660 + + remote-hg: improve lightweight tag author

661 + + remote-hg: use remote 'default' not local one

662 + + remote-hg: improve branch listing

663 + + remote-hg: simplify branch_tip()

664 + + remote-hg: check diverged bookmarks

665 + + remote-hg: pass around revision refs

666 + + remote-hg: implement custom checkheads()

667 + + remote-hg: implement custom push()

668 + + remote-hg: only update necessary revisions

669 + + remote-hg: force remote bookmark push selectively

670 + + remote-hg: reorganize bookmark handling

671 + + remote-hg: add test for failed double push

672 + + remote-hg: add test for big push

673 + + remote-hg: add test for new bookmark special

674 + + remote-hg: add test for bookmark diverge

675 + + remote-hg: add test for diverged push

676 + + remote-hg: add test to push new bookmark

677 + + remote-hg: add remote tests

678 + + remote-hg: update bookmarks when using a remote

679 + + remote-hg: add check_bookmark() test helper

680 + + remote-bzr: simplify test checks

681 + + remote-hg: add tests for 'master' bookmark

682 + + remote-hg: always point HEAD to master

683 + + remote-hg: improve progress calculation

684 + + remote-hg: trivial cleanups

685 + + remote-hg: ensure remote rebasing works

686 + + remote-hg: upgrade version 1 marks

687 + + remote-hg: switch from revisions to SHA-1 noteids

688 + + remote-hg: add version checks to the marks

689 + + remote-hg: improve node traversing

690 + + remote-hg: shuffle some code

691 + + remote-hg: use a shared repository store

692 + + remote-hg: load all extensions

693 + + remote-hg: test: simplify previous branch checkout

694 + + remote-helpers: test: simplify remote URLs

695 + + remote-helpers: tests: general improvements

696 + + remote-helpers: test: cleanup style

697 + + remote-helpers: test: cleanup white-spaces

698 + + remote-hg: trivial reorganization

699 + + remote-hg: test: be a little more quiet

700 + + remote-hg: tests: fix hg merge

701 + + remote-helpers: tests: use python directly

702

726 - Will merge to 'next'.

703 + Will merge to 'master'.

704

705

706 * hv/config-from-blob (2013-05-12) 5 commits

@@ -733,17 +710,18 @@ of the repositories listed at

710 - config: drop cf validity check in get_next_char()

711 - config: factor out config file stack management

712

736 - Will see a resubmit.

713 + Waiting for a reroll.

714 $gmane/223964

715

716

717 * nd/clone-connectivity-shortcut (2013-05-28) 4 commits

741 - - clone: open a shortcut for connectivity check

742 - - index-pack: remove dead code (it should never happen)

743 - - fetch-pack: prepare updated shallow file before fetching the pack

744 - - clone: let the user know when check_everything_connected is run

718 + (merged to 'next' on 2013-06-03 at 812bd80)

719 + + clone: open a shortcut for connectivity check

720 + + index-pack: remove dead code (it should never happen)

721 + + fetch-pack: prepare updated shallow file before fetching the pack

722 + + clone: let the user know when check_everything_connected is run

723

746 - Will merge to 'next'.

724 + Will merge to 'master'.

725

726

727 * kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits

@@ -782,6 +760,7 @@ of the repositories listed at

760 major version bump.

761

762 I'd vote for merging this without waiting for 2.0. Comments?

763 +

764 Waiting for a reroll.

765

766

@@ -801,7 +780,8 @@ of the repositories listed at

780

781

782 * nd/warn-ambiguous-object-name (2013-05-29) 1 commit

804 - - get_sha1: warn about full or short object names that look like refs

783 + (merged to 'next' on 2013-06-04 at e87c9d1)

784 + + get_sha1: warn about full or short object names that look like refs

785

786 "git cmd <name>", when <name> happens to be a 40-hex string,

787 directly uses the 40-hex string as an object name, even if a ref

@@ -810,6 +790,8 @@ of the repositories listed at

790 like we warn when more than one refs/ hierachies share the same

791 name.

792

793 + Will merge to 'master'.

794 +

795

796 * jk/packed-refs-race (2013-05-06) 4 commits

797 - for_each_ref: load all loose refs before packed refs

@@ -821,53 +803,50 @@ of the repositories listed at

803

804

805 * fc/at-head (2013-05-08) 13 commits

824 - - sha1_name: compare variable with constant, not constant with variable

825 - - Add new @ shortcut for HEAD

826 - - sha1_name: refactor reinterpret()

827 - - sha1_name: check @{-N} errors sooner

828 - - sha1_name: reorganize get_sha1_basic()

829 - - sha1_name: don't waste cycles in the @-parsing loop

830 - - sha1_name: remove unnecessary braces

831 - - sha1_name: remove no-op

832 - - tests: at-combinations: @{N} versus HEAD@{N}

833 - - tests: at-combinations: increase coverage

834 - - tests: at-combinations: improve nonsense()

835 - - tests: at-combinations: check ref names directly

836 - - tests: at-combinations: simplify setup

806 + (merged to 'next' on 2013-06-04 at f334a2a)

807 + + sha1_name: compare variable with constant, not constant with variable

808 + + Add new @ shortcut for HEAD

809 + + sha1_name: refactor reinterpret()

810 + + sha1_name: check @{-N} errors sooner

811 + + sha1_name: reorganize get_sha1_basic()

812 + + sha1_name: don't waste cycles in the @-parsing loop

813 + + sha1_name: remove unnecessary braces

814 + + sha1_name: remove no-op

815 + + tests: at-combinations: @{N} versus HEAD@{N}

816 + + tests: at-combinations: increase coverage

817 + + tests: at-combinations: improve nonsense()

818 + + tests: at-combinations: check ref names directly

819 + + tests: at-combinations: simplify setup

820

821 Instead of typing four capital letters "HEAD", you can say "@"

822 instead.

823

841 - Will merge to 'next'.

824 + Will merge to 'master'.

825

826

827 * jk/submodule-subdirectory-ok (2013-04-24) 3 commits

845 - (merged to 'next' on 2013-04-24 at 6306b29)

846 - + submodule: fix quoting in relative_path()

847 - (merged to 'next' on 2013-04-22 at f211e25)

848 - + submodule: drop the top-level requirement

849 - + rev-parse: add --prefix option

828 + - submodule: fix quoting in relative_path()

829 + - submodule: drop the top-level requirement

830 + - rev-parse: add --prefix option

831

832 Allow various subcommands of "git submodule" to be run not from the

833 top of the working tree of the superproject.

834

854 - Will be commented by Jens.

835 + Waiting for a reroll.

836

837

838 * jl/submodule-mv (2013-04-23) 5 commits

858 - (merged to 'next' on 2013-04-23 at c04f574)

859 - + submodule.c: duplicate real_path's return value

860 - (merged to 'next' on 2013-04-19 at 45ae3c9)

861 - + rm: delete .gitmodules entry of submodules removed from the work tree

862 - + Teach mv to update the path entry in .gitmodules for moved submodules

863 - + Teach mv to move submodules using a gitfile

864 - + Teach mv to move submodules together with their work trees

839 + - submodule.c: duplicate real_path's return value

840 + - rm: delete .gitmodules entry of submodules removed from the work tree

841 + - Teach mv to update the path entry in .gitmodules for moved submodules

842 + - Teach mv to move submodules using a gitfile

843 + - Teach mv to move submodules together with their work trees

844

845 "git mv A B" when moving a submodule A does "the right thing",

846 inclusing relocating its working tree and adjusting the paths in

847 the .gitmodules file.

848

870 - Will be commented by Jens.

849 + Waiting for a reroll.

850

851

852 * jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit

What's cooking (2013/06 #02)