3ac8b34396 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jul 2009, #03; Wed, 29)

3 -X-master-at: e6580020057afd207b7cfb9c96905f99e13cfe4d

4 -X-next-at: 4719968c98d7ad8352bb14916c65c094842a980d

2 +Subject: What's cooking in git.git (Aug 2009, #01; Wed, 05)

3 +X-master-at: 3f55e4107f7906134df029f9a5c44864f9258110

4 +X-next-at: 2981fa5b8f20e8ff086aceb252c0e693fa2d0c75

5

6 -What's cooking in git.git (Jul 2009, #03; Wed, 29)

6 +What's cooking in git.git (Aug 2009, #01; Wed, 05)

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

8

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

@@ -19,47 +19,70 @@ out the planned "push safety" change. 1.7.0 would be a good time to

19 introduce "justifiable" changes that are not strictly backward compatible.

20

21 During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.

22 -I've already merged the "diff --exit-code --ignore-whitespace" change and

23 -"push safety" change.

22

25 -I'll rewind 'next' sometime this weekend.

23 +----------------------------------------------------------------

24 +[New Topics]

25 +

26 +* gb/apply-ignore-whitespace (Tue Aug 4 13:16:49 2009 +0200) 1 commit

27 + - git apply: option to ignore whitespace differences

28 +

29 +* db/vcs-helper (Wed Aug 5 01:02:25 2009 -0400) 13 commits

30 + - Changes for new vcs-helper series

31 + - Add simple test cases of git-vcs-cvs functionality

32 + - First draft of CVS importer using the foreign-scm machinery

33 + - Allow helpers to request marks for fast-import

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

35 + unchanged

36 + - Add support for "import" helper command

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

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

39 + - Allow fetch to modify refs

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

41 + - git-http-fetch: not a builtin

42 + - Use an external program to implement fetching with curl

43 + - Add support for external programs for handling native fetches

44 +

45 +This consolidates various previous rounds from Daniel and Johan.

46 +

47 +* je/send-email-no-subject (Wed Aug 5 18:49:54 2009 +0200) 1 commit

48 + - send-email: confirm on empty mail subjects

49 +

50 +* zf/maint-gitweb-acname (Sun Aug 2 09:42:24 2009 +0200) 1 commit

51 + - gitweb: parse_commit_text encoding fix

52 +

53 +* jc/maint-clean-nested-dir-safety (Tue Jun 30 15:33:45 2009 -0700) 1 commit

54 + - clean: require double -f options to nuke nested git repository and

55 + work tree

56 +

57 +* jc/shortstatus (Tue Aug 4 23:55:22 2009 -0700) 5 commits

58 + - shortstatus: a new command

59 + - status: show worktree status of conflicted paths separately

60 + - wt-status.c: rework the way changes to the index and work tree are

61 + summarized

62 + - diff-index: keep the original index intact

63 + - diff-index: report unmerged new entries

64 +

65 +* bc/mailsplit-cr-at-eol (Tue Aug 4 22:31:59 2009 -0500) 4 commits

66 + - Allow mailsplit (and hence git-am) to handle mails with CRLF line-

67 + endings

68 + - builtin-mailsplit.c: remove read_line_with_nul() since it is no

69 + longer used

70 + - builtin-mailinfo,builtin-mailsplit: use strbufs

71 + - strbuf: add new function strbuf_getwholeline()

72 +

73 +* jc/maint-merge-recursive-fix (Thu Jul 30 17:38:15 2009 -0700) 1 commit

74 + - merge-recursive: don't segfault while handling rename clashes

75

76 ----------------------------------------------------------------

28 -[In 'next']

77 +[Graduated to "master"]

78

79 * ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit

80 + Shift object enumeration out of upload-pack

81

33 -* js/run-command-updates (Sat Jul 4 21:26:43 2009 +0200) 6 commits

34 - + receive-pack: remove unnecessary run_status report

35 - + run_command: report failure to execute the program, but optionally

36 - don't

37 - + run_command: encode deadly signal number in the return value

38 - + run_command: report system call errors instead of returning error

39 - codes

40 - + run_command: return exit code as positive value

41 - + MinGW: simplify waitpid() emulation macros

42 -

82 * sb/maint-pull-rebase (Sun Jul 19 09:45:16 2009 +0200) 2 commits

83 + pull: support rebased upstream + fetch + pull --rebase

84 + t5520-pull: Test for rebased upstream + fetch + pull --rebase

85

47 -* jc/1.7.0-diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits

48 - + diff: Rename QUIET internal option to QUICK

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

50 -

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

52 -when there is no actual output. It is a backward incompatible change, but

53 -we could argue that it is a bugfix.

54 -

55 -* jc/1.7.0-push-safety (Mon Feb 9 00:19:46 2009 -0800) 2 commits

56 - + Refuse deleting the current branch via push

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

58 - push

59 -

60 -This is old 'jc/deny-delete-current-1.7.0' and 'jc/1.7.0-push-safety'

61 -topics redone.

62 -

86 * sb/read-tree (Thu Jun 25 22:14:10 2009 -0700) 2 commits

87 + read-tree: migrate to parse-options

88 + read-tree: convert unhelpful usage()'s to helpful die()'s

@@ -70,11 +93,42 @@ topics redone.

93 + verify-tag: migrate to parse-options

94 + write-tree: migrate to parse-options

95

73 -Parse-options migration; should be in 'master' soonish.

96 +* ns/init-mkdir (Sat Jul 25 06:59:28 2009 +0900) 1 commit

97 + + git init: optionally allow a directory argument

98 +

99 +Straightforward usability change.

100 +

101 +* mk/init-db-parse-options (Sun Jul 12 12:24:32 2009 +0200) 1 commit

102 + + init-db: migrate to parse-options

103 +

104 +* jk/maint-show-tag (Sat Jul 18 06:14:37 2009 -0400) 2 commits

105 + + show: add space between multiple items

106 + + show: suppress extra newline when showing annotated tag

107 +

108 +* jc/apply-epoch-patch (Fri Jul 10 18:38:08 2009 -0700) 1 commit

109 + + apply: notice creation/removal patches produced by GNU diff

110 +

111 +----------------------------------------------------------------

112 +[In 'next']

113 +

114 +* js/run-command-updates (Tue Aug 4 11:28:40 2009 +0200) 7 commits

115 + + run-command.c: squelch a "use before assignment" warning

116 + + receive-pack: remove unnecessary run_status report

117 + + run_command: report failure to execute the program, but optionally

118 + don't

119 + + run_command: encode deadly signal number in the return value

120 + + run_command: report system call errors instead of returning error

121 + codes

122 + + run_command: return exit code as positive value

123 + + MinGW: simplify waitpid() emulation macros

124 +

125 +Will merge soon.

126

127 * mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit

128 + grep: Add --max-depth option.

129

130 +Will merge soon.

131 +

132 * cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits

133 + t6050: check pushing something based on a replaced commit

134 + Documentation: add documentation for "git replace"

@@ -96,60 +150,46 @@ Does not seem to hurt normal operation without "replace". The basic idea

150 should be easier and safer to use than the graft mechanism. I haven't

151 tried the replacement myself, though.

152

99 -* ns/init-mkdir (Sat Jul 25 06:59:28 2009 +0900) 1 commit

100 - + git init: optionally allow a directory argument

153 +* jp/symlink-dirs (Wed Jul 29 20:22:25 2009 -0700) 3 commits

154 + + git-checkout: be careful about untracked symlinks

155 + + lstat_cache: guard against full match of length of 'name'

156 + parameter

157 + + Demonstrate bugs when a directory is replaced with a symlink

158

102 -Straightforward usability change. Should be in 'master' soonish.

159 +James's test scripts to expose corner case bugs in the merge and branch

160 +switching machinery, and a few fix-ups.

161

104 -* mk/init-db-parse-options (Sun Jul 12 12:24:32 2009 +0200) 1 commit

105 - + init-db: migrate to parse-options

162 +* jn/gitweb-blame (Sat Jul 25 00:44:10 2009 +0200) 10 commits

163 + + gitweb: Create links leading to 'blame_incremental' using

164 + JavaScript

165 + + gitweb: Incremental blame (proof of concept)

166 + + gitweb: Add optional "time to generate page" info in footer

167 + + gitweb: Add -partial_query option to href() subroutine

168 + + gitweb: Use light/dark for class names also in 'blame' view

169 + + gitweb: Add author initials in 'blame' view, a la "git gui blame"

170 + + gitweb: Mark commits with no "previous" in 'blame' view

171 + + gitweb: Use "previous" header of git-blame -p in 'blame' view

172 + + gitweb: Mark boundary commits in 'blame' view

173 + + gitweb: Make .error style generic

174 +

175 +Will merge soon.

176

107 -* jk/maint-show-tag (Sat Jul 18 06:14:37 2009 -0400) 2 commits

108 - + show: add space between multiple items

109 - + show: suppress extra newline when showing annotated tag

177 +* jc/1.7.0-diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits

178 + + diff: Rename QUIET internal option to QUICK

179 + + diff: change semantics of "ignore whitespace" options

180

111 -* jc/apply-epoch-patch (Fri Jul 10 18:38:08 2009 -0700) 1 commit

112 - + apply: notice creation/removal patches produced by GNU diff

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

182 +when there is no actual output. It is a backward incompatible change, but

183 +we could argue that it is a bugfix.

184

114 -Better acceptance of some "GNU patch" output to create or remove files.

185 +* jc/1.7.0-push-safety (Mon Feb 9 00:19:46 2009 -0800) 2 commits

186 + + Refuse deleting the current branch via push

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

188 + push

189

190 ----------------------------------------------------------------

191 [In 'pu']

192

119 -* jp/symlink-dirs (Sun Jun 14 15:08:28 2009 +0200) 2 commits

120 - - lstat_cache: guard against full match of length of 'name'

121 - parameter

122 - - Demonstrate bugs when a directory is replaced with a symlink

123 -

124 -James's test scripts to expose corner case bugs in the merge and branch

125 -switching machinery.

126 -

127 -* jh/vcs-cvs (Mon Jul 27 03:04:17 2009 +0200) 15 commits

128 - - Introduce a 'marks <filename>' feature to the foreign transport

129 - code

130 - - Teach foreign transport code to perform the "capabilities" command

131 - - Preliminary clarifications to git-vcs documentation

132 - - fast-import: Add support for importing commit notes

133 - - Add a transport implementation using git-vcs-* helpers

134 - - Allow programs to not depend on remotes having urls

135 - - Use a function to determine whether a remote is valid

136 - - Add specification of git-vcs-* helper programs

137 - - Merge branch 'db/transport-shim' into jh/vcs-cvs

138 - - git-http-fetch: not a builtin

139 - - Use an external program to implement fetching with curl

140 - - Add support for external programs for handling native fetches

141 - - Add option for using a foreign VCS

142 - - Document details of transport function APIs

143 - - Allow late reporting of fetched hashes

144 -

145 -With its 6th patch replaced to keep the pathname syntax of the fast-import

146 -language, but without the commits near the tip of the old series.

147 -

148 -* db/transport-shim (Tue Jul 28 02:08:53 2009 -0400) 3 commits

149 - - git-http-fetch: not a builtin

150 - - Use an external program to implement fetching with curl

151 - - Add support for external programs for handling native fetches

152 -

193 * jh/notes (Wed Jul 29 04:25:26 2009 +0200) 8 commits

194 - t3302-notes-index-expensive: Speed up create_repo()

195 - fast-import: Add support for importing commit notes

@@ -160,71 +200,29 @@ language, but without the commits near the tip of the old series.

200 - Add a script to edit/inspect notes

201 - Introduce commit notes

202

163 -jh/vcs-cvs topic needs to be rebuilt, merging this instead of having its

164 -own copy of "fast-import: Add support for importing commit notes".

165 -

166 -* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits

167 - - Add option for using a foreign VCS

168 - - Document details of transport function APIs

169 - - Allow late reporting of fetched hashes

170 -

203 * cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits

204 - rebase -i: use "git sequencer--helper --make-patch"

205 - sequencer: free memory used in "make_patch" function

206 - sequencer: add "make_patch" function to save a patch

207 - sequencer: add "builtin-sequencer--helper.c"

208

177 -I do not know how this will interact with what Dscho has been doing.

178 -

209 * jc/mailinfo-remove-brackets (Wed Jul 15 15:31:12 2009 -0700) 1 commit

210 - mailinfo: -b option keeps [bracketed] strings that is not a

211 [PATCH] marker

212

183 -* jn/gitweb-blame (Sat Jul 25 00:44:10 2009 +0200) 10 commits

184 - - gitweb: Create links leading to 'blame_incremental' using

185 - JavaScript

186 - - gitweb: Incremental blame (proof of concept)

187 - - gitweb: Add optional "time to generate page" info in footer

188 - - gitweb: Add -partial_query option to href() subroutine

189 - - gitweb: Use light/dark for class names also in 'blame' view

190 - - gitweb: Add author initials in 'blame' view, a la "git gui blame"

191 - - gitweb: Mark commits with no "previous" in 'blame' view

192 - - gitweb: Use "previous" header of git-blame -p in 'blame' view

193 - - gitweb: Mark boundary commits in 'blame' view

194 - - gitweb: Make .error style generic

195 -

196 -There may have been updates during 1.6.4-rc period that I missed.

197 -

198 -* tr/reset-checkout-patch (Tue Jul 28 23:20:11 2009 +0200) 5 commits

213 +* tr/reset-checkout-patch (Tue Jul 28 23:20:12 2009 +0200) 8 commits

214 + - DWIM 'git stash save -p' for 'git stash -p'

215 + - Merge branch 'js/stash-dwim' into tr/reset-checkout-patch

216 + - Make 'git stash -k' a short form for 'git stash save --keep-index'

217 - Implement 'git stash save --patch'

218 - Implement 'git checkout --patch'

219 - Implement 'git reset --patch'

220 - builtin-add: refactor the meat of interactive_add()

221 - git-apply--interactive: Refactor patch mode code

222

223 +* js/stash-dwim (Mon Jul 27 20:37:10 2009 +0200) 1 commit

224 + - Make 'git stash -k' a short form for 'git stash save --keep-index'

225 +

226 * jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit

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

228

208 -* pb/tracking (Thu Jul 16 16:26:15 2009 -0500) 7 commits

209 - - branch.c: if remote is not config'd for branch, don't try delete

210 - push config

211 - - branch, checkout: introduce autosetuppush

212 - - move deletion of merge configuration to branch.c

213 - - remote: add per-remote autosetupmerge and autosetuprebase

214 - configuration

215 - - introduce a struct tracking_config

216 - - branch: install_branch_config and struct tracking refactoring

217 - - config: allow false and true values for branch.autosetuprebase

218 -

219 -This has been reverted from 'next' for now to give it a fresh start.

220 -

221 -----------------------------------------------------------------

222 -[Dropped]

223 -

224 -* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits

225 - . Fix for a merge where a branch has an F->D transition

226 - . Add a reminder test case for a merge with F/D transition

227 -

228 -The fix the author hinted iffy is dropped for now, but the test case is

229 -already in 'master' to remind us.

230 -

What's cooking (2009/08 #01)