cf3e4ee029 · matheusbsbs/matheus-bagliano

@@ -1,16 +1,21 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Mar 2013, #07; Tue, 26)

4 -X-master-at: 2bba2f0e6542d541e9f27653d8c9d5fc8d0e679c

5 -X-next-at: 21b325ca9d683712f5399553f0472ba31ad5cf0f

3 +Subject: What's cooking in git.git (Mar 2013, #08; Fri, 29)

4 +X-master-at: 631bc94e67383b66da190550866566f09d32f299

5 +X-next-at: 26eb6e9fce877ff55db93fee605b878939872a5a

6

7 -What's cooking in git.git (Mar 2013, #07; Tue, 26)

7 +What's cooking in git.git (Mar 2013, #08; Fri, 29)

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

9

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

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

12 '+' are in 'next'.

13

14 +A handful of topics that have been stalled for quite a while have

15 +been discarded; for those that are not superseded by something else,

16 +interested parties can still resubmit a reroll, but without any

17 +advances, we do not get any benefit from carrying them in my tree.

18 +

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

20 of the repositories listed at

21

@@ -19,229 +24,221 @@ of the repositories listed at

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

25 [Graduated to "master"]

26

22 -* ap/maint-diff-rename-avoid-overlap (2013-03-06) 3 commits

23 - (merged to 'next' on 2013-03-19 at c3276cf)

24 - + tests: make sure rename pretty print works

25 - + diff: prevent pprint_rename from underrunning input

26 - + diff: Fix rename pretty-print when suffix and prefix overlap

27 -

28 - Originally merged to 'next' on 2013-03-06

29 -

30 - The logic used by "git diff -M --stat" to shorten the names of

31 - files before and after a rename did not work correctly when the

32 - common prefix and suffix between the two filenames overlapped.

33 -

34 -

35 -* jc/describe (2013-02-28) 1 commit

36 - (merged to 'next' on 2013-03-19 at 89e6e47)

37 - + describe: --match=<pattern> must limit the refs even when used with --all

38 -

39 - Originally merged to 'next' on 2013-03-05

40 -

41 - The "--match=<pattern>" option of "git describe", when used with

42 - "--all" to allow refs that are not annotated tags to be used as a

43 - base of description, did not restrict the output from the command

44 - to those that match the given pattern.

45 -

46 - We may want to have a looser matching that does not restrict to tags,

47 - but that can be done as a follow-up topic; this step is purely a bugfix.

48 -

27 +* ap/combine-diff-ignore-whitespace (2013-03-14) 1 commit

28 + (merged to 'next' on 2013-03-19 at dfb2c98)

29 + + Allow combined diff to ignore white-spaces

30 + (this branch is used by ap/combine-diff-coalesce-lost.)

31

50 -* jc/maint-reflog-expire-clean-mark-typofix (2013-03-05) 1 commit

51 - (merged to 'next' on 2013-03-19 at a4f9eac)

52 - + reflog: fix typo in "reflog expire" clean-up codepath

32 + Originally merged to 'next' on 2013-03-18

33

54 - Originally merged to 'next' on 2013-03-07

34 + Teach "diff --cc" output to honor options to ignore various forms

35 + of whitespace changes.

36

56 - In "git reflog expire", REACHABLE bit was not cleared from the

57 - correct objects.

37

38 +* jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit

39 + (merged to 'next' on 2013-03-26 at 7999dbe)

40 + + simplify-merges: drop merge from irrelevant side branch

41

60 -* jc/push-follow-tag (2013-03-05) 4 commits

61 - (merged to 'next' on 2013-03-19 at d302a10)

62 - + push: --follow-tags

63 - + commit.c: use clear_commit_marks_many() in in_merge_bases_many()

64 - + commit.c: add in_merge_bases_many()

65 - + commit.c: add clear_commit_marks_many()

42 + The --simplify-merges logic did not cull irrelevant parents from a

43 + merge that is otherwise not interesting with respect to the paths

44 + we are following.

45

67 - Originally merged to 'next' on 2013-03-09

46 + This touches a fairly core part of the revision traversal

47 + infrastructure; even though I think this change is correct, please

48 + report immediately if you find any unintended side effect.

49

69 - The new "--follow-tags" option tells "git push" to push relevant

70 - annotated tags when pushing branches out.

50

51 +* jk/checkout-attribute-lookup (2013-03-20) 3 commits

52 + (merged to 'next' on 2013-03-20 at 43a89e8)

53 + + t2003: work around path mangling issue on Windows

54 + (merged to 'next' on 2013-03-19 at b063a55)

55 + + entry: fix filter lookup

56 + + t2003: modernize style

57

73 -* jc/reflog-reverse-walk (2013-03-23) 4 commits

74 - (merged to 'next' on 2013-03-25 at 1bcc1c4)

75 - + refs.c: fix fread error handling

76 - (merged to 'next' on 2013-03-19 at 25beb2a)

77 - + reflog: add for_each_reflog_ent_reverse() API

78 - + for_each_recent_reflog_ent(): simplify opening of a reflog file

79 - + for_each_reflog_ent(): extract a helper to process a single entry

80 - (this branch is tangled with nd/branch-show-rebase-bisect-state.)

58 + Codepath to stream blob object contents directly from the object

59 + store to filesystem did not use the correct path to find conversion

60 + filters when writing to temporary files.

61

82 - An internal function used to implement "git checkout @{-1}" was

83 - hard to use correctly.

62

63 +* jk/difftool-dir-diff-edit-fix (2013-03-14) 3 commits

64 + (merged to 'next' on 2013-03-19 at e68014a)

65 + + difftool --dir-diff: symlink all files matching the working tree

66 + + difftool: avoid double slashes in symlink targets

67 + + git-difftool(1): fix formatting of --symlink description

68

86 -* jk/alias-in-bare (2013-03-08) 3 commits

87 - (merged to 'next' on 2013-03-19 at d2b4227)

88 - + setup: suppress implicit "." work-tree for bare repos

89 - + environment: add GIT_PREFIX to local_repo_env

90 - + cache.h: drop LOCAL_REPO_ENV_SIZE

69 + Originally merged to 'next' on 2013-03-15

70

92 - Originally merged to 'next' on 2013-03-09

71 + "git difftool --dir-diff" made symlinks to working tree files when

72 + preparing a temporary directory structure, so that accidental edits

73 + of these files in the difftool are reflected back to the working

74 + tree, but the logic to decide when to do so was not quite right.

75

94 - An aliased command spawned from a bare repository that does not say

95 - it is bare with "core.bare = yes" is treated as non-bare by mistake.

76

77 +* kk/revwalk-slop-too-many-commit-within-a-second (2013-03-22) 1 commit

78 + (merged to 'next' on 2013-03-26 at ea90e75)

79 + + Fix revision walk for commits with the same dates

80

98 -* jk/empty-archive (2013-03-10) 2 commits

99 - (merged to 'next' on 2013-03-19 at bb4eb61)

100 - + archive: handle commits with an empty tree

101 - + test-lib: factor out $GIT_UNZIP setup

81 + Allow the revision "slop" code to look deeper while commits with

82 + exactly the same timestamps come next to each other (which can

83 + often happen after a large "am" and "rebase" session).

84

103 - Originally merged to 'next' on 2013-03-12

85

105 - "git archive" reports a failure when asked to create an archive out

106 - of an empty tree. It would be more intuitive to give an empty

107 - archive back in such a case.

86 +* rr/tests-dedup-test-config (2013-03-19) 1 commit

87 + (merged to 'next' on 2013-03-26 at d314299)

88 + + t4018,7810,7811: remove test_config() redefinition

89

90

110 -* jk/fast-export-object-lookup (2013-03-17) 2 commits

111 - (merged to 'next' on 2013-03-19 at 026ac3d)

112 - + fast-export: do not load blob objects twice

113 - + fast-export: rename handle_object function

91 +* rs/archive-zip-raw-compression (2013-03-16) 1 commit

92 + (merged to 'next' on 2013-03-19 at 8cc1cb3)

93 + + archive-zip: use deflateInit2() to ask for raw compressed data

94

95 Originally merged to 'next' on 2013-03-18

96

97

118 -* jk/fully-peeled-packed-ref (2013-03-18) 4 commits

119 - (merged to 'next' on 2013-03-19 at fa92bc7)

120 - + pack-refs: add fully-peeled trait

121 - + pack-refs: write peeled entry for non-tags

122 - + use parse_object_or_die instead of die("bad object")

123 - + avoid segfaults on parse_object failure

98 +* yd/doc-is-in-asciidoc (2013-03-21) 1 commit

99 + (merged to 'next' on 2013-03-26 at a980af2)

100 + + CodingGuidelines: our documents are in AsciiDoc

101

125 - Originally merged to 'next' on 2013-03-18

102

127 - Not that we do not actively encourage having annotated tags outside

128 - refs/tags/ hierarchy, but they were not advertised correctly to the

129 - ls-remote and fetch with recent version of Git.

103 +* yd/doc-merge-annotated-tag (2013-03-21) 1 commit

104 + (merged to 'next' on 2013-03-26 at a11162f)

105 + + Documentation: merging a tag is a special case

106

107 + Document the 1.7.9 feature to merge a signed tag and keep that in

108 + the mergetag header in the resulting commit better.

109

132 -* jk/peel-ref (2013-03-16) 3 commits

133 - (merged to 'next' on 2013-03-19 at f0d4c16)

134 - + upload-pack: load non-tip "want" objects from disk

135 - + upload-pack: make sure "want" objects are parsed

136 - + upload-pack: drop lookup-before-parse optimization

110

138 - Originally merged to 'next' on 2013-03-18

111 +* yd/use-test-config-unconfig (2013-03-25) 12 commits

112 + (merged to 'next' on 2013-03-26 at 55b69a9)

113 + + t7600: use test_config to set/unset git config variables

114 + + t7502: remove clear_config

115 + + t7502: use test_config to set/unset git config variables

116 + + t9500: use test_config to set/unset git config variables

117 + + t7508: use test_config to set/unset git config variables

118 + + t7500: use test_config to set/unset git config variables

119 + + t5541: use test_config to set/unset git config variables

120 + + t5520: use test_config to set/unset git config variables

121 + + t4202: use test_config/test_unconfig to set/unset git config variables

122 + + t4034: use test_config/test_unconfig to set/unset git config variables

123 + + t4304: use test_config to set/unset git config variables

124 + + t3400: use test_config to set/unset git config variables

125

140 - Recent optimization broke shallow clones.

126 + Bulk-update of the test suite.

127

128 +--------------------------------------------------

129 +[New Topics]

130

143 -* jk/suppress-clang-warning (2013-02-25) 1 commit

144 - (merged to 'next' on 2013-03-19 at 1fd6858)

145 - + fix clang -Wtautological-compare with unsigned enum

131 +* js/log-gpg (2013-03-27) 1 commit

132 + - log: read gpg settings for signed commit verification

133

147 - Originally merged to 'next' on 2013-03-14

134 + Teach "show/log" honor gpg.program configuration just like other

135 + parts of the code that use GnuPG.

136

137 + Will merge to 'next'.

138

150 -* jl/submodule-deinit (2013-03-04) 1 commit

151 - (merged to 'next' on 2013-03-19 at d8367c5)

152 - + submodule: add 'deinit' command

139

154 - Originally merged to 'next' on 2013-03-05

140 +* jc/t5516-pushInsteadOf-vs-pushURL (2013-03-28) 1 commit

141 + - t5516: test interaction between pushURL and pushInsteadOf correctly

142

156 - There was no Porcelain way to say "I no longer am interested in

157 - this submodule", once you express your interest in a submodule with

158 - "submodule init". "submodule deinit" is the way to do so.

143 + Update a test to match the documented interaction between pushURL

144 + and pushInsteadOf.

145

146 + Will merge to 'next'.

147

161 -* kb/p4merge (2013-03-25) 6 commits

162 - (merged to 'next' on 2013-03-25 at 4db939e)

163 - + merge-one-file: force content conflict for "both sides added" case

164 - + git-merge-one-file: send "ERROR:" messages to stderr

165 - + git-merge-one-file: style cleanup

166 - + merge-one-file: remove stale comment

167 - (merged to 'next' on 2013-03-19 at 43cc599)

168 - + mergetools/p4merge: create a base if none available

169 - + mergetools/p4merge: swap LOCAL and REMOTE

148

171 - Originally merged to 'next' on 2013-03-14

149 +* jk/merge-tree-added-identically (2013-03-27) 1 commit

150 + - merge-tree: fix "same file added in subdir"

151

173 - Adjust the order mergetools feeds the files to the p4merge backend

174 - to match the p4 convention.

152 + We would most likely want to change things the other way around.

153

154

177 -* ks/rfc2047-one-char-at-a-time (2013-03-09) 1 commit

178 - (merged to 'next' on 2013-03-19 at 577ddf2)

179 - + format-patch: RFC 2047 says multi-octet character may not be split

155 +* rr/triangle (2013-03-28) 6 commits

156 + - remote.c: introduce branch.<name>.pushremote

157 + - remote.c: introduce remote.pushdefault

158 + - remote.c: introduce a way to have different remotes for fetch/push

159 + - t5516 (fetch-push): drop implicit arguments from helper functions

160 + - t5516 (fetch-push): update test description

161 + - remote.c: simplify a bit of code using git_config_string()

162

181 - Originally merged to 'next' on 2013-03-09

163 + Support "pull from one place, push to another place" workflow

164 + better by introducing remote.pushdefault (overrides the "origin"

165 + thing) and branch.*.pushremote (overrides the branch.*.remote).

166

183 - When "format-patch" quoted a non-ascii strings on the header files,

184 - it incorrectly applied rfc2047 and chopped a single character in

185 - the middle of it.

167

168 +* sg/gpg-sig (2013-03-29) 5 commits

169 + - pretty printing: extend %G? to include 'N' and 'U'

170 + - merge/pull Check for untrusted good GPG signatures

171 + - merge/pull: verify GPG signatures of commits being merged

172 + - commit.c: also look at the first GPG status line

173 + - Move commit GPG signature verification to commit.c

174

188 -* lf/setup-prefix-pathspec (2013-03-14) 2 commits

189 - (merged to 'next' on 2013-03-19 at 0017e9e)

190 - + setup.c: check that the pathspec magic ends with ")"

191 - + setup.c: stop prefix_pathspec() from looping past the end of string

175 + Teach "merge/pull" to optionally verify and reject commits that are

176 + not signed properly.

177

193 - Originally merged to 'next' on 2013-03-14

178 + Will merge to 'next'.

179

195 - "git cmd -- ':(top'" was not diagnosed as an invalid syntax, and

196 - instead the parser kept reading beyond the end of the string.

180

181 +* tr/log-tree-optim (2013-03-28) 1 commit

182 + - Avoid loading commits twice in log with diffs

183

199 -* mg/unsigned-time-t (2013-02-25) 2 commits

200 - (merged to 'next' on 2013-03-19 at 1fc1ad6)

201 - + Fix time offset calculation in case of unsigned time_t

202 - + date.c: fix unsigned time_t comparison

184 + Optimize "log" that shows the difference between the parent and the

185 + child.

186

204 - Originally merged to 'next' on 2013-03-14

187 + Will merge to 'next'.

188

206 - A few workarounds for systems with unsigned time_t.

189

190 +* jk/config-with-empty-section (2013-03-29) 1 commit

191 + - t1300: document some aesthetic failures of the config editor

192

209 -* pe/pull-rebase-v-q (2013-03-16) 1 commit

210 - (merged to 'next' on 2013-03-19 at 10b311c)

211 - + pull: Apply -q and -v options to rebase mode as well

193 + Document that "git config --unset" does not remove an empty section

194 + head after removing the last variable in a section, and adding a

195 + new variable does not try to reuse a leftover empty section head.

196

213 - Originally merged to 'next' on 2013-03-18

197 + Will merge to 'next'.

198

215 - Teach "git pull --rebase" to pass "-v/-q" command line options to

216 - underlying "git rebase".

199

200 +* jk/difftool-no-overwrite-on-copyback (2013-03-29) 5 commits

201 + - t7800: run --dir-diff tests with and without symlinks

202 + - t7800: fix tests when difftool uses --no-symlinks

203 + - t7800: don't hide grep output

204 + - difftool: don't overwrite modified files

205 + - t7800: move '--symlinks' specific test to the end

206

219 -* ph/tag-force-no-warn-on-creation (2013-03-13) 1 commit

220 - (merged to 'next' on 2013-03-19 at b273fd3)

221 - + tag: --force does not have to warn when creating tags

207 + Try to be careful when difftool backend allows the user to write

208 + into the temporary files being shown *and* the user makes changes

209 + to the working tree at the same time. One of the changes has to be

210 + lost in such a case, but at least tell the user what he did.

211

223 - Originally merged to 'next' on 2013-03-14

212

225 - "git tag -f <tag>" always said "Updated tag '<tag>'" even when

226 - creating a new tag (i.e. not overwriting nor updating).

213

214 +--------------------------------------------------

215 +[Stalled]

216

229 -* pw/p4-symlinked-root (2013-03-11) 3 commits

230 - (merged to 'next' on 2013-03-19 at 9127e82)

231 - + git p4: avoid expanding client paths in chdir

232 - + git p4 test: should honor symlink in p4 client root

233 - + git p4 test: make sure P4CONFIG relative path works

217 +* jc/format-patch (2013-02-21) 2 commits

218 + - format-patch: --inline-single

219 + - format-patch: rename "no_inline" field

220

235 - Originally merged to 'next' on 2013-03-12

221 + A new option to send a single patch to the standard output to be

222 + appended at the bottom of a message. I personally have no need for

223 + this, but it was easy enough to cobble together. Tests, docs and

224 + stripping out more MIMEy stuff are left as exercises to interested

225 + parties.

226

237 - "git p4" did not behave well when the path to the root of the P4

238 - client was not its real path.

227 + Not ready for inclusion.

228

229 --------------------------------------------------

241 -[New Topics]

230 +[Cooking]

231 +

232 +* jc/apply-ws-fix-tab-in-indent (2013-03-29) 2 commits

233 + (merged to 'next' on 2013-03-29 at 26eb6e9)

234 + + test: resurrect q_to_tab

235 + (merged to 'next' on 2013-03-26 at 46c6bda)

236 + + apply --whitespace=fix: avoid running over the postimage buffer

237

243 -* jc/apply-ws-fix-tab-in-indent (2013-03-22) 1 commit

244 - - apply --whitespace=fix: avoid running over the postimage buffer

238 + "git apply --whitespace=fix" was not prepared to see a line getting

239 + longer after fixing whitespaces (e.g. tab-in-indent aka Python).

240 +

241 + Will merge to 'master'.

242

243

244 * jk/no-more-self-assignment (2013-03-25) 2 commits

@@ -254,49 +251,17 @@ of the repositories listed at

251 warning from some compilers, but resulted in rewriting logic with

252 a version that is simpler and easier to understand for humans.

253

257 -

258 -* jk/t7800-modernize (2013-03-23) 3 commits

259 - - t7800: run --dir-diff tests with and without symlinks

260 - - t7800: fix tests when difftool uses --no-symlinks

261 - - t7800: don't hide grep output

262 -

263 - Looked reasonable standalone; conflicts with other topics in flight

264 - needs to be resolved carefully, though.

265 -

266 -

267 -* kk/revwalk-slop-too-many-commit-within-a-second (2013-03-22) 1 commit

268 - (merged to 'next' on 2013-03-26 at ea90e75)

269 - + Fix revision walk for commits with the same dates

270 -

271 - Allow the revision "slop" code to look deeper while commits with

272 - exactly the same timestamps come next to each other (which can

273 - often happen after a large "am" and "rebase" session).

274 -

275 -

276 -* yd/use-test-config-unconfig (2013-03-25) 12 commits

277 - - t7600: use test_config to set/unset git config variables

278 - - t7502: remove clear_config

279 - - t7502: use test_config to set/unset git config variables

280 - - t9500: use test_config to set/unset git config variables

281 - - t7508: use test_config to set/unset git config variables

282 - - t7500: use test_config to set/unset git config variables

283 - - t5541: use test_config to set/unset git config variables

284 - - t5520: use test_config to set/unset git config variables

285 - - t4202: use test_config/test_unconfig to set/unset git config variables

286 - - t4034: use test_config/test_unconfig to set/unset git config variables

287 - - t4304: use test_config to set/unset git config variables

288 - - t3400: use test_config to set/unset git config variables

289 -

290 - Bulk-update of the test suite.

254 + Will merge to 'master'.

255

256

257 * ap/combine-diff-coalesce-lost (2013-03-25) 1 commit

258 - combine-diff: coalesce lost lines optimally

295 - (this branch uses ap/combine-diff-ignore-whitespace.)

259

260 Attempts to minimize "diff -c/--cc" output by coalescing the same

261 lines removed from the parents better, but with an O(n^2)

299 - complexity. I wonder

262 + complexity.

263 +

264 + Will merge to 'next' to see if people with real-world usage scream.

265

266

267 * bk/document-commit-tree-S (2013-03-25) 1 commit

@@ -306,7 +271,8 @@ of the repositories listed at

271 Will merge to 'master'.

272

273

309 -* jk/check-corrupt-objects-carefully (2013-03-25) 9 commits

274 +* jk/check-corrupt-objects-carefully (2013-03-27) 10 commits

275 + - clone: leave repo in place after checkout errors

276 - clone: run check_everything_connected

277 - clone: die on errors from unpack_trees

278 - add tests for cloning corrupted repositories

@@ -320,15 +286,20 @@ of the repositories listed at

286 Have the streaming interface and other codepaths more carefully

287 examine for corrupt objects.

288

289 + The message in the last one may want to be updated.

290 + $gmane/219229

291 +

292

293 * js/iterm-is-on-osx (2013-03-25) 1 commit

294 - git-web--browse: recognize iTerm as a GUI terminal on OS X

295

296 Add more logic to detect graphic environment of OS X.

297

298 + We may want to simplify it down to just "is there TERM_PROGRAM?",

299 + but I am not an OS X user.

300 +

301

330 -* tb/cygwin-shared-repository (2013-03-25) 2 commits

331 - - optimize set_shared_perm()

302 +* tb/cygwin-shared-repository (2013-03-25) 1 commit

303 - Make core.sharedRepository work under cygwin 1.7

304

305 Cygwin port has a faster-but-lying lstat(2) emulation whose

@@ -336,92 +307,32 @@ of the repositories listed at

307 codepaths, and setting permission bits to directories is a codepath

308 that needs to use a more correct one.

309

310 + Will merge to 'next'.

311

340 -* jc/directory-attrs-regression-fix (2013-03-26) 4 commits

341 - - make sure a pattern without trailing slash matches a directory

342 - - attr.c::path_matches(): special case paths that end with a slash

312 +

313 +* jc/directory-attrs-regression-fix (2013-03-28) 6 commits

314 + - t: check that a pattern without trailing slash matches a directory

315 + - dir.c::match_pathname(): pay attention to the length of string parameters

316 + - dir.c::match_pathname(): adjust patternlen when shifting pattern

317 - dir.c::match_basename(): pay attention to the length of string parameters

318 + - attr.c::path_matches(): special case paths that end with a slash

319 - attr.c::path_matches(): the basename is part of the pathname

320

321 Fix 1.8.1.x regression that stopped matching "dir" (without

322 trailing slash) to a directory "dir".

323

324 + Will merge to 'next'.

325

350 -* nd/checkout-paths-reduce-match-pathspec-calls (2013-03-26) 1 commit

351 - - [NEEDSTEST] checkout: avoid unnecessary match_pathspec calls

352 -

353 ---------------------------------------------------

354 -[Stalled]

355 -

356 -* jc/format-patch (2013-02-21) 2 commits

357 - - format-patch: --inline-single

358 - - format-patch: rename "no_inline" field

359 -

360 - A new option to send a single patch to the standard output to be

361 - appended at the bottom of a message. I personally have no need for

362 - this, but it was easy enough to cobble together. Tests, docs and

363 - stripping out more MIMEy stuff are left as exercises to interested

364 - parties.

365 -

366 - Not ready for inclusion.

367 -

368 -

369 -* mg/qnx6 (2013-02-25) 1 commit

370 - - QNX: newer QNX 6.x.x is not so crippled

371 -

372 - Not ready for inclusion.

373 -

374 -

375 -* po/help-guides (2013-03-03) 5 commits

376 - - help doc: include --guide option description

377 - - help.c: add list_common_guides_help() function

378 - - help.c: add --guide option

379 - - help.c: use OPT_COUNTUP

380 - - show 'git help <guide>' usage, with examples

381 -

382 - Give more visibility to "concept guides" to help "git help" users.

383 -

384 - Expecting a reroll.

385 - $gmane/217384

386 -

387 -

388 -* hv/config-from-strbuf (2013-03-10) 4 commits

389 - - teach config parsing to read from strbuf

390 - - config: make parsing stack struct independent from actual data source

391 - - config: drop file pointer validity check in get_next_char()

392 - - config: factor out config file stack management

393 -

394 - Expecting a reroll.

395 - $gmane/217811

396 -

397 -

398 -* mb/gitweb-highlight-link-target (2012-12-20) 1 commit

399 - - Highlight the link target line in Gitweb using CSS

400 -

401 - Expecting a reroll.

402 - $gmane/211935

403 -

404 -

405 -* mb/remote-default-nn-origin (2012-07-11) 6 commits

406 - - Teach get_default_remote to respect remote.default.

407 - - Test that plain "git fetch" uses remote.default when on a detached HEAD.

408 - - Teach clone to set remote.default.

409 - - Teach "git remote" about remote.default.

410 - - Teach remote.c about the remote.default configuration setting.

411 - - Rename remote.c's default_remote_name static variables.

326

413 - When the user does not specify what remote to interact with, we

414 - often attempt to use 'origin'. This can now be customized via a

415 - configuration variable.

327 +* nd/checkout-paths-reduce-match-pathspec-calls (2013-03-27) 1 commit

328 + - checkout: avoid unnecessary match_pathspec calls

329

417 - Expecting a reroll.

418 - $gmane/210151

330 + Consolidate repeated pathspec matches on the same paths, while

331 + fixing a bug in "git checkout dir/" code started from an unmerged

332 + index.

333

420 - "The first remote becomes the default" bit is better done as a

421 - separate step.

334 + Will merge to 'next'.

335

423 ---------------------------------------------------

424 -[Cooking]

336

337 * jc/merge-tag-object (2013-03-19) 1 commit

338 - merge: a random object may not necssarily be a commit

@@ -439,29 +350,40 @@ of the repositories listed at

350 though. After all, the user went to great length to feed something

351 different from the normal "v1.8.2" to the command.

352

353 + Will merge to 'next'.

354 +

355

356 * jk/index-pack-correct-depth-fix (2013-03-20) 1 commit

444 - - index-pack: always zero-initialize object_entry list

357 + (merged to 'next' on 2013-03-26 at c56e839)

358 + + index-pack: always zero-initialize object_entry list

359

360 "index-pack --fix-thin" used uninitialize value to compute delta

361 depths of objects it appends to the resulting pack.

362

363 + Will merge to 'master'.

364 +

365

366 * jn/push-tests (2013-03-19) 3 commits

451 - - push test: rely on &&-chaining instead of 'if bad; then echo Oops; fi'

452 - - push test: simplify check of push result

453 - - push test: use test_config when appropriate

367 + (merged to 'next' on 2013-03-26 at da891db)

368 + + push test: rely on &&-chaining instead of 'if bad; then echo Oops; fi'

369 + + push test: simplify check of push result

370 + + push test: use test_config when appropriate

371

372 Update t5516 with style fixes.

373

374 + Will merge to 'master'.

375 +

376

377 * nd/index-pack-threaded-fixes (2013-03-19) 2 commits

459 - - index-pack: guard nr_resolved_deltas reads by lock

460 - - index-pack: protect deepest_delta in multithread code

378 + (merged to 'next' on 2013-03-26 at e508c77)

379 + + index-pack: guard nr_resolved_deltas reads by lock

380 + + index-pack: protect deepest_delta in multithread code

381

382 "index-pack --verify-stat" used a few counters outside protection

383 of mutex, possibly showing incorrect numbers.

384

385 + Will merge to 'master'.

386 +

387

388 * kb/status-ignored-optim (2013-03-19) 8 commits

389 - dir.c: git-status: avoid is_excluded checks for tracked files

@@ -483,13 +405,6 @@ of the repositories listed at

405 data.

406

407

486 -* rr/tests-dedup-test-config (2013-03-19) 1 commit

487 - (merged to 'next' on 2013-03-26 at d314299)

488 - + t4018,7810,7811: remove test_config() redefinition

489 -

490 - Will merge to 'master'.

491 -

492 -

408 * jn/add-2.0-u-A-sans-pathspec (2013-03-20) 5 commits

409 - git add: -u/-A now affects the entire working tree

410 - add -A: only show pathless 'add -A' warning when changes exist outside cwd

@@ -501,6 +416,9 @@ of the repositories listed at

416 "add -u/-A" that is ran without pathspec when there is no change

417 outside the current directory.

418

419 + Expecting a reroll and then merge the bottom bits to 'next'.

420 + $gmane/219342

421 +

422

423 * rr/test-3200-style (2013-03-20) 1 commit

424 (merged to 'next' on 2013-03-26 at 1214287)

@@ -511,7 +429,7 @@ of the repositories listed at

429 Will merge to 'master'.

430

431

514 -* tr/packed-object-info-wo-recursion (2013-03-25) 3 commits

432 +* tr/packed-object-info-wo-recursion (2013-03-27) 3 commits

433 - sha1_file: remove recursion in unpack_entry

434 - Refactor parts of in_delta_base_cache/cache_or_unpack_entry

435 - sha1_file: remove recursion in packed_object_info

@@ -519,6 +437,8 @@ of the repositories listed at

437 Attempts to reduce the stack footprint of sha1_object_info()

438 and unpack_entry() codepaths.

439

440 + Will merge to 'next'.

441 +

442

443 * sr/am-show-final-message-in-applying-indicator (2013-03-21) 1 commit

444 (merged to 'next' on 2013-03-26 at 9ecb143)

@@ -532,68 +452,7 @@ of the repositories listed at

452 Will merge to 'master'.

453

454

535 -* yd/doc-merge-annotated-tag (2013-03-21) 1 commit

536 - (merged to 'next' on 2013-03-26 at a11162f)

537 - + Documentation: merging a tag is a special case

538 -

539 - Document the 1.7.9 feature to merge a signed tag and keep that in

540 - the mergetag header in the resulting commit better.

541 -

542 - Will merge to 'master'.

543 -

544 -

545 -* yd/doc-is-in-asciidoc (2013-03-21) 1 commit

546 - (merged to 'next' on 2013-03-26 at a980af2)

547 - + CodingGuidelines: our documents are in AsciiDoc

548 -

549 - Will merge to 'master'.

550 -

551 -

552 -* ap/combine-diff-ignore-whitespace (2013-03-14) 1 commit

553 - (merged to 'next' on 2013-03-19 at dfb2c98)

554 - + Allow combined diff to ignore white-spaces

555 - (this branch is used by ap/combine-diff-coalesce-lost.)

556 -

557 - Originally merged to 'next' on 2013-03-18

558 -

559 - Teach "diff --cc" output to honor options to ignore various forms

560 - of whitespace changes.

561 -

562 - Will merge to 'master' in the 4th batch (Safe).

563 -

564 -

565 -* jk/checkout-attribute-lookup (2013-03-20) 3 commits

566 - (merged to 'next' on 2013-03-20 at 43a89e8)

567 - + t2003: work around path mangling issue on Windows

568 - (merged to 'next' on 2013-03-19 at b063a55)

569 - + entry: fix filter lookup

570 - + t2003: modernize style

571 -

572 - Codepath to stream blob object contents directly from the object

573 - store to filesystem did not use the correct path to find conversion

574 - filters when writing to temporary files.

575 -

576 - Will merge to 'master' in the 4th batch (Safe).

577 -

578 -

579 -* jk/difftool-dir-diff-edit-fix (2013-03-14) 3 commits

580 - (merged to 'next' on 2013-03-19 at e68014a)

581 - + difftool --dir-diff: symlink all files matching the working tree

582 - + difftool: avoid double slashes in symlink targets

583 - + git-difftool(1): fix formatting of --symlink description

584 -

585 - Originally merged to 'next' on 2013-03-15

586 -

587 - "git difftool --dir-diff" made symlinks to working tree files when

588 - preparing a temporary directory structure, so that accidental edits

589 - of these files in the difftool are reflected back to the working

590 - tree, but the logic to decide when to do so was not quite right.

591 -

592 - Will merge to 'master' in the 4th batch (Safe).

593 -

594 -

595 -* nd/magic-pathspecs (2013-03-22) 46 commits

596 - - fixup

455 +* nd/magic-pathspecs (2013-03-23) 45 commits

456 - Rename field "raw" to "_raw" in struct pathspec

457 - pathspec: support :(glob) syntax

458 - pathspec: make --literal-pathspecs disable pathspec magic

@@ -642,35 +501,27 @@ of the repositories listed at

501

502 Migrate the rest of codebase to use "struct pathspec" more.

503

645 - Haven't picked up the reroll yet.

646 -

647 -

648 -* rs/archive-zip-raw-compression (2013-03-16) 1 commit

649 - (merged to 'next' on 2013-03-19 at 8cc1cb3)

650 - + archive-zip: use deflateInit2() to ask for raw compressed data

651 -

652 - Originally merged to 'next' on 2013-03-18

504 + Will merge to 'next' after all the dust settles.

505

654 - Will merge to 'master' in the 4th batch (Safe).

506

507 +* sw/safe-create-leading-dir-race (2013-03-26) 1 commit

508 + (merged to 'next' on 2013-03-26 at 744bb50)

509 + + safe_create_leading_directories: fix race that could give a false negative

510

657 -* sw/safe-create-leading-dir-race (2013-03-17) 2 commits

658 - - SQUASH???

659 - - safe_create_leading_directories: fix race that could give a false negative

660 -

661 - Will merge to 'next' after squashing in the fix.

511 + Will merge to 'master'.

512

513

514 * nd/branch-show-rebase-bisect-state (2013-03-23) 7 commits

665 - - status, branch: fix the misleading "bisecting" message

666 - - branch: show more information when HEAD is detached

667 - - status: show more info than "currently not on any branch"

668 - - wt-status: move wt_status_get_state() out to wt_status_print()

669 - - wt-status: split wt_status_state parsing function out

670 - - wt-status: move strbuf into read_and_strip_branch()

671 - - Merge branch 'jc/reflog-reverse-walk' into nd/branch-show-rebase-bisect-state

515 + (merged to 'next' on 2013-03-26 at cd666f6)

516 + + status, branch: fix the misleading "bisecting" message

517 + + branch: show more information when HEAD is detached

518 + + status: show more info than "currently not on any branch"

519 + + wt-status: move wt_status_get_state() out to wt_status_print()

520 + + wt-status: split wt_status_state parsing function out

521 + + wt-status: move strbuf into read_and_strip_branch()

522 + + Merge branch 'jc/reflog-reverse-walk' into nd/branch-show-rebase-bisect-state

523

673 - Will merge to 'next'.

524 + Will merge to 'master'.

525

526

527 * jc/add-2.0-delete-default (2013-03-08) 3 commits

@@ -690,7 +541,8 @@ of the repositories listed at

541

542

543 * jc/nobody-sets-src-peer-ref (2013-03-04) 1 commit

693 - - match_push_refs(): nobody sets src->peer_ref anymore

544 + (merged to 'next' on 2013-03-26 at 9d13c02)

545 + + match_push_refs(): nobody sets src->peer_ref anymore

546

547 Dead code removal.

548

@@ -701,7 +553,8 @@ of the repositories listed at

553

554

555 * kb/name-hash (2013-02-27) 1 commit

704 - - name-hash.c: fix endless loop with core.ignorecase=true

556 + (merged to 'next' on 2013-03-26 at 750490a)

557 + + name-hash.c: fix endless loop with core.ignorecase=true

558

559 The code to keep track of what directory names are known to Git on

560 platforms with case insensitive filesystems can get confused upon

@@ -713,19 +566,21 @@ of the repositories listed at

566 Will merge to 'master' in the 4th batch (Risky).

567

568

716 -* tr/line-log (2013-03-23) 6 commits

569 +* tr/line-log (2013-03-28) 5 commits

570 - Speed up log -L... -M

571 - log -L: :pattern:file syntax to find by funcname

572 - Implement line-history search (git log -L)

573 - Export rewrite_parents() for 'log -L'

721 - - fixup

574 - Refactor parse_loc

575

724 - Rerolled; collides with nd/magic-pathspecs.

576 + Rerolled.

577 +

578 + Will merge to 'next'.

579

580

581 * jk/common-make-variables-export-safety (2013-02-25) 1 commit

728 - - Makefile: make mandir, htmldir and infodir absolute

582 + (merged to 'next' on 2013-03-26 at 8b7bb16)

583 + + Makefile: make mandir, htmldir and infodir absolute

584

585 Make the three variables safer to be exported to submakes by

586 ensuring that they are full paths so that they can be used as

@@ -738,26 +593,27 @@ of the repositories listed at

593

594

595 * jk/pkt-line-cleanup (2013-03-21) 20 commits

741 - - do not use GIT_TRACE_PACKET=3 in tests

742 - - remote-curl: always parse incoming refs

743 - - remote-curl: move ref-parsing code up in file

744 - - remote-curl: pass buffer straight to get_remote_heads

745 - - teach get_remote_heads to read from a memory buffer

746 - - pkt-line: share buffer/descriptor reading implementation

747 - - pkt-line: provide a LARGE_PACKET_MAX static buffer

748 - - pkt-line: move LARGE_PACKET_MAX definition from sideband

749 - - pkt-line: teach packet_read_line to chomp newlines

750 - - pkt-line: provide a generic reading function with options

751 - - pkt-line: drop safe_write function

752 - - pkt-line: move a misplaced comment

753 - - write_or_die: raise SIGPIPE when we get EPIPE

754 - - upload-archive: use argv_array to store client arguments

755 - - upload-archive: do not copy repo name

756 - - send-pack: prefer prefixcmp over memcmp in receive_status

757 - - fetch-pack: fix out-of-bounds buffer offset in get_ack

758 - - upload-pack: remove packet debugging harness

759 - - upload-pack: do not add duplicate objects to shallow list

760 - - upload-pack: use get_sha1_hex to parse "shallow" lines

596 + (merged to 'next' on 2013-03-26 at 2bb3b75)

597 + + do not use GIT_TRACE_PACKET=3 in tests

598 + + remote-curl: always parse incoming refs

599 + + remote-curl: move ref-parsing code up in file

600 + + remote-curl: pass buffer straight to get_remote_heads

601 + + teach get_remote_heads to read from a memory buffer

602 + + pkt-line: share buffer/descriptor reading implementation

603 + + pkt-line: provide a LARGE_PACKET_MAX static buffer

604 + + pkt-line: move LARGE_PACKET_MAX definition from sideband

605 + + pkt-line: teach packet_read_line to chomp newlines

606 + + pkt-line: provide a generic reading function with options

607 + + pkt-line: drop safe_write function

608 + + pkt-line: move a misplaced comment

609 + + write_or_die: raise SIGPIPE when we get EPIPE

610 + + upload-archive: use argv_array to store client arguments

611 + + upload-archive: do not copy repo name

612 + + send-pack: prefer prefixcmp over memcmp in receive_status

613 + + fetch-pack: fix out-of-bounds buffer offset in get_ack

614 + + upload-pack: remove packet debugging harness

615 + + upload-pack: do not add duplicate objects to shallow list

616 + + upload-pack: use get_sha1_hex to parse "shallow" lines

617

618 Cleans up pkt-line API, implementation and its callers to make them

619 more robust. Even though I think this change is correct, please

@@ -767,9 +623,10 @@ of the repositories listed at

623

624

625 * jc/remove-export-from-config-mak-in (2013-03-05) 3 commits

770 - - Fix `make install` when configured with autoconf

771 - - Makefile: do not export mandir/htmldir/infodir

772 - - config.mak.in: remove unused definitions

626 + (merged to 'next' on 2013-03-26 at a789220)

627 + + Fix `make install` when configured with autoconf

628 + + Makefile: do not export mandir/htmldir/infodir

629 + + config.mak.in: remove unused definitions

630

631 config.mak.in template had an "export" line to cause a few

632 common makefile variables to be exported; if they need to be

@@ -786,20 +643,6 @@ of the repositories listed at

643 Will merge to 'master' in the 4th batch (Risky).

644

645

789 -* jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit

790 - - simplify-merges: drop merge from irrelevant side branch

791 -

792 - The --simplify-merges logic did not cull irrelevant parents from a

793 - merge that is otherwise not interesting with respect to the paths

794 - we are following.

795 -

796 - This touches a fairly core part of the revision traversal

797 - infrastructure; even though I think this change is correct, please

798 - report immediately if you find any unintended side effect.

799 -

800 - Will merge to 'master' in the 2nd batch (Risky).

801 -

802 -

646 * jc/push-2.0-default-to-simple (2013-03-18) 15 commits

647 - advice: Remove unused advice_push_non_ff_default

648 - t5570: do not assume the "matching" push is the default

@@ -821,19 +664,20 @@ of the repositories listed at

664

665

666 * bc/append-signed-off-by (2013-02-23) 13 commits

824 - - git-commit: populate the edit buffer with 2 blank lines before s-o-b

825 - - Unify appending signoff in format-patch, commit and sequencer

826 - - format-patch: update append_signoff prototype

827 - - t4014: more tests about appending s-o-b lines

828 - - sequencer.c: teach append_signoff to avoid adding a duplicate newline

829 - - sequencer.c: teach append_signoff how to detect duplicate s-o-b

830 - - sequencer.c: always separate "(cherry picked from" from commit body

831 - - sequencer.c: require a conforming footer to be preceded by a blank line

832 - - sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer

833 - - t/t3511: add some tests of 'cherry-pick -s' functionality

834 - - t/test-lib-functions.sh: allow to specify the tag name to test_commit

835 - - commit, cherry-pick -s: remove broken support for multiline rfc2822 fields

836 - - sequencer.c: rework search for start of footer to improve clarity

667 + (merged to 'next' on 2013-03-26 at 0e3c79b)

668 + + git-commit: populate the edit buffer with 2 blank lines before s-o-b

669 + + Unify appending signoff in format-patch, commit and sequencer

670 + + format-patch: update append_signoff prototype

671 + + t4014: more tests about appending s-o-b lines

672 + + sequencer.c: teach append_signoff to avoid adding a duplicate newline

673 + + sequencer.c: teach append_signoff how to detect duplicate s-o-b

674 + + sequencer.c: always separate "(cherry picked from" from commit body

675 + + sequencer.c: require a conforming footer to be preceded by a blank line

676 + + sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer

677 + + t/t3511: add some tests of 'cherry-pick -s' functionality

678 + + t/test-lib-functions.sh: allow to specify the tag name to test_commit

679 + + commit, cherry-pick -s: remove broken support for multiline rfc2822 fields

680 + + sequencer.c: rework search for start of footer to improve clarity

681

682 Consolidates codepaths that inspect log-message-to-be and decide to

683 add a new Signed-off-by line in various commands. I think there is

@@ -854,7 +698,7 @@ of the repositories listed at

698 Even though I think this change is correct, please report

699 immediately if you find any unintended side effect.

700

857 - kb/status-ignored-optim may supersede this.

701 + kb/status-ignored-optim supersedes this.

702

703

704 * jc/add-2.0-u-A-sans-pathspec (2013-03-14) 1 commit

@@ -867,9 +711,8 @@ of the repositories listed at

711 entire working tree). With this, we finally change the behaviour

712 and make it affect the entire working tree in Git 2.0.

713

714 + jn/add-2.0-u-A-sans-pathspec supersedes this.

715

871 ---------------------------------------------------

872 -[Discarded]

716

717 * ja/directory-attrs (2013-03-20) 1 commit

718 . trailing slash required in .gitattributes

@@ -877,3 +720,65 @@ of the repositories listed at

720 Now part of jc/directory-attrs-regression-fix.

721

722

723 +* hv/config-from-strbuf (2013-03-10) 4 commits

724 + . teach config parsing to read from strbuf

725 + . config: make parsing stack struct independent from actual data source

726 + . config: drop file pointer validity check in get_next_char()

727 + . config: factor out config file stack management

728 +

729 + Was expecting a reroll.

730 + $gmane/217811

731 +

732 +

733 +* mb/gitweb-highlight-link-target (2012-12-20) 1 commit

734 + . Highlight the link target line in Gitweb using CSS

735 +

736 + Was expecting a reroll.

737 + $gmane/211935

738 +

739 +

740 +* mb/remote-default-nn-origin (2012-07-11) 6 commits

741 + . Teach get_default_remote to respect remote.default.

742 + . Test that plain "git fetch" uses remote.default when on a detached HEAD.

743 + . Teach clone to set remote.default.

744 + . Teach "git remote" about remote.default.

745 + . Teach remote.c about the remote.default configuration setting.

746 + . Rename remote.c's default_remote_name static variables.

747 +

748 + When the user does not specify what remote to interact with, we

749 + often attempt to use 'origin'. This can now be customized via a

750 + configuration variable.

751 +

752 + Was expecting a reroll.

753 + $gmane/210151

754 +

755 + "The first remote becomes the default" bit is better done as a

756 + separate step.

757 +

758 +

759 +* mg/qnx6 (2013-02-25) 1 commit

760 + . QNX: newer QNX 6.x.x is not so crippled

761 +

762 + Not ready for inclusion.

763 +

764 +

765 +* po/help-guides (2013-03-03) 5 commits

766 + . help doc: include --guide option description

767 + . help.c: add list_common_guides_help() function

768 + . help.c: add --guide option

769 + . help.c: use OPT_COUNTUP

770 + . show 'git help <guide>' usage, with examples

771 +

772 + Give more visibility to "concept guides" to help "git help" users.

773 +

774 + Was (and still is) expecting a reroll.

775 + $gmane/217384

776 +

777 +

778 +* jk/t7800-modernize (2013-03-23) 3 commits

779 + . t7800: run --dir-diff tests with and without symlinks

780 + . t7800: fix tests when difftool uses --no-symlinks

781 + . t7800: don't hide grep output

782 +

783 + Superseded by jk/difftool-no-overwrite-on-copyback.

784 +

What's cooking (2013/03 #08)