066cbd132d · matheusbsbs/matheus-bagliano

@@ -1,56 +1,23 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Apr 2012, #02; Wed, 4)

3 -X-master-at: e5056c05ecd2bdaceaa95e12e9e94b1584ec59c8

4 -X-next-at: 0677f639064c22077f02df7b77b29cd097a4ecef

2 +Subject: What's cooking in git.git (Apr 2012, #03; Fri, 6)

3 +X-master-at: e8dde3e5f9ddb7cf95a6ff3cea6cf07c3a2db80d

4 +X-next-at: 554fe20f43cb5d69d3fd745ccacd93776a4c101d

5

6 -What's cooking in git.git (Apr 2012, #02; Wed, 4)

6 +What's cooking in git.git (Apr 2012, #03; Fri, 6)

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

8

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

10 only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.

11

12 -It seems that a last minute bug or two slipped in with the latest gitk

13 -updates, so I'll probably do the 1.7.10-rc4 tonight or tomorrow with the

14 -two patches posted yesterday and schedule the final by the end of the

15 -week. In the meantime, 1.7.9.6 is also out, to give GIT_MERGE_AUTOEDIT

16 -support for the maintenance track.

12 +After slipping for about a week, 1.7.10 final has been tagged. Let's wait

13 +for a few days to give time for the dust to settle and then open the new

14 +development cycle sometime next week.

15

16 You can find the changes described here in the integration branches of the

17 repositories listed at

18

19 http://git-blame.blogspot.com/p/git-public-repositories.html

20

23 ---------------------------------------------------

24 -[New Topics]

25 -

26 -* jc/index-v4 (2012-04-04) 10 commits

27 - - update-index: upgrade/downgrade on-disk index version

28 - - read-cache.c: write prefix-compressed names in the index

29 - - read-cache.c: read prefix-compressed names in index on-disk version v4

30 - - read-cache.c: move code to copy incore to ondisk cache to a helper function

31 - - read-cache.c: move code to copy ondisk to incore cache to a helper function

32 - - read-cache.c: report the header version we do not understand

33 - - read-cache.c: make create_from_disk() report number of bytes it consumed

34 - - read-cache.c: allow unaligned mapping of the index file

35 - - cache.h: hide on-disk index details

36 - - varint: make it available outside the context of pack

37 - (this branch is tangled with jc/split-blob.)

38 -

39 -* jk/add-p-skip-conflicts (2012-04-04) 3 commits

40 - - fixup from rctay

41 - - snap

42 - - add -p: skip conflicted paths

43 -

44 ---------------------------------------------------

45 -[Graduated to "master"]

46 -

47 -* pt/gitk (2012-04-02) 2 commits

48 - + gitk: fix setting font display with new tabbed dialog layout.

49 - + gitk: fix tabbed preferences construction when using tcl 8.4

50 -

51 -Pat spotted and fixed a few bugs in the latest gitk updates; we may need

52 -these in 1.7.10 so testing on various platforms is very much appreciated.

53 -

21 --------------------------------------------------

22 [Stalled]

23

@@ -164,6 +131,31 @@ not working :-(.

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

132 [Cooking]

133

134 +* jc/index-v4 (2012-04-04) 10 commits

135 + - update-index: upgrade/downgrade on-disk index version

136 + - read-cache.c: write prefix-compressed names in the index

137 + - read-cache.c: read prefix-compressed names in index on-disk version v4

138 + - read-cache.c: move code to copy incore to ondisk cache to a helper function

139 + - read-cache.c: move code to copy ondisk to incore cache to a helper function

140 + - read-cache.c: report the header version we do not understand

141 + - read-cache.c: make create_from_disk() report number of bytes it consumed

142 + - read-cache.c: allow unaligned mapping of the index file

143 + - cache.h: hide on-disk index details

144 + - varint: make it available outside the context of pack

145 + (this branch is tangled with jc/split-blob.)

146 +

147 +Trivially shrinks the on-disk size of the index file to save both I/O and

148 +checksum overhead. The "v4" format represented here may not be what we

149 +eventually want to have, but the preparatory refactoring steps and the way

150 +how backward compatibility is retained should give plenty to learn to GSoC

151 +student-hopefuls.

152 +

153 +* jk/add-p-skip-conflicts (2012-04-05) 1 commit

154 + - add--interactive: ignore unmerged entries in patch mode

155 +

156 +Excludes conflicted paths from "add -p" processing, as it is not prepared

157 +to handle them.

158 +

159 * bw/spawn-via-shell-path (2012-04-03) 1 commit

160 - Use SHELL_PATH from build system in run_command.c:prepare_shell_cmd

161

@@ -181,15 +173,13 @@ When "git commit --template F" errors out because the user did not touch

173 the message, it claimed that it aborts due to "empty message", which was

174 utterly wrong.

175

184 -* jc/push-upstream-sanity (2012-04-03) 2 commits

185 - - [fixup] remove misguided "try to see if URLs are the same"

186 - - push: detect nonsense "upstream" check more carefully

176 +* jc/push-upstream-sanity (2012-04-05) 1 commit

177 + - push: error out when the "upstream" semantics does not make sense

178

188 -"git push $there" without refspec, when the current branch is set to push

189 -to a remote different from $there, used to push to $there using the

190 -upstream information to a remote unreleated to $there.

191 -

192 -This is necessary if we were to switch the push.default to 'current'.

179 +Fix broken 'push to upstream' implementation. "git push $there" without

180 +refspec, when the current branch is set to push to a remote different from

181 +$there, used to push to $there using the upstream information to a remote

182 +unreleated to $there.

183

184 * jk/http-backend-keep-committer-ident-env (2012-03-30) 1 commit

185 - http-backend: respect existing GIT_COMMITTER_* variables

@@ -197,7 +187,7 @@ This is necessary if we were to switch the push.default to 'current'.

187 The smart-http backend used to always override GIT_COMMITTER_* variables

188 with REMOTE_USER and REMOTE_ADDR.

189

200 -* mk/gitweb-diff-hl (2012-04-04) 8 commits

190 +* mk/gitweb-diff-hl (2012-04-05) 8 commits

191 - gitweb: Refinement highlightning in combined diffs

192 - gitweb: Highlight interesting parts of diff

193 - gitweb: Push formatting diff lines to print_diff_chunk()

@@ -207,6 +197,8 @@ with REMOTE_USER and REMOTE_ADDR.

197 - gitweb: esc_html_hl_regions(): Don't create empty <span> elements

198 - gitweb: Use descriptive names in esc_html_hl_regions()

199

200 +Rerolled.

201 +

202 * it/fetch-pack-many-refs (2012-04-02) 5 commits

203 - remote-curl: main test case for the OS command line overflow

204 - fetch-pack: test cases for the new --stdin option

@@ -243,6 +235,7 @@ looked sane.

235 - ...

236

237 A test merge of the 'subtree'.

238 +Waiting for an updated pull request.

239

240 * jk/branch-quiet (2012-03-26) 2 commits

241 - teach "git branch" a --quiet option

@@ -251,8 +244,9 @@ A test merge of the 'subtree'.

244 Even with "-q"uiet option, "checkout" used to report setting up tracking.

245 Also "branch" learns "-q"uiet option to squelch informational message.

246

254 -* jk/run-command-eacces (2012-04-03) 1 commit

247 +* jk/run-command-eacces (2012-04-05) 2 commits

248 - run-command: treat inaccessible directories as ENOENT

249 + - compat/mingw.[ch]: Change return type of exec functions to int

250

251 When PATH contains an unreadable directory, alias expansion code did not

252 kick in, and failed with an error that said "git-subcmd" was not found.

What's cooking (2012/04 #03)