d38c3808a7 · matheusbsbs/matheus-bagliano

@@ -1,10 +1,10 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Mar 2016, #02; Fri, 4)

3 +Subject: What's cooking in git.git (Mar 2016, #03; Wed, 9)

4 X-master-at: ab5d01a29eb7380ceab070f0807c2939849c44bc

5 -X-next-at: 19dcece4e85c9fe888a1ab646b626fa6039c184c

5 +X-next-at: 56288600415de8e2277476281e1838ff7e19dd4d

6

7 -What's cooking in git.git (Mar 2016, #02; Fri, 4)

7 +What's cooking in git.git (Mar 2016, #03; Wed, 9)

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

9

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

@@ -12,9 +12,7 @@ Here are the topics that have been cooking. Commits prefixed with

12 '+' are in 'next'. The ones marked with '.' do not appear in any of

13 the integration branches, but I am still holding onto them.

14

15 -v2.8-rc1 has been tagged. There still is a known regression around

16 -"git status" (and "ls-files -o") relative to 2.7.2, which we may end

17 -up resolving by reverting a topic. We'll see.

15 +Hopefully 2.8-rc2 tomorrow.

16

17 Again, the topics that have not been cooked sufficiently in 'next'

18 at this point will not be considered for 2.8 final, even though I

@@ -31,110 +29,84 @@ repositories listed at

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

30

31 --------------------------------------------------

34 -[Graduated to "master"]

35 -

36 -* jk/pack-idx-corruption-safety (2016-02-27) 4 commits

37 - (merged to 'next' on 2016-03-01 at 49e08d3)

38 - + sha1_file.c: mark strings for translation

39 - (merged to 'next' on 2016-02-26 at ef0d6de)

40 - + use_pack: handle signed off_t overflow

41 - + nth_packed_object_offset: bounds-check extended offset

42 - + t5313: test bounds-checks of corrupted/malicious pack/idx files

43 -

44 - The code to read the pack data using the offsets stored in the pack

45 - idx file has been made more carefully check the validity of the

46 - data in the idx.

47 -

48 -

49 -* jk/tighten-alloc (2016-02-29) 1 commit

50 - (merged to 'next' on 2016-03-01 at f4df936)

51 - + compat/mingw: brown paper bag fix for 50a6c8e

52 -

53 -

54 -* js/pthread-exit-emu-windows (2016-03-02) 1 commit

55 - (merged to 'next' on 2016-03-02 at 391b917)

56 - + Mark win32's pthread_exit() as NORETURN

57 -

58 -

59 -* mg/httpd-tests-update-for-apache-2.4 (2016-02-25) 1 commit

60 - (merged to 'next' on 2016-03-01 at d2f7e8c)

61 - + t/lib-httpd: load mod_unixd

62 - (this branch is used by jk/submodule-c-credential.)

32 +[New Topics]

33

64 - The way the test scripts configure the Apache web server has been

65 - updated to work also for Apache 2.4 running on RedHat derived

66 - distros.

34 +* cc/doc-recommend-performance-trace-to-file (2016-03-07) 1 commit

35 + - Documentation: talk about pager in api-trace.txt

36

37

69 -* nd/clear-gitenv-upon-use-of-alias (2016-03-03) 1 commit

70 - (merged to 'next' on 2016-03-03 at 1c1c50f)

71 - + t0001: fix GIT_* environment variable check under --valgrind

38 +* da/mergetool-delete-delete-conflict (2016-03-09) 3 commits

39 + - t7610-mergetool: add test cases for tempfile behavior

40 + - mergetool: support delete/delete conflicts

41 + - mergetool: honor tempfile configuration when resolving delete conflicts

42

73 - Hotfix for a test breakage made between 2.7 and 'master'.

43

44 +* es/test-gpg-tags (2016-03-06) 4 commits

45 + - t6302: skip only signed tags rather than all tests when GPG is missing

46 + - t6302: also test annotated in addition to signed tags

47 + - t6302: normalize names and descriptions of signed tags

48 + - lib-gpg: drop unnecessary "missing GPG" warning

49

76 -* nd/i18n-2.8.0 (2016-02-29) 4 commits

77 - (merged to 'next' on 2016-03-01 at cdf4675)

78 - + trailer.c: mark strings for translation

79 - + ref-filter.c: mark strings for translation

80 - + builtin/clone.c: mark strings for translation

81 - + builtin/checkout.c: mark strings for translation

50 + A test for tags has been restructured so that more parts of it can

51 + easily be run on a platform without a working GnuPG.

52

53 + Will merge to 'next'.

54

84 -* sb/submodule-parallel-fetch (2016-03-01) 1 commit

85 - (merged to 'next' on 2016-03-01 at b47ab6e)

86 - + run-command: do not pass child process data into callbacks

87 - (this branch is used by sb/submodule-init and sb/submodule-parallel-update.)

55

89 - Simplify the two callback functions that are triggered when the

90 - child process terminates to avoid misuse of the child-process

91 - structure that has already been cleaned up.

56 +* jk/getwholeline-getdelim-empty (2016-03-05) 1 commit

57 + - strbuf_getwholeline: NUL-terminate getdelim buffer on error

58

59 + strbuf_getwholeline() did not NUL-terminate the buffer on certain

60 + corner cases in its error codepath.

61

94 -* tb/avoid-gcc-on-darwin-10-6 (2016-02-28) 1 commit

95 - (merged to 'next' on 2016-03-01 at e8dd08a)

96 - + config.mak.uname: use clang for Mac OS X 10.6

62 + Will merge to 'next'.

63

98 - Out of maintenance gcc on OSX 10.6 fails to compile the code in

99 - 'master'; work it around by using clang by default on the platform.

64

101 ---------------------------------------------------

102 -[New Topics]

65 +* jk/startup-info (2016-03-07) 6 commits

66 + - use setup_git_directory() in test-* programs

67 + - grep: turn off gitlink detection for --no-index

68 + - mailmap: do not resolve blobs in a non-repository

69 + - remote: don't resolve HEAD in non-repository

70 + - setup: set startup_info->have_repository more reliably

71 + - setup: make startup_info available everywhere

72

104 -* sb/rebase-summary (2016-03-02) 1 commit

105 - (merged to 'next' on 2016-03-04 at d40714d)

106 - + Documentation: reword rebase summary

73 + The startup_info data, which records if we are working inside a

74 + repository (among other things), are now uniformly available to Git

75 + subcommand implementations, and Git avoids attempting to touch

76 + references when we are not in a repository.

77

108 - Will merge to 'master' by 2.8-rc2.

78 + Will merge to 'next'.

79

80

111 -* jc/index-pack (2016-03-03) 2 commits

112 - - index-pack: add a helper function to derive .idx/.keep filename

113 - - Merge branch 'jc/maint-index-pack-keep' into jc/index-pack

114 - (this branch is used by jc/bundle; uses jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)

81 +* rj/xdiff-prepare-plug-leak-on-error-codepath (2016-03-04) 2 commits

82 + - xdiff/xprepare: fix a memory leak

83 + - xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits

84

116 - Code clean-up.

85 + A small memory leak in an error codepath has been plugged in xdiff

86 + code.

87

88 Will merge to 'next'.

89

90

121 -* jc/maint-index-pack-keep (2016-03-03) 1 commit

122 - (merged to 'next' on 2016-03-04 at bc1d37a)

123 - + index-pack: correct --keep[=<msg>]

124 - (this branch is used by jc/bundle, jc/index-pack and jc/index-pack-clone-bundle.)

91 +* jc/exclusion-doc (2016-03-08) 1 commit

92 + - gitignore: document that unignoring a directory unignores everything in it

93

126 - "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.

94 + Will merge to 'next' and then to 'master' before 2.8 final.

95

128 - Will merge to 'master' after 2.8 final.

96

97 +* jc/sane-grep (2016-03-08) 2 commits

98 + - rebase-i: clarify "is this commit relevant?" test

99 + - sane_grep: pass "-a" if grep accepts it

100

131 -* js/close-packs-before-gc (2016-03-04) 1 commit

132 - (merged to 'next' on 2016-03-04 at fe6f6ed)

133 - + t5510: do not leave changed cwd

134 -

135 - A small future-proofing of a test added recently.

101 + Recent versions of GNU grep is pickier than before to decide if a

102 + file is "binary" and refuse to give line-oriented hits when we

103 + expect it to, unless explicitly told with "-a" option. As our

104 + scripted Porcelains use sane_grep wrapper for line-oriented data,

105 + even when the line may contain non-ASCII payload we took from

106 + end-user data, use "grep -a" to implement sane_grep wrapper when

107 + using an implementation of "grep" that takes the "-a" option.

108

137 - Will merge to 'master' by 2.8-rc2.

109 + Will merge to 'next'.

110

111 --------------------------------------------------

112 [Stalled]

@@ -210,6 +182,42 @@ repositories listed at

182 --------------------------------------------------

183 [Cooking]

184

185 +* sb/rebase-summary (2016-03-02) 1 commit

186 + (merged to 'next' on 2016-03-04 at d40714d)

187 + + Documentation: reword rebase summary

188 +

189 + Will merge to 'master' by 2.8-rc2.

190 +

191 +

192 +* jc/index-pack (2016-03-03) 2 commits

193 + - index-pack: add a helper function to derive .idx/.keep filename

194 + - Merge branch 'jc/maint-index-pack-keep' into jc/index-pack

195 + (this branch is used by jc/bundle; uses jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)

196 +

197 + Code clean-up.

198 +

199 + Will merge to 'next'.

200 +

201 +

202 +* jc/maint-index-pack-keep (2016-03-03) 1 commit

203 + (merged to 'next' on 2016-03-04 at bc1d37a)

204 + + index-pack: correct --keep[=<msg>]

205 + (this branch is used by jc/bundle, jc/index-pack and jc/index-pack-clone-bundle.)

206 +

207 + "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.

208 +

209 + Will merge to 'master' after 2.8 final.

210 +

211 +

212 +* js/close-packs-before-gc (2016-03-04) 1 commit

213 + (merged to 'next' on 2016-03-04 at fe6f6ed)

214 + + t5510: do not leave changed cwd

215 +

216 + A small future-proofing of a test added recently.

217 +

218 + Will merge to 'master' by 2.8-rc2.

219 +

220 +

221 * mm/readme-markdown (2016-02-27) 1 commit

222 (merged to 'next' on 2016-03-01 at 81f3858)

223 + README.md: don't take 'commandname' literally

@@ -221,7 +229,9 @@ repositories listed at

229 Will merge to 'master' after 2.8 final.

230

231

224 -* gf/fetch-pack-direct-object-fetch (2016-03-01) 1 commit

232 +* gf/fetch-pack-direct-object-fetch (2016-03-05) 2 commits

233 + (merged to 'next' on 2016-03-06 at 5628860)

234 + + fetch-pack: update the documentation for "<refs>..." arguments

235 (merged to 'next' on 2016-03-04 at 49199e0)

236 + fetch-pack: fix object_id of exact sha1

237

@@ -311,7 +321,6 @@ repositories listed at

321 Will merge to 'master' after 2.8 final.

322

323

314 -

324 * jc/bundle (2016-03-03) 6 commits

325 - index-pack: --clone-bundle option

326 - Merge branch 'jc/index-pack' into jc/bundle

@@ -447,12 +456,14 @@ repositories listed at

456 Needs a better explanation.

457

458

450 -* cn/deprecate-ssh-git-url (2016-02-15) 1 commit

459 +* cn/deprecate-ssh-git-url (2016-03-09) 1 commit

460 - Disown ssh+git and git+ssh

461

453 - Needs toning down by replacing the condescendence with an

454 - explanation and enlightenment.

455 - ($gmane/286222)

462 + The two alternative ways to spell "ssh://" transport have been

463 + deprecated for a long time. The last mention of them has finally

464 + removed from the documentation.

465 +

466 + Will merge to 'next'.

467

468

469 * ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit

@@ -561,7 +572,8 @@ repositories listed at

572 ($gmane/275680).

573

574

564 -* jc/rerere-multi (2016-02-08) 7 commits

575 +* jc/rerere-multi (2016-03-09) 8 commits

576 + - rerere: gc and clear

577 - rerere: do use multiple variants

578 - t4200: rerere a merge with two identical conflicts

579 - rerere: allow multiple variants to exist

@@ -574,7 +586,7 @@ repositories listed at

586 signature that have to be resolved in different ways, but there was

587 no way to record these separate resolutions.

588

577 - Needs further work on forget/gc.

589 + May need further work on forget.

590

591

592 * jc/merge-drop-old-syntax (2015-04-29) 1 commit

What's cooking (2016/03 #03)