c788b2186f · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (May 2011, #08; Mon, 16)

2 +Subject: What's cooking in git.git (May 2011, #09; Wed, 18)

3 X-master-at: b602ed7dea968d72c5b3f61ca016de7f285d80ef

4 -X-next-at: cc6c7e82981e91501dc98f94e565f15ae4591a0c

4 +X-next-at: d7180b92680b81e5de1cd29156f51a7371d65fe1

5

6 -What's cooking in git.git (May 2011, #08; Mon, 16)

6 +What's cooking in git.git (May 2011, #09; Wed, 18)

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

8

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

@@ -17,75 +17,38 @@ We are at the beginning of week #4 of this cycle.

17 --------------------------------------------------

18 [New Topics]

19

20 -* jk/cherry-pick-root-with-resolve (2011-05-16) 3 commits

21 - (merged to 'next' on 2011-05-16 at 2a63845)

22 - + t3503: test cherry picking and reverting root commits

23 - + revert: allow reverting a root commit

24 - + cherry-pick: handle root commits with external strategies

20 +* hg/add-i-qq (2011-05-17) 1 commit

21 + - add-interactive: add 'Quit' shortcut to add hunk and quit

22

26 -Will merge to "master" soonish, to merge further to "maint" later.

23 +The question "why is y+q any more deserving for a short-cut than d+q" was

24 +raised late in the discussion, and I think it a very valid concern.

25

28 -* jk/git-connection-deadlock-fix (2011-05-16) 3 commits

29 - (merged to 'next' on 2011-05-16 at 33e6c11)

30 - + send-pack: avoid deadlock on git:// push with failed pack-objects

31 - + connect: let callers know if connection is a socket

32 - + connect: treat generic proxy processes like ssh processes

33 - (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix; is tangled with js/maint-send-pack-stateless-rpc-deadlock-fix.)

26 +May drop.

27

35 -Will merge to "master" soonish, to merge further to "maint" later.

28 +* js/log-abbrev-commit-config (2011-05-18) 2 commits

29 + - Add log.abbrevCommit config variable

30 + - "git log -h": typofix misspelled 'suppress'

31

37 ---------------------------------------------------

38 -[Graduated to "master"]

39 -

40 -* ci/commit--interactive-atomic (2011-05-10) 6 commits

41 - (merged to 'next' on 2011-05-11 at 7f36fd8)

42 - + Test atomic git-commit --interactive

43 - + Add commit to list of config.singlekey commands

44 - + Add support for -p/--patch to git-commit

45 - + Allow git commit --interactive with paths

46 - + t7501.8: feed a meaningful command

47 - + Use a temporary index for git commit --interactive

48 -

49 -* fc/completion-zsh (2011-05-10) 1 commit

50 - + git-completion: fix regression in zsh support

51 - (this branch is used by sg/completion-updates.)

52 -

53 -* jc/convert (2011-05-09) 4 commits

54 - (merged to 'next' on 2011-05-15 at 9d35a6e)

55 - + convert: make it harder to screw up adding a conversion attribute

56 - + convert: make it safer to add conversion attributes

57 - + convert: give saner names to crlf/eol variables, types and functions

58 - + convert: rename the "eol" global variable to "core_eol"

59 - (this branch is used by jc/streaming.)

32 +* js/mingw-shutdown (2011-05-18) 1 commit

33 + - Windows: add a wrapper for the shutdown() system call

34 +

35 +Meant for maint-1.7.4 and later.

36 +

37 +* mg/config-symbolic-constants (2011-05-17) 2 commits

38 + - config: Give error message when not changing a multivar

39 + - config: define and document exit codes

40 +

41 +* ms/ls-remote-exit-with-status (2011-05-18) 1 commit

42 + - ls-remote: the --exit-code option reports "no matching refs"

43 +

44 +* rg/copy-gecos-username (2011-05-17) 1 commit

45 + (merged to 'next' on 2011-05-17 at 6080944)

46 + + copy_gecos: fix not adding nlen to len when processing "&"

47

61 -* kk/maint-prefix-in-config-mak (2011-05-09) 3 commits

62 - (merged to 'next' on 2011-05-09 at 267a3aa)

63 - + Honor $(prefix) set in config.mak* when defining ETC_GIT*

64 - + Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir"

65 - (merged to 'next' on 2011-05-02 at c747ba3)

66 - + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir

67 -

68 -One revert and replace the whole thing from J6t. The end result looked

69 -reasonable.

70 -

71 -* mg/merge-ff-config (2011-05-06) 3 commits

72 - (merged to 'next' on 2011-05-08 at 977b432)

73 - + tests: check git does not barf on merge.ff values for future versions of git

74 - + merge: introduce merge.ff configuration variable

75 - + Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config

76 -

77 -* sg/completion-updates (2011-05-10) 4 commits

78 - (merged to 'next' on 2011-05-10 at eaf5398)

79 - + Merge branch 'fc/completion-zsh' into sg/completion-updates

80 - + Revert "completion: don't declare 'local words' to make zsh happy"

81 - (merged to 'next' on 2011-05-08 at 761178c)

82 - + completion: move private shopt shim for zsh to __git_ namespace

83 - (merged to 'next' on 2011-05-02 at 0fd443a)

84 - + completion: don't declare 'local words' to make zsh happy

85 - (this branch uses fc/completion-zsh.)

86 -

87 -This reverts the "local words only on bash" thingy and uses the

88 -workaround blessed by zsh folks instead.

48 +* tr/add-i-no-escape (2011-05-17) 1 commit

49 + - add -i: ignore terminal escape sequences

50 +

51 +Will merge to "next".

52

53 --------------------------------------------------

54 [Stalled]

@@ -172,6 +135,31 @@ Needs to tighten the advice to only govern the generic How-to part.

135 --------------------------------------------------

136 [Cooking]

137

138 +* jh/receive-count-limit (2011-05-14) 1 commit

139 + - receive-pack: Add receive.objectCountLimit to refuse push with too many objects

140 +

141 +Re-rolled but decided not to pick it up while it is still being

142 +discussed.

143 +

144 +* jk/cherry-pick-root-with-resolve (2011-05-16) 3 commits

145 + (merged to 'next' on 2011-05-16 at 2a63845)

146 + + t3503: test cherry picking and reverting root commits

147 + + revert: allow reverting a root commit

148 + + cherry-pick: handle root commits with external strategies

149 +

150 +Will merge to "master" soonish, to merge further to "maint" later.

151 +

152 +* jk/git-connection-deadlock-fix (2011-05-18) 4 commits

153 + (merged to 'next' on 2011-05-18 at d4567da)

154 + + test core.gitproxy configuration

155 + (merged to 'next' on 2011-05-16 at 33e6c11)

156 + + send-pack: avoid deadlock on git:// push with failed pack-objects

157 + + connect: let callers know if connection is a socket

158 + + connect: treat generic proxy processes like ssh processes

159 + (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix; is tangled with js/maint-send-pack-stateless-rpc-deadlock-fix.)

160 +

161 +Will merge to "master" soonish, to merge further to "maint" later.

162 +

163 * jc/replacing (2011-05-15) 5 commits

164 (merged to 'next' on 2011-05-16 at 5d0b584)

165 + read_sha1_file(): allow selective bypassing of replacement mechanism

@@ -184,11 +172,6 @@ Needs to tighten the advice to only govern the generic How-to part.

172 Code restructuring without much new feature.

173 Will merge to "master" by the end of week #4.

174

187 -* jh/receive-count-limit (2011-05-14) 1 commit

188 - - receive-pack: Add receive.objectCountLimit to refuse push with too many objects

189 -

190 -Being rerolled.

191 -

175 * jl/submodule-conflicted-gitmodules (2011-05-14) 2 commits

176 (merged to 'next' on 2011-05-16 at cc6c7e8)

177 + Submodules: Don't parse .gitmodules when it contains, merge conflicts

@@ -238,7 +221,7 @@ Will merge to "master" soonish, to merge further to "maint" later.

221 Looked good. We _might_ want to make -n simply ignore -u, though.

222 Waiting for a reroll.

223

241 -* jc/streaming (2011-05-16) 12 commits

224 +* jc/streaming (2011-05-18) 12 commits

225 - streaming: read loose objects incrementally

226 - sha1_file.c: expose helpers to read loose objects

227 - streaming: read non-delta incrementally from a pack

@@ -253,9 +236,8 @@ Waiting for a reroll.

236 - Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming

237 (this branch uses jc/bigfile and jc/replacing.)

238

256 -I _think_ the "hole" one does a reasonable job to avoid excessible and

257 -pointless seeks (it operates on 10k chunks and coalesces continuous chunks

258 -full of NULs), which was the concern raised in the review.

239 +Thanks to Peff, it has become clear that sha1_object_info_extended()

240 +change was not paying enough attention to the performance.

241

242 * jc/bigfile (2011-05-13) 3 commits

243 (merged to 'next' on 2011-05-15 at 0ee7144)

@@ -347,17 +329,13 @@ Will merge to "master" by the end of week #4.

329 (this branch uses ab/i18n-scripts-basic.)

330

331 * ab/i18n-scripts-basic (2011-05-14) 4 commits

350 - - Makefile: add xgettext target for *.sh files

351 - - git-sh-i18n.sh: add GIT_GETTEXT_POISON support

352 - - git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers

353 - - git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()

332 + (merged to 'next' on 2011-05-18 at 3dc69f0)

333 + + Makefile: add xgettext target for *.sh files

334 + + git-sh-i18n.sh: add GIT_GETTEXT_POISON support

335 + + git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers

336 + + git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()

337 (this branch is used by ab/i18n-scripts.)

338

356 -Re-rolled to drop credits from the individual documentation pages

357 -and update the documentation.

358 -

359 -Will merge to "next" by the end of week #4.

360 -

339 * mk/grep-pcre (2011-05-16) 12 commits

340 (merged to 'next' on 2011-05-16 at 0c6c25e)

341 + Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS

@@ -388,7 +366,9 @@ Will merge to "master" by the middle of week #5.

366

367 Will merge to "master" by the end of week #4.

368

391 -* jc/magic-pathspec (2011-05-12) 13 commits

369 +* jc/magic-pathspec (2011-05-17) 14 commits

370 + (merged to 'next' on 2011-05-18 at d7180b9)

371 + + setup.c: Fix some "symbol not declared" sparse warnings

372 (merged to 'next' on 2011-05-12 at 656c8b5)

373 + t3703: Skip tests using directory name ":" on Windows

374 (merged to 'next' on 2011-05-11 at 86d1d6d)

What's cooking (2011/05 #09)