ff84629ea2 · 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 (Jun 2018, #02; Mon, 4)

4 -X-master-at: 3e5524907b43337e82a24afbc822078daf7a868f

5 -X-next-at: 61856ae69a2ceb241a90e47953e18f218e4d5f2f

3 +Subject: What's cooking in git.git (Jun 2018, #03; Tue, 12)

4 +X-master-at: 6f333ff2fb28add6d54e9526b8dfdf47bc2b7a9a

5 +X-next-at: 331a1db143dd028146b93af7da9e32f451bf2002

6

7 -What's cooking in git.git (Jun 2018, #02; Mon, 4)

7 +What's cooking in git.git (Jun 2018, #03; Tue, 12)

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

9

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

@@ -18,114 +18,100 @@ of the repositories listed at

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

19

20 --------------------------------------------------

21 -[Graduated to "master"]

21 +[New Topics]

22

23 -* bc/t3430-fixup (2018-06-04) 1 commit

24 - (merged to 'next' on 2018-06-04 at 892aab2dc8)

25 - + t3430: test clean-up

23 +* ab/refspec-init-fix (2018-06-11) 3 commits

24 + - refspec: initalize `refspec_item` in `valid_fetch_refspec()`

25 + - refspec: add back a refspec_item_init() function

26 + - refspec: s/refspec_item_init/&_or_die/g

27

27 - Test fix.

28 + Make refspec parsing codepath more robust.

29

30 + Will merge to 'next'.

31

30 -* bw/refspec-api (2018-06-01) 1 commit

31 - (merged to 'next' on 2018-06-04 at f244fe357b)

32 - + refspec-api: avoid uninitialized field in refspec item

32

34 - Hotfix.

33 +* as/safecrlf-quiet-fix (2018-06-11) 1 commit

34 + - config.c: fix regression for core.safecrlf false

35

36 + Fix for 2.17-era regression.

37

37 -* jt/submodule-pull-recurse-rebase (2018-05-25) 1 commit

38 - (merged to 'next' on 2018-06-01 at cd3e2a1008)

39 - + submodule: do not pass null OID to setup_revisions

38 + Will merge to 'next'.

39

41 - "git pull -recurse-submodules --rebase", when the submodule

42 - repository's history did not have anything common between ours and

43 - the upstream's, failed to execute. We need to fetch from them to

44 - continue even in such a case.

40

41 +* jk/submodule-fsck-loose-fixup (2018-06-11) 2 commits

42 + (merged to 'next' on 2018-06-11 at 3eadb39c0a)

43 + + fsck: avoid looking at NULL blob->object

44 + + t7415: don't bother creating commit for symlink test

45

47 -* nd/remote-update-doc (2018-06-04) 2 commits

48 - (merged to 'next' on 2018-06-04 at b2901b60ad)

49 - + remote: doc typofix

50 - (merged to 'next' on 2018-06-04 at 82cce447e5)

51 - + remote.txt: update documentation for 'update' command

46 + Finishing touches to a topic that already is in 'maint'.

47

53 - "git remote update" can take both a single remote nickname and a

54 - nickname for remote groups, but only one of them was documented.

48 + Will merge to 'master' and then to 'maint'.

49

50

57 -* rd/p4-doc-markup-env (2018-06-01) 1 commit

58 - (merged to 'next' on 2018-06-04 at 80212295cf)

59 - + p4.txt: Use backquotes for variable names

51 +* sb/submodule-merge-in-merge-recursive (2018-06-11) 1 commit

52 + (merged to 'next' on 2018-06-11 at ad05b6bc6a)

53 + + merge-submodule: reduce output verbosity

54

61 - Doc markup update.

55 + Finishing touches to a topic that already is in 'master'.

56

57 + Will merge to 'master'.

58

64 -* tg/doc-sec-list (2018-06-01) 2 commits

65 - (merged to 'next' on 2018-06-04 at e1f80ffe09)

66 - + note git-security@googlegroups.com in more places

67 - + SubmittingPatches: replace numbered attributes with names

59

69 - Doc update.

60 +* sg/completion-zsh-workaround (2018-06-12) 1 commit

61 + (merged to 'next' on 2018-06-12 at 331a1db143)

62 + + completion: correct zsh detection when run from git-completion.zsh

63

71 ---------------------------------------------------

72 -[New Topics]

64 + Work around zsh segfaulting when loading git-completion.zsh

65

74 -* ab/checkout-default-remote (2018-06-04) 8 commits

75 - - checkout & worktree: introduce checkout.defaultRemote

76 - - checkout: add advice for ambiguous "checkout <branch>"

77 - - builtin/checkout.c: use "ret" variable for return

78 - - checkout: pass the "num_matches" up to callers

79 - - checkout.c]: change "unique" member to "num_matches"

80 - - checkout.c: introduce an *_INIT macro

81 - - checkout.h: wrap the arguments to unique_tracking_name()

82 - - checkout tests: index should be clean after dwim checkout

66 + Will merge to 'master'.

67

68

85 -* nd/reject-empty-shallow-request (2018-06-04) 1 commit

86 - - upload-pack: reject shallow requests that would return nothing

87 -

88 - "git fetch --shallow-since=<cutoff>" that specifies the cut-off

89 - point that is newer than the existing history used to end up

90 - grabbing the entire history. Such a request now errors out.

69 +* sg/gpg-tests-fix (2018-06-11) 2 commits

70 + - tests: make forging GPG signed commits and tags more robust

71 + - t7510-signed-commit: use 'test_must_fail'

72

73 + Some flaky tests have been fixed.

74

93 -* pw/add-p-recount (2018-06-04) 1 commit

94 - - add -p: fix counting empty context lines in edited patches

75 + Will merge to 'next'.

76

96 - When user edits the patch in "git add -p" and the user's editor is

97 - set to strip trailing whitespaces indiscriminately, an empty line

98 - that is unchanged in the patch would become completely empty

99 - (instead of a line with a sole SP on it). The code introduced in

100 - Git 2.17 timeframe failed to parse such a patch, but now it learned

101 - to notice the situation and cope with it.

77

103 - Will merge to and cook in 'next'.

78 +* jk/fetch-all-peeled-fix (2018-06-11) 1 commit

79 + - fetch-pack: don't try to fetch peel values with --all

80

81

106 -* rd/comment-typofix-in-sha1-file (2018-06-04) 1 commit

107 - - sha1-file.c: correct $GITDIR to $GIT_DIR in a comment

82 +* rd/diff-options-typofix (2018-06-11) 1 commit

83 + - diff-options.txt: fix minor typos, font inconsistencies, in docs

84

109 - In code comment typofix

85

111 - Will merge to 'next'.

86 +* ld/git-p4-updates (2018-06-12) 6 commits

87 + - git-p4: auto-size the block

88 + - git-p4: narrow the scope of exceptions caught when parsing an int

89 + - git-p4: raise exceptions from p4CmdList based on error from p4 server

90 + - git-p4: better error reporting when p4 fails

91 + - git-p4: add option to disable syncing of p4/master with p4

92 + - git-p4: disable-rebase: allow setting this via configuration

93 + (this branch uses rm/p4-submit-with-commit-option.)

94

95

114 -* sg/update-ref-stdin-cleanup (2018-06-04) 1 commit

115 - - update-ref --stdin: use skip_prefix()

96 +* en/merge-recursive-cleanup (2018-06-12) 6 commits

97 + - merge-recursive: add pointer about unduly complex looking code

98 + - merge-recursive: rename conflict_rename_*() family of functions

99 + - merge-recursive: clarify the rename_dir/RENAME_DIR meaning

100 + - merge-recursive: align labels with their respective code blocks

101 + - merge-recursive: fix numerous argument alignment issues

102 + - merge-recursive: fix miscellaneous grammar error in comment

103

117 - Code cleanup.

104

119 - Will merge to 'next'.

105 +* jh/partial-clone (2018-06-12) 1 commit

106 + - list-objects: check if filter is NULL before using

107

108

122 -* cc/tests-without-assuming-ref-files-backend (2018-06-04) 1 commit

123 - - t9104: kosherly remove remote refs

109 +* km/doc-workflows-typofix (2018-06-12) 1 commit

110 + - gitworkflows: fix grammar in 'Merge upwards' rule

111

125 - Instead of mucking with filesystem directly, use plumbing commands

126 - update-ref etc. to manipulate the refs in the tests.

112

128 - Will merge to 'next'.

113 +* ms/send-pack-honor-config (2018-06-12) 1 commit

114 + - builtin/send-pack: populate the default configs

115

116 --------------------------------------------------

117 [Stalled]

@@ -223,10 +209,10 @@ of the repositories listed at

209 cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>

210

211

226 -* mk/http-backend-content-length (2018-06-04) 3 commits

227 - - SQUASH???

212 +* mk/http-backend-content-length (2018-06-11) 3 commits

213 - http-backend: respect CONTENT_LENGTH for receive-pack

214 - http-backend: respect CONTENT_LENGTH as specified by rfc3875

215 + - http-backend: cleanup writing to child process

216

217 The http-backend (used for smart-http transport) used to slurp the

218 whole input until EOF, without paying attention to CONTENT_LENGTH

@@ -259,6 +245,65 @@ of the repositories listed at

245 --------------------------------------------------

246 [Cooking]

247

248 +* ab/checkout-default-remote (2018-06-11) 8 commits

249 + - checkout & worktree: introduce checkout.defaultRemote

250 + - checkout: add advice for ambiguous "checkout <branch>"

251 + - builtin/checkout.c: use "ret" variable for return

252 + - checkout: pass the "num_matches" up to callers

253 + - checkout.c: change "unique" member to "num_matches"

254 + - checkout.c: introduce an *_INIT macro

255 + - checkout.h: wrap the arguments to unique_tracking_name()

256 + - checkout tests: index should be clean after dwim checkout

257 +

258 +

259 +* nd/reject-empty-shallow-request (2018-06-04) 1 commit

260 + - upload-pack: reject shallow requests that would return nothing

261 +

262 + "git fetch --shallow-since=<cutoff>" that specifies the cut-off

263 + point that is newer than the existing history used to end up

264 + grabbing the entire history. Such a request now errors out.

265 +

266 + Will merge to 'next'.

267 +

268 +

269 +* pw/add-p-recount (2018-06-11) 1 commit

270 + - add -p: fix counting empty context lines in edited patches

271 +

272 + When user edits the patch in "git add -p" and the user's editor is

273 + set to strip trailing whitespaces indiscriminately, an empty line

274 + that is unchanged in the patch would become completely empty

275 + (instead of a line with a sole SP on it). The code introduced in

276 + Git 2.17 timeframe failed to parse such a patch, but now it learned

277 + to notice the situation and cope with it.

278 +

279 + Will merge to and cook in 'next'.

280 +

281 +

282 +* rd/comment-typofix-in-sha1-file (2018-06-04) 1 commit

283 + - sha1-file.c: correct $GITDIR to $GIT_DIR in a comment

284 +

285 + In code comment typofix

286 +

287 + Will merge to 'next'.

288 +

289 +

290 +* sg/update-ref-stdin-cleanup (2018-06-04) 1 commit

291 + - update-ref --stdin: use skip_prefix()

292 +

293 + Code cleanup.

294 +

295 + Will merge to 'next'.

296 +

297 +

298 +* cc/tests-without-assuming-ref-files-backend (2018-06-04) 1 commit

299 + - t9104: kosherly remove remote refs

300 +

301 + Instead of mucking with filesystem directly, use plumbing commands

302 + update-ref etc. to manipulate the refs in the tests.

303 +

304 + Will merge to 'next'.

305 +

306 +

307 * ag/rebase-p (2018-06-01) 4 commits

308 - rebase: remove -p code from git-rebase--interactive.sh

309 - rebase: use the new git-rebase--preserve-merges.sh

@@ -271,7 +316,9 @@ of the repositories listed at

316 Will merge to 'next'.

317

318

274 -* jk/index-pack-maint (2018-06-01) 2 commits

319 +* jk/index-pack-maint (2018-06-11) 3 commits

320 + (merged to 'next' on 2018-06-11 at f85a566b11)

321 + + index-pack: correct install_packed_git() args

322 (merged to 'next' on 2018-06-04 at c553a485e8)

323 + index-pack: handle --strict checks of non-repo packs

324 + prepare_commit_graft: treat non-repository as a noop

@@ -280,7 +327,7 @@ of the repositories listed at

327 final object integrity checks after making the freshly indexed

328 packfile available to itself.

329

283 - Will cook in 'next'.

330 + Will merge to 'master'.

331

332

333 * ls/complete-remote-update-names (2018-06-01) 1 commit

@@ -390,7 +437,7 @@ of the repositories listed at

437 Will merge to and cook in 'next'.

438

439

393 -* nd/completion-negation (2018-05-29) 3 commits

440 +* nd/completion-negation (2018-06-11) 3 commits

441 - completion: collapse extra --no-.. options

442 - completion: suppress some -no- options

443 - parse-options: option to let --git-completion-helper show negative form

@@ -419,6 +466,7 @@ of the repositories listed at

466

467 * rm/p4-submit-with-commit-option (2018-05-21) 1 commit

468 - git-p4: add options --commit and --disable-rebase

469 + (this branch is used by ld/git-p4-updates.)

470

471 Needs sign-off.

472

@@ -430,7 +478,7 @@ of the repositories listed at

478

479 Update to ds/generation-numbers topic.

480

433 - Wait for ds/generation-numbers

481 + Will cook in 'next'.

482

483

484 * nd/commit-util-to-slab (2018-05-21) 15 commits

What's cooking (2018/06 #03)