7fb537ebec · matheusbsbs/matheus-bagliano

@@ -1,136 +1,98 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Feb 2011, #06; Sun, 27)

3 -X-master-at: 8978166e531e0941811099d4117574ebbbcf35d8

4 -X-next-at: 4aa7278540f2c67a375cee26edfb39164695d3e8

2 +Subject: What's cooking in git.git (Feb 2011, #07; Mon, 28)

3 +X-master-at: f70f736bcbb22cfe434eaf20089d9713b991ee31

4 +X-next-at: 0b70480002217322d29f03aafa94d076d6e8c8d5

5

6 -What's cooking in git.git (Feb 2011, #06; Sun, 27)

6 +What's cooking in git.git (Feb 2011, #07; Mon, 28)

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

8

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

10 only in 'pu' while commits prefixed with '+' are in 'next'.

11

12 ---------------------------------------------------

13 -[Graduated to "master"]

14 -

15 -* en/object-list-with-pathspec (2010-09-20) 2 commits

16 - (merged to 'next' on 2011-02-09 at ccf6c6a)

17 - + Add testcases showing how pathspecs are handled with rev-list --objects

18 - + Make rev-list --objects work together with pathspecs

19 - (this branch uses nd/struct-pathspec; is tangled with jc/grep--no-index-pathspec-fix.)

20 -

21 -* hv/mingw-fs-funnies (2011-02-07) 5 commits

22 - (merged to 'next' on 2011-02-09 at 3d0bb1a)

23 - + mingw_rmdir: set errno=ENOTEMPTY when appropriate

24 - + mingw: add fallback for rmdir in case directory is in use

25 - + mingw: make failures to unlink or move raise a question

26 - + mingw: work around irregular failures of unlink on windows

27 - + mingw: move unlink wrapper to mingw.c

28 -

29 -* jh/push-default-upstream-configname (2011-02-16) 1 commit

30 - (merged to 'next' on 2011-02-23 at b5c25fa)

31 - + push.default: Rename 'tracking' to 'upstream'

32 -

33 -* js/detach-doc (2011-02-20) 1 commit

34 - (merged to 'next' on 2011-02-21 at c384c3c)

35 - + git-checkout.txt: improve detached HEAD documentation

36 -

37 -* js/maint-merge-use-prepare-commit-msg-hook (2011-02-14) 1 commit

38 - (merged to 'next' on 2011-02-22 at 6458c4b)

39 - + merge: honor prepare-commit-msg hook

40 -

41 -* lp/config-vername-check (2011-02-01) 2 commits

42 - (merged to 'next' on 2011-02-23 at 426d48d)

43 - + Disallow empty section and variable names

44 - + Sanity-check config variable names

45 -

46 -* mg/patch-id (2011-02-17) 2 commits

47 - (merged to 'next' on 2011-02-22 at 6f4acd8)

48 - + git-patch-id: do not trip over "no newline" markers

49 - + git-patch-id: test for "no newline" markers

50 -

51 -* mg/placeholders-are-lowercase (2011-02-17) 5 commits

52 - (merged to 'next' on 2011-02-22 at 2754e21)

53 - + Make <identifier> lowercase in Documentation

54 - + Make <identifier> lowercase as per CodingGuidelines

55 - + Make <identifier> lowercase as per CodingGuidelines

56 - + Make <identifier> lowercase as per CodingGuidelines

57 - + CodingGuidelines: downcase placeholders in usage messages

58 -

59 -* mo/perl-bidi-pipe-envfix (2011-02-15) 1 commit

60 - (merged to 'next' on 2011-02-15 at c36e816)

61 - + perl: command_bidi_pipe() method should set-up git environmens

62 -

63 -* mz/rerere-remaining (2011-02-16) 2 commits

64 - (merged to 'next' on 2011-02-22 at fa2d5ab)

65 - + mergetool: don't skip modify/remove conflicts

66 - + rerere "remaining"

67 -

68 -* nd/hash-object-sanity (2011-02-05) 1 commit

69 - (merged to 'next' on 2011-02-22 at 09acf6f)

70 - + Make hash-object more robust against malformed objects

71 -

72 -* nd/sorted-builtin-command-list (2011-02-15) 1 commit

73 - (merged to 'next' on 2011-02-22 at 91fccd1)

74 - + git.c: reorder builtin command list

75 -

76 -* nd/struct-pathspec (2011-01-31) 22 commits

77 - (merged to 'next' on 2011-02-09 at b1e64ee)

78 - + t6004: add pathspec globbing test for log family

79 - + t7810: overlapping pathspecs and depth limit

80 - + grep: drop pathspec_matches() in favor of tree_entry_interesting()

81 - + grep: use writable strbuf from caller for grep_tree()

82 - + grep: use match_pathspec_depth() for cache/worktree grepping

83 - + grep: convert to use struct pathspec

84 - + Convert ce_path_match() to use match_pathspec_depth()

85 - + Convert ce_path_match() to use struct pathspec

86 - + struct rev_info: convert prune_data to struct pathspec

87 - + pathspec: add match_pathspec_depth()

88 - + tree_entry_interesting(): optimize wildcard matching when base is matched

89 - + tree_entry_interesting(): support wildcard matching

90 - + tree_entry_interesting(): fix depth limit with overlapping pathspecs

91 - + tree_entry_interesting(): support depth limit

92 - + tree_entry_interesting(): refactor into separate smaller functions

93 - + diff-tree: convert base+baselen to writable strbuf

94 - + glossary: define pathspec

95 - + Move tree_entry_interesting() to tree-walk.c and export it

96 - + tree_entry_interesting(): remove dependency on struct diff_options

97 - + Convert struct diff_options to use struct pathspec

98 - + diff-no-index: use diff_tree_setup_paths()

99 - + Add struct pathspec

100 - (this branch is used by en/object-list-with-pathspec and jc/grep--no-index-pathspec-fix.)

101 -

102 -* pw/p4 (2011-02-19) 8 commits

103 - (merged to 'next' on 2011-02-21 at 1a7b7d2)

104 - + git-p4: support clone --bare

105 - + git-p4: decode p4 wildcard characters

106 - + git-p4: better message for "git-p4 sync" when not cloned

107 - + git-p4: reinterpret confusing p4 message

108 - + git-p4: accommodate new move/delete type in p4

109 - + git-p4: add missing newline in initial import message

110 - + git-p4: fix key error for p4 problem

111 - + git-p4: test script

112 -

113 -* sp/maint-smart-http-sans-100-continue (2011-02-15) 1 commit

114 - (merged to 'next' on 2011-02-15 at 553e3e5)

115 - + smart-http: Don't use Expect: 100-Continue

116 -

117 -* uk/checkout-ambiguous-ref (2011-02-15) 5 commits

118 - (merged to 'next' on 2011-02-15 at 645dad6)

119 - + Rename t2019 with typo "amiguous" that meant "ambiguous"

120 - + checkout: rearrange update_refs_for_switch for clarity

121 - + checkout: introduce --detach synonym for "git checkout foo^{commit}"

122 - + checkout: split off a function to peel away branchname arg

123 - (merged to 'next' on 2011-02-03 at 9044724)

124 - + checkout: fix bug with ambiguous refs

125 -

126 -* va/p4 (2011-02-20) 2 commits

127 - (merged to 'next' on 2011-02-21 at d981b23)

128 - + git-p4: Add copy detection support

129 - + git-p4: Improve rename detection support

12 +I started draft release notes for 1.7.5 on 'master' branch.

13

14 --------------------------------------------------

15 [New Topics]

16

17 +* jc/diff-irreversible-delete (2011-02-28) 1 commit

18 + - git diff -D: omit the preimage of deletes

19 +

20 +Just a POC.

21 +

22 +* jc/index-pack (2011-02-25) 5 commits

23 + - index-pack --verify: read anomalous offsets from v2 idx file

24 + - write_idx_file: need_large_offset() helper function

25 + - index-pack: --verify

26 + - write_idx_file: introduce a struct to hold idx customization options

27 + - index-pack: group the delta-base array entries also by type

28 +

29 +Still a WIP.

30 +

31 +* mm/push-default-advice (2011-02-28) 2 commits

32 + - push: better error messages for detached HEAD and "no destination"

33 + - push: better error message when push.default = tracking

34 +

35 +There were some rewording discussion I didn't roll into this, not because

36 +I had objections to, but because I was handling other topics. I expect

37 +I'll see a reroll soonish so that we can merge this down soonish.

38 +

39 +* sp/maint-fd-limit (2011-02-28) 2 commits

40 + - mingw: add minimum getrlimit() compatibility stub

41 + - Limit file descriptors used by packs

42 +

43 +Erik, please check the made-up commit log message and sign it off.

44 +Will merge to 'next' after that.

45 +

46 +* uk/ls-remote-in-get-remote-url (2011-02-28) 1 commit

47 + - get_remote_url(): use the same data source as ls-remote to get remote urls

48 +

49 +Will merge to 'next'.

50 +

51 +--------------------------------------------------

52 +[Stalled]

53 +

54 +* jh/merge-sans-branch (2011-02-10) 4 commits

55 + . merge: add support for merging from upstream by default

56 + - merge: introduce per-branch-configuration helper function

57 + - merge: introduce setup_merge_commit helper function

58 + - merge: update the usage information to be more modern

59 +

60 +There was an objection to the tip one that determines the upstream in a

61 +wrong way?

62 +

63 +* jc/complete-symmetric-diff (2011-02-23) 1 commit

64 + - completion: complete "git diff ...branc<TAB>"

65 +

66 +It was pointed out that this would regress diffing two blobs,

67 +using <tree>:<path> syntax.

68 +

69 +* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit

70 + - Look for password in both CVS and CVSNT password files.

71 +

72 +It seems that we need separate parsers for these two formats in order not

73 +to regress the users of the original cvs.

74 +

75 +* jk/tag-contains (2010-07-05) 4 commits

76 + - Why is "git tag --contains" so slow?

77 + - default core.clockskew variable to one day

78 + - limit "contains" traversals based on commit timestamp

79 + - tag: speed up --contains calculation

80 +

81 +The idea of the bottom one is probably Ok, except that the use of object

82 +flags needs to be rethought, or at least the helper needs to be moved to

83 +builtin/tag.c to make it clear that it should not be used outside the

84 +current usage context.

85 +

86 +* jc/rename-degrade-cc-to-c (2011-01-06) 3 commits

87 + . diffcore-rename: fall back to -C when -C -C busts the rename limit

88 + . diffcore-rename: record filepair for rename src

89 + . diffcore-rename: refactor "too many candidates" logic

90 +

91 +Somebody said that this is an expensive no-op?

92 +

93 +--------------------------------------------------

94 +[Cooking]

95 +

96 * jn/maint-commit-missing-template (2011-02-25) 1 commit

97 (merged to 'next' on 2011-02-25 at c95589d)

98 + commit: error out for missing commit message template

@@ -180,40 +142,13 @@ only in 'pu' while commits prefixed with '+' are in 'next'.

142 - mergetool--lib: Add Beyond Compare 3 as a tool

143 - mergetool--lib: Sort tools alphabetically for easier lookup

144

183 ---------------------------------------------------

184 -[Stalled]

185 -

186 -* jh/merge-sans-branch (2011-02-10) 4 commits

187 - . merge: add support for merging from upstream by default

188 - - merge: introduce per-branch-configuration helper function

189 - - merge: introduce setup_merge_commit helper function

190 - - merge: update the usage information to be more modern

191 -

192 -There was an objection to the tip one that determines the upstream in a

193 -wrong way?

194 -

195 -* jk/tag-contains (2010-07-05) 4 commits

196 - - Why is "git tag --contains" so slow?

197 - - default core.clockskew variable to one day

198 - - limit "contains" traversals based on commit timestamp

199 - - tag: speed up --contains calculation

200 -

201 -The idea of the bottom one is probably Ok, except that the use of object

202 -flags needs to be rethought, or at least the helper needs to be moved to

203 -builtin/tag.c to make it clear that it should not be used outside the

204 -current usage context.

205 -

206 -* jc/rename-degrade-cc-to-c (2011-01-06) 3 commits

207 - . diffcore-rename: fall back to -C when -C -C busts the rename limit

208 - . diffcore-rename: record filepair for rename src

209 - . diffcore-rename: refactor "too many candidates" logic

210 -

211 ---------------------------------------------------

212 -[Cooking]

145 +Will merge to 'next'.

146

147 * nd/index-doc (2010-09-06) 1 commit

148 - doc: technical details about the index file format

149

150 +I'll try to find time to fill in the details.

151 +

152 * ab/i18n-st (2011-02-22) 74 commits

153 - i18n: git-shortlog basic messages

154 - i18n: git-revert split up "could not revert/apply" message

@@ -296,17 +231,18 @@ branch). I'd like to fast-track the basics (especially the bottom 3

231 patches), and am even tempted to rebase other patches on 'pu' that are not

232 yet in 'next' on top of them, to make the transition easier.

233

299 -* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit

300 - - Look for password in both CVS and CVSNT password files.

234 +Unless there is something glaringly wrong, I'd merge up to 9018b8a (i18n:

235 +git-clone "Cloning into" message) to 'next' soonish, possibly rebasing

236 +other 'pu'-only topics on top of that commit.

237

238 * jc/checkout-orphan-warning (2011-02-18) 1 commit

239 - commit: give final warning when reattaching HEAD to leave commits behind

240

305 -Likes, dislikes?

306 -

241 * jh/maint-do-not-track-non-branches (2011-02-17) 1 commit

242 - branch/checkout --track: Ensure that upstream branch is indeed a branch

243

244 +Will merge to 'next'.

245 +

246 * jk/diffstat-binary (2011-02-19) 2 commits

247 (merged to 'next' on 2011-02-23 at 49da967)

248 + diff: don't retrieve binary blobs for diffstat

@@ -324,7 +260,7 @@ Likes, dislikes?

260 - bump rename limit defaults (again)

261 - merge: improve inexact rename limit warning

262

327 -The above three all seemed sensible improvements.

263 +Will merge to 'next'.

264

265 * jn/test-terminal-punt-on-osx-breakage (2011-02-17) 1 commit

266 (merged to 'next' on 2011-02-23 at d754139)

@@ -351,14 +287,14 @@ The above three all seemed sensible improvements.

287 - t6007: Make sure we test --cherry-pick

288 - revlist.c: introduce --left/right-only for unsymmetric picking

289

290 +Will merge to 'next'; somebody may want to try losing many lines from

291 +format-patch before it hits 'master', though. Hint, hint...

292 +

293 * so/submodule-no-update-first-time (2011-02-17) 2 commits

294 (merged to 'next' on 2011-02-23 at 2c6e8c9)

295 + t7406: "git submodule update {--merge|--rebase]" with new submodules

296 + submodule: no [--merge|--rebase] when newly cloned

297

359 -* jc/complete-symmetric-diff (2011-02-23) 1 commit

360 - - completion: complete "git diff ...branc<TAB>"

361 -

298 * jh/submodule-fetch-on-demand (2011-02-23) 6 commits

299 - submodule update: Don't fetch when the submodule commit is already present

300 - fetch/pull: Don't recurse into a submodule when commits are already present

@@ -367,11 +303,15 @@ The above three all seemed sensible improvements.

303 - fetch/pull: Add the 'on-demand' value to the --recurse-submodules option

304 - fetch/pull: recurse into submodules when necessary

305

306 +How well has this been cooked?

307 +

308 * jk/format-patch-multiline-header (2011-02-23) 3 commits

309 - format-patch: rfc2047-encode newlines in headers

310 - format-patch: wrap long header lines

311 - strbuf: add fixed-length version of add_wrapped_text

312

313 +Will merge to 'next'.

314 +

315 * js/checkout-untracked-symlink (2011-02-20) 2 commits

316 (merged to 'next' on 2011-02-23 at 52a35ce)

317 + do not overwrite untracked symlinks

@@ -420,11 +360,3 @@ The above three all seemed sensible improvements.

360

361 Minor UI regression was reported but otherwise it looked like that the

362 topic is in a good shape.

423 -

424 ---------------------------------------------------

425 -[Discarded]

426 -

427 -* cp/mergetool-beyondcompare (2011-02-18) 1 commit

428 - . mergetool--lib: add support for beyond compare

429 -

430 -ss/mergetool--lib replaces this.

What's cooking (2011/02 #07)