ae46ec3e69 · matheusbsbs/matheus-bagliano

@@ -1,18 +1,21 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Feb 2013, #07; Sun, 17)

4 -X-master-at: 004825d314db4ba3f34ef499e3522ef72792d896

5 -X-next-at: 838f5639caf00f6b9b0bfab81f201c6402762bf9

3 +Subject: What's cooking in git.git (Feb 2013, #08; Tue, 19)

4 +X-master-at: b3600c36286517cda38df976946557ce3e87bd82

5 +X-next-at: 01e6e4a21161470b1c5f7df6d2d4d6cbc7556508

6

7 -What's cooking in git.git (Feb 2013, #07; Sun, 17)

7 +What's cooking in git.git (Feb 2013, #08; Tue, 19)

8 --------------------------------------------------

9

10 Here are the topics that have been cooking. Commits prefixed with

11 '-' are only in 'pu' (proposed updates) while commits prefixed with

12 '+' are in 'next'.

13

14 -The tip of the 'master' is at 1.8.2-rc0; new topics that are not

15 -listed in this report are likely to be too late for the upcoming

14 +On the 'maint' front, a maintenance release 1.8.1.4 is out. The

15 +same fixes are also included in the 'master' and upwards.

16 +

17 +The tip of the 'master' is a bit past 1.8.2-rc0; new topics that are

18 +not listed in this report are likely to be too late for the upcoming

19 release.

20

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

@@ -23,124 +26,73 @@ repositories listed at

26 --------------------------------------------------

27 [New Topics]

28

26 -* da/difftool-fixes (2013-02-17) 5 commits

27 - - [DONTMERGE] expect reroll $gmane/216376

28 - - t7800: "defaults" is no longer a builtin tool name

29 - - t7800: modernize tests

30 - - t7800: Update copyright notice

31 - - difftool: silence uninitialized variable warning

29 +* as/check-ignore (2013-02-19) 2 commits

30 + - name-hash: allow hashing an empty string

31 + - t0008: document test_expect_success_multi

32

33 - Minor maintenance updates to difftool, and updates to its tests.

34 - Expecting a reroll.

35 - $gmane/216376

33 + "git check-ignore ." segfaulted, as a function it calls deep in its

34 + callchain took a string in the <ptr, length> form but did not stop

35 + when given an empty string.

36

37 + Will merge to 'next' and will fast-track to 'master' (this is a new

38 + feature in the upcoming release).

39

38 -* jk/smart-http-robustify (2013-02-17) 3 commits

39 - - remote-curl: sanity check ref advertisement from server

40 - - remote-curl: verify smart-http metadata lines

41 - - pkt-line: teach packet_get_line a no-op mode

40

43 - Parse the HTTP exchange that implements the native Git protocol as

44 - a series of stateless RPC more carefully to diagnose protocol

45 - breakage better.

46 -

47 - Will merge to and hold in 'next'.

48 -

49 -

50 -* nd/read-directory-recursive-optim (2013-02-17) 1 commit

51 - - read_directory: avoid invoking exclude machinery on tracked files

41 +* bc/commit-complete-lines-given-via-m-option (2013-02-19) 4 commits

42 + (merged to 'next' on 2013-02-19 at cf622b7)

43 + + Documentation/git-commit.txt: rework the --cleanup section

44 + + git-commit: only append a newline to -m mesg if necessary

45 + + t7502: demonstrate breakage with a commit message with trailing newlines

46 + + t/t7502: compare entire commit message with what was expected

47

53 - "git status" has been optimized by taking advantage of the fact

54 - that paths that are already known to the index do not have to be

55 - checked against the .gitignore mechanism under some conditions.

56 -

57 - Will merge to and hold in 'next'.

48 + 'git commit -m "$str"' when $str was already terminated with a LF

49 + now avoids adding an extra LF to the message.

50

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

60 -[Graduated to "master"]

61 -

62 -* da/p4merge-mktemp-fix (2013-02-10) 1 commit

63 - (merged to 'next' on 2013-02-14 at c5fc5ba)

64 - + p4merge: fix printf usage

65 -

66 -

67 -* ef/non-ascii-parse-options-error-diag (2013-02-11) 1 commit

68 - (merged to 'next' on 2013-02-14 at 10cbdf8)

69 - + parse-options: report uncorrupted multi-byte options

70 -

71 -

72 -* jc/hidden-refs (2013-02-07) 3 commits

73 - (merged to 'next' on 2013-02-14 at b69f9cc)

74 - + upload/receive-pack: allow hiding ref hierarchies

75 - + upload-pack: simplify request validation

76 - + upload-pack: share more code

77 - (this branch is used by jc/fetch-raw-sha1.)

78 -

79 - Allow the server side to redact the refs/ namespace it shows to the

80 - client.

81 -

82 -

83 -* jk/read-commit-buffer-data-after-free (2013-02-11) 1 commit

84 - (merged to 'next' on 2013-02-14 at 220e3a8)

85 - + log: re-encode commit messages before grepping

86 -

87 - "git log --grep=<pattern>" has been taught to honor the logoutput

88 - encoding when matching the log message against the given pattern.

89 -

90 -

91 -* jk/rebase-i-comment-char (2013-02-12) 1 commit

92 - (merged to 'next' on 2013-02-14 at 0ed2f48)

93 - + rebase -i: respect core.commentchar

94 -

95 - Finishing touches to core.commentchar topic to teach it to "rebase

96 - -i" as well.

51 + Will merge to 'next'.

52

53

99 -* mk/make-rm-depdirs-could-be-empty (2013-02-13) 1 commit

100 - (merged to 'next' on 2013-02-14 at d966248)

101 - + Makefile: don't run "rm" without any files

54 +* ct/autoconf-htmldir (2013-02-19) 1 commit

55 + - Bugfix: undefined htmldir in config.mak.autogen

56

103 - "make COMPUTE_HEADER_DEPENDENCIES=no clean" would try to run "rm

104 - -rf $(dep_dirs)" with an empty dep_dir, but some implementations of

105 - "rm -rf" barf on an empty argument list.

57 + An earlier change to config.mak.autogen broke a build driven by the

58 + ./configure script when --htmldir is not specified on the command

59 + line of ./configure.

60

61 + Will merge to 'next' and will fast-track to 'master' (this is a

62 + regressin workaround).

63

108 -* mk/old-expat (2013-02-11) 1 commit

109 - (merged to 'next' on 2013-02-14 at 5fb47ce)

110 - + Allow building with xmlparse.h

64

112 - Old expat needs to include xmlparse.h instead of expat.h header

113 - file.

65 +* wk/user-manual (2013-02-19) 3 commits

66 + (merged to 'next' on 2013-02-19 at dbc0eb2)

67 + + user-manual: Flesh out uncommitted changes and submodule updates

68 + + user-manual: Use request-pull to generate "please pull" text

69 + + user-manual: Reorganize the reroll sections, adding 'git rebase -i'

70

71 + Further updates to the user manual.

72

116 -* mm/config-local-completion (2013-02-12) 1 commit

117 - (merged to 'next' on 2013-02-14 at 26bf6c2)

118 - + completion: support 'git config --local'

73 + Will merge to 'next'.

74

75

121 -* mp/diff-algo-config (2013-01-16) 3 commits

122 - (merged to 'next' on 2013-02-14 at cd765dc)

123 - + diff: Introduce --diff-algorithm command line option

124 - + config: Introduce diff.algorithm variable

125 - + git-completion.bash: Autocomplete --minimal and --histogram for git-diff

76 +* wk/man-deny-current-branch-is-default-these-days (2013-02-18) 1 commit

77 + - user-manual: typofix (ofthe->of the)

78

127 - Add diff.algorithm configuration so that the user does not type

128 - "diff --histogram".

79 + Will merge to 'next' and fast-track to 'master'.

80

81 +--------------------------------------------------

82 +[Graduated to "master"]

83

131 -* mw/bash-prompt-show-untracked-config (2013-02-13) 3 commits

132 - (merged to 'next' on 2013-02-14 at 809dbcf)

133 - + t9903: add extra tests for bash.showDirtyState

134 - + t9903: add tests for bash.showUntrackedFiles

135 - + shell prompt: add bash.showUntrackedFiles option

84 +* jc/mention-tracking-for-pull-default (2013-01-31) 1 commit

85 + (merged to 'next' on 2013-02-17 at 043624b)

86 + + doc: mention tracking for pull.default

87

137 - Allows skipping the untracked check GIT_PS1_SHOWUNTRACKEDFILES

138 - asks for the git-prompt (in contrib/) per repository.

88 + We stopped mentioning `tracking` is a deprecated but supported

89 + synonym for `upstream` in pull.default even though we have no

90 + intention of removing the support for it.

91

92

141 -* wk/man-deny-current-branch-is-default-these-days (2013-02-14) 1 commit

142 - (merged to 'next' on 2013-02-14 at 6fab9d4)

143 - + user-manual: Update for receive.denyCurrentBranch=refuse

93 +* mm/config-intro-in-git-doc (2013-02-15) 1 commit

94 + (merged to 'next' on 2013-02-17 at ff03eb5)

95 + + git.txt: update description of the configuration mechanism

96

97 --------------------------------------------------

98 [Stalled]

@@ -187,6 +139,38 @@ repositories listed at

139 --------------------------------------------------

140 [Cooking]

141

142 +* da/difftool-fixes (2013-02-19) 4 commits

143 + - t7800: "defaults" is no longer a builtin tool name

144 + - t7800: modernize tests

145 + - t7800: update copyright notice

146 + - difftool: silence uninitialized variable warning

147 +

148 + Minor maintenance updates to difftool, and updates to its tests.

149 +

150 +

151 +* jk/smart-http-robustify (2013-02-17) 3 commits

152 + - remote-curl: sanity check ref advertisement from server

153 + - remote-curl: verify smart-http metadata lines

154 + - pkt-line: teach packet_get_line a no-op mode

155 +

156 + Parse the HTTP exchange that implements the native Git protocol as

157 + a series of stateless RPC more carefully to diagnose protocol

158 + breakage better.

159 +

160 + Will merge to and hold in 'next'.

161 +

162 +

163 +* nd/read-directory-recursive-optim (2013-02-17) 1 commit

164 + (merged to 'next' on 2013-02-17 at 36ba9f4)

165 + + read_directory: avoid invoking exclude machinery on tracked files

166 +

167 + "git status" has been optimized by taking advantage of the fact

168 + that paths that are already known to the index do not have to be

169 + checked against the .gitignore mechanism under some conditions.

170 +

171 + Will cook in 'next'.

172 +

173 +

174 * mg/gpg-interface-using-status (2013-02-14) 5 commits

175 - pretty: make %GK output the signing key for signed commits

176 - pretty: parse the gpg status lines rather than the output

@@ -198,12 +182,6 @@ repositories listed at

182 tags.

183

184

201 -* mm/config-intro-in-git-doc (2013-02-15) 1 commit

202 - - git.txt: update description of the configuration mechanism

203 -

204 - Will merge to 'master'.

205 -

206 -

185 * jn/shell-disable-interactive (2013-02-11) 2 commits

186 - shell: pay attention to exit status from 'help' command

187 - shell doc: emphasize purpose and security model

@@ -247,12 +225,13 @@ repositories listed at

225

226

227 * nd/count-garbage (2013-02-15) 4 commits

250 - - count-objects: report how much disk space taken by garbage files

251 - - count-objects: report garbage files in pack directory too

252 - - sha1_file: reorder code in prepare_packed_git_one()

253 - - git-count-objects.txt: describe each line in -v output

228 + (merged to 'next' on 2013-02-17 at b2af923)

229 + + count-objects: report how much disk space taken by garbage files

230 + + count-objects: report garbage files in pack directory too

231 + + sha1_file: reorder code in prepare_packed_git_one()

232 + + git-count-objects.txt: describe each line in -v output

233

255 - Will merge to 'next'.

234 + Will cook in 'next'.

235

236

237 * tz/credential-authinfo (2013-02-05) 1 commit

@@ -292,20 +271,6 @@ repositories listed at

271 Will cook in 'next'.

272

273

295 -* jc/mention-tracking-for-pull-default (2013-01-31) 1 commit

296 - - doc: mention tracking for pull.default

297 -

298 - We stopped mentioning `tracking` is a deprecated but supported

299 - synonym for `upstream` in pull.default even though we have no

300 - intention of removing the support for it.

301 -

302 - This is my "don't list it to catch readers' eyes, but make sure it

303 - can be found if the reader looks for it" version; I'm not married

304 - to the layout and will be happy to take a replacement patch.

305 -

306 - Will merge to 'next'.

307 -

308 -

274 * jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit

275 (merged to 'next' on 2013-01-30 at b639b47)

276 + simplify-merges: drop merge from irrelevant side branch

@@ -339,7 +304,7 @@ repositories listed at

304 + t5505: do not assume the "matching" push is the default

305 + t5404: do not assume the "matching" push is the default

306

342 - Will cook in 'next' until Git 2.0 ;-).

307 + Will cook in 'next' until Git 2.0.

308

309

310 * bc/append-signed-off-by (2013-02-12) 12 commits

What's cooking (2013/02 #08)