1d0ee99c82 · matheusbsbs/matheus-bagliano

@@ -1,9 +1,9 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Aug 2010, #03; Sun, 15)

3 -X-master-at: 3d045897585c4b1ca0dce6bb5a33331f1b48c2bf

4 -X-next-at: f2a27ee4a32784537ae739b7c6668eec567dd60c

2 +Subject: What's cooking in git.git (Aug 2010, #04; Wed, 18)

3 +X-master-at: bd3a97a27a97485b130802d497214be312b737f9

4 +X-next-at: f88bdb1c315a588128fcf0b68cfd286e3e096110

5

6 -What's cooking in git.git (Aug 2010, #03; Sun, 15)

6 +What's cooking in git.git (Aug 2010, #04; Wed, 18)

7 --------------------------------------------------

8

9 Here are the topics that have been cooking. Commits prefixed with '-' are

@@ -12,78 +12,222 @@ marked with '.' do not appear in any of the integration branches, but I am

12 still holding onto them.

13

14 --------------------------------------------------

15 -[New Topics]

15 +[Graduated to "master"]

16

17 -* ab/perl-install (2010-08-03) 1 commit

18 - (merged to 'next' on 2010-08-14 at f2a27ee)

19 - + perl/Makefile: Unset INSTALL_BASE when making perl.mak

17 +* ab/report-corrupt-object-with-type (2010-06-10) 1 commit

18 + (merged to 'next' on 2010-08-12 at 8a9e1d0)

19 + + sha1_file: Show the the type and path to corrupt objects

20

21 -* ab/test (2010-08-14) 6 commits

22 - - t/Makefile: Create test-results dir for smoke target

23 - - Merge branch 'ab/test-no-skip'

24 - - Merge branch 'ab/test-coverage'

25 - - Merge branch 'ab/test-smoke'

26 - - Merge branch 'ab/test-prereq'

27 - - Merge branch 'ab/omit-aggregate-test-result-under-tap-harness'

28 - (this branch uses ab/omit-aggregate-test-result-under-tap-harness, ab/test-coverage, ab/test-no-skip, ab/test-prereq and ab/test-smoke.)

21 +* ar/string-list-foreach (2010-07-03) 2 commits

22 + (merged to 'next' on 2010-08-11 at 993dc02)

23 + + Convert the users of for_each_string_list to for_each_string_list_item macro

24 + + Add a for_each_string_list_item macro

25 + (this branch is used by tf/string-list-init.)

26

30 -All the test-related topics seem to be almost ready for 'next', so I made

31 -a single aggregate of them in preparation for merging (there is one fix-up

32 -already still on 'pu', which is good).

27 +* cc/find-commit-subject (2010-07-22) 6 commits

28 + (merged to 'next' on 2010-08-12 at ce38436)

29 + + blame: use find_commit_subject() instead of custom code

30 + + merge-recursive: use find_commit_subject() instead of custom code

31 + + bisect: use find_commit_subject() instead of custom code

32 + + revert: rename variables related to subject in get_message()

33 + + revert: refactor code to find commit subject in find_commit_subject()

34 + + revert: fix off by one read when searching the end of a commit subject

35

34 -* jc/maint-follow-rename-fix (2010-08-13) 2 commits

36 +* jc/maint-follow-rename-fix (2010-08-15) 3 commits

37 + (merged to 'next' on 2010-08-15 at 2f41ea8)

38 + + log: test for regression introduced in v1.7.2-rc0~103^2~2

39 (merged to 'next' on 2010-08-14 at 16706d6)

40 + diff --follow: do call diffcore_std() as necessary

41 + diff --follow: do not waste cycles while recursing

42

39 -* dj/fetch-tagopt (2010-08-11) 1 commit

40 - - fetch: allow command line --tags to override config

43 +* jh/clean-exclude (2010-07-20) 2 commits

44 + (merged to 'next' on 2010-08-12 at 9a63fd4)

45 + + Add test for git clean -e.

46 + + Add -e/--exclude to git-clean.

47

42 -* po/userdiff-csharp (2010-08-11) 1 commit

43 - - Userdiff patterns for C#

48 +* jh/graph-next-line (2010-07-13) 2 commits

49 + (merged to 'next' on 2010-08-11 at 333f9df)

50 + + Enable custom schemes for column colors in the graph API

51 + + Make graph_next_line() available in the graph.h API

52

45 ---------------------------------------------------

46 -[Graduated to "master"]

53 +* jh/use-test-must-fail (2010-07-20) 1 commit

54 + (merged to 'next' on 2010-08-12 at 16d4e11)

55 + + Convert "! git" to "test_must_fail git"

56 +

57 +* jl/submodule-ignore-diff (2010-08-06) 4 commits

58 + (merged to 'next' on 2010-08-12 at ffe84bb)

59 + + Add tests for the diff.ignoreSubmodules config option

60 + + Add the 'diff.ignoreSubmodules' config setting

61 + + Submodules: Use "ignore" settings from .gitmodules too for diff and status

62 + + Submodules: Add the new "ignore" config option for diff and status

63 +

64 +* jn/fast-import-subtree (2010-06-30) 1 commit

65 + (merged to 'next' on 2010-08-11 at 5e19de0)

66 + + Teach fast-import to import subtrees named by tree id

67 +

68 +* jn/fix-abbrev (2010-07-27) 3 commits

69 + (merged to 'next' on 2010-08-12 at 2cf70df)

70 + + examples/commit: use --abbrev for commit summary

71 + + checkout, commit: remove confusing assignments to rev.abbrev

72 + + archive: abbreviate substituted commit ids again

73 +

74 +* jn/maint-plug-leak (2010-08-09) 3 commits

75 + (merged to 'next' on 2010-08-14 at ec2ba20)

76 + + write-tree: Avoid leak when index refers to an invalid object

77 + + read-tree: stop leaking tree objects

78 + + core: Stop leaking ondisk_cache_entrys

79

48 -* bc/use-more-hardlinks-in-install (2010-07-23) 2 commits

49 - (merged to 'next' on 2010-08-11 at 59dd30e)

50 - + Makefile: make hard/symbolic links for non-builtins too

51 - + Makefile: link builtins residing in bin directory to main git binary too

80 +* jn/rebase-rename-am (2008-11-10) 5 commits

81 + (merged to 'next' on 2010-08-12 at a6d25c4)

82 + + rebase: protect against diff.renames configuration

83 + + t3400 (rebase): whitespace cleanup

84 + + Teach "apply --index-info" to handle rename patches

85 + + t4150 (am): futureproof against failing tests

86 + + t4150 (am): style fix

87

53 -* jc/sha1-name-find-fix (2010-08-02) 1 commit

54 - (merged to 'next' on 2010-08-11 at 51106a5)

55 - + sha1_name.c: fix parsing of ":/token" syntax

88 +* kf/post-receive-sample-hook (2010-07-16) 1 commit

89 + (merged to 'next' on 2010-08-12 at 9b7e3c9)

90 + + post-receive-email: optional message line count limit

91

57 -* jn/doc-pull (2010-08-02) 1 commit

58 - (merged to 'next' on 2010-08-11 at a223479)

59 - + Documentation: flesh out “git pull” description

92 +I do not particularly like the idea of counting number of lines in a shell

93 +loop but this is an opt-in feature to a contrib/ item so it should be ok.

94

61 -* jn/maint-gitweb-dynconf (2010-07-30) 1 commit

62 - (merged to 'next' on 2010-08-11 at a94ce85)

63 - + gitweb: allow configurations that change with each request

95 +* ml/rebase-x-strategy (2010-07-29) 1 commit

96 + (merged to 'next' on 2010-08-12 at 0aa2fdb)

97 + + rebase: support -X to pass through strategy options

98

65 -* jn/parse-date-basic (2010-07-15) 1 commit

66 - (merged to 'next' on 2010-08-11 at ca9fef0)

67 - + Export parse_date_basic() to convert a date string to timestamp

68 - (this branch is used by rr/svn-export.)

99 +* tc/checkout-B (2010-08-10) 4 commits

100 + (merged to 'next' on 2010-08-11 at 5433b51)

101 + + builtin/checkout: handle -B from detached HEAD correctly

102 + + builtin/checkout: learn -B

103 + + builtin/checkout: reword hint for -b

104 + + add tests for checkout -b

105

70 -* sp/fix-smart-http-deadlock-on-error (2010-08-06) 1 commit

71 - (merged to 'next' on 2010-08-11 at 0a6369e)

72 - + smart-http: Don't deadlock on server failure

106 +* tf/string-list-init (2010-07-04) 1 commit

107 + (merged to 'next' on 2010-08-14 at 193b4db)

108 + + string_list: Add STRING_LIST_INIT macro and make use of it.

109

74 -Will merge to 'maint' later.

110 +* tr/xsize-bits (2010-07-28) 1 commit

111 + (merged to 'next' on 2010-08-11 at bcc0271)

112 + + xsize_t: check whether we lose bits

113

76 -* tr/rfc-reset-doc (2010-07-18) 5 commits

77 - (merged to 'next' on 2010-08-11 at 8e7c8d1)

78 - + Documentation/reset: move "undo permanently" example behind "make topic"

79 - + Documentation/reset: reorder examples to match description

80 - + Documentation/reset: promote 'examples' one section up

81 - + Documentation/reset: separate options by mode

82 - + Documentation/git-reset: reorder modes for soft-mixed-hard progression

114 +* vs/doc-spell (2010-07-20) 1 commit

115 + (merged to 'next' on 2010-08-12 at 3fbd06c)

116 + + Documentation: spelling fixes

117 +

118 +--------------------------------------------------

119 +[New Topics]

120 +

121 +* ab/maint-reset-mixed-w-pathspec-advice (2010-08-15) 1 commit

122 + - reset: Better warning message on git reset --mixed <paths>

123 +

124 +Probably needs a "better" title; the commit shouldn't advertise itself

125 +being "better" (or "clean" for that matter), but say what it changed and

126 +leave it to the readers to judge if it is better.

127 +

128 +* cb/binary-patch-id (2010-08-15) 1 commit

129 + - hash binary sha1 into patch id

130 +

131 +* jj/icase-directory (2010-08-16) 6 commits

132 + - Support case folding in git fast-import when core.ignorecase=true

133 + - Support case folding for git add when core.ignorecase=true

134 + - Add case insensitivity support when using git ls-files

135 + - Add case insensitivity support for directories when using git status

136 + - Case insensitivity support for .gitignore via core.ignorecase

137 + - Add string comparison functions that respect the ignore_case variable.

138 +

139 +Depends on GNU extension to fnmatch(3).

140 +

141 +* jn/cherry-revert-message-clean-up (2010-08-18) 5 commits

142 + - tests: fix syntax error in "Use advise() for hints" test

143 + - cherry-pick/revert: Use advise() for hints

144 + - cherry-pick/revert: Use error() for failure message

145 + - Introduce advise() to print hints

146 + - Eliminate “Finished cherry-pick/revert” message

147 + (this branch uses cc/revert.)

148 +

149 +* jn/merge-custom-no-trivial (2010-08-15) 2 commits

150 + - merge: let custom strategies intervene in trivial merges

151 + - t7606 (merge-theirs): modernize style

152 +

153 +* po/etc-gitattributes (2010-08-16) 1 commit

154 + - Add global and system-wide gitattributes

155 +

156 +* ab/compat-regex (2010-08-17) 5 commits

157 + - autoconf: don't use platform regex if it lacks REG_STARTEND

158 + - t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND

159 + - Change regerror() declaration from K&R style to ANSI C (C89)

160 + - compat/regex: get the gawk regex engine to compile within git

161 + - compat/regex: use the regex engine from gawk for compat

162 +

163 +* ab/test-1 (2010-08-18) 5 commits

164 + . t/t0000-basic.sh: Run the passing TODO test inside its own test-lib

165 + . test-lib: Allow overriding of TEST_DIRECTORY

166 + . test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../

167 + . test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../

168 + . Merge branch 'ab/i18n' into ab/test-1

169 + (this branch uses ab/i18n and ab/test.)

170 +

171 +Not merged to 'pu' as it seemed to have broken something.

172 +

173 +* da/fix-submodule-sync-superproject-config (2010-08-18) 1 commit

174 + - submodule sync: Update "submodule.<name>.url"

175 +

176 +Looked reasonable; will merge to 'next' soonish.

177 +

178 +* jn/update-contrib-example-merge (2010-08-17) 25 commits

179 + - mergetool: Skip autoresolved paths

180 + - merge script: learn --[no-]rerere-autoupdate

181 + - merge script: notice @{-1} shorthand

182 + - merge script: handle --no-ff --no-commit correctly

183 + - merge script: --ff-only to disallow true merge

184 + - merge script: handle many-way octopus

185 + - merge script: handle -m --log correctly

186 + - merge script: forbid merge -s index

187 + - merge script: allow custom strategies

188 + - merge script: merge -X<option>

189 + - merge script: improve log message subject

190 + - merge script: refuse to merge during merge

191 + - merge script: tweak unmerged files message to match builtin

192 + - merge script: --squash, --ff from unborn branch are errors

193 + - fmt-merge-msg -m to override merge title

194 + - merge-base --independent to print reduced parent list in a merge

195 + - merge-base --octopus to mimic show-branch --merge-base

196 + - Documentation: add a SEE ALSO section for merge-base

197 + - t6200 (fmt-merge-msg): style nitpicks

198 + - t6010 (merge-base): modernize style

199 + - t7600 (merge): test merge from branch yet to be born

200 + - t7600 (merge): check reflog entry

201 + - t7600 (merge): do not launch gitk for --debug

202 + - t7600 (merge): modernize style

203 + - merge: do not mistake (ancestor of) tag for branch

204 +

205 +I am of two minds about this series. While I do very much like the ease

206 +of experimenting with scripted implementations, contrib/examples has been

207 +about giving easier access to the historical implementations (iow, people

208 +could check out an older version to see how the things looked like, but

209 +they do not have to with scripted implementations shipped in

210 +contrib/examples). A series like this may update scripted Porcelains with

211 +recent new features, but the result will never be as solidly battle tested

212 +implementations (admittedly with only subset of features and without later

213 +fixes) like we had there so far.

214

215 --------------------------------------------------

216 [Stalled]

217

218 +* jc/log-grep (2010-07-19) 1 commit

219 + - git log: add -G<regexp> that greps in the patch text

220 +

221 +This is broken, but haven't found any time to revisit it yet.

222 +

223 +* jn/apply-filename-with-sp (2010-07-23) 4 commits

224 + - apply: Handle traditional patches with space in filename

225 + - t4135 (apply): use expand instead of pr for portability

226 + - tests: Test how well "git apply" copes with weird filenames

227 + - apply: Split quoted filename handling into new function

228 +

229 +Needs prereq?

230 +

231 * zl/mailinfo-recode-patch (2010-06-14) 2 commits

232 - add --recode-patch option to git-am

233 - add --recode-patch option to git-mailinfo

@@ -113,61 +257,111 @@ There seemed to be some doubts on removal of the "no changes" line?

257 --------------------------------------------------

258 [Cooking]

259

116 -* jn/paginate-fix (2010-08-05) 13 commits

117 - - merge-file: run setup_git_directory_gently() sooner

118 - - var: run setup_git_directory_gently() sooner

119 - - ls-remote: run setup_git_directory_gently() sooner

120 - - index-pack: run setup_git_directory_gently() sooner

121 - - Merge branch 'jn/maint-setup-fix' (early part) into HEAD

122 - - config: run setup_git_directory_gently() sooner

123 - - bundle: run setup_git_directory_gently() sooner

124 - - apply: run setup_git_directory_gently() sooner

125 - - grep: run setup_git_directory_gently() sooner

126 - - shortlog: run setup_git_directory_gently() sooner

127 - - git wrapper: allow setup_git_directory_gently() be called earlier

128 - - setup: remember whether repository was found

129 - - git wrapper: introduce startup_info struct

130 - (this branch uses jn/maint-setup-fix.)

260 +* ab/perl-install (2010-08-03) 1 commit

261 + (merged to 'next' on 2010-08-14 at f2a27ee)

262 + + perl/Makefile: Unset INSTALL_BASE when making perl.mak

263

132 -Merging this to 'pu' seems to break some tests...

264 +* ab/test (2010-08-16) 43 commits

265 + (merged to 'next' on 2010-08-18 at f88bdb1)

266 + + cvs tests: do not touch test CVS repositories shipped with source

267 + + t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite

268 + + t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite

269 + + t/t7105-reset-patch.sh: Add a PERL prerequisite

270 + + t/t9001-send-email.sh: convert setup code to tests

271 + + t/t9001-send-email.sh: change from skip_all=* to prereq skip

272 + + t/t9001-send-email.sh: Remove needless PROG=* assignment

273 + + t/t9600-cvsimport.sh: change from skip_all=* to prereq skip

274 + + lib-patch-mode tests: change from skip_all=* to prereq skip

275 + + t/t3701-add-interactive.sh: change from skip_all=* to prereq skip

276 + + tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh

277 + + t/Makefile: Create test-results dir for smoke target

278 + + git-notes: Run partial expensive test everywhere

279 + + t/t3300-funny-names: change from skip_all=* to prereq skip

280 + + t/t3902-quoted: change from skip_all=* to prereq skip

281 + + t/t4016-diff-quote: change from skip_all=* to prereq skip

282 + + t/t5503-tagfollow: change from skip_all=* to prereq skip

283 + + t/t7005-editor: change from skip_all=* to prereq skip

284 + + t/t5705-clone-2gb: change from skip_all=* to prereq skip

285 + + t/t1304-default-acl: change from skip_all=* to prereq skip

286 + + t/README: Update "Skipping tests" to align with best practices

287 + + t/t7800-difftool.sh: Skip with prereq on no PERL

288 + + t/t5800-remote-helpers.sh: Skip with prereq on python <2.4

289 + + t/t4004-diff-rename-symlink.sh: use three-arg <prereq>

290 + + tests: implicitly skip SYMLINKS tests using <prereq>

291 + + Makefile: make gcov invocation configurable

292 + + t/README: Add a note about the dangers of coverage chasing

293 + + t/README: A new section about test coverage

294 + + Makefile: Add cover_db_html target

295 + + Makefile: Add cover_db target

296 + + Makefile: Split out the untested functions target

297 + + Makefile: Include subdirectories in "make cover" reports

298 + + gitignore: Ignore files generated by "make coverage"

299 + + t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target

300 + + t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh

301 + + t/README: Document the Smoke testing

302 + + tests: Infrastructure for Git smoke testing

303 + + test-lib: Multi-prereq support only checked the last prereq

304 + + tests: A SANITY test prereq for testing if we're root

305 + + t/README: Document the predefined test prerequisites

306 + + test-lib: Print missing prerequisites in test output

307 + + test-lib: Add support for multiple test prerequisites

308 + + test-lib: Don't write test-results when HARNESS_ACTIVE

309 + (this branch is used by ab/test-1.)

310 +

311 +Previously many individual topic branches from the same author, all

312 +regarding tests. I thought it probably was ready for 'next' but was

313 +holding off as we seem to still keep getting many fixes on top.

314 +

315 +* dj/fetch-tagopt (2010-08-11) 1 commit

316 + - fetch: allow command line --tags to override config

317 +

318 +* po/userdiff-csharp (2010-08-16) 1 commit

319 + (merged to 'next' on 2010-08-18 at f5edb3a)

320 + + Userdiff patterns for C#

321 +

322 +* jn/paginate-fix (2010-08-16) 14 commits

323 + (merged to 'next' on 2010-08-18 at bb04a13)

324 + + t7006 (pager): add missing TTY prerequisites

325 + + merge-file: run setup_git_directory_gently() sooner

326 + + var: run setup_git_directory_gently() sooner

327 + + ls-remote: run setup_git_directory_gently() sooner

328 + + index-pack: run setup_git_directory_gently() sooner

329 + + Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fix

330 + + config: run setup_git_directory_gently() sooner

331 + + bundle: run setup_git_directory_gently() sooner

332 + + apply: run setup_git_directory_gently() sooner

333 + + grep: run setup_git_directory_gently() sooner

334 + + shortlog: run setup_git_directory_gently() sooner

335 + + git wrapper: allow setup_git_directory_gently() be called earlier

336 + + setup: remember whether repository was found

337 + + git wrapper: introduce startup_info struct

338 + (this branch uses jn/maint-setup-fix.)

339

340 * jn/merge-renormalize (2010-08-05) 12 commits

135 - - merge-recursive --renormalize

136 - - rerere: never renormalize

137 - - rerere: migrate to parse-options API

138 - - t4200 (rerere): modernize style

139 - - ll-merge: let caller decide whether to renormalize

140 - - ll-merge: make flag easier to populate

141 - - Documentation/technical: document ll_merge

142 - - merge-trees: let caller decide whether to renormalize

143 - - merge-trees: push choice to renormalize away from low level

144 - - t6038 (merge.renormalize): check that it can be turned off

145 - - t6038 (merge.renormalize): try checkout -m and cherry-pick

146 - - t6038 (merge.renormalize): style nitpicks

341 + (merged to 'next' on 2010-08-18 at d9aa77b)

342 + + merge-recursive --renormalize

343 + + rerere: never renormalize

344 + + rerere: migrate to parse-options API

345 + + t4200 (rerere): modernize style

346 + + ll-merge: let caller decide whether to renormalize

347 + + ll-merge: make flag easier to populate

348 + + Documentation/technical: document ll_merge

349 + + merge-trees: let caller decide whether to renormalize

350 + + merge-trees: push choice to renormalize away from low level

351 + + t6038 (merge.renormalize): check that it can be turned off

352 + + t6038 (merge.renormalize): try checkout -m and cherry-pick

353 + + t6038 (merge.renormalize): style nitpicks

354 (this branch uses eb/double-convert-before-merge.)

355

356 There were heavy merge conflicts in t4200; I tried to be careful when

357 merging this, but extra sets of eyeballs from parties involved (Jonathan

358 and Szeder) would always be a good idea.

359

153 -* ab/omit-aggregate-test-result-under-tap-harness (2010-08-11) 1 commit

154 - - test-lib: Don't write test-results when HARNESS_ACTIVE

155 - (this branch is used by ab/test.)

156 -

157 -* ab/test-prereq (2010-08-11) 5 commits

158 - - test-lib: Multi-prereq support only checked the last prereq

159 - - tests: A SANITY test prereq for testing if we're root

160 - - t/README: Document the predefined test prerequisites

161 - - test-lib: Print missing prerequisites in test output

162 - - test-lib: Add support for multiple test prerequisites

163 - (this branch is used by ab/test.)

164 -

165 -* ab/test-smoke (2010-08-08) 4 commits

166 - - t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target

167 - - t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh

168 - - t/README: Document the Smoke testing

169 - - tests: Infrastructure for Git smoke testing

170 - (this branch is used by ab/test.)

360 +* eb/double-convert-before-merge (2010-07-02) 3 commits

361 + + Don't expand CRLFs when normalizing text during merge

362 + + Try normalizing files to avoid delete/modify conflicts when merging

363 + + Avoid conflicts when merging branches with mixed normalization

364 + (this branch is used by jn/merge-renormalize.)

365

366 * by/line-log (2010-08-11) 17 commits

367 - Document line history browser

@@ -188,6 +382,9 @@ and Szeder) would always be a good idea.

382 - parse-options: add two helper functions

383 - parse-options: enhance STOP_AT_NON_OPTION

384

385 +Not entirely happy with the command line parser, but will merge to 'next'

386 +after giving the series another look.

387 +

388 * dg/local-mod-error-messages (2010-08-11) 5 commits

389 (merged to 'next' on 2010-08-14 at e684ca8)

390 + t7609: test merge and checkout error messages

@@ -205,51 +402,36 @@ and Szeder) would always be a good idea.

402 (merged to 'next' on 2010-08-14 at 41146ff)

403 + split_cmdline: Allow caller to access error string

404

208 -* jl/submodule-ignore-diff (2010-08-06) 4 commits

209 - (merged to 'next' on 2010-08-12 at ffe84bb)

210 - + Add tests for the diff.ignoreSubmodules config option

211 - + Add the 'diff.ignoreSubmodules' config setting

212 - + Submodules: Use "ignore" settings from .gitmodules too for diff and status

213 - + Submodules: Add the new "ignore" config option for diff and status

214 -

215 -* jn/maint-plug-leak (2010-08-09) 3 commits

216 - (merged to 'next' on 2010-08-14 at ec2ba20)

217 - + write-tree: Avoid leak when index refers to an invalid object

218 - + read-tree: stop leaking tree objects

219 - + core: Stop leaking ondisk_cache_entrys

220 -

405 * jn/svn-fe (2010-08-13) 16 commits

222 - - t9010 (svn-fe): avoid symlinks in test

223 - - t9010 (svn-fe): use Unix-style path in URI

224 - - vcs-svn: Avoid %z in format string

225 - - vcs-svn: Rename dirent pool to build on Windows

226 - - compat: add strtok_r()

227 - - treap: style fix

228 - - vcs-svn: remove build artifacts on "make clean"

229 - - svn-fe manual: Clarify warning about deltas in dump files

230 - - Update svn-fe manual

231 - - SVN dump parser

232 - - Infrastructure to write revisions in fast-export format

233 - - Add stream helper library

234 - - Add string-specific memory pool

235 - - Add treap implementation

236 - - Add memory pool library

237 - - Introduce vcs-svn lib

238 -

239 -Added patches to port to Windows.

240 -

241 -* js/detached-stash (2010-08-10) 9 commits

242 - - Documentation: git stash branch now tolerates non-stash references.

243 - - t3903-stash.sh: tests of git stash with stash-like arguments

244 - - stash: teach git stash show to always tolerate stash-like arguments.

245 - - stash: teach git stash branch to tolerate stash-like arguments

246 - - stash: teach git stash drop to fail early if the specified revision is not a stash reference

247 - - stash: teach git stash pop to fail early if the argument is not a stash ref

248 - - stash: introduce is_stash_ref and assert_stash_ref functions.

249 - - stash: extract stash-like check into its own function

250 - - stash: refactor - create pop_stash function

251 -

252 -Sent out comments...

406 + (merged to 'next' on 2010-08-18 at 24ab19e)

407 + + t9010 (svn-fe): avoid symlinks in test

408 + + t9010 (svn-fe): use Unix-style path in URI

409 + + vcs-svn: Avoid %z in format string

410 + + vcs-svn: Rename dirent pool to build on Windows

411 + + compat: add strtok_r()

412 + + treap: style fix

413 + + vcs-svn: remove build artifacts on "make clean"

414 + + svn-fe manual: Clarify warning about deltas in dump files

415 + + Update svn-fe manual

416 + + SVN dump parser

417 + + Infrastructure to write revisions in fast-export format

418 + + Add stream helper library

419 + + Add string-specific memory pool

420 + + Add treap implementation

421 + + Add memory pool library

422 + + Introduce vcs-svn lib

423 +

424 +* js/detached-stash (2010-08-18) 8 commits

425 + - detached-stash: update Documentation

426 + - detached-stash: tests of git stash with stash-like arguments

427 + - detached-stash: simplify git stash show

428 + - detached-stash: simplify git stash branch

429 + - detached-stash: refactor git stash pop implementation

430 + - detached-stash: simplify stash_drop

431 + - detached-stash: simplify stash_apply

432 + - detached-stash: introduce parse_flags_and_revs function

433 +

434 +Rerolled.

435

436 * mm/rebase-i-exec (2010-08-13) 4 commits

437 (merged to 'next' on 2010-08-14 at 17620dc)

@@ -267,103 +449,32 @@ Sent out comments...

449 (merged to 'next' on 2010-08-12 at 431f7af)

450 + config: add --local option

451

270 -* ab/test-coverage (2010-07-26) 8 commits

271 - - Makefile: make gcov invocation configurable

272 - - t/README: Add a note about the dangers of coverage chasing

273 - - t/README: A new section about test coverage

274 - - Makefile: Add cover_db_html target

275 - - Makefile: Add cover_db target

276 - - Makefile: Split out the untested functions target

277 - - Makefile: Include subdirectories in "make cover" reports

278 - - gitignore: Ignore files generated by "make coverage"

279 - (this branch is used by ab/test.)

280 -

281 -* ab/test-no-skip (2010-08-10) 13 commits

282 - - git-notes: Run partial expensive test everywhere

283 - - t/t3300-funny-names: change from skip_all=* to prereq skip

284 - - t/t3902-quoted: change from skip_all=* to prereq skip

285 - - t/t4016-diff-quote: change from skip_all=* to prereq skip

286 - - t/t5503-tagfollow: change from skip_all=* to prereq skip

287 - - t/t7005-editor: change from skip_all=* to prereq skip

288 - - t/t5705-clone-2gb: change from skip_all=* to prereq skip

289 - - t/t1304-default-acl: change from skip_all=* to prereq skip

290 - - t/README: Update "Skipping tests" to align with best practices

291 - - t/t7800-difftool.sh: Skip with prereq on no PERL

292 - - t/t5800-remote-helpers.sh: Skip with prereq on python <2.4

293 - - t/t4004-diff-rename-symlink.sh: use three-arg <prereq>

294 - - tests: implicitly skip SYMLINKS tests using <prereq>

295 - (this branch is used by ab/test.)

296 -

297 -* cc/find-commit-subject (2010-07-22) 6 commits

298 - (merged to 'next' on 2010-08-12 at ce38436)

299 - + blame: use find_commit_subject() instead of custom code

300 - + merge-recursive: use find_commit_subject() instead of custom code

301 - + bisect: use find_commit_subject() instead of custom code

302 - + revert: rename variables related to subject in get_message()

303 - + revert: refactor code to find commit subject in find_commit_subject()

304 - + revert: fix off by one read when searching the end of a commit subject

452 +Will merge to 'master' soon.

453

454 * gb/shell-ext (2010-07-28) 3 commits

455 - Add sample commands for git-shell

456 - Add interactive mode to git-shell for user-friendliness

457 - Allow creation of arbitrary git-shell commands

458

311 -Replaced the first one with the version that uses getenv("HOME")

312 -

313 -* jc/log-grep (2010-07-19) 1 commit

314 - - git log: add -G<regexp> that greps in the patch text

315 -

316 -This is broken, but haven't found any time to revisit it yet.

317 -

318 -* jh/clean-exclude (2010-07-20) 2 commits

319 - (merged to 'next' on 2010-08-12 at 9a63fd4)

320 - + Add test for git clean -e.

321 - + Add -e/--exclude to git-clean.

322 -

323 -* jh/use-test-must-fail (2010-07-20) 1 commit

324 - (merged to 'next' on 2010-08-12 at 16d4e11)

325 - + Convert "! git" to "test_must_fail git"

326 -

327 -* jn/apply-filename-with-sp (2010-07-23) 4 commits

328 - - apply: Handle traditional patches with space in filename

329 - - t4135 (apply): use expand instead of pr for portability

330 - - tests: Test how well "git apply" copes with weird filenames

331 - - apply: Split quoted filename handling into new function

332 -

333 -prereq?

334 -

335 -* jn/fix-abbrev (2010-07-27) 3 commits

336 - (merged to 'next' on 2010-08-12 at 2cf70df)

337 - + examples/commit: use --abbrev for commit summary

338 - + checkout, commit: remove confusing assignments to rev.abbrev

339 - + archive: abbreviate substituted commit ids again

459 +Replaced the first one with the version that uses getenv("HOME"); I am not

460 +very happy about adding these backdoors to git-shell, which is primarily a

461 +security mechanism, and obviously security and backdoor do not mix well.

462

463 * jn/maint-setup-fix (2010-07-24) 11 commits

342 - - setup: split off a function to handle ordinary .git directories

343 - - Revert "rehabilitate 'git index-pack' inside the object store"

344 - - setup: do not forget working dir from subdir of gitdir

345 - - t4111 (apply): refresh index before applying patches to it

346 - - setup: split off get_device_or_die helper

347 - - setup: split off a function to handle hitting ceiling in repo search

348 - - setup: split off code to handle stumbling upon a repository

349 - - setup: split off a function to checks working dir for .git file

350 - - setup: split off $GIT_DIR-set case from setup_git_directory_gently

351 - - tests: try git apply from subdir of toplevel

352 - - t1501 (rev-parse): clarify

464 + (merged to 'next' on 2010-08-18 at ded5f4d)

465 + + setup: split off a function to handle ordinary .git directories

466 + + Revert "rehabilitate 'git index-pack' inside the object store"

467 + + setup: do not forget working dir from subdir of gitdir

468 + + t4111 (apply): refresh index before applying patches to it

469 + + setup: split off get_device_or_die helper

470 + + setup: split off a function to handle hitting ceiling in repo search

471 + + setup: split off code to handle stumbling upon a repository

472 + + setup: split off a function to checks working dir for .git file

473 + + setup: split off $GIT_DIR-set case from setup_git_directory_gently

474 + + tests: try git apply from subdir of toplevel

475 + + t1501 (rev-parse): clarify

476 (this branch is used by jn/paginate-fix.)

477

355 -* jn/rebase-rename-am (2008-11-10) 5 commits

356 - (merged to 'next' on 2010-08-12 at a6d25c4)

357 - + rebase: protect against diff.renames configuration

358 - + t3400 (rebase): whitespace cleanup

359 - + Teach "apply --index-info" to handle rename patches

360 - + t4150 (am): futureproof against failing tests

361 - + t4150 (am): style fix

362 -

363 -* ml/rebase-x-strategy (2010-07-29) 1 commit

364 - (merged to 'next' on 2010-08-12 at 0aa2fdb)

365 - + rebase: support -X to pass through strategy options

366 -

478 * mm/shortopt-detached (2010-08-05) 5 commits

479 (merged to 'next' on 2010-08-12 at 35ceb98)

480 + log: parse separate option for --glob

@@ -381,19 +492,11 @@ prereq?

492 + t1011 (sparse checkout): style nitpicks

493

494 * tr/maint-no-unquote-plus (2010-07-24) 1 commit

384 - - Do not unquote + into ' ' in URLs

385 -

386 -* tr/xsize-bits (2010-07-28) 1 commit

387 - (merged to 'next' on 2010-08-11 at bcc0271)

388 - + xsize_t: check whether we lose bits

389 -

390 -* vs/doc-spell (2010-07-20) 1 commit

391 - (merged to 'next' on 2010-08-12 at 3fbd06c)

392 - + Documentation: spelling fixes

495 + (merged to 'next' on 2010-08-18 at b811248)

496 + + Do not unquote + into ' ' in URLs

497

394 -* ab/report-corrupt-object-with-type (2010-06-10) 1 commit

395 - (merged to 'next' on 2010-08-12 at 8a9e1d0)

396 - + sha1_file: Show the the type and path to corrupt objects

498 +I think this one is safe in the context of git (namely smart-http

499 +interface).

500

501 * cc/revert (2010-07-21) 5 commits

502 (merged to 'next' on 2010-08-14 at a910d5a)

@@ -402,31 +505,16 @@ prereq?

505 + revert: don't print "Finished one cherry-pick." if commit failed

506 + revert: refactor commit code into a new run_git_commit() function

507 + revert: report success when using option --strategy

508 + (this branch is used by jn/cherry-revert-message-clean-up.)

509

510 * en/fast-export-fix (2010-07-17) 2 commits

407 - - fast-export: Add a --full-tree option

408 - - fast-export: Fix dropping of files with --import-marks and path limiting

409 -

410 -* kf/post-receive-sample-hook (2010-07-16) 1 commit

411 - (merged to 'next' on 2010-08-12 at 9b7e3c9)

412 - + post-receive-email: optional message line count limit

413 -

414 -I do not particularly like the idea of counting number of lines in a shell

415 -loop but this is an opt-in feature to a contrib/ item so it should be ok.

511 + (merged to 'next' on 2010-08-18 at 9fdaf27)

512 + + fast-export: Add a --full-tree option

513 + + fast-export: Fix dropping of files with --import-marks and path limiting

514

515 * hv/autosquash-config (2010-07-14) 1 commit

418 - - add configuration variable for --autosquash option of interactive rebase

419 -

420 -* jh/graph-next-line (2010-07-13) 2 commits

421 - (merged to 'next' on 2010-08-11 at 333f9df)

422 - + Enable custom schemes for column colors in the graph API

423 - + Make graph_next_line() available in the graph.h API

424 -

425 -* ar/string-list-foreach (2010-07-03) 2 commits

426 - (merged to 'next' on 2010-08-11 at 993dc02)

427 - + Convert the users of for_each_string_list to for_each_string_list_item macro

428 - + Add a for_each_string_list_item macro

429 - (this branch is used by tf/string-list-init.)

516 + (merged to 'next' on 2010-08-18 at 03a8eec)

517 + + add configuration variable for --autosquash option of interactive rebase

518

519 * il/rfc-remote-fd-ext (2010-08-14) 6 commits

520 - Fix build on Windows

@@ -436,26 +524,25 @@ loop but this is an opt-in feature to a contrib/ item so it should be ok.

524 - New remote helper: git-remote-ext

525 - New remote helper git-remote-fd

526

527 +I haven't heard anything about this series. Is it desirable? Or is it

528 +not used by anybody and just another baggage we'd rather not carry?

529 +

530 * hv/submodule-find-ff-merge (2010-07-07) 3 commits

531 (merged to 'next' on 2010-08-11 at 6900d2c)

532 + Implement automatic fast-forward merge for submodules

533 + setup_revisions(): Allow walking history in a submodule

534 + Teach ref iteration module about submodules

535

445 -* jn/fast-import-subtree (2010-06-30) 1 commit

446 - (merged to 'next' on 2010-08-11 at 5e19de0)

447 - + Teach fast-import to import subtrees named by tree id

448 -

536 * sg/rerere-gc-old-still-used (2010-07-13) 2 commits

450 - - rerere: fix overeager gc

451 - - mingw_utime(): handle NULL times parameter

452 -

453 -* tf/string-list-init (2010-07-04) 1 commit

454 - (merged to 'next' on 2010-08-14 at 193b4db)

455 - + string_list: Add STRING_LIST_INIT macro and make use of it.

456 - (this branch uses ar/string-list-foreach.)

457 -

458 -* en/d-f-conflict-fix (2010-08-12) 8 commits

537 + (merged to 'next' on 2010-08-18 at 8bc4635)

538 + + rerere: fix overeager gc

539 + + mingw_utime(): handle NULL times parameter

540 +

541 +* en/d-f-conflict-fix (2010-08-17) 11 commits

542 + (merged to 'next' on 2010-08-18 at 6be0f13)

543 + + merge-recursive: Fix multiple file rename across D/F conflict

544 + + t6031: Add a testcase covering multiple renames across a D/F conflict

545 + + merge-recursive: Fix typo

546 (merged to 'next' on 2010-08-14 at 1c9b0f5)

547 + Mark tests that use symlinks as needing SYMLINKS prerequisite

548 (merged to 'next' on 2010-08-03 at 7f78604)

@@ -472,16 +559,4 @@ loop but this is an opt-in feature to a contrib/ item so it should be ok.

559 - gettext: setlocale(LC_CTYPE, "") breaks Git's C function assumptions

560 - tests: rename test to work around GNU gettext bug

561 - Add infrastructure for translating Git with gettext

475 -

476 -* tc/checkout-B (2010-08-10) 4 commits

477 - (merged to 'next' on 2010-08-11 at 5433b51)

478 - + builtin/checkout: handle -B from detached HEAD correctly

479 - + builtin/checkout: learn -B

480 - + builtin/checkout: reword hint for -b

481 - + add tests for checkout -b

482 -

483 -* eb/double-convert-before-merge (2010-07-02) 3 commits

484 - - Don't expand CRLFs when normalizing text during merge

485 - - Try normalizing files to avoid delete/modify conflicts when merging

486 - - Avoid conflicts when merging branches with mixed normalization

487 - (this branch is used by jn/merge-renormalize.)

562 + (this branch is used by ab/test-1.)

What's cooking (2010/08 #04)