01f7ee5f5b · 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 (May 2013, #07; Fri, 24)

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

4 X-master-at: edca4152560522a431a51fc0a06147fc680b5b18

5 -X-next-at: ea353ceddcd1414717ea6ae8fce60c7b4d705849

5 +X-next-at: c6abf3f6e02deba43158d8c73669e079c83d9722

6

7 -What's cooking in git.git (May 2013, #07; Fri, 24)

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

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

9

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

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

14 There are topics that are still in 'next', not because they needed

15 more testing, but only because we already were in the -rc period.

16 Now that 1.8.3 is out, we will start merging them to 'master' (and

17 -some to 'maint' for 1.8.3.1) in the middle of the next week, after

18 -waiting for a few days to make sure we can have a clean start of the

19 -post 1.8.3 maint branch (with brown paper bag fixes and nothing

20 -else).

17 +some to 'maint' for 1.8.3.1) probably tomorrow (after waiting for a

18 +few days to make sure we can have a clean start of the post 1.8.3

19 +maint branch with brown paper bag fixes and nothing else).

20

21 The post 1.8.3 cycle will start early next month, at which time the

22 'next' branch will be rewound and rebuilt. Until then, I expect

24 -that my patch queue may stay leaky while I take a bit of break.

23 +that my patch queue may stay slow and leaky while I take a bit of

24 +break.

25

26 You can find the changes described here in the integration branches

27 of the repositories listed at

@@ -31,71 +31,117 @@ of the repositories listed at

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

32 [New Topics]

33

34 -* mh/reflife (2013-05-22) 17 commits

35 - - refs: document the lifetime of the refname passed to each_ref_fn

36 - - object_array_entry: copy name before storing in name field

37 - - find_first_merges(): remove unnecessary code

38 - - find_first_merges(): initialize merges variable using initializer

39 - - fsck: don't put a void*-shaped peg in a char*-shaped hole

40 - - object_array_remove_duplicates(): rewrite to reduce copying

41 - - object_array: add function object_array_filter()

42 - - get_revision_internal(): make check less mysterious

43 - - gc_boundary(): move the check "alloc <= nr" to caller

44 - - revision: split some overly-long lines

45 - - cmd_diff(): make it obvious which cases are exclusive of each other

46 - - cmd_diff(): rename local variable "list" -> "entry"

47 - - cmd_diff(): use an object_array for holding trees

48 - - builtin_diff_tree(): make it obvious that function wants two entries

49 - - add_rev_cmdline(): make a copy of the name argument

50 - - fetch: make own copies of refnames

51 - - describe: make own copy of refname

34 +* nd/urls-doc-no-file-hyperlink-fix (2013-05-24) 1 commit

35 + - urls.txt: avoid auto converting to hyperlink

36

53 - Define memory ownership and lifetime rules for what for-each-ref

54 - feeds to its callbacks (in short, "you do not own it, so make a

55 - copy if you want to keep it").

37 + Will merge to 'next'.

38

57 - Some parts are still RFC.

39

40 +* cb/log-follow-with-combined (2013-05-28) 1 commit

41 + - fix segfault with git log -c --follow

42

60 -* th/bisect-skip-report-range-fix (2013-05-22) 1 commit

61 - - bisect: Fix log output for multi-parent skip ranges

43 + Will merge to 'next'.

44

63 - Fix for an additional bisect log comments.

45 +

46 +* fc/cleanups (2013-05-28) 3 commits

47 + - test: rebase: fix --interactive test

48 + - test: trivial cleanups

49 + - remote: trivial style cleanup

50

51 Will merge to 'next'.

52

53

68 -* mm/mediawiki-https-fail-message (2013-05-23) 1 commit

69 - - git-remote-mediawiki: better error message when HTTP(S) access fails

54 +* fc/makefile (2013-05-26) 5 commits

55 + - build: do not install git-remote-testpy

56 + - build: add NO_INSTALL variable

57 + - build: cleanup using $<

58 + - build: cleanup using $^

59 + - build: trivial simplification

60 + (this branch is used by fc/remote-helpers-use-specified-python.)

61

71 - Hint users when https:// connection failed to check the

72 - certificate; it is a good hint if we assumie that it is common

73 - error for the end users to make.

62 + Will merge to 'next'.

63 +

64 +

65 +* fc/remote-helpers-use-specified-python (2013-05-28) 4 commits

66 + - remote-helpers: add exec-path links

67 + - remote-helpers: allow direct test execution

68 + - remote-helpers: rename tests

69 + - remote-helpers: generate scripts

70 + (this branch uses fc/makefile.)

71 +

72 + I do not particularly think the second from the bottom is a good

73 + change, but it takes the remainder of the series hostage.

74 + Will hopefully be rerolled without it.

75 +

76 +

77 +* fc/send-email-chainreplyto-warning (2013-05-28) 1 commit

78 + - send-email: remove warning about unset chainreplyto

79 +

80 + An overdue removal od "behaviour changed at 1.7.0; if you were

81 + living in a cave, here is what you can adjust to it" message.

82

83 Will merge to 'next'.

84

85

78 -* tg/maint-zsh-svn-remote-prompt (2013-05-22) 1 commit

79 - - prompt: fix show upstream with svn and zsh

86 +* ks/difftool-dirdiff-copy-all (2013-05-28) 1 commit

87 + - difftool --dir-diff: always use identical working tree file

88

81 - zsh prompt script that borrowed from bash prompt script did not

82 - work due to slight differences in array variable notation between

83 - these two shells.

89 + "difftool --dir-diff" populates a temporary directory with files,

90 + inviting the user to modify them in place, but in some cases we

91 + weren't expecting the user to modify them and did not take the

92 + change back to the working tree.

93 +

94 + The log message has room for clarification, but the change looked

95 + sane.

96 +

97 +

98 +* nd/prune-packed-dryrun-verbose (2013-05-28) 1 commit

99 + - prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()

100

101 Will merge to 'next'.

102

103

88 -* tr/push-no-verify-doc (2013-05-23) 1 commit

89 - - Document push --no-verify

104 +* rj/mingw-compat-st-mode-bits (2013-05-28) 1 commit

105 + - path: Fix a sparse warning

106 +

107 + Will merge to 'next'.

108 +

109 +

110 +* rs/commit-m-no-edit (2013-05-28) 1 commit

111 + - commit: don't start editor if empty message is given with -m

112 +

113 + Will merge to 'next'.

114

91 - "git push --[no-]verify" was not documented.

115 +

116 +* xq/credential-osxkeychain (2013-05-28) 1 commit

117 + - credential-osxkeychain: support more protocols

118

119 Will merge to 'next'.

120

121

122 +* jc/core-checkstat (2013-05-06) 1 commit

123 + - deprecate core.statinfo at Git 2.0 boundary

124 + (this branch is used by jc/core-checkstat-2.0.)

125 +

126 + Will merge to 'next'.

127 +

128 --------------------------------------------------

129 [Stalled]

130

131 +* rr/rebase-autostash (2013-05-12) 7 commits

132 + - rebase: implement --[no-]autostash and rebase.autostash

133 + - rebase --merge: return control to caller, for housekeeping

134 + - rebase -i: return control to caller, for housekeeping

135 + - am: return control to caller, for housekeeping

136 + - rebase: prepare to do generic housekeeping

137 + - rebase -i: don't error out if $state_dir already exists

138 + - am: tighten a conditional that checks for $dotest

139 +

140 + This is from v3, but after a "Fixed" message in $gmane/224111 we

141 + haven't seen a reroll yet. Also there was an attempt for a

142 + follow-up, but it was never completed.

143 +

144 +

145 * rj/mingw-cygwin (2013-05-08) 2 commits

146 - cygwin: Remove the CYGWIN_V15_WIN32API build variable

147 - mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE

@@ -144,6 +190,31 @@ of the repositories listed at

190 Technology demonstration to show a way we could use unbound number

191 of flag bits on commit objects.

192

193 +--------------------------------------------------

194 +[Cooking]

195 +

196 +* tr/line-log (2013-04-22) 13 commits

197 + (merged to 'next' on 2013-04-22 at 8f2c1de)

198 + + git-log(1): remove --full-line-diff description

199 + (merged to 'next' on 2013-04-21 at cd92620)

200 + + line-log: fix documentation formatting

201 + (merged to 'next' on 2013-04-15 at 504559e)

202 + + log -L: improve comments in process_all_files()

203 + + log -L: store the path instead of a diff_filespec

204 + + log -L: test merge of parallel modify/rename

205 + + t4211: pass -M to 'git log -M -L...' test

206 + (merged to 'next' on 2013-04-05 at 5afb00c)

207 + + log -L: fix overlapping input ranges

208 + + log -L: check range set invariants when we look it up

209 + (merged to 'next' on 2013-04-01 at 5be920c)

210 + + Speed up log -L... -M

211 + + log -L: :pattern:file syntax to find by funcname

212 + + Implement line-history search (git log -L)

213 + + Export rewrite_parents() for 'log -L'

214 + + Refactor parse_loc

215 +

216 + Will merge to 'master'.

217 +

218

219 * jn/config-ignore-inaccessible (2013-04-15) 1 commit

220 (merged to 'next' on 2013-05-07 at 4f09e24)

@@ -152,8 +223,77 @@ of the repositories listed at

223 When $HOME is misconfigured to point at an unreadable directory, we

224 used to complain and die. This loosens the check.

225

155 ---------------------------------------------------

156 -[Cooking]

226 + Will merge to 'master'.

227 +

228 +

229 +* mh/reflife (2013-05-28) 25 commits

230 + - refs: document the lifetime of the args passed to each_ref_fn

231 + - register_ref(): make a copy of the bad reference SHA-1

232 + - exclude_existing(): set existing_refs.strdup_strings

233 + - string_list_add_refs_by_glob(): add a comment about memory management

234 + - string_list_add_one_ref(): rename first parameter to "refname"

235 + - show_head_ref(): rename first parameter to "refname"

236 + - show_head_ref(): do not shadow name of argument

237 + - add_existing(): do not retain a reference to sha1

238 + - do_fetch(): clean up existing_refs before exiting

239 + - do_fetch(): reduce scope of peer_item

240 + - object_array_entry: fix memory handling of the name field

241 + - find_first_merges(): remove unnecessary code

242 + - find_first_merges(): initialize merges variable using initializer

243 + - fsck: don't put a void*-shaped peg in a char*-shaped hole

244 + - object_array_remove_duplicates(): rewrite to reduce copying

245 + - revision: use object_array_filter() in implementation of gc_boundary()

246 + - object_array: add function object_array_filter()

247 + - revision: split some overly-long lines

248 + - cmd_diff(): make it obvious which cases are exclusive of each other

249 + - cmd_diff(): rename local variable "list" -> "entry"

250 + - cmd_diff(): use an object_array for holding trees

251 + - builtin_diff_tree(): make it obvious that function wants two entries

252 + - add_rev_cmdline(): make a copy of the name argument

253 + - fetch: make own copies of refnames

254 + - describe: make own copy of refname

255 +

256 + Define memory ownership and lifetime rules for what for-each-ref

257 + feeds to its callbacks (in short, "you do not own it, so make a

258 + copy if you want to keep it").

259 +

260 +

261 +* th/bisect-skip-report-range-fix (2013-05-22) 1 commit

262 + - bisect: Fix log output for multi-parent skip ranges

263 +

264 + Fix for an additional bisect log comments.

265 +

266 + Will merge to 'next'.

267 +

268 +

269 +* mm/mediawiki-https-fail-message (2013-05-23) 1 commit

270 + - git-remote-mediawiki: better error message when HTTP(S) access fails

271 +

272 + Hint users when https:// connection failed to check the

273 + certificate; it is a good hint if we assumie that it is common

274 + error for the end users to make.

275 +

276 + Still under discussion.

277 + $gmane/225678

278 +

279 +

280 +* tg/maint-zsh-svn-remote-prompt (2013-05-22) 1 commit

281 + - prompt: fix show upstream with svn and zsh

282 +

283 + zsh prompt script that borrowed from bash prompt script did not

284 + work due to slight differences in array variable notation between

285 + these two shells.

286 +

287 + Will merge to 'next'.

288 +

289 +

290 +* tr/push-no-verify-doc (2013-05-23) 1 commit

291 + - Document push --no-verify

292 +

293 + "git push --[no-]verify" was not documented.

294 +

295 + Will merge to 'next'.

296 +

297

298 * dm/unbash-subtree (2013-05-21) 1 commit

299 - contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash

@@ -198,7 +338,9 @@ of the repositories listed at

338 Waiting for the final step to lift the hard-limit before sending it out.

339

340

201 -* fc/remote-bzr (2013-05-16) 6 commits

341 +* fc/remote-bzr (2013-05-28) 8 commits

342 + - remote-bzr: add fallback check for a partial clone

343 + - remote-bzr: reorganize the way 'wanted' works

344 - remote-bzr: trivial cleanups

345 - remote-bzr: change global repo

346 - remote-bzr: delay cloning/pulling

@@ -209,7 +351,7 @@ of the repositories listed at

351 The ones near the tip conflicted with the hotfix for 1.8.3 so I

352 discarded them for now.

353

212 - Expecting a reroll on top of 1.8.3

354 + Will merge to 'next'?

355

356

357 * jx/clean-interactive (2013-05-22) 15 commits

@@ -244,6 +386,7 @@ of the repositories listed at

386 of the test suite under Valgrind, to speed things up.

387

388 The tip one may be useful in practice but is a tad ugly ;-)

389 + Will merge to 'next'.

390

391

392 * rh/merge-options-doc-fix (2013-05-16) 1 commit

@@ -316,7 +459,14 @@ of the repositories listed at

459 Will merge to 'master'.

460

461

319 -* fc/remote-hg (2013-05-21) 41 commits

462 +* fc/remote-hg (2013-05-28) 50 commits

463 + - remote-hg: add support for --force

464 + - remote-hg: add support for --dry-run

465 + - remote-hg: check if a fetch is needed

466 + - remote-hg: trivial cleanup

467 + - remote-helpers: improve marks usage

468 + - remote-hg: add check_push() helper

469 + - remote-hg: add setup_big_push() helper

470 - remote-hg: remove files before modifications

471 - remote-hg: improve lightweight tag author

472 - remote-hg: use remote 'default' not local one

@@ -336,8 +486,10 @@ of the repositories listed at

486 - remote-hg: add test for diverged push

487 - remote-hg: add test to push new bookmark

488 - remote-hg: add remote tests

489 + - remote-hg: update bookmarks when using a remote

490 - remote-hg: add check_bookmark() test helper

491 - remote-bzr: simplify test checks

492 + - remote-hg: add tests for 'master' bookmark

493 - remote-hg: always point HEAD to master

494 - remote-hg: improve progress calculation

495 - remote-hg: trivial cleanups

@@ -359,11 +511,7 @@ of the repositories listed at

511 - remote-hg: tests: fix hg merge

512 - remote-helpers: tests: use python directly

513

362 - The remainder are to be rerolled on top of the bottom-two, so I

363 - flipped the order of the series.

364 -

365 - Will merge the bottom two to 'next'.

366 - Leaving the remainder up to Felipe to reroll or advance to 'next'.

514 + Will merge to 'next'.

515

516

517 * hv/config-from-blob (2013-05-12) 5 commits

@@ -386,7 +534,9 @@ of the repositories listed at

534 Will merge to 'master'.

535

536

389 -* jk/fetch-always-update-tracking (2013-05-12) 4 commits

537 +* jk/fetch-always-update-tracking (2013-05-28) 5 commits

538 + (merged to 'next' on 2013-05-28 at c6abf3f)

539 + + fetch: don't try to update unfetched tracking refs

540 (merged to 'next' on 2013-05-21 at f7e4b16)

541 + fetch: opportunistically update tracking refs

542 + refactor "ref->merge" flag

@@ -404,29 +554,13 @@ of the repositories listed at

554 Will merge to 'master'.

555

556

407 -* nd/clone-connectivity-shortcut (2013-05-11) 4 commits

557 +* nd/clone-connectivity-shortcut (2013-05-28) 4 commits

558 - clone: open a shortcut for connectivity check

559 - index-pack: remove dead code (it should never happen)

560 - fetch-pack: prepare updated shallow file before fetching the pack

561 - clone: let the user know when check_everything_connected is run

562

413 - Needs some minor fixups.

414 - $gmane/223584

415 -

416 -

417 -* rr/rebase-autostash (2013-05-12) 7 commits

418 - - rebase: implement --[no-]autostash and rebase.autostash

419 - - rebase --merge: return control to caller, for housekeeping

420 - - rebase -i: return control to caller, for housekeeping

421 - - am: return control to caller, for housekeeping

422 - - rebase: prepare to do generic housekeeping

423 - - rebase -i: don't error out if $state_dir already exists

424 - - am: tighten a conditional that checks for $dotest

425 -

426 - This is from v3 with some "Fixed" message in $gmane/224111 without

427 - a reroll yet. Also there was an attempt to follow-up, but it was

428 - never completed.

429 - $gmane/224125

563 + Will merge to 'next'.

564

565

566 * kb/ancestry-path-threedots (2013-05-16) 2 commits

@@ -499,7 +633,8 @@ of the repositories listed at

633 expedite it, as this change is not all that important to deserve a

634 major version bump.

635

502 - I'd vote for merging this without waiting for 2.0.

636 + I'd vote for merging this without waiting for 2.0. Comments?

637 + Waiting for a reroll.

638

639

640 * tr/coverage (2013-05-13) 4 commits

@@ -568,11 +703,13 @@ of the repositories listed at

703 like we warn when more than one refs/ hierachies share the same

704 name.

705

571 - The message needs to be fixed up, as this is not "refname is

572 - ambiguous".

706 + Will be rerolled.

707 + $gmane/225585

708

709

575 -* fc/zsh-leftover-bits (2013-05-08) 2 commits

710 +* fc/zsh-leftover-bits (2013-05-28) 3 commits

711 + (merged to 'next' on 2013-05-28 at d4a7aee)

712 + + completion: zsh: improve bash script loading

713 (merged to 'next' on 2013-05-21 at 1b84ec1)

714 + completion: synchronize zsh wrapper

715 + completion: cleanup zsh wrapper

@@ -615,15 +752,6 @@ of the repositories listed at

752 Will merge to 'master'.

753

754

618 -* jc/core-checkstat-2.0 (2013-05-06) 2 commits

619 - - core.statinfo: remove as promised in Git 2.0

620 - - deprecate core.statinfo at Git 2.0 boundary

621 -

622 - The bottom one is a fix for a breakage of a new feature in 1.8.2.

623 -

624 - Will merge to 'next' (the bottom one only).

625 -

626 -

755 * jk/packed-refs-race (2013-05-06) 4 commits

756 - for_each_ref: load all loose refs before packed refs

757 - get_packed_refs: reload packed-refs file when it changes

@@ -883,7 +1011,7 @@ of the repositories listed at

1011 Allow various subcommands of "git submodule" to be run not from the

1012 top of the working tree of the superproject.

1013

886 - What's the status of this one?

1014 + Will be commented by Jens.

1015

1016

1017 * jl/submodule-mv (2013-04-23) 5 commits

@@ -899,7 +1027,7 @@ of the repositories listed at

1027 inclusing relocating its working tree and adjusting the paths in

1028 the .gitmodules file.

1029

902 - What's the status of this one?

1030 + Will be commented by Jens.

1031

1032

1033 * jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit

@@ -908,88 +1036,16 @@ of the repositories listed at

1036 Will cook in 'next' until Git 2.0.

1037

1038

911 -* nd/magic-pathspecs (2013-03-31) 45 commits

912 - . Rename field "raw" to "_raw" in struct pathspec

913 - . pathspec: support :(glob) syntax

914 - . pathspec: make --literal-pathspecs disable pathspec magic

915 - . pathspec: support :(literal) syntax for noglob pathspec

916 - . Kill limit_pathspec_to_literal() as it's only used by parse_pathspec()

917 - . parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN

918 - . parse_pathspec: make sure the prefix part is wildcard-free

919 - . tree-diff: remove the use of pathspec's raw[] in follow-rename codepath

920 - . Remove match_pathspec() in favor of match_pathspec_depth()

921 - . Remove init_pathspec() in favor of parse_pathspec()

922 - . Remove diff_tree_{setup,release}_paths

923 - . Convert common_prefix() to use struct pathspec

924 - . Convert add_files_to_cache to take struct pathspec

925 - . Convert {read,fill}_directory to take struct pathspec

926 - . Convert refresh_index to take struct pathspec

927 - . Convert report_path_error to take struct pathspec

928 - . checkout: convert read_tree_some to take struct pathspec

929 - . Convert unmerge_cache to take struct pathspec

930 - . Convert run_add_interactive to use struct pathspec

931 - . Convert read_cache_preload() to take struct pathspec

932 - . reset: convert to use parse_pathspec

933 - . add: convert to use parse_pathspec

934 - . check-ignore: convert to use parse_pathspec

935 - . archive: convert to use parse_pathspec

936 - . ls-files: convert to use parse_pathspec

937 - . rm: convert to use parse_pathspec

938 - . checkout: convert to use parse_pathspec

939 - . rerere: convert to use parse_pathspec

940 - . status: convert to use parse_pathspec

941 - . commit: convert to use parse_pathspec

942 - . clean: convert to use parse_pathspec

943 - . Guard against new pathspec magic in pathspec matching code

944 - . parse_pathspec: support prefixing original patterns

945 - . parse_pathspec: support stripping/checking submodule paths

946 - . parse_pathspec: support stripping submodule trailing slashes

947 - . parse_pathspec: a special flag for max_depth feature

948 - . Convert some get_pathspec() calls to parse_pathspec()

949 - . parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL}

950 - . parse_pathspec: save original pathspec for reporting

951 - . Add parse_pathspec() that converts cmdline args to struct pathspec

952 - . pathspec: add copy_pathspec

953 - . pathspec: i18n-ize error strings in pathspec parsing code

954 - . Move struct pathspec and related functions to pathspec.[ch]

955 - . clean: remove unused variable "seen"

956 - . setup.c: check that the pathspec magic ends with ")"

957 -

958 - Migrate the rest of codebase to use "struct pathspec" more.

959 -

960 - This has nasty conflicts with kb/status-ignored-optim-2,

961 - as/check-ignore and tr/line-log; I've already asked Duy to hold

962 - this and later rebase on top of them.

963 -

964 -

965 -* tr/line-log (2013-04-22) 13 commits

966 - (merged to 'next' on 2013-04-22 at 8f2c1de)

967 - + git-log(1): remove --full-line-diff description

968 - (merged to 'next' on 2013-04-21 at cd92620)

969 - + line-log: fix documentation formatting

970 - (merged to 'next' on 2013-04-15 at 504559e)

971 - + log -L: improve comments in process_all_files()

972 - + log -L: store the path instead of a diff_filespec

973 - + log -L: test merge of parallel modify/rename

974 - + t4211: pass -M to 'git log -M -L...' test

975 - (merged to 'next' on 2013-04-05 at 5afb00c)

976 - + log -L: fix overlapping input ranges

977 - + log -L: check range set invariants when we look it up

978 - (merged to 'next' on 2013-04-01 at 5be920c)

979 - + Speed up log -L... -M

980 - + log -L: :pattern:file syntax to find by funcname

981 - + Implement line-history search (git log -L)

982 - + Export rewrite_parents() for 'log -L'

983 - + Refactor parse_loc

1039 +* jc/core-checkstat-2.0 (2013-05-06) 1 commit

1040 + - core.statinfo: remove as promised in Git 2.0

1041 + (this branch uses jc/core-checkstat.)

1042

985 - Will merge to 'master'.

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

1044

1045

1046 * jc/push-2.0-default-to-simple (2013-04-03) 1 commit

1047 - push: switch default from "matching" to "simple"

1048

991 - The early bits to adjust the tests have been merged to 'master'.

992 -

1049 Will cook in 'next' until Git 2.0.

1050

1051

What's cooking (2013/05 #08)