aaf301335d · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Sep 2009, #03; Sun, 13)

3 -X-master-at: eaf1c941bbc10f5aa67fcf64e316fb548b910cfe

4 -X-next-at: ad50cbaea8afd009cb843c743b248c53ed6285ee

2 +Subject: What's cooking in git.git (Sep 2009, #04; Wed, 16)

3 +X-master-at: 8426f672fc65239135b1f1580bb79ecb16fd05f0

4 +X-next-at: 63b02d52a162438e5262062b3e6768beb3962be8

5

6 -What's cooking in git.git (Sep 2009, #03; Sun, 13)

6 +What's cooking in git.git (Sep 2009, #04; Wed, 16)

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

8

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

@@ -51,75 +51,35 @@ backward compatible. Currently planeed changes are:

51

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

53

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

54 +We are in pre-release feature freeze. 'next' will hold topics meant for

55 +1.6.6 and 1.7.0.

56

56 -I tagged and pushed out 1.6.5-rc1. As far as I am concered, all the big

57 -topics eligible for 1.6.5 are now in, except for possibly gfi-options

58 -series from Sverre. Updates to subsystems (svn, gitk, gui, and gitweb)

59 -may still need to be merged in.

60 -

61 -I've been hoping to keep this cycle short, and I'm also hoping to tag the

62 -real 1.6.5 before I vanish for about a week and half later in the

63 -month. so it looks like there may have to be a 1.6.6 to include the

64 -leftover topics.

57 +Except for possibly gfi-options series from Sverre, and updates to

58 +subsystems (svn, gitk, gui, and gitweb) may still need to be merged in,

59 +but otherwise 'master' is ready for -rc2. I am still hoping that I can

60 +tag the final before I take a vacation starting on 24th for a week, but we

61 +may have to give the final -rc a week to shake out any possible last

62 +minute regressions and release 1.6.5 at the beginning of next month.

63

64 --------------------------------------------------

65 [Graduated to "master"]

66

69 -* jc/merge-saner-messages (2009-09-07) 1 commit

70 - + merge-recursive: give less scary messages when merge did not start

71 -

72 -* rc/maint-http-no-head-pack-check (2009-09-09) 1 commit.

67 +* rc/maint-http-no-head-pack-check (2009-09-14) 2 commits.

68 + + http.c: avoid freeing an uninitialized pointer

69 + http.c: remove verification of remote packs

70

75 -* db/vcs-helper (2009-09-03) 16 commits

76 - + Use a clearer style to issue commands to remote helpers

77 - + Make the "traditionally-supported" URLs a special case

78 - (merged to 'next' on 2009-08-07 at f3533ba)

79 - + Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible

80 - + Makefile: do not link three copies of git-remote-* programs

81 - + Makefile: git-http-fetch does not need expat

82 - + http-fetch: Fix Makefile dependancies

83 - + Add transport native helper executables to .gitignore

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

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

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

87 -

88 -Up to the part that eject -lcurl from the main "git" binary cleanly are

89 -now in 'master', with a few fix-ups from Jim Mayering.

90 -

91 -* cb/maint-1.6.3-grep-relative-up (2009-09-05) 2 commits.

92 - + grep: accept relative paths outside current working directory

93 - + grep: fix exit status if external_grep() punts

94 -

95 -* jk/unwanted-advices (2009-09-09) 2 commits

96 - + status: make "how to stage" messages optional

97 - + push: make non-fast-forward help message configurable

98 -

99 -* jt/pushinsteadof (2009-09-07) 2 commits

100 - + Add url.<base>.pushInsteadOf: URL rewriting for push only

101 - + Wrap rewrite globals in a struct in preparation for adding another set

102 -

103 -* pk/fast-import-tars (2009-09-03) 1 commit

104 - + import-tars: Allow per-tar author and commit message.

105 -

106 -* pk/fast-import-dirs (2009-09-03) 1 commit

107 - + Add script for importing bits-and-pieces to Git.

71 +Graduated to master and maint but then needed a small fixup.

72

73 --------------------------------------------------

74 [New Topics]

75

112 -* db/vcs-helper-rest (2009-09-03) 6 commits

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

114 - - Add support for "import" helper command

115 - - Add a config option for remotes to specify a foreign vcs

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

117 - - Allow fetch to modify refs

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

119 - (this branch is used by jh/cvs-helper.)

76 +* jc/maint-blank-at-eof (2009-09-15) 0 commits.

77 + (this branch uses jc/maint-1.6.0-blank-at-eof.)

78

121 -This is not exactly new. It holds the remainder of the db/vcs-helper

122 -topic.

79 +The series does not have a commit of its own but is a preparation for

80 +merging the original jc/1.6.0-maint-blank-at-eof topic to 'maint' and then

81 +'master'. It is a fix for longstanding bug and 1.6.5 will likely to ship

82 +without this topic.

83

84 --------------------------------------------------

85 [Stalled]

@@ -161,6 +121,18 @@ Replaced but I do not think this is ready for 'pu' yet.

121 --------------------------------------------------

122 [Cooking]

123

124 +* db/vcs-helper-rest (2009-09-03) 6 commits

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

126 + - Add support for "import" helper command

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

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

129 + - Allow fetch to modify refs

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

131 + (this branch is used by jh/cvs-helper.)

132 +

133 +This holds the remainder of the db/vcs-helper topic that has already

134 +merged for 1.6.5.

135 +

136 * jh/notes (2009-09-12) 13 commits

137 - Selftests verifying semantics when loading notes trees with various fanouts

138 - Teach the notes lookup code to parse notes trees with various fanout schemes

@@ -190,7 +162,16 @@ with ("a" "a-b"), ("a/b" "a-b") and just ("a-b"), but my reading of it is

162 that it is just the first step to demonstrate one-entry lookahead and not

163 a full solution yet.

164

193 -* jc/maint-1.6.0-blank-at-eof (2009-09-05) 10 commits.

165 +I started writing a replacement series but the progress is a bit slower

166 +than I would have liked.

167 +

168 +* jc/maint-1.6.0-blank-at-eof (2009-09-14) 15 commits.

169 + (merged to 'next' on 2009-09-15 at 9cbfa00)

170 + + diff -B: colour whitespace errors

171 + + diff.c: emit_add_line() takes only the rest of the line

172 + + diff.c: split emit_line() from the first char and the rest of the line

173 + + diff.c: shuffling code around

174 + + diff --whitespace: fix blank lines at end

175 (merged to 'next' on 2009-09-07 at 165dc3c)

176 + core.whitespace: split trailing-space into blank-at-{eol,eof}

177 + diff --color: color blank-at-eof

@@ -202,9 +183,13 @@ a full solution yet.

183 + apply.c: split check_whitespace() into two

184 + apply --whitespace=fix: detect new blank lines at eof correctly

185 + apply --whitespace=fix: fix handling of blank lines at the eof

186 + (this branch is used by jc/maint-blank-at-eof.)

187 +

188 +This is a fix for an ancient bug (or inconsistent set of features); the

189 +topic is based on an ancient codebase and is designed to be merged

190 +upwards. jc/maint-blank-at-eof serves that purpose.

191

206 -This started a bit late in the cycle, and I'd rather hold it back during

207 -this feature freeze and push it out after 1.6.5 final.

192 +Will not be in 1.6.5.

193

194 * jn/gitweb-blame (2009-09-01) 5 commits

195 - gitweb: Minify gitweb.js if JSMIN is defined

@@ -226,7 +211,7 @@ Ajax-y blame.

211 + fast-import: put option parsing code in separate functions

212 (this branch is used by jh/notes.)

213

229 -Perhaps 1.6.5 material but I wasn't sure.

214 +Ping?

215

216 * nd/sparse (2009-08-20) 19 commits

217 - sparse checkout: inhibit empty worktree

@@ -314,23 +299,3 @@ Maybe some people care about this. I dunno.

299 . Add initial support for pathname conversion to UTF-8

300 . read_directory(): infrastructure for pathname character set conversion

301 . Add 'fill_directory()' helper function for directory traversal

317 -

318 -* cc/sequencer-rebase-i (2009-08-28) 15 commits

319 - - rebase -i: use "git sequencer--helper --cherry-pick"

320 - - sequencer: add "--cherry-pick" option to "git sequencer--helper"

321 - - sequencer: add "do_commit()" and related functions working on "next_commit"

322 - - pick: libify "pick_help_msg()"

323 - - revert: libify cherry-pick and revert functionnality

324 - - rebase -i: use "git sequencer--helper --fast-forward"

325 - - sequencer: let "git sequencer--helper" callers set "allow_dirty"

326 - - sequencer: add "--fast-forward" option to "git sequencer--helper"

327 - - sequencer: add "do_fast_forward()" to perform a fast forward

328 - - rebase -i: use "git sequencer--helper --reset-hard"

329 - - sequencer: add "--reset-hard" option to "git sequencer--helper"

330 - - sequencer: add "reset_almost_hard()" and related functions

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

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

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

334 -

335 -This was to be replaced with multiple bite-sized smaller topics. We've

336 -seen one such topic for "git reset" on the list.

What's cooking (2009/09 #04)