4d5436e197 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Mar 2010, #05; Sat, 20)

3 -X-master-at: 0d0925c5e25fad8079739be36d88faa21fc1f588

4 -X-next-at: fdfcd14527c8a7f606aebfcd9dcd99e6cbf7cea5

2 +Subject: What's cooking in git.git (Mar 2010, #06; Wed, 24)

3 +X-master-at: 5e4f61474202122f376b16181b760f390623bf4e

4 +X-next-at: 82eebc138fb5ed99525fe1c2d3062e9256495a05

5

6 -What's cooking in git.git (Mar 2010, #05; Sat, 20)

6 +What's cooking in git.git (Mar 2010, #06; Wed, 24)

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

8

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

@@ -11,101 +11,114 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones

11 marked with '.' do not appear in any of the integration branches, but I am

12 still holding onto them.

13

14 +The tip of 'pu' is broken right now; it does not pass t7006.

15 +

16 --------------------------------------------------

17 [Graduated to "master"]

18

17 -* jk/maint-add-ignored-dir (2010-02-28) 3 commits

18 - (merged to 'next' on 2010-03-13 at df91e32)

19 - + tests for "git add ignored-dir/file" without -f

20 - + dir: fix COLLECT_IGNORED on excluded prefixes

21 - + t0050: mark non-working test as such

22 -

23 -This replaced jc/maint-add-ignored-dir. Will need to merge to maint

24 -later.

25 -

26 -* bg/apply-fix-blank-at-eof (2010-03-06) 5 commits

27 - (merged to 'next' on 2010-03-07 at daec679)

28 - + t3417: Add test cases for "rebase --whitespace=fix"

29 - + t4124: Add additional tests of --whitespace=fix

30 - + apply: Allow blank context lines to match beyond EOF

31 - + apply: Remove the quick rejection test

32 - + apply: Don't unnecessarily update line lengths in the preimage

33 -

34 -* fl/askpass (2010-03-04) 2 commits

35 - (merged to 'next' on 2010-03-07 at 5ab370a)

36 - + git-core: Support retrieving passwords with GIT_ASKPASS

37 - + git-svn: Support retrieving passwords with GIT_ASKPASS

38 -

39 -* jc/color-attrs (2010-02-27) 1 commit

40 - (merged to 'next' on 2010-03-08 at ba02883)

41 - + color: allow multiple attributes

42 -

43 -* ml/color-grep (2010-03-07) 3 commits

44 - (merged to 'next' on 2010-03-08 at 24d1eb4)

45 - + grep: Colorize selected, context, and function lines

46 - + grep: Colorize filename, line number, and separator

47 - + Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*

48 -

49 -* bw/union-merge-refactor (2010-03-01) 4 commits

50 - (merged to 'next' on 2010-03-10 at b917078)

51 - + merge-file: add option to select union merge favor

52 - + merge-file: add option to specify the marker size

53 - (merged to 'next' on 2010-03-07 at 9d1eff6)

54 - + refactor merge flags into xmparam_t

55 - + make union merge an xdl merge favor

56 -

57 -* cc/reset-keep (2010-03-09) 6 commits

58 - (merged to 'next' on 2010-03-08 at 015ef4b)

59 - + Documentation: improve description of "git reset --keep"

60 - (merged to 'next' on 2010-03-07 at 5237d8e)

61 - + reset: disallow using --keep when there are unmerged entries

62 - + reset: disallow "reset --keep" outside a work tree

63 - + Documentation: reset: describe new "--keep" option

64 - + reset: add test cases for "--keep" option

65 - + reset: add option "--keep" to "git reset"

19 +* jh/maint-submodule-status-in-void (2010-03-09) 2 commits

20 + (merged to 'next' on 2010-03-15 at 49af9de)

21 + + git submodule summary: Handle HEAD as argument when on an unborn branch

22 + (merged to 'next' on 2010-03-08 at 0697bf4)

23 + + submodule summary: do not fail before the first commit

24 +

25 +* jc/maint-refs-dangling (2010-03-15) 1 commit

26 + (merged to 'next' on 2010-03-16 at 376027b)

27 + + refs: ref entry with NULL sha1 is can be a dangling symref

28 +

29 +* pb/log-first-parent-p-m (2010-03-09) 5 commits

30 + (merged to 'next' on 2010-03-15 at 0ae494e)

31 + + show --first-parent/-m: do not default to --cc

32 + + show -c: show patch text

33 + + revision: introduce setup_revision_opt

34 + + t4013: add tests for log -p -m --first-parent

35 + (merged to 'next' on 2010-02-17 at 2f8e5ae)

36 + + git log -p -m: document -m and honor --first-parent

37 +

38 +Ready for 'master'.

39 +

40 +* jl/submodule-diff-dirtiness (2010-03-13) 5 commits

41 + (merged to 'next' on 2010-03-15 at 9601fd9)

42 + + git status: ignoring untracked files must apply to submodules too

43 + (merged to 'next' on 2010-03-13 at f9bfd8a)

44 + + git status: Fix false positive "new commits" output for dirty submodules

45 + + Refactor dirty submodule detection in diff-lib.c

46 + (merged to 'next' on 2010-03-08 at 33f7a57)

47 + + git status: Show detailed dirty status of submodules in long format

48 + (merged to 'next' on 2010-03-04 at 58b2645)

49 + + git diff --submodule: Show detailed dirty status of submodules

50 +

51 +Ready for 'master'.

52 +

53 +* tr/notes-display (2010-03-12) 13 commits

54 + (merged to 'next' on 2010-03-15 at 3329361)

55 + + git-notes(1): add a section about the meaning of history

56 + + notes: track whether notes_trees were changed at all

57 + + notes: add shorthand --ref to override GIT_NOTES_REF

58 + + commit --amend: copy notes to the new commit

59 + + rebase: support automatic notes copying

60 + + notes: implement helpers needed for note copying during rewrite

61 + + notes: implement 'git notes copy --stdin'

62 + + rebase -i: invoke post-rewrite hook

63 + + rebase: invoke post-rewrite hook

64 + + commit --amend: invoke post-rewrite hook

65 + + Documentation: document post-rewrite hook

66 + + Support showing notes from more than one notes tree

67 + + test-lib: unset GIT_NOTES_REF to stop it from influencing tests

68 + (this branch is used by sb/notes-parse-opt.)

69

70 --------------------------------------------------

71 [New Topics]

72

70 -* ar/config-from-command-line (2010-03-19) 1 commit

71 - - Allow passing of configuration parameters in the command line

73 +* bw/git-completion-rpmspec (2010-03-20) 1 commit

74 + - Add a git-completion rpm subpackage to the spec

75

73 -* bc/t5505-fix (2010-03-19) 3 commits

74 - - t/t5505-remote.sh: escape * to prevent interpretation by shell as glob

75 - - t5505: add missing &&

76 - - t5505: remove unnecessary subshell invocations

76 +Shipping bash-completion as part of RPM package; since Todd Zullinger who

77 +packages git for Fedora joined the thread, I am hoping that I can defer

78 +the direction of the final version to the discussion between Todd and Ben.

79 +

80 +* ef/maint-empty-commit-log (2010-03-21) 1 commit

81 + - rev-list: fix --pretty=oneline with empty message

82

83 Looked reasonable. Soon in 'next'.

84

80 -* bw/template-tool-buildconfig (2010-03-20) 2 commits

81 - - Modernize git calling conventions in hook templates

82 - - Make templates honour SHELL_PATH and PERL_PATH

85 +* em/checkout-orphan (2010-03-21) 1 commit

86 + - git checkout: create unparented branch by --orphan

87

84 -Looked reasonable. Soon in 'next'.

88 +Looked reasonable, except that we might want to come up with a way to

89 +allow people with core.logallrefupdates set to false to still override it

90 +with "-l" when switching to this new branch. Or we may not care. I dunno.

91

86 -* mb/rebase-i-no-ff (2010-03-16) 1 commit

87 - - Teach --no-ff option to 'rebase -i'.

92 +Soon in 'next'.

93

89 -Looked reasonable. Soon in 'next'.

94 +* mg/mailmap-update (2010-03-19) 1 commit

95 + - .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela

96 +

97 +Soon in 'next'.

98

91 -* jn/merge-diff3-label (2010-03-17) 13 commits

92 - . cherry-pick, revert: add a label for ancestor

93 - . revert: clarify label on conflict hunks

94 - . compat: add mempcpy()

95 - . tests: document cherry-pick behavior in face of conflicts

96 - . checkout -m --conflict=diff3: add a label for ancestor

97 - . tests: document format of conflicts from checkout -m

98 - . merge_trees(): add ancestor label parameter for diff3-style output

99 - . merge_file(): add comment explaining behavior wrt conflict style

100 - . checkout --conflict=diff3: add a label for ancestor

101 - . ll_merge(): add ancestor label parameter for diff3-style output

102 - . merge-file --diff3: add a label for ancestor

103 - . xdl_merge(): move file1 and file2 labels to xmparam structure

104 - . xdl_merge(): add optional ancestor label to diff3-style output

105 -

106 -This somewhat conflicts with bw/union-merge-refactor that in 'master'; I

107 -could resolve the conflicts myself, but I'd rather not. Jonathan, could

108 -you rebase the series?

99 +* mg/maint-send-email-lazy-editor (2010-03-22) 1 commit

100 + - [reword?] send-email: lazily assign editor variable

101 +

102 +* mg/use-default-abbrev-length-in-rev-list (2010-03-22) 1 commit

103 + - rev-list: use default abbrev length when abbrev-commit is in effect

104 +

105 +* np/malloc-threading (2010-03-24) 1 commit

106 + - Make xmalloc and xrealloc thread-safe

107 +

108 +* rb/maint-python-path (2010-03-21) 1 commit

109 + - Correct references to /usr/bin/python which does not exist on FreeBSD

110 +

111 +Soon in 'next'.

112 +

113 +* rr/imap-send-unconfuse-from-line (2010-03-22) 1 commit

114 + - imap-send: Remove limitation on message body

115 +

116 +Soon in 'next'.

117 +

118 +* sp/maint-http-backend-die-triggers-die-recursively (2010-03-22) 1 commit

119 + - http-backend: Don't infinite loop during die()

120 +

121 +Soon in 'next'.

122

123 --------------------------------------------------

124 [Stalled]

@@ -143,6 +156,44 @@ at least, or possibly when any "--pretty" is explicitly given.

156 --------------------------------------------------

157 [Cooking]

158

159 +* ar/config-from-command-line (2010-03-19) 1 commit

160 + - Allow passing of configuration parameters in the command line

161 +

162 +* bc/t5505-fix (2010-03-19) 3 commits

163 + - t/t5505-remote.sh: escape * to prevent interpretation by shell as glob

164 + - t5505: add missing &&

165 + - t5505: remove unnecessary subshell invocations

166 +

167 +Looked reasonable. Soon in 'next'.

168 +

169 +* bw/template-tool-buildconfig (2010-03-20) 2 commits

170 + - Modernize git calling conventions in hook templates

171 + - Make templates honour SHELL_PATH and PERL_PATH

172 +

173 +Looked reasonable. Soon in 'next'.

174 +

175 +* mb/rebase-i-no-ff (2010-03-24) 1 commit

176 + - Teach rebase the --no-ff option.

177 +

178 +Looked reasonable. Soon in 'next'.

179 +

180 +* jn/merge-diff3-label (2010-03-20) 14 commits

181 + (merged to 'next' on 2010-03-20 at 26f1805)

182 + + merge-recursive: add a label for ancestor

183 + + cherry-pick, revert: add a label for ancestor

184 + + revert: clarify label on conflict hunks

185 + + compat: add mempcpy()

186 + + checkout -m --conflict=diff3: add a label for ancestor

187 + + merge_trees(): add ancestor label parameter for diff3-style output

188 + + merge_file(): add comment explaining behavior wrt conflict style

189 + + checkout --conflict=diff3: add a label for ancestor

190 + + ll_merge(): add ancestor label parameter for diff3-style output

191 + + merge-file --diff3: add a label for ancestor

192 + + xdl_merge(): move file1 and file2 labels to xmparam structure

193 + + xdl_merge(): add optional ancestor label to diff3-style output

194 + + tests: document cherry-pick behavior in face of conflicts

195 + + tests: document format of conflicts from checkout -m

196 +

197 * do/rebase-i-arbitrary (2010-03-14) 1 commit

198 - rebase--interactive: don't require what's rebased to be a branch

199

@@ -174,7 +225,8 @@ Looked reasonable. Soon in 'next'.

225

226 Looked reasonable. Soon in 'next'.

227

177 -* ef/cherry-abbrev (2010-03-15) 1 commit

228 +* ef/cherry-abbrev (2010-03-20) 2 commits

229 + - ls: remove redundant logic

230 - cherry: support --abbrev option

231

232 Looked reasonable. Soon in 'next'.

@@ -184,43 +236,14 @@ Looked reasonable. Soon in 'next'.

236

237 Looked reasonable. Soon in 'next'.

238

187 -* jc/maint-refs-dangling (2010-03-15) 1 commit

188 - (merged to 'next' on 2010-03-16 at 376027b)

189 - + refs: ref entry with NULL sha1 is can be a dangling symref

190 -

191 -Looked reasonable. Soon in 'next'.

192 -

239 * rs/threaded-grep-context (2010-03-15) 1 commit

240 - grep: enable threading for context line printing

241

242 Looked reasonable. Soon in 'next'.

243

198 -* pb/log-first-parent-p-m (2010-03-09) 5 commits

199 - (merged to 'next' on 2010-03-15 at 0ae494e)

200 - + show --first-parent/-m: do not default to --cc

201 - + show -c: show patch text

202 - + revision: introduce setup_revision_opt

203 - + t4013: add tests for log -p -m --first-parent

204 - (merged to 'next' on 2010-02-17 at 2f8e5ae)

205 - + git log -p -m: document -m and honor --first-parent

206 -

207 -Ready for 'master'.

208 -

209 -* jl/submodule-diff-dirtiness (2010-03-13) 5 commits

210 - (merged to 'next' on 2010-03-15 at 9601fd9)

211 - + git status: ignoring untracked files must apply to submodules too

212 - (merged to 'next' on 2010-03-13 at f9bfd8a)

213 - + git status: Fix false positive "new commits" output for dirty submodules

214 - + Refactor dirty submodule detection in diff-lib.c

215 - (merged to 'next' on 2010-03-08 at 33f7a57)

216 - + git status: Show detailed dirty status of submodules in long format

217 - (merged to 'next' on 2010-03-04 at 58b2645)

218 - + git diff --submodule: Show detailed dirty status of submodules

219 -

220 -Ready for 'master'.

221 -

222 -* cc/cherry-pick-ff (2010-03-06) 6 commits

223 - (merged to 'next' on 2010-03-20 at fdfcd14)

244 +* cc/cherry-pick-ff (2010-03-20) 7 commits

245 + (merged to 'next' on 2010-03-20 at a1ae16b)

246 + + revert: fix tiny memory leak in cherry-pick --ff

247 + rebase -i: use new --ff cherry-pick option

248 (merged to 'next' on 2010-03-07 at 5589b26)

249 + Documentation: describe new cherry-pick --ff option

@@ -243,7 +266,26 @@ Ready for 'master'.

266

267 The tip one will be soon in 'next', but one step at a time.

268

246 -* nd/setup (2010-03-08) 21 commits

269 +* nd/setup (2010-03-21) 40 commits

270 + - Guard unallowed access to repository when it's not set up

271 + - alias: keep repository found while collecting aliases as long as possible

272 + - Allow to undo setup_git_directory_gently() gracefully (and fix alias code)

273 + - builtins: check for startup_info->help, print and exit early

274 + - builtins: utilize startup_info->help where possible

275 + - run_builtin(): save "-h" detection result for later use

276 + - config: do not read .git/config if there is no repository

277 + - apply: do not check sha1 when repository has not been found

278 + - Do not read .git/info/attributes if there is no repository

279 + - Do not read .git/info/exclude if there is no repository

280 + - git_config(): do not read .git/config if there is no repository

281 + - init/clone: turn on startup->have_repository properly

282 + - worktree setup: restore original state when things go wrong

283 + - Use git_config_early() instead of git_config() during repo setup

284 + - Add git_config_early()

285 + - worktree setup: call set_git_dir explicitly

286 + - rev-parse --git-dir: print relative gitdir correctly

287 + - enter_repo(): initialize other variables as setup_git_directory_gently() does

288 + - Move enter_repo() to setup.c

289 - index-pack: use RUN_SETUP_GENTLY

290 - index-pack: trust the prefix returned by setup_git_directory_gently()

291 - worktree setup: calculate prefix even if no worktree is found

@@ -266,29 +308,8 @@ The tip one will be soon in 'next', but one step at a time.

308 - builtin: Support RUN_SETUP_GENTLY to set up repository early if found

309 - builtin: introduce startup_info struct

310

269 -* sb/notes-parse-opt (2010-02-27) 1 commit

270 - - notes: rework subcommands and parse options

271 - (this branch uses tr/notes-display.)

272 -

273 -* jh/maint-submodule-status-in-void (2010-03-09) 2 commits

274 - (merged to 'next' on 2010-03-15 at 49af9de)

275 - + git submodule summary: Handle HEAD as argument when on an unborn branch

276 - (merged to 'next' on 2010-03-08 at 0697bf4)

277 - + submodule summary: do not fail before the first commit

311 +This seems to break t7006 when merged to 'pu'.

312

279 -* tr/notes-display (2010-03-12) 13 commits

280 - (merged to 'next' on 2010-03-15 at 3329361)

281 - + git-notes(1): add a section about the meaning of history

282 - + notes: track whether notes_trees were changed at all

283 - + notes: add shorthand --ref to override GIT_NOTES_REF

284 - + commit --amend: copy notes to the new commit

285 - + rebase: support automatic notes copying

286 - + notes: implement helpers needed for note copying during rewrite

287 - + notes: implement 'git notes copy --stdin'

288 - + rebase -i: invoke post-rewrite hook

289 - + rebase: invoke post-rewrite hook

290 - + commit --amend: invoke post-rewrite hook

291 - + Documentation: document post-rewrite hook

292 - + Support showing notes from more than one notes tree

293 - + test-lib: unset GIT_NOTES_REF to stop it from influencing tests

294 - (this branch is used by sb/notes-parse-opt.)

313 +* sb/notes-parse-opt (2010-02-27) 1 commit

314 + (merged to 'next' on 2010-03-24 at 82eebc1)

315 + + notes: rework subcommands and parse options

What's cooking (2010/03 #6)