aa357dd51c · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Dec 2009, #02; Sat, 05)

3 -X-master-at: 9a424b276c409a3510e7735b6ecc012f50dc2a49

4 -X-next-at: d8fe1b5dc75e54be82e59239a8d5a430ae072fd8

2 +Subject: What's cooking in git.git (Dec 2009, #03; Tue, 08)

3 +X-master-at: f9ad77a739c0d012ee58b64eda2d7ec0d4e1df9d

4 +X-next-at: 3c2c08adfbff17e13665b5151a337380f57275d8

5

6 -What's cooking in git.git (Dec 2009, #02; Sat, 05)

6 +What's cooking in git.git (Dec 2009, #03; Tue, 08)

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

8

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

@@ -11,79 +11,46 @@ 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 -In 1.7.0, we plan to correct handful of warts in the interfaces everybody

15 -agrees that they were mistakes. The resulting system may not be strictly

16 -backward compatible. Currently planned changes are:

17 -

18 - * refuse push to update the checked out branch in a non-bare repo by

19 - default

20 -

21 - Make "git push" into a repository to update the branch that is checked

22 - out fail by default. You can countermand this default by setting a

23 - configuration variable in the receiving repository.

24 -

25 - http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007

26 -

27 - * refuse push to delete the current branch by default

28 -

29 - Make "git push $there :$killed" to delete the branch that is pointed at

30 - by its HEAD fail by default. You can countermand this default by

31 - setting a configuration variable in the receiving repository.

32 -

33 - http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936

14 +--------------------------------------------------

15 +[New Topics]

16

35 - * "git send-email" won't make deep threads by default

17 +* bg/maint-add-all-doc (2009-12-07) 4 commits.

18 + - squash! rm documentation--also mention add-u where we mention commit-a

19 + - git-rm doc: Describe how to sync index & work tree

20 + - git-add/rm doc: Consistently back-quote

21 + - Documentation: 'git add -A' can remove files

22

37 - Many people said that by default when sending more than 2 patches the

38 - threading git-send-email makes by default is hard to read, and they

39 - prefer the default be one cover letter and each patch as a direct

40 - follow-up to the cover letter. You can countermand this by setting a

41 - configuration variable.

23 +I didn't like the existing documentation for "add -u" myself (especially

24 +because I wrote the initial version) and this neatly fix it as well.

25

43 - http://article.gmane.org/gmane.comp.version-control.git/109790

26 +* il/vcs-helper (2009-12-06) 8 commits

27 + - Remove special casing of http, https and ftp

28 + - Support remote archive from external protocol helpers

29 + - Support remote helpers implementing smart transports

30 + - Support taking over transports

31 + - Refactor git transport options parsing

32 + - Pass unknown protocols to external protocol handlers

33 + - Support mandatory capabilities

34 + - Add remote helper debug mode

35 + (this branch is related to sr/vcs-helper.)

36

45 - * "git status" won't be "git-commit --dry-run" anymore

37 +Under active discussion and review; another round expected.

38

47 - http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993

39 +* jh/commit-status (2009-12-07) 1 commit

40 + - [test?] Add commit.status, --status, and --no-status

41

49 - * "git diff -w --exit-code" will exit success if only differences it

50 - found are whitespace changes that are stripped away from the output.

42 +* jk/maint-add-p-delete-fix (2009-12-08) 1 commit.

43 + (merged to 'next' on 2009-12-08 at 3c2c08a)

44 + + add-interactive: fix deletion of non-empty files

45

52 - http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751

46 +Fixes a regression in 1.6.5.3.

47

54 - * "git diff -w/-b" won't even produce "diff --git" header when all changes

55 - are about whitespaces.

48 +* mm/diag-path-in-treeish (2009-12-07) 1 commit

49 + - Detailed diagnosis when parsing an object name fails.

50

57 - http://thread.gmane.org/gmane.comp.version-control.git/133256

58 -

59 ---------------------------------------------------

60 -[New Topics]

61 -

62 -Note: Ilari's vcs-helper series hasn't been queued yet, as its first round

63 -generated a healthy amount of discussion and he made it clear that the

64 -second round is being prepared, addressing the comments given on the list.

65 -Hopefully trivial coding style issues in the first round will also be

66 -fixed (e.g. keyword "if" lacked a SP after it before opening parenthesis

67 -of the condition) in the second round.

68 -

69 -* jn/maint-pull-rebase-error-message (2009-11-27) 1 commit.

70 - (merged to 'next' on 2009-12-03 at 2ced03c)

71 - + pull: clarify advice for the unconfigured error case

72 -

73 -Replaces old 'jn/rfc-pull-rebase-error-message' topic.

74 -

75 -* fc/opt-quiet-gc-reset (2009-12-02) 1 commit

76 - - General --quiet improvements

77 -

78 -* mv/commit-date (2009-12-03) 2 commits

79 - - Document date formats accepted by parse_date()

80 - - builtin-commit: add --date option

81 -

82 -* mh/rebase-fixup (2009-12-05) 4 commits

83 - - [squash to Add a command "fix"] Avoid "$alternatives\|choices$" in sed script

84 - - Add a command "fix" to rebase --interactive.

85 - - t3404: set a couple more tags in the original repository

86 - - t3404: Better document the original repository layout

51 +* ns/rebase-auto-squash (2009-12-08) 1 commit

52 + - rebase -i --autosquash: auto-squash commits

53 + (this branch uses mh/rebase-fixup.)

54

55 --------------------------------------------------

56 [Stalled]

@@ -105,21 +72,6 @@ says "no"?)

72 I've been using the first one for a while myself but do not see many users

73 want this (yet); the new feature is not urgent anyway.

74

108 -* jh/notes (2009-12-02) 11 commits

109 - - Refactor notes concatenation into a flexible interface for combining notes

110 - - Notes API: Allow multiple concurrent notes trees with new struct notes_tree

111 - - Notes API: for_each_note(): Traverse the entire notes tree with a callback

112 - - Notes API: get_note(): Return the note annotating the given object

113 - - Notes API: add_note(): Add note objects to the internal notes tree structure

114 - - Notes API: init_notes(): Initialize the notes tree from the given notes ref

115 - - Notes API: get_commit_notes() -> format_note() + remove the commit restriction

116 - - Minor style fixes to notes.c

117 - - Add more testcases to test fast-import of notes

118 - - Rename t9301 to t9350, to make room for more fast-import tests

119 - - fast-import: Proper notes tree manipulation

120 -

121 -Rerolled (waiting for Acks).

122 -

75 * tr/maint-merge-ours-clarification (2009-11-15) 1 commit

76 (merged to 'next' on 2009-11-21 at fadaf7b)

77 + rebase: refuse to rebase with -s ours

@@ -155,6 +107,45 @@ all the header files in the tree, for example.

107 --------------------------------------------------

108 [Cooking]

109

110 +* jh/notes (2009-12-07) 11 commits

111 + - Refactor notes concatenation into a flexible interface for combining notes

112 + - Notes API: Allow multiple concurrent notes trees with new struct notes_tree

113 + - Notes API: for_each_note(): Traverse the entire notes tree with a callback

114 + - Notes API: get_note(): Return the note annotating the given object

115 + - Notes API: add_note(): Add note objects to the internal notes tree structure

116 + - Notes API: init_notes(): Initialize the notes tree from the given notes ref

117 + - Notes API: get_commit_notes() -> format_note() + remove the commit restriction

118 + - Minor style fixes to notes.c

119 + - Add more testcases to test fast-import of notes

120 + - Rename t9301 to t9350, to make room for more fast-import tests

121 + - fast-import: Proper notes tree manipulation

122 +

123 +Rerolled and under discussion.

124 +

125 +* jn/maint-pull-rebase-error-message (2009-11-27) 1 commit.

126 + (merged to 'next' on 2009-12-03 at 2ced03c)

127 + + pull: clarify advice for the unconfigured error case

128 +

129 +Replaces old 'jn/rfc-pull-rebase-error-message' topic.

130 +

131 +* fc/opt-quiet-gc-reset (2009-12-02) 1 commit

132 + - General --quiet improvements

133 +

134 +* mv/commit-date (2009-12-03) 2 commits

135 + - Document date formats accepted by parse_date()

136 + - builtin-commit: add --date option

137 +

138 +* mh/rebase-fixup (2009-12-07) 2 commits

139 + - Add a command "fixup" to rebase --interactive

140 + - t3404: Use test_commit to set up test repository

141 + (this branch is used by ns/rebase-auto-squash.)

142 +

143 +Initial round of "fixup" action that is similar to "squash" action in

144 +"rebase -i" that excludes the commit log message from follow-up commits

145 +when composing the log message for the updated one. Expected is a further

146 +improvement to skip opening the editor if a pick is followed only by

147 +"fixup" and no "squash".

148 +

149 * sr/gfi-options (2009-12-04) 7 commits

150 - fast-import: add (non-)relative-marks feature

151 - fast-import: allow for multiple --import-marks= arguments

@@ -185,22 +176,24 @@ but otherwise seemed good.

176 Rerolled.

177

178 * tr/http-updates (2009-12-01) 3 commits

188 - - Allow curl to rewind the RPC read buffer

189 - - Add an option for using any HTTP authentication scheme, not only basic

190 - - http: maintain curl sessions

191 -

192 -There was a discussion on a better structure not to require rewinding in

193 -the first place? I didn't follow it closely...

179 + (merged to 'next' on 2009-12-07 at f08d447)

180 + + Allow curl to rewind the RPC read buffer

181 + + Add an option for using any HTTP authentication scheme, not only basic

182 + + http: maintain curl sessions

183

184 * jc/diff-whitespace-prepare (2009-11-28) 2 commits

185 - diff: flip the default diff.bwoutputonly to true

186 - diff: optionally allow traditional "-b/-w affects only output" semantics

187 (this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)

188

200 -This is to redo the two -b/-w semantic changes to prepare the migration of

201 -existing users before 1.7.0 happens.

189 +This was to redo the two -b/-w semantic changes to prepare the migration of

190 +existing users before 1.7.0 happens, but I think we should drop it.

191 +

192 +Comments?

193

203 -* sr/vcs-helper (2009-12-04) 13 commits

194 +* sr/vcs-helper (2009-12-07) 14 commits

195 + (merged to 'next' on 2009-12-07 at 8f041bc)

196 + + tests: handle NO_PYTHON setting

197 (merged to 'next' on 2009-12-03 at e45b562)

198 + builtin-push: don't access freed transport->url

199 (merged to 'next' on 2009-11-27 at 83268ab)

@@ -216,6 +209,7 @@ existing users before 1.7.0 happens.

209 + Use a function to determine whether a remote is valid

210 + Allow programs to not depend on remotes having urls

211 + Fix memory leak in helper method for disconnect

212 + (this branch is related to il/vcs-helper.)

213

214 Should be among the first to graduate after 1.6.6 final.

215

@@ -227,6 +221,8 @@ I do not particularly like a configuration like this that changes the

221 behaviour of a command in a drastic way---it will make helping others

222 much harder.

223

224 +Comments?

225 +

226 * nd/sparse (2009-11-25) 20 commits.

227 (merged to 'next' on 2009-11-25 at 71380f5)

228 + tests: rename duplicate t1009

@@ -258,7 +254,10 @@ Fix-up expected.

254 --------------------------------------------------

255 [For 1.7.0]

256

261 -* jk/1.7.0-status (2009-12-05) 9 commits.

257 +* jk/1.7.0-status (2009-12-07) 11 commits.

258 + (merged to 'next' on 2009-12-07 at 7723acf)

259 + + status: reduce duplicated setup code

260 + + status: disable color for porcelain format

261 (merged to 'next' on 2009-12-05 at 44dcefd)

262 + status -s: obey color.status

263 + builtin-commit: refactor short-status code into wt-status.c

@@ -327,6 +326,8 @@ Likewise but for the output of "diff --git" headers.

326 (this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)

327

328 And this is to actually flip the default and eventually remove the warning.

329 +As I am contemplating of dropping jc/diff-whitespace-prepare, this should

330 +also be dropped as well.

331

332 * ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit

333 - send-email: make --no-chain-reply-to the default

@@ -357,42 +358,3 @@ fix from Ramsay is already in 'master'.

358

359 Reverted out of 'next', to be replaced with jn/faster-completion-startup

360 topic.

360 -

361 ---------------------------------------------------

362 -[I have been too busy to purge these]

363 -

364 -* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit

365 - . git-pull.sh --rebase: overhaul error handling when no candidates are found

366 -

367 -Replaced.

368 -

369 -* jc/log-tz (2009-03-03) 1 commit.

370 - - Allow --date=local --date=other-format to work as expected

371 -

372 -Maybe some people care about this. I dunno.

373 -

374 -* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.

375 - . git-merge: forbid fast-forward and up-to-date when --no-commit is given

376 -

377 -This makes "git merge --no-commit" fail when it results in fast-forward or

378 -up-to-date. It appears nobody wants to have this, so I dropped it.

379 -

380 -* ne/rev-cache (2009-10-19) 7 commits.

381 - . support for commit grafts, slight change to general mechanism

382 - . support for path name caching in rev-cache

383 - . full integration of rev-cache into git, completed test suite

384 - . administrative functions for rev-cache, start of integration into git

385 - . support for non-commit object caching in rev-cache

386 - . basic revision cache system, no integration or features

387 - . man page and technical discussion for rev-cache

388 -

389 -The author indicated that there is another round coming. Does not seem to

390 -pass the tests when merged to 'pu', so it has been ejected for now.

391 -

392 -* pb/gitweb-no-project-list (2009-11-06) 3 commits.

393 - . gitweb: Polish the content tags support

394 - . gitweb: Support for no project list on gitweb front page

395 - . gitweb: Refactor project list routines

396 -

397 -I picked these up but didn't queue as Warthog9's comments made certain

398 -amount of sense to me.

What's cooking (2009/12 #03)