dd5c59edea · matheusbsbs/matheus-bagliano

@@ -1,17 +1,19 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Mar 2012, #10; Wed, 28)

3 -X-master-at: 455cf268dbaf227bdbd5e9fbf96525452bcfe44f

4 -X-next-at: 59406684b6bbd073b171b4f8f3bc5b33966f3187

2 +Subject: What's cooking in git.git (Apr 2012, #01; Mon, 2)

3 +X-master-at: d82829b6128263951569221ca0c00dd143da055c

4 +X-next-at: 534144fcf8debe1f1ee527931c7346ce866f9ef5

5

6 -What's cooking in git.git (Mar 2012, #10; Wed, 28)

6 +What's cooking in git.git (Apr 2012, #01; Mon, 2)

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 -Hopefully the release will be done early next week. The final rc was

13 -tagged and pushed out today so that people can play with it and report

14 -possible issues.

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.

17

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

19 repositories listed at

@@ -21,36 +23,78 @@ repositories listed at

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

24 [New Topics]

25

24 -* dg/subtree (2012-03-25) 112 commits

25 - - Add 'contrib/subtree/' from commit '2e63f75b8f49abe220ef55ec4e978e7a3b8dc351'

26 - - Add Subtree Test Makefile

27 - - Build Subtree

28 - - Use Project Config Files

29 - - Remove Unneeded Files

30 - - ...

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

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

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

29

32 -A test merge of the 'subtree'.

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

31 +these in 1.7.10 so testing on various platforms is very much appreciated.

32

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

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

36 - - checkout: suppress tracking message with "-q"

33 +* bw/spawn-via-shell-path (2012-03-31) 2 commits

34 + - fixup? Quote SHELL_PATH the same way as DEFAULT_EDITOR for C

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

36

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

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

37 +"sh" on the user's PATH may be utterly broken on some systems;

38 +consistently use SHELL_PATH even from inside run-command API.

39

41 -* jk/run-command-eacces (2012-03-27) 3 commits

42 - - [DONTMERGE] semi-squashable test addition

43 - - git: continue alias lookup on EACCES errors

44 - - run-command: propagate EACCES errors to parent

40 +Will squash the fixup and schedule it to merge soon after 1.7.10.

41

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

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

42 +* jc/commit-unedited-template (2012-04-01) 4 commits

43 + - git-commit.txt: clarify -t requires editing message

44 + - commit: rephrase the error when user did not touch templated log message

45 + - commit: do not trigger bogus "has templated message edited" check

46 + - t7501: test the right kind of breakage

47

49 -* jb/am-include (2012-03-28) 1 commit

50 - - am: support --include option

48 +When "git commit --template F" errors out because the user did not touch

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

50 +utterly wrong.

51

52 -* jc/am-report-3way (2012-03-28) 1 commit

53 - - am -3: list the paths that needed 3-way fallback

52 +* jc/push-upstream-sanity (2012-03-30) 1 commit

53 + - push: detect nonsense "upstream" check more carefully

54 +

55 +"git push $there" without refspec, when the current branch is set to push

56 +to a remote different from $there, used to push to $there using the

57 +upstream information to a remote unreleated to $there.

58 +

59 +This is necessary if we were to switch the push.default to 'current'.

60 +

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

62 + - http-backend: respect existing GIT_COMMITTER_* variables

63 +

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

65 +with REMOTE_USER and REMOTE_ADDR.

66 +

67 +* mk/gitweb-diff-hl (2012-03-29) 8 commits

68 + - gitweb: Refinement highlightning in combined diffs

69 + - gitweb: Highlight interesting parts of diff

70 + - gitweb: Push formatting diff lines to print_diff_chunk()

71 + - gitweb: Move HTML-formatting diff line back to process_diff_line()

72 + - gitweb: Use print_diff_chunk() for both side-by-side and inline diffs

73 + - gitweb: Extract print_sidebyside_diff_lines()

74 + - gitweb: Pass esc_html_hl_regions() options to esc_html()

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

76 +

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

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

79 + - fetch-pack: test cases for the new --stdin option

80 + - fixup? no longer need flex argv[]

81 + - remote-curl: send the refs to fetch-pack on stdin

82 + - fetch-pack: new --stdin option to read refs from stdin

83 +

84 +Will squash the fix-up one and then requeue.

85 +

86 +* jn/debian-customizes-default-editor (2012-03-31) 3 commits

87 + - fixup? do not hide the "usual" default from readers

88 + - var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings

89 + - var doc: default editor and pager are configurable at build time

90 +

91 +Haven't heard anything back for the fix-up suggestion, but otherwise

92 +looked sane.

93 +

94 +* rs/commit-list-sort-in-batch (2012-04-02) 3 commits

95 + - revision: insert unsorted, then sort in prepare_revision_walk()

96 + - commit: use mergesort() in commit_list_sort_by_date()

97 + - add mergesort() for linked lists

98

99 --------------------------------------------------

100 [Stalled]

@@ -106,8 +150,9 @@ Another reroll after a bugreport on pthread usage discovered by Ramsey,

150 but it seems the topic is cooking between Ramsay and Duy out of tree.

151 Waiting for resolution.

152

109 -* jh/apply-free-patch (2012-03-27) 6 commits

153 +* jh/apply-free-patch (2012-03-28) 7 commits

154 - apply.c: WIP ownership audit

155 + - apply: free unused fragments for submodule patch

156 - apply: free patch->result

157 - apply: release memory for fn_table

158 - apply: free patch->{def,old,new}_name fields

@@ -119,13 +164,6 @@ auditing the memory ownership rules in the command, and am almost done.

164

165 Will defer til 1.7.10.

166

122 -* hv/submodule-recurse-push (2012-02-13) 3 commits

123 - - push: teach --recurse-submodules the on-demand option

124 - - Refactor submodule push check to use string list instead of integer

125 - - Teach revision walking machinery to walk multiple times sequencially

126 -

127 -The bottom one was not clearly explained and needs a reroll.

128 -

167 * ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits

168 - fixup! 15eaaf4

169 - git-svn, perl/Git.pm: extend Git::prompt helper for querying users

@@ -169,6 +207,40 @@ not working :-(.

207 --------------------------------------------------

208 [Cooking]

209

210 +* hv/submodule-recurse-push (2012-03-30) 3 commits

211 + - push: teach --recurse-submodules the on-demand option

212 + - Refactor submodule push check to use string list instead of integer

213 + - Teach revision walking machinery to walk multiple times sequencially

214 +

215 +* dg/subtree (2012-03-25) 112 commits

216 + - Add 'contrib/subtree/' from commit '2e63f75b8f49abe220ef55ec4e978e7a3b8dc351'

217 + - Add Subtree Test Makefile

218 + - Build Subtree

219 + - Use Project Config Files

220 + - Remove Unneeded Files

221 + - ...

222 +

223 +A test merge of the 'subtree'.

224 +

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

226 + - teach "git branch" a --quiet option

227 + - checkout: suppress tracking message with "-q"

228 +

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

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

231 +

232 +* jk/run-command-eacces (2012-03-30) 1 commit

233 + - run-command: treat inaccessible directories as ENOENT

234 +

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

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

237 +

238 +* jb/am-include (2012-03-28) 1 commit

239 + - am: support --include option

240 +

241 +* jc/am-report-3way (2012-03-28) 1 commit

242 + - am -3: list the paths that needed 3-way fallback

243 +

244 * rs/combine-diff-zero-context-at-the-beginning (2012-03-25) 1 commit

245 - combine-diff: fix loop index underflow

246

@@ -182,7 +254,7 @@ and the hunk at the beginning of the file needs to be shown).

254

255 Updates our configure.ac to follow a better "autoconf" style.

256

185 -* wk/gitweb-snapshot-use-if-modified-since (2012-03-26) 3 commits

257 +* wk/gitweb-snapshot-use-if-modified-since (2012-03-30) 3 commits

258 - gitweb: add If-Modified-Since handling to git_snapshot().

259 - gitweb: refactor If-Modified-Since handling

260 - gitweb: add `status` headers to git_feed() responses.

@@ -190,16 +262,6 @@ Updates our configure.ac to follow a better "autoconf" style.

262 Makes 'snapshot' request to "gitweb" honor If-Modified-Since: header,

263 based on the commit date.

264

193 -* jc/maint-merge-autoedit (2012-03-20) 1 commit

194 - - merge: backport GIT_MERGE_AUTOEDIT support

195 -

196 -In 1.7.10, we added GIT_MERGE_AUTOEDIT=no environment variable to help

197 -older scripts to let them refuse giving users a chance to explain the

198 -merge, but forgot that 1.7.9 automatically opens an editor when merging an

199 -annotated tag, and there is no equivalent escape hatch. A merge of this

200 -topic to 1.7.10 track becomes a no-op, but we may want to apply this to

201 -the 1.7.9.x series.

202 -

265 * jk/diff-no-rename-empty (2012-03-23) 4 commits

266 - merge-recursive: don't detect renames of empty files

267 - teach diffcore-rename to optionally ignore empty content

@@ -209,7 +271,7 @@ the 1.7.9.x series.

271 Forbids rename detection logic from matching two empty files as renames

272 during merge-recursive to prevent mismerges.

273

212 -* th/difftool-diffall (2012-03-26) 9 commits

274 +* th/difftool-diffall (2012-03-29) 9 commits

275 - difftool: print list of valid tools with '--tool-help'

276 - difftool: teach difftool to handle directory diffs

277 - difftool: replace system call with Git::command_noisy

@@ -237,8 +299,9 @@ working trees that are at the top-level of the current project by mistake.

299 Not urgent.

300

301 * ct/advise-push-default (2012-03-26) 2 commits

240 - - clean up struct ref's nonfastforward field

241 - - push: Provide situational hints for non-fast-forward errors

302 + (merged to 'next' on 2012-03-28 at 62764ae)

303 + + clean up struct ref's nonfastforward field

304 + + push: Provide situational hints for non-fast-forward errors

305

306 Breaks down the cases in which "git push" fails due to non-ff into three

307 categories, and gives separate advise messages. This should be a good

@@ -347,7 +410,8 @@ Not urgent.

410 Will defer til 1.7.10.

411

412 * mm/push-default-switch-warning (2012-03-09) 1 commit

350 - - push: start warning upcoming default change for push.default

413 + (merged to 'next' on 2012-03-28 at 074b16b)

414 + + push: start warning upcoming default change for push.default

415

416 Not urgent.

417

What's cooking (2012/04 #01)