e19f8cbd08 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

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

3 -X-master-at: c2ff10c98e22ae64d553273e6d67bb123a1c916f

4 -X-next-at: ba67783643e94c85cfa57edf932dea2abdf68711

2 +Subject: What's cooking in git.git (Dec 2009, #06; Thu, 31)

3 +X-master-at: 37bae10e38a66e4f1ddd5350daded00b21735126

4 +X-next-at: 442ff22addab31be84a7a93a389d265fc8a49f93

5

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

6 +What's cooking in git.git (Dec 2009, #06; Thu, 31)

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

8

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

@@ -11,97 +11,75 @@ 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 ---------------------------------------------------

15 -[Graduated to "master"]

16 -

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

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

19 - + tests: handle NO_PYTHON setting

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

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

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

23 - + Add Python support library for remote helpers

24 - + Basic build infrastructure for Python scripts

25 - + Allow helpers to report in "list" command that the ref is unchanged

26 - + Fix various memory leaks in transport-helper.c

27 - + Allow helper to map private ref names into normal names

28 - + Add support for "import" helper command

29 - + Allow specifying the remote helper in the url

30 - + Add a config option for remotes to specify a foreign vcs

31 - + Allow fetch to modify refs

32 - + Use a function to determine whether a remote is valid

33 - + Allow programs to not depend on remotes having urls

34 - + Fix memory leak in helper method for disconnect

35 -

36 -* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit

37 - (merged to 'next' on 2009-10-11 at 043acdf)

38 - + send-email: make --no-chain-reply-to the default

39 -

40 -* jc/1.7.0-push-safety (2009-02-09) 2 commits

41 - (merged to 'next' on 2009-10-11 at 81b8128)

42 - + Refuse deleting the current branch via push

43 - + Refuse updating the current branch in a non-bare repository via push

44 -

45 -* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits

46 - (merged to 'next' on 2009-10-11 at 546c74d)

47 - + diff.c: fix typoes in comments

48 - + Make test case number unique

49 - + diff: Rename QUIET internal option to QUICK

50 - + diff: change semantics of "ignore whitespace" options

51 - (this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)

52 -

53 -This changes exit code from "git diff --ignore-whitespace" and friends

54 -when there is no actual output.

55 -

56 -* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit

57 - (merged to 'next' on 2009-11-21 at 3375bf4)

58 - + No diff -b/-w output for all-whitespace changes

59 - (this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)

60 -

61 -Likewise but for the output of "diff --git" headers.

62 -

63 -* jk/1.7.0-status (2009-12-11) 16 commits

64 - (merged to 'next' on 2009-12-24 at e9929b3)

65 - + status/commit: do not suggest "reset HEAD <path>" while merging

66 - + commit/status: "git add <path>" is not necessarily how to resolve

67 - + commit/status: check $GIT_DIR/MERGE_HEAD only once

68 - (merged to 'next' on 2009-12-08 at 9b57d84)

69 - + t7508-status: test all modes with color

70 - + t7508-status: status --porcelain ignores relative paths setting

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

72 - + status: reduce duplicated setup code

73 - + status: disable color for porcelain format

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

75 - + status -s: obey color.status

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

77 - (merged to 'next' on 2009-11-27 at 91691ec)

78 - + t7508-status.sh: Add tests for status -s

79 - + status -s: respect the status.relativePaths option

80 - (merged to 'next' on 2009-11-21 at 884bb56)

81 - + docs: note that status configuration affects only long format

82 - (merged to 'next' on 2009-10-11 at 65c8513)

83 - + commit: support alternate status formats

84 - + status: add --porcelain output format

85 - + status: refactor format option parsing

86 - + status: refactor short-mode printing to its own function

87 - (this branch uses jc/1.7.0-status.)

88 -

89 -Gives the --short output format to post 1.7.0 "git commit --dry-run" that

90 -is similar to that of post 1.7.0 "git status".

91 -

92 -* jc/1.7.0-status (2009-09-05) 4 commits

93 - (merged to 'next' on 2009-10-11 at 9558627)

94 - + status: typo fix in usage

95 - + git status: not "commit --dry-run" anymore

96 - + git stat -s: short status output

97 - + git stat: the beginning of "status that is not a dry-run of commit"

98 - (this branch is used by jk/1.7.0-status.)

99 -

100 -With this, "git status" is no longer "git commit --dry-run".

14 +The tip of 'next' will soon be rebuilt on top of the current 'master'.

15 +

16 +This will be the last "What's cooking" message in year 2009 ;-)

17

18 --------------------------------------------------

19 [New Topics]

20

21 +* cc/reset-more (2009-12-30) 4 commits

22 + - reset: use "unpack_trees()" directly instead of "git read-tree"

23 + - reset: add a few tests for "git reset --merge"

24 + - Documentation: reset: add some tables to describe the different options

25 + - reset: improve mixed reset error message when in a bare repo

26 +

27 +Resurrected from "Ejected" category. Haven't looked at it yet myself,

28 +though...

29 +

30 +* bg/maint-remote-update-default (2009-12-31) 1 commit

31 + - Fix "git remote update" with remotes.defalt set

32 +

33 +* jc/branch-d (2009-12-29) 1 commit

34 + - branch -d: base the "already-merged" safety on the branch it merges with

35 +

36 +* jc/rerere (2009-12-04) 1 commit

37 + - Teach --[no-]rerere-autoupdate option to merge, revert and friends

38 +

39 +* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit

40 + (merged to 'next' on 2009-12-30 at de97679)

41 + + reset: unbreak hard resets with GIT_WORK_TREE

42 +

43 +* jk/push-to-delete (2009-12-30) 1 commit

44 + - builtin-push: add --delete as syntactic sugar for :foo

45 +

46 +* jk/run-command-use-shell (2009-12-30) 6 commits

47 + - diff: run external diff helper with shell

48 + - textconv: use shell to run helper

49 + - editor: use run_command's shell feature

50 + - run-command: optimize out useless shell calls

51 + - run-command: convert simple callsites to use_shell

52 + - run-command: add "use shell" option

53 +

54 +* mm/config-path (2009-12-30) 1 commit

55 + - builtin-config: add --path option doing ~ and ~user expansion.

56 +

57 +* pm/cvs-environ (2009-12-30) 1 commit

58 + - CVS Server: Support reading base and roots from environment

59 +

60 +* rs/maint-archive-match-pathspec (2009-12-12) 1 commit

61 + - archive: complain about path specs that don't match anything

62 +

63 +* so/cvsserver-update (2009-12-07) 1 commit

64 + - cvsserver: make the output of 'update' more compatible with cvs.

65 +

66 +* tc/clone-v-progress (2009-12-26) 4 commits

67 + - clone: use --progress to force progress reporting

68 + - clone: set transport->verbose when -v/--verbose is used

69 + - git-clone.txt: reword description of progress behaviour

70 + - check stderr with isatty() instead of stdout when deciding to show progress

71 +

72 +* tc/smart-http-restrict (2009-12-30) 3 commits

73 + - Smart-http tests: Test http-backend without curl or a webserver

74 + - Smart-http tests: Break test t5560-http-backend into pieces

75 + - Smart-http: check if repository is OK to export before serving it

76 +

77 +* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit

78 + - bash completion: factor submodules into dirty state

79 +

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

81 +[Cooking]

82 +

83 * jc/cache-unmerge (2009-12-25) 9 commits

84 - rerere forget path: forget recorded resolution

85 - rerere: refactor rerere logic to make it independent from I/O

@@ -124,13 +102,6 @@ With this, "git status" is no longer "git commit --dry-run".

102 - octopus: reenable fast-forward merges

103 - octopus: make merge process simpler to follow

104

127 -* il/exec-error-report (2009-12-24) 2 commits

128 - - Improve transport helper exec failure reporting

129 - - Report exec errors from run-command

130 -

131 ---------------------------------------------------

132 -[Cooking]

133 -

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

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

107

@@ -194,9 +165,10 @@ improvement to skip opening the editor if a pick is followed only by

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

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

167 - Minor style fixes to notes.c

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

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

199 - - fast-import: Proper notes tree manipulation

168 + (merged to 'next' on 2009-12-29 at c89a730)

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

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

171 + + fast-import: Proper notes tree manipulation

172

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

174 - General --quiet improvements

@@ -230,13 +202,17 @@ but otherwise seemed good.

202 - run test suite without dashed git-commands in PATH

203 - build dashless "bin-wrappers" directory similar to installed bindir

204

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

205 +* tr/http-updates (2009-12-28) 4 commits

206 + (merged to 'next' on 2009-12-30 at e143bc9)

207 + + Remove http.authAny

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

209 + Allow curl to rewind the RPC read buffer

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

211 + http: maintain curl sessions

212

239 -* nd/sparse (2009-12-14) 22 commits

213 +* nd/sparse (2009-12-30) 23 commits

214 + (merged to 'next' on 2009-12-31 at 442ff22)

215 + + grep: do not do external grep on skip-worktree entries

216 (merged to 'next' on 2009-12-24 at 1fa9ff3)

217 + commit: correctly respect skip-worktree bit

218 + ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID

@@ -266,6 +242,13 @@ but otherwise seemed good.

242 --------------------------------------------------

243 [Ejected]

244

245 +* il/exec-error-report (2009-12-30) 2 commits

246 + . Improve transport helper exec failure reporting

247 + . Report exec errors from run-command

248 +

249 +Freezes "git log" or anything that uses pager; J6t made quite a many good

250 +suggestions. Expecting more rounds of reroll.

251 +

252 * je/send-email-no-subject (2009-08-05) 1 commit

253 (merged to 'next' on 2009-10-11 at 1b99c56)

254 + send-email: confirm on empty mail subjects

@@ -291,17 +274,3 @@ the "temporarily" turned out to be very loooong.

274 The interaction with this option and pathspecs need to be worked out

275 better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from

276 all the header files in the tree, for example.

294 -

295 -* cc/reset-more (2009-12-08) 6 commits

296 - . Documentation: reset: add some tables to describe the different options

297 - . Documentation: reset: describe new "--keep-local-changes" option

298 - . reset: add test cases for "--keep-local-changes" option

299 - . reset: add option "--keep-local-changes" to "git reset"

300 - . reset: use "unpack_trees()" directly instead of "git read-tree"

301 - . reset: add a few tests for "git reset --merge"

302 -

303 -The documentation is much clearer than the previous round in describing

304 -what it does, but I find it a bit unclear in describing what it is _good_

305 -for (iow, scenarios and use cases).

306 -

307 -Breaks 'pu' and does not pass test on its own yet.

What's cooking (2009/12 #06)