53993102a2 · 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 (Feb 2013, #01; Fri, 1)

4 -X-master-at: bcd45b4085f9269a536c8fb1963ac8380bfac0e8

5 -X-next-at: d83cc6ec328c2d32e7699b6436e01deade4cc994

3 +Subject: What's cooking in git.git (Feb 2013, #02; Mon, 4)

4 +X-master-at: f51a757fafc1e1ca9565381a13109932acd81dba

5 +X-next-at: 3b7952273237a5df57414b4a5327ce7e64e63255

6

7 -What's cooking in git.git (Feb 2013, #01; Fri, 1)

7 +What's cooking in git.git (Feb 2013, #02; Mon, 4)

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

9

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

@@ -22,174 +22,181 @@ repositories listed at

22 --------------------------------------------------

23 [Graduated to "master"]

24

25 -* as/test-cleanup (2013-01-24) 1 commit

26 - (merged to 'next' on 2013-01-28 at cc1147d)

27 - + t7102 (reset): don't hardcode SHA-1 in expected outputs

28 -

29 -

30 -* bc/git-p4-for-python-2.4 (2013-01-30) 3 commits

31 - (merged to 'next' on 2013-01-31 at 1096db1)

32 - + INSTALL: git-p4 does not support Python 3

33 - (merged to 'next' on 2013-01-30 at 5d81ed2)

34 - + git-p4.py: support Python 2.4

35 - + git-p4.py: support Python 2.5

36 -

37 - With small updates to remove dependency on newer features of

38 - Python, keep git-p4 usable with older Python.

39 -

40 -

41 -* jc/do-not-let-random-file-interfere-with-completion-tests (2013-01-24) 1 commit

42 - (merged to 'next' on 2013-01-28 at df27f53)

43 - + t9902: protect test from stray build artifacts

44 -

45 - Scripts to test bash completion was inherently flaky as it was

46 - affected by whatever random things the user may have on $PATH.

47 -

25 +* jc/custom-comment-char (2013-01-16) 1 commit

26 + (merged to 'next' on 2013-01-25 at 91d8a5d)

27 + + Allow custom "comment char"

28

49 -* jc/no-git-config-in-clone (2013-01-11) 1 commit

50 - (merged to 'next' on 2013-01-15 at feeffe1)

51 - + clone: do not export and unexport GIT_CONFIG

29 + Allow a configuration variable core.commentchar to customize the

30 + character used to comment out the hint lines in the edited text

31 + from the default '#'.

32

53 - We stopped paying attention to $GIT_CONFIG environment that points

54 - at a single configuration file from any command other than "git config"

55 - quite a while ago, but "git clone" internally set, exported, and

56 - then unexported the variable during its operation unnecessarily.

33 + This is half my work and half by Ralf Thielow. There may still be

34 + leftover '#' lurking around, though. My "git grep" says C code

35 + should be already fine, but git-rebase--interactive.sh could be

36 + converted (it should not matter, as the file is not really a

37 + free-form text).

38

39

59 -* jk/cvsimport-does-not-work-with-cvsps3 (2013-01-24) 1 commit

60 - (merged to 'next' on 2013-01-28 at fef4eb2)

61 - + git-cvsimport.txt: cvsps-2 is deprecated

40 +* jc/push-reject-reasons (2013-01-24) 4 commits

41 + (merged to 'next' on 2013-01-28 at b60be93)

42 + + push: finishing touches to explain REJECT_ALREADY_EXISTS better

43 + + push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE

44 + + push: further simplify the logic to assign rejection reason

45 + + push: further clean up fields of "struct ref"

46

63 - Warn people that other tools are more recommendable over

64 - cvsimport+cvsps2 combo when doing a one-shot import, and cvsimport

65 - will not work with cvsps3.

47 + Improve error and advice messages given locally when "git push"

48 + refuses when it cannot compute fast-forwardness by separating these

49 + cases from the normal "not a fast-forward; merge first and push

50 + again" case.

51

52

68 -* jk/gc-auto-after-fetch (2013-01-26) 1 commit

69 - (merged to 'next' on 2013-01-30 at 472d07b)

70 - + Merge branch 'jk/maint-gc-auto-after-fetch' into jk/gc-auto-after-fetch

71 - (this branch uses jk/maint-gc-auto-after-fetch.)

53 +* jk/config-parsing-cleanup (2013-01-23) 8 commits

54 + (merged to 'next' on 2013-01-28 at 9bc9411)

55 + + reflog: use parse_config_key in config callback

56 + + help: use parse_config_key for man config

57 + + submodule: simplify memory handling in config parsing

58 + + submodule: use parse_config_key when parsing config

59 + + userdiff: drop parse_driver function

60 + + convert some config callbacks to parse_config_key

61 + + archive-tar: use parse_config_key when parsing config

62 + + config: add helper function for parsing key names

63

73 - This is to resolve merge conflicts early for the same topic to

74 - recent codebase.

64 + Configuration parsing for tar.* configuration variables were

65 + broken. Introduce a new config-keyname parser API to make the

66 + callers much less error prone.

67

68

77 -* jk/maint-gc-auto-after-fetch (2013-01-26) 2 commits

78 - + fetch-pack: avoid repeatedly re-scanning pack directory

79 - + fetch: run gc --auto after fetching

80 - (this branch is used by jk/gc-auto-after-fetch.)

69 +* jk/read-commit-buffer-data-after-free (2013-01-26) 3 commits

70 + (merged to 'next' on 2013-01-30 at c6d7e16)

71 + + logmsg_reencode: lazily load missing commit buffers

72 + + logmsg_reencode: never return NULL

73 + + commit: drop useless xstrdup of commit message

74

82 - Help "fetch only" repositories that do not trigger "gc --auto"

83 - often enough.

75 + Clarify the ownership rule for commit->buffer field, which some

76 + callers incorrectly accessed without making sure it is populated.

77

78

86 -* jn/do-not-drop-username-when-reading-from-etc-mailname (2013-01-25) 1 commit

87 - (merged to 'next' on 2013-01-28 at e0a8222)

88 - + ident: do not drop username when reading from /etc/mailname

79 +* jk/remote-helpers-in-python-3 (2013-01-30) 10 commits

80 + (merged to 'next' on 2013-01-31 at 5a948aa)

81 + + git_remote_helpers: remove GIT-PYTHON-VERSION upon "clean"

82 + (merged to 'next' on 2013-01-28 at d898471)

83 + + git-remote-testpy: fix path hashing on Python 3

84 + (merged to 'next' on 2013-01-25 at acf9419)

85 + + git-remote-testpy: call print as a function

86 + + git-remote-testpy: don't do unbuffered text I/O

87 + + git-remote-testpy: hash bytes explicitly

88 + + svn-fe: allow svnrdump_sim.py to run with Python 3

89 + + git_remote_helpers: use 2to3 if building with Python 3

90 + + git_remote_helpers: force rebuild if python version changes

91 + + git_remote_helpers: fix input when running under Python 3

92 + + git_remote_helpers: allow building with Python 3

93

90 - We used to stuff "user@" and then append what we read from

91 - /etc/mailname to come up with a default e-mail ident, but a bug

92 - lost the "user@" part. This is to fix it.

94 + Prepare remote-helper test written in Python to be run with Python3.

95

96

95 -* nd/edit-branch-desc-while-detached (2013-01-30) 1 commit

96 - (merged to 'next' on 2013-01-30 at 69307d6)

97 - + branch: no detached HEAD check when editing another branch's description

98 - (this branch is used by nd/branch-error-cases.)

97 +* mm/add-u-A-sans-pathspec (2013-01-28) 1 commit

98 + (merged to 'next' on 2013-01-28 at fe762a6)

99 + + add: warn when -u or -A is used without pathspec

100

100 - Attempt to "branch --edit-description" an existing branch, while

101 - being on a detached HEAD, errored out.

101 + Forbid "git add -u" and "git add -A" without pathspec run from a

102 + subdirectory, to train people to type "." (or ":/") to make the

103 + choice of default does not matter.

104

105

104 -* nd/fetch-depth-is-broken (2013-01-11) 3 commits

105 - (merged to 'next' on 2013-01-15 at 70a5ca7)

106 - + fetch: elaborate --depth action

107 - + upload-pack: fix off-by-one depth calculation in shallow clone

108 - + fetch: add --unshallow for turning shallow repo into complete one

106 +* pw/git-p4-on-cygwin (2013-01-26) 21 commits

107 + (merged to 'next' on 2013-01-30 at 958ae3a)

108 + + git p4: introduce gitConfigBool

109 + + git p4: avoid shell when calling git config

110 + + git p4: avoid shell when invoking git config --get-all

111 + + git p4: avoid shell when invoking git rev-list

112 + + git p4: avoid shell when mapping users

113 + + git p4: disable read-only attribute before deleting

114 + + git p4 test: use test_chmod for cygwin

115 + + git p4: cygwin p4 client does not mark read-only

116 + + git p4 test: avoid wildcard * in windows

117 + + git p4 test: use LineEnd unix in windows tests too

118 + + git p4 test: newline handling

119 + + git p4: scrub crlf for utf16 files on windows

120 + + git p4: remove unreachable windows \r\n conversion code

121 + + git p4 test: translate windows paths for cygwin

122 + + git p4 test: start p4d inside its db dir

123 + + git p4 test: use client_view in t9806

124 + + git p4 test: avoid loop in client_view

125 + + git p4 test: use client_view to build the initial client

126 + + git p4: generate better error message for bad depot path

127 + + git p4: remove unused imports

128 + + git p4: temp branch name should use / even on windows

129

110 - "git fetch --depth" was broken in at least three ways. The

111 - resulting history was deeper than specified by one commit, it was

112 - unclear how to wipe the shallowness of the repository with the

113 - command, and documentation was misleading.

130 + Improve "git p4" on Cygwin.

131

132 --------------------------------------------------

133 [New Topics]

134

118 -* ft/transport-report-segv (2013-01-31) 1 commit

119 - - push: fix segfault when HEAD points nowhere

120 -

121 - A failure to push due to non-ff while on an unborn branch

122 - dereferenced a NULL pointer while showing an error message.

135 +* jn/auto-depend-workaround-buggy-ccache (2013-02-01) 1 commit

136 + (merged to 'next' on 2013-02-02 at db5940a)

137 + + Makefile: explicitly set target name for autogenerated dependencies

138

124 - Will merge to 'next'.

139 + An age-old workaround to prevent buggy versions of ccache from

140 + breaking the auto-generation of dependencies, which unfortunately

141 + is still relevant because some people use ancient distros.

142

143 + Will merge to 'master'.

144

127 -* sb/gpg-i18n (2013-01-31) 1 commit

128 - - gpg: allow translation of more error messages

129 -

130 - Will merge to 'next'.

145

146 +* ct/autoconf-htmldir (2013-02-02) 1 commit

147 + - Honor configure's htmldir switch

148

133 -* sb/gpg-plug-fd-leak (2013-01-31) 1 commit

134 - - gpg: close stderr once finished with it in verify_signed_buffer()

149 + The autoconf subsystem passed --mandir down to generated

150 + config.mak.autogen but forgot to do the same for --htmldir.

151

152 Will merge to 'next'.

153

154

139 -* sb/run-command-fd-error-reporting (2013-01-31) 1 commit

140 - - run-command: be more informative about what failed

141 -

142 - Will merge to 'next' after spelling stdout, etc. out.

143 -

155 +* mk/tcsh-complete-only-known-paths (2013-02-03) 1 commit

156 + - completion: handle path completion and colon for tcsh script

157 + (this branch uses mp/complete-paths.)

158

145 -* jk/remote-helpers-doc (2013-01-31) 2 commits

146 - - [SQUASH] simplify maintenance of redirection pages

147 - - Rename {git- => git}remote-helpers.txt

148 -

149 - "git help remote-helpers" did not work; 'remote-helpers' is not

150 - a subcommand name but a concept, so its documentation should have

151 - been in gitremote-helpers, not git-remote-helpers.

152 -

153 - Will merge to 'next' after squashing the fix in.

159 + Manlio's "complete with known paths only" update to completion

160 + scripts returns directory names without trailing slash to

161 + compensate the addition of '/' done by bash that reads from our

162 + completion result. tcsh completion code that reads from our

163 + internal completion result does not add '/', so let it ask our

164 + complletion code to keep the '/' at the end.

165

166 + Will merge to 'next'.

167

156 -* sp/smart-http-content-type-check (2013-01-31) 1 commit

157 - - Verify Content-Type from smart HTTP servers

168

159 - The smart HTTP clients forgot to verify the content-type that comes

160 - back from the server side to make sure that the request is being

161 - handled properly.

169 +* jc/combine-diff-many-parents (2013-02-03) 1 commit

170 + - combine-diff: lift 32-way limit of combined diff

171

163 - Will merge to 'next'.

172 + We used to have an arbitrary 32 limit for combined diff input,

173 + resulting in incorrect number of leading colons shown when showing

174 + the "--raw --cc" output.

175

176 + May want a couple of new tests.

177

166 -* jc/mention-tracking-for-pull-default (2013-01-31) 1 commit

167 - - doc: mention tracking for pull.default

178

169 - We stopped mentioning `tracking` is a deprecated but supported

170 - synonym for `upstream` in pull.default even though we have no

171 - intention of removing the support for it.

179 +* jc/remove-export-from-config-mak-in (2013-02-03) 1 commit

180 + - config.mak.in: remove unused definitions

181

173 - This is my "don't list it to catch readers' eyes, but make sure it

174 - can be found if the reader looks for it" version; I'm not married

175 - to the layout and am willing to take a replacement patch.

182 + config.mak.in template had an "export" line to cause a few

183 + common makefile variables to be exported; if they need to be

184 + expoted for autoconf/configure users, they should also be exported

185 + for people who write config.mak the same way. Move the "export" to

186 + the main Makefile.

187

188

178 -* jc/fake-ancestor-with-non-blobs (2013-01-31) 3 commits

179 - - apply: diagnose incomplete submodule object name better

180 - - apply: simplify build_fake_ancestor()

181 - - git-am: record full index line in the patch used while rebasing

189 +* jk/apply-similaritly-parsing (2013-02-03) 1 commit

190 + - builtin/apply: tighten (dis)similarity index parsing

191

183 - Rebasing the history of superproject with change in the submodule

184 - has been broken since v1.7.12.

192 + Make sure the similarity value shown in the "apply --summary"

193 + output is sensible, even when the input had a bogus value.

194

195 Will merge to 'next'.

196

197

189 -* jk/doc-makefile-cleanup (2013-02-01) 1 commit

190 - - Documentation/Makefile: clean up MAN*_TXT lists

191 -

192 - Will merge to 'next'.

198 +* nd/status-show-in-progress (2013-02-03) 1 commit

199 + - status: show the branch name if possible in in-progress info

200

201 --------------------------------------------------

202 [Stalled]

@@ -356,19 +363,108 @@ repositories listed at

363 --------------------------------------------------

364 [Cooking]

365

366 +* ft/transport-report-segv (2013-01-31) 1 commit

367 + (merged to 'next' on 2013-02-02 at 6c450a7)

368 + + push: fix segfault when HEAD points nowhere

369 +

370 + A failure to push due to non-ff while on an unborn branch

371 + dereferenced a NULL pointer when showing an error message.

372 +

373 + Will merge to 'master'.

374 +

375 +

376 +* sb/gpg-i18n (2013-01-31) 1 commit

377 + (merged to 'next' on 2013-02-02 at 7a54574)

378 + + gpg: allow translation of more error messages

379 +

380 + Will merge to 'master'.

381 +

382 +

383 +* sb/gpg-plug-fd-leak (2013-01-31) 1 commit

384 + (merged to 'next' on 2013-02-02 at c271a31)

385 + + gpg: close stderr once finished with it in verify_signed_buffer()

386 +

387 + We forgot to close the file descriptor reading from "gpg" output,

388 + killing "git log --show-signature" on a long history.

389 +

390 + Will merge to 'master'.

391 +

392 +

393 +* sb/run-command-fd-error-reporting (2013-02-01) 1 commit

394 + (merged to 'next' on 2013-02-02 at be7e970)

395 + + run-command: be more informative about what failed

396 +

397 + Will merge to 'master'.

398 +

399 +

400 +* jk/remote-helpers-doc (2013-02-01) 1 commit

401 + (merged to 'next' on 2013-02-02 at ce1461a)

402 + + Rename {git- => git}remote-helpers.txt

403 +

404 + "git help remote-helpers" did not work; 'remote-helpers' is not

405 + a subcommand name but a concept, so its documentation should have

406 + been in gitremote-helpers, not git-remote-helpers.

407 +

408 + Will merge to 'master'.

409 +

410 +

411 +* sp/smart-http-content-type-check (2013-02-04) 1 commit

412 + (merged to 'next' on 2013-02-04 at d0759cb)

413 + + Verify Content-Type from smart HTTP servers

414 +

415 + The smart HTTP clients forgot to verify the content-type that comes

416 + back from the server side to make sure that the request is being

417 + handled properly.

418 +

419 + Will merge to 'master'.

420 +

421 +

422 +* jc/mention-tracking-for-pull-default (2013-01-31) 1 commit

423 + - doc: mention tracking for pull.default

424 +

425 + We stopped mentioning `tracking` is a deprecated but supported

426 + synonym for `upstream` in pull.default even though we have no

427 + intention of removing the support for it.

428 +

429 + This is my "don't list it to catch readers' eyes, but make sure it

430 + can be found if the reader looks for it" version; I'm not married

431 + to the layout and am willing to take a replacement patch.

432 +

433 +

434 +* jc/fake-ancestor-with-non-blobs (2013-01-31) 3 commits

435 + (merged to 'next' on 2013-02-02 at 86d457a)

436 + + apply: diagnose incomplete submodule object name better

437 + + apply: simplify build_fake_ancestor()

438 + + git-am: record full index line in the patch used while rebasing

439 +

440 + Rebasing the history of superproject with change in the submodule

441 + has been broken since v1.7.12.

442 +

443 + Will merge to 'master'.

444 +

445 +

446 +* jk/doc-makefile-cleanup (2013-02-01) 1 commit

447 + (merged to 'next' on 2013-02-02 at 86ff373)

448 + + Documentation/Makefile: clean up MAN*_TXT lists

449 +

450 + Will merge to 'master'.

451 +

452 +

453 * ab/gitweb-use-same-scheme (2013-01-28) 1 commit

360 - - gitweb: refer to picon/gravatar images over the same scheme

454 + (merged to 'next' on 2013-02-02 at 7e4a108)

455 + + gitweb: refer to picon/gravatar images over the same scheme

456

457 Avoid mixed contents on a page coming via http and https when

458 gitweb is hosted on a https server.

459

365 - Will merge to 'next'.

460 + Will merge to 'master'.

461

462

463 * jk/python-styles (2013-01-30) 1 commit

369 - - CodingGuidelines: add Python coding guidelines

464 + (merged to 'next' on 2013-02-02 at 293edc1)

465 + + CodingGuidelines: add Python coding guidelines

466

371 - Will merge to 'next'.

467 + Will merge to 'master'.

468

469

470 * mn/send-email-authinfo (2013-01-29) 1 commit

@@ -381,6 +477,7 @@ repositories listed at

477 * mp/complete-paths (2013-01-11) 1 commit

478 (merged to 'next' on 2013-01-30 at 70e4f1a)

479 + git-completion.bash: add support for path completion

480 + (this branch is used by mk/tcsh-complete-only-known-paths.)

481

482 The completion script used to let the default completer to suggest

483 pathnames, which gave too many irrelevant choices (e.g. "git add"

@@ -394,129 +491,63 @@ repositories listed at

491 Will cook in 'next' to see if anybody screams.

492

493

397 -* jk/read-commit-buffer-data-after-free (2013-01-26) 3 commits

398 - (merged to 'next' on 2013-01-30 at c6d7e16)

399 - + logmsg_reencode: lazily load missing commit buffers

400 - + logmsg_reencode: never return NULL

401 - + commit: drop useless xstrdup of commit message

402 -

403 - Clarify the ownership rule for commit->buffer field, which some

404 - callers incorrectly accessed without making sure it is populated.

405 -

406 - Will merge to 'master'.

407 -

408 -

409 -* pw/git-p4-on-cygwin (2013-01-26) 21 commits

410 - (merged to 'next' on 2013-01-30 at 958ae3a)

411 - + git p4: introduce gitConfigBool

412 - + git p4: avoid shell when calling git config

413 - + git p4: avoid shell when invoking git config --get-all

414 - + git p4: avoid shell when invoking git rev-list

415 - + git p4: avoid shell when mapping users

416 - + git p4: disable read-only attribute before deleting

417 - + git p4 test: use test_chmod for cygwin

418 - + git p4: cygwin p4 client does not mark read-only

419 - + git p4 test: avoid wildcard * in windows

420 - + git p4 test: use LineEnd unix in windows tests too

421 - + git p4 test: newline handling

422 - + git p4: scrub crlf for utf16 files on windows

423 - + git p4: remove unreachable windows \r\n conversion code

424 - + git p4 test: translate windows paths for cygwin

425 - + git p4 test: start p4d inside its db dir

426 - + git p4 test: use client_view in t9806

427 - + git p4 test: avoid loop in client_view

428 - + git p4 test: use client_view to build the initial client

429 - + git p4: generate better error message for bad depot path

430 - + git p4: remove unused imports

431 - + git p4: temp branch name should use / even on windows

432 -

433 - Improve "git p4" on Cygwin.

434 -

435 - Will merge to 'master'.

436 -

437 -

494 * ss/mergetools-tortoise (2013-02-01) 2 commits

439 - - mergetools: teach tortoisemerge to handle filenames with SP correctly

440 - - mergetools: support TortoiseGitMerge

495 + (merged to 'next' on 2013-02-03 at d306b83)

496 + + mergetools: teach tortoisemerge to handle filenames with SP correctly

497 + + mergetools: support TortoiseGitMerge

498

499 Update mergetools to work better with newer merge helper tortoise ships.

500

444 - Will merge to 'next'.

501 + Will merge to 'master'.

502

503

447 -* da/mergetool-docs (2013-01-30) 7 commits

448 - - doc: generate a list of valid merge tools

449 - - mergetool--lib: list user configured tools in '--tool-help'

450 - - fixup! doc: generate a list of valid merge tools

451 - - fixup! mergetool--lib: add functions for finding available tools

452 - - mergetool--lib: add functions for finding available tools

453 - - mergetool--lib: improve the help text in guess_merge_tool()

454 - - mergetool--lib: simplify command expressions

504 +* da/mergetool-docs (2013-02-02) 5 commits

505 + (merged to 'next' on 2013-02-03 at f822dcf)

506 + + doc: generate a list of valid merge tools

507 + + mergetool--lib: list user configured tools in '--tool-help'

508 + + mergetool--lib: add functions for finding available tools

509 + + mergetool--lib: improve the help text in guess_merge_tool()

510 + + mergetool--lib: simplify command expressions

511 (this branch uses jk/mergetool.)

512

513 Build on top of the clean-up done by jk/mergetool and automatically

514 generate the list of mergetool and difftool backends the build

515 supports to be included in the documentation.

516

461 - Will merge to 'next', after squashing the fixup! commits from John

462 - Keeping.

517 + Will merge to 'master'.

518

519

520 * nd/branch-error-cases (2013-01-31) 6 commits

466 - - branch: let branch filters imply --list

467 - - docs: clarify git-branch --list behavior

468 - - branch: mark more strings for translation

469 - - Merge branch 'nd/edit-branch-desc-while-detached' into HEAD

470 - - branch: give a more helpful message on redundant arguments

471 - - branch: reject -D/-d without branch name

521 + (merged to 'next' on 2013-02-02 at cf5e745)

522 + + branch: let branch filters imply --list

523 + + docs: clarify git-branch --list behavior

524 + + branch: mark more strings for translation

525 + + Merge branch 'nd/edit-branch-desc-while-detached' into HEAD

526 + + branch: give a more helpful message on redundant arguments

527 + + branch: reject -D/-d without branch name

528

529 Fix various error messages and conditions in "git branch", e.g. we

530 advertised "branch -d/-D" to remove one or more branches but actually

531 implemented removal of zero or more branches---request to remove no

532 branches was not rejected.

533

478 - Will merge to 'next'.

479 -

480 -

481 -* jc/push-reject-reasons (2013-01-24) 4 commits

482 - (merged to 'next' on 2013-01-28 at b60be93)

483 - + push: finishing touches to explain REJECT_ALREADY_EXISTS better

484 - + push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE

485 - + push: further simplify the logic to assign rejection reason

486 - + push: further clean up fields of "struct ref"

487 -

488 - Improve error and advice messages given locally when "git push"

489 - refuses when it cannot compute fast-forwardness by separating these

490 - cases from the normal "not a fast-forward; merge first and push

491 - again" case.

492 -

534 Will merge to 'master'.

535

536

537 * jk/mergetool (2013-01-28) 8 commits

497 - - mergetools: simplify how we handle "vim" and "defaults"

498 - - mergetool--lib: don't call "exit" in setup_tool

499 - - mergetool--lib: improve show_tool_help() output

500 - - mergetools/vim: remove redundant diff command

501 - - git-difftool: use git-mergetool--lib for "--tool-help"

502 - - git-mergetool: don't hardcode 'mergetool' in show_tool_help

503 - - git-mergetool: remove redundant assignment

504 - - git-mergetool: move show_tool_help to mergetool--lib

538 + (merged to 'next' on 2013-02-03 at 2ff5dee)

539 + + mergetools: simplify how we handle "vim" and "defaults"

540 + + mergetool--lib: don't call "exit" in setup_tool

541 + + mergetool--lib: improve show_tool_help() output

542 + + mergetools/vim: remove redundant diff command

543 + + git-difftool: use git-mergetool--lib for "--tool-help"

544 + + git-mergetool: don't hardcode 'mergetool' in show_tool_help

545 + + git-mergetool: remove redundant assignment

546 + + git-mergetool: move show_tool_help to mergetool--lib

547 (this branch is used by da/mergetool-docs.)

548

549 Cleans up mergetool/difftool combo.

550

509 - This is looking ready for 'next'.

510 -

511 -

512 -* mm/add-u-A-sans-pathspec (2013-01-28) 1 commit

513 - (merged to 'next' on 2013-01-28 at fe762a6)

514 - + add: warn when -u or -A is used without pathspec

515 -

516 - Forbid "git add -u" and "git add -A" without pathspec run from a

517 - subdirectory, to train people to type "." (or ":/") to make the

518 - choice of default does not matter.

519 -

551 Will merge to 'master'.

552

553

@@ -534,22 +565,26 @@ repositories listed at

565 the client. Optionally allow requests for histories leading to the

566 tips of hidden refs by updated clients.

567

568 + Will merge to 'next' after dropping the tip.

569 +

570

571 * ta/doc-no-small-caps (2013-02-01) 6 commits

539 - - Documentation: StGit is the right spelling, not StGIT

540 - - Documentation: describe the "repository" in repository-layout

541 - - Documentation: add a description for 'gitfile' to glossary

542 - - Documentation: do not use undefined terms git-dir and git-file

543 - - Documentation: the name of the system is 'Git', not 'git'

544 - - Documentation: avoid poor-man's small caps GIT

572 + (merged to 'next' on 2013-02-02 at 77cbd0e)

573 + + Documentation: StGit is the right spelling, not StGIT

574 + + Documentation: describe the "repository" in repository-layout

575 + + Documentation: add a description for 'gitfile' to glossary

576 + + Documentation: do not use undefined terms git-dir and git-file

577 + + Documentation: the name of the system is 'Git', not 'git'

578 + + Documentation: avoid poor-man's small caps GIT

579

580 Update documentation to change "GIT" which was a poor-man's small

547 - caps to "Git" which was the intended spelling. Also change "git"

548 - spelled in all-lowercase to "Git" when it refers to the system as

549 - the whole or the concept it embodies, as opposed to the command the

550 - end users would type.

581 + caps to "Git". The latter was the intended spelling.

582

552 - Will merge to 'next'.

583 + Also change "git" spelled in all-lowercase to "Git" when it refers

584 + to the system as the whole or the concept it embodies, as opposed to

585 + the command the end users would type.

586 +

587 + Will merge to 'master'.

588

589

590 * jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit

@@ -564,62 +599,7 @@ repositories listed at

599 infrastructure; even though I think this change is correct, please

600 report immediately if you find any unintended side effect.

601

567 - Will merge to 'next'.

568 -

569 -

570 -* jk/remote-helpers-in-python-3 (2013-01-30) 10 commits

571 - (merged to 'next' on 2013-01-31 at 5a948aa)

572 - + git_remote_helpers: remove GIT-PYTHON-VERSION upon "clean"

573 - (merged to 'next' on 2013-01-28 at d898471)

574 - + git-remote-testpy: fix path hashing on Python 3

575 - (merged to 'next' on 2013-01-25 at acf9419)

576 - + git-remote-testpy: call print as a function

577 - + git-remote-testpy: don't do unbuffered text I/O

578 - + git-remote-testpy: hash bytes explicitly

579 - + svn-fe: allow svnrdump_sim.py to run with Python 3

580 - + git_remote_helpers: use 2to3 if building with Python 3

581 - + git_remote_helpers: force rebuild if python version changes

582 - + git_remote_helpers: fix input when running under Python 3

583 - + git_remote_helpers: allow building with Python 3

584 -

585 - Prepare remote-helper test written in Python to be run with Python3.

586 -

587 - Will merge to 'master'.

588 -

589 -

590 -* jk/config-parsing-cleanup (2013-01-23) 8 commits

591 - (merged to 'next' on 2013-01-28 at 9bc9411)

592 - + reflog: use parse_config_key in config callback

593 - + help: use parse_config_key for man config

594 - + submodule: simplify memory handling in config parsing

595 - + submodule: use parse_config_key when parsing config

596 - + userdiff: drop parse_driver function

597 - + convert some config callbacks to parse_config_key

598 - + archive-tar: use parse_config_key when parsing config

599 - + config: add helper function for parsing key names

600 -

601 - Configuration parsing for tar.* configuration variables were

602 - broken. Introduce a new config-keyname parser API to make the

603 - callers much less error prone.

604 -

605 - Will merge to 'master'.

606 -

607 -

608 -* jc/custom-comment-char (2013-01-16) 1 commit

609 - (merged to 'next' on 2013-01-25 at 91d8a5d)

610 - + Allow custom "comment char"

611 -

612 - An illustration to show codepaths that need to be touched to change

613 - the hint lines in the edited text to begin with something other

614 - than '#'.

615 -

616 - This is half my work and half by Ralf Thielow. There may still be

617 - leftover '#' lurking around, though. My "git grep" says C code

618 - should be already fine, but git-rebase--interactive.sh could be

619 - converted (it should not matter, as the file is not really a

620 - free-form text).

621 -

622 - Will merge to 'master'.

602 + Will cook in 'next'.

603

604

605 * jc/push-2.0-default-to-simple (2013-01-16) 14 commits

@@ -658,11 +638,3 @@ repositories listed at

638

639 Waiting for the final round of reroll before merging to 'next'.

640 After that we will go incremental.

661 -

662 ---------------------------------------------------

663 -[Discarded]

664 -

665 -* jk/update-install-for-p4 (2013-01-20) 1 commit

666 - . INSTALL: git-p4 doesn't support Python 3

667 -

668 - Made obsolete by bc/git-p4-for-python-2.4 topic.

What's cooking (2013/02 #02)