499b1d6692 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

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

3 -X-master-at: bd3a97a27a97485b130802d497214be312b737f9

4 -X-next-at: f88bdb1c315a588128fcf0b68cfd286e3e096110

2 +Subject: What's cooking in git.git (Aug 2010, #05; Sat, 21)

3 +X-master-at: 5cba1229d8246da2a6d1d956eeed8227f69e185b

4 +X-next-at: 5af700393e003167b0b86690fd4132ebfc677088

5

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

6 +What's cooking in git.git (Aug 2010, #05; Sat, 21)

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

8

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

@@ -14,203 +14,118 @@ still holding onto them.

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

15 [Graduated to "master"]

16

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

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 -

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 -

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 -

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 -

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 -

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 -

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 -

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 -

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 -

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 -

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 -

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 -

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

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

116 - + Documentation: spelling fixes

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

20

118 ---------------------------------------------------

119 -[New Topics]

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

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

23 + + t7609: test merge and checkout error messages

24 + + unpack_trees: group error messages by type

25 + + merge-recursive: distinguish "removed" and "overwritten" messages

26 + + merge-recursive: porcelain messages for checkout

27 + + Turn unpack_trees_options.msgs into an array + enum

28

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

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

29 +* en/rebase-against-rebase-fix (2010-08-12) 2 commits

30 + (merged to 'next' on 2010-08-14 at 1dea7b9)

31 + + pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

32 + + t5520-pull: Add testcases showing spurious conflicts from git pull --rebase

33

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.

34 +* gb/split-cmdline-errmsg (2010-08-07) 1 commit

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

36 + + split_cmdline: Allow caller to access error string

37

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

129 - - hash binary sha1 into patch id

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

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

40 + + Implement automatic fast-forward merge for submodules

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

42 + + Teach ref iteration module about submodules

43

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.

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

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

46 + + git-rebase--interactive.sh: use printf instead of echo to print commit message

47 + + git-rebase--interactive.sh: rework skip_unnecessary_picks

48 + (merged to 'next' on 2010-08-12 at 377e3f0)

49 + + test-lib: user-friendly alternatives to test [-d|-f|-e]

50 + + rebase -i: add exec command to launch a shell command

51

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

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

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

54 + + log: parse separate option for --glob

55 + + log: parse separate options like git log --grep foo

56 + + diff: parse separate options --stat-width n, --stat-name-width n

57 + + diff: split off a function for --stat-* option parsing

58 + + diff: parse separate options like -S foo

59

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.)

60 +* nd/fix-sparse-checkout (2010-07-31) 5 commits

61 + (merged to 'next' on 2010-08-12 at 4f7a3b9)

62 + + unpack-trees: mark new entries skip-worktree appropriately

63 + + unpack-trees: do not check for conflict entries too early

64 + + unpack-trees: let read-tree -u remove index entries outside sparse area

65 + + unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set

66 + + t1011 (sparse checkout): style nitpicks

67

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

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

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

70 + + Userdiff patterns for C#

71

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

154 - - Add global and system-wide gitattributes

72 +* so/http-user-agent (2010-08-11) 1 commit

73 + (merged to 'next' on 2010-08-12 at 86cc5c4)

74 + + Allow HTTP user agent string to be modified.

75

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.)

76 +* sr/local-config (2010-08-03) 1 commit

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

78 + + config: add --local option

79

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

80 +--------------------------------------------------

81 +[New Topics]

82

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.

83 +* jn/maint-doc-user-manual-html-doctype (2010-08-21) 2 commits

84 + - docs: fix Makefile dependency for user manual

85 + - Documentation: set a !DOCTYPE for user manual

86 +

87 +* cb/maint-mergetool-no-tty (2010-08-20) 1 commit

88 + - mergetool: Remove explicit references to /dev/tty

89 +

90 +* jn/doc-backslash (2010-08-20) 17 commits

91 + - Documentation: remove stray backslash in show-branch discussion

92 + - Documentation: remove stray backslashes from "Fighting regressions" article

93 + - Documentation: do not convert ... operator to ellipses

94 + - Documentation: avoid stray backslash in user manual

95 + - Documentation: avoid stray backslashes in core tutorial

96 + - Documentation: remove stray backslashes in rev-parse manual

97 + - Documentation: remove backslash before ~ in fast-import manual

98 + - Documentation: remove stray backslash from "git bundle" manual

99 + - Documentation/technical: avoid stray backslash in parse-options API docs

100 + - Documentation: remove backslashes in manpage synopses

101 + - Documentation: clarify quoting in gitignore docs

102 + - Documentation: clarify quoting in "git rm" example

103 + - Documentation: add missing quotes to "git grep" examples

104 + - Documentation: clarify quoting in "git add" example

105 + - Documentation: unbreak regex in show-ref manual

106 + - Documentation: quoting trouble in "git rm" discussion

107 + - Documentation: tweak description of log.date

108 +

109 +* nd/clone-depth-zero (2010-08-20) 3 commits

110 + - {fetch,upload}-pack: allow --depth=0 for infinite depth

111 + - fetch-pack: use args.shallow to detect shallow clone instead of args.depth

112 + - clone: do not accept --depth on local clones

113 +

114 +* cb/ignored-paths-are-precious (2010-08-21) 1 commit

115 + - checkout/merge: optionally fail operation when ignored files need to be overwritten

116 +

117 +I fixed up a trivial error in the configuration parser (which didn't

118 +return immediately after parsing), and while at it flipped the default

119 +value of the configuration and the command line option to false.

120 +

121 +This probably needs tests; also we know of longstanding bugs in related

122 +area that needs to be addressed---they do not have to be part of this

123 +series but their reproduction recipe would belong to the test script for

124 +this topic.

125 +

126 +* np/maint-huge-delta-generation (2010-08-21) 1 commit

127 + (merged to 'next' on 2010-08-21 at 5af7003)

128 + + fix >4GiB source delta assertion failure

129

130 --------------------------------------------------

131 [Stalled]

@@ -220,14 +135,6 @@ fixes) like we had there so far.

135

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

137

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 -

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

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

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

@@ -240,26 +147,99 @@ I recall there was another round of re-roll planned for this one.

147 - limit "contains" traversals based on commit timestamp

148 - tag: speed up --contains calculation

149

243 -* jn/commit-no-change-wo-status (2010-08-11) 10 commits

244 - . t6040 (branch tracking): check “status” instead of “commit”

245 - . commit: suppress status summary when no changes staged

246 - . commit --dry-run: give advice on empty amend

247 - . commit: give empty-commit avoidance code its own function

248 - . t7508 (status): modernize style

249 - . commit: split off the piece that writes status

250 - . commit: split commit -s handling into its own function

251 - . commit: split off a function to fetch the default log message

252 - . wt-status: split off a function for printing submodule summary

253 - . wt-status: split wt_status_print into digestible pieces

254 -

255 -There seemed to be some doubts on removal of the "no changes" line?

256 -

150 --------------------------------------------------

151 [Cooking]

152

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

153 +* jn/apply-filename-with-sp (2010-08-18) 3 commits

154 + - apply: handle traditional patches with space in filename

155 + - tests: exercise "git apply" with weird filenames

156 + - apply: split quoted filename handling into new function

157 +

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

159 + (merged to 'next' on 2010-08-21 at b09ee46)

160 + + reset: suggest what to do upon "git reset --mixed <paths>"

161 +

162 +Retitled.

163 +

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

165 + (merged to 'next' on 2010-08-21 at ff38c3e)

166 + + hash binary sha1 into patch id

167 +

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

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

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

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

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

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

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

175 +

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

177 +

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

179 + (merged to 'next' on 2010-08-21 at 09b123c)

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

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

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

183 + + Introduce advise() to print hints

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

185 + (this branch uses cc/revert.)

186 +

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

188 + (merged to 'next' on 2010-08-21 at 674498b)

189 + + merge: let custom strategies intervene in trivial merges

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

191 +

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

193 + - Add global and system-wide gitattributes

194 +

195 +* ab/compat-regex (2010-08-17) 7 commits

196 + (merged to 'next' on 2010-08-21 at 632d60f)

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

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

199 + + compat/regex: get rid of old-style definition

200 + + compat/regex: define out variables only used under RE_ENABLE_I18N

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

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

203 + + compat/regex: use the regex engine from gawk for compat

204 +

205 +* ab/test-1 (2010-08-19) 5 commits

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

207 + - test-lib: Allow overriding of TEST_DIRECTORY

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

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

210 + - Merge branch 'ab/i18n' into ab/test-1

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

212 +

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

214 + (merged to 'next' on 2010-08-21 at e96772a)

215 + + submodule sync: Update "submodule.<name>.url"

216 +

217 +* jn/update-contrib-example-merge (2010-08-17) 24 commits

218 + (merged to 'next' on 2010-08-21 at 41b5c4d)

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

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

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

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

223 + + merge script: handle many-way octopus

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

225 + + merge script: forbid merge -s index

226 + + merge script: allow custom strategies

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

228 + + merge script: improve log message subject

229 + + merge script: refuse to merge during merge

230 + + merge script: tweak unmerged files message to match builtin

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

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

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

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

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

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

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

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

239 + + t7600 (merge): check reflog entry

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

241 + + t7600 (merge): modernize style

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

243

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

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

@@ -313,11 +293,8 @@ regarding tests. I thought it probably was ready for 'next' but was

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

294

295 * 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#

296 + (merged to 'next' on 2010-08-21 at 737dfec)

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

298

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

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

@@ -353,10 +330,6 @@ holding off as we seem to still keep getting many fixes on top.

330 + t6038 (merge.renormalize): style nitpicks

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

332

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 -

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

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

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

@@ -385,24 +358,9 @@ and Szeder) would always be a good idea.

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

359 after giving the series another look.

360

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

391 - + unpack_trees: group error messages by type

392 - + merge-recursive: distinguish "removed" and "overwritten" messages

393 - + merge-recursive: porcelain messages for checkout

394 - + Turn unpack_trees_options.msgs into an array + enum

395 -

396 -* en/rebase-against-rebase-fix (2010-08-12) 2 commits

397 - (merged to 'next' on 2010-08-14 at 1dea7b9)

398 - + pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

399 - + t5520-pull: Add testcases showing spurious conflicts from git pull --rebase

400 -

401 -* gb/split-cmdline-errmsg (2010-08-07) 1 commit

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

403 - + split_cmdline: Allow caller to access error string

404 -

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

361 +* jn/svn-fe (2010-08-19) 17 commits

362 + (merged to 'next' on 2010-08-19 at b1a242a)

363 + + t/t9010-svn-fe.sh: add an +x bit to this test

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

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

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

@@ -421,7 +379,7 @@ after giving the series another look.

379 + Add memory pool library

380 + Introduce vcs-svn lib

381

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

382 +* js/detached-stash (2010-08-21) 9 commits

383 - detached-stash: update Documentation

384 - detached-stash: tests of git stash with stash-like arguments

385 - detached-stash: simplify git stash show

@@ -429,36 +387,19 @@ after giving the series another look.

387 - detached-stash: refactor git stash pop implementation

388 - detached-stash: simplify stash_drop

389 - detached-stash: simplify stash_apply

390 + - detached-stash: work around git rev-parse failure to detect bad log refs

391 - detached-stash: introduce parse_flags_and_revs function

392

434 -Rerolled.

435 -

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

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

438 - + git-rebase--interactive.sh: use printf instead of echo to print commit message

439 - + git-rebase--interactive.sh: rework skip_unnecessary_picks

440 - (merged to 'next' on 2010-08-12 at 377e3f0)

441 - + test-lib: user-friendly alternatives to test [-d|-f|-e]

442 - + rebase -i: add exec command to launch a shell command

443 -

444 -* so/http-user-agent (2010-08-11) 1 commit

445 - (merged to 'next' on 2010-08-12 at 86cc5c4)

446 - + Allow HTTP user agent string to be modified.

447 -

448 -* sr/local-config (2010-08-03) 1 commit

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

450 - + config: add --local option

451 -

452 -Will merge to 'master' soon.

393 +Rerolled again.

394

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

396 - Add sample commands for git-shell

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

398 - Allow creation of arbitrary git-shell commands

399

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.

400 +I am not very happy about adding these backdoors to git-shell, which is

401 +primarily a security mechanism, and obviously security and backdoor do not

402 +mix well.

403

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

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

@@ -475,22 +416,6 @@ security mechanism, and obviously security and backdoor do not mix well.

416 + t1501 (rev-parse): clarify

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

418

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

481 - + log: parse separate options like git log --grep foo

482 - + diff: parse separate options --stat-width n, --stat-name-width n

483 - + diff: split off a function for --stat-* option parsing

484 - + diff: parse separate options like -S foo

485 -

486 -* nd/fix-sparse-checkout (2010-07-31) 5 commits

487 - (merged to 'next' on 2010-08-12 at 4f7a3b9)

488 - + unpack-trees: mark new entries skip-worktree appropriately

489 - + unpack-trees: do not check for conflict entries too early

490 - + unpack-trees: let read-tree -u remove index entries outside sparse area

491 - + unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set

492 - + t1011 (sparse checkout): style nitpicks

493 -

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

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

421 + Do not unquote + into ' ' in URLs

@@ -527,18 +452,14 @@ interface).

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

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

454

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 -

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

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

457 + rerere: fix overeager gc

458 + mingw_utime(): handle NULL times parameter

459

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

460 +* en/d-f-conflict-fix (2010-08-20) 12 commits

461 + (merged to 'next' on 2010-08-20 at af7f2b0)

462 + + merge-recursive: Avoid excessive output for and reprocessing of renames

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

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

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

@@ -560,3 +481,19 @@ not used by anybody and just another baggage we'd rather not carry?

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

482 - Add infrastructure for translating Git with gettext

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

484 +

485 +--------------------------------------------------

486 +[Ejected]

487 +

488 +* jn/commit-no-change-wo-status (2010-08-11) 10 commits

489 + . t6040 (branch tracking): check “status” instead of “commit”

490 + . commit: suppress status summary when no changes staged

491 + . commit --dry-run: give advice on empty amend

492 + . commit: give empty-commit avoidance code its own function

493 + . t7508 (status): modernize style

494 + . commit: split off the piece that writes status

495 + . commit: split commit -s handling into its own function

496 + . commit: split off a function to fetch the default log message

497 + . wt-status: split off a function for printing submodule summary

498 + . wt-status: split wt_status_print into digestible pieces

499 +

What's cooking (2010/08 #05)