f9daf882bd · matheusbsbs/matheus-bagliano

@@ -1,16 +1,19 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jul 2013, #04; Thu, 11)

4 -X-master-at: 911011aacc78dfa8ac81a5e631cb86bb69fd66e1

5 -X-next-at: 71b857428ffd5d83c0aea148f93f6de2820be300

3 +Subject: What's cooking in git.git (Jul 2013, #05; Fri, 12)

4 +X-master-at: 0da7a53a76b48ea1b2ee6ebe7bd7fbcd7d5c3f9d

5 +X-next-at: 3a6d6276f9ce81c14c10f2d798b4fc9a9950eef6

6

7 -What's cooking in git.git (Jul 2013, #04; Thu, 11)

7 +What's cooking in git.git (Jul 2013, #05; Fri, 12)

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

9

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

11 '-' are only in 'pu' (proposed updates) while commits prefixed with

12 '+' are in 'next'.

13

14 +A handful of code and documentation clean-up patches have been

15 +applied to 'master'.

16 +

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

18 of the repositories listed at

19

@@ -19,174 +22,176 @@ of the repositories listed at

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

23 [Graduated to "master"]

24

22 -* af/rebase-i-merge-options (2013-07-02) 1 commit

23 - (merged to 'next' on 2013-07-08 at f411975)

24 - + Do not ignore merge options in interactive rebase

25 +* as/log-output-encoding-in-user-format (2013-07-05) 11 commits

26 + (merged to 'next' on 2013-07-08 at 2e1bdd9)

27 + + t4205 (log-pretty-formats): avoid using `sed`

28 + + t6006 (rev-list-format): add tests for "%b" and "%s" for the case i18n.commitEncoding is not set

29 + + t4205, t6006, t7102: make functions better readable

30 + + t4205 (log-pretty-formats): revert back single quotes

31 + (merged to 'next' on 2013-07-05 at d2c99e5)

32 + + t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1

33 + (merged to 'next' on 2013-07-01 at 3318aa8)

34 + + t4205: replace .\+ with ..* in sed commands

35 + (merged to 'next' on 2013-06-28 at 4063330)

36 + + pretty: --format output should honor logOutputEncoding

37 + + pretty: Add failing tests: --format output should honor logOutputEncoding

38 + + t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

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

40 + + t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

41 +

42 + "log --format=" did not honor i18n.logoutputencoding configuration

43 + and this attempts to fix it.

44 +

45 +

46 +* ft/diff-rename-default-score-is-half (2013-07-05) 1 commit

47 + (merged to 'next' on 2013-07-09 at 6a6b57e)

48 + + diff-options: document default similarity index

49 +

50

26 - "git rebase -i" now honors --strategy and -X options.

51 +* jc/remote-http-argv-array (2013-07-09) 1 commit

52 + (merged to 'next' on 2013-07-11 at 7fbe8bd)

53 + + remote-http: use argv-array

54

55

29 -* jc/maint-diff-core-safecrlf (2013-06-25) 1 commit

30 - (merged to 'next' on 2013-07-03 at db8a2a6)

31 - + diff: demote core.safecrlf=true to core.safecrlf=warn

56 +* jk/maint-config-multi-order (2013-07-07) 1 commit

57 + (merged to 'next' on 2013-07-09 at 0db1db9)

58 + + git-config(1): clarify precedence of multiple values

59

33 - "git diff" refused to even show difference when core.safecrlf is

34 - set to true (i.e. error out) and there are offending lines in the

35 - working tree files.

60

61 +* jk/pull-to-integrate (2013-07-08) 2 commits

62 + (merged to 'next' on 2013-07-09 at 2ecac24)

63 + + pull: change the description to "integrate" changes

64 + + push: avoid suggesting "merging" remote changes

65

38 -* jc/t1512-fix (2013-07-01) 2 commits

39 - (merged to 'next' on 2013-07-09 at a6c62bb)

40 - + get_short_sha1(): correctly disambiguate type-limited abbreviation

41 - + t1512: correct leftover constants from earlier edition

66

43 - A test that should have failed but didn't revealed a bug that needs

44 - to be corrected.

67 +* ml/cygwin-does-not-have-fifo (2013-07-05) 1 commit

68 + (merged to 'next' on 2013-07-09 at 7d6849d)

69 + + test-lib.sh - cygwin does not have usable FIFOs

70 +

71 +

72 +* ms/remote-tracking-branches-in-doc (2013-07-03) 1 commit

73 + (merged to 'next' on 2013-07-09 at 411a8bd)

74 + + Change "remote tracking" to "remote-tracking"

75

76

47 -* jc/triangle-push-fixup (2013-06-24) 5 commits

48 - (merged to 'next' on 2013-06-26 at 73cbb69)

49 - + t/t5528-push-default: test pushdefault workflows

50 - + t/t5528-push-default: generalize test_push_*

51 - + push: change `simple` to accommodate triangular workflows

52 - + config doc: rewrite push.default section

53 - + t/t5528-push-default: remove redundant test_config lines

77 +* rr/name-rev-stdin-doc (2013-07-07) 1 commit

78 + (merged to 'next' on 2013-07-09 at 7cfbff6)

79 + + name-rev doc: rewrite --stdin paragraph

80 +

81 +

82 +* rs/pickaxe-simplify (2013-07-07) 1 commit

83 + (merged to 'next' on 2013-07-11 at c5972f7)

84 + + diffcore-pickaxe: simplify has_changes and contains

85

55 - Earlier remote.pushdefault (and per-branch branch.*.pushremote)

56 - were introduced as an additional mechanism to choose what

57 - repository to push into when "git push" did not say it from the

58 - command line, to help people who push to a repository that is

59 - different from where they fetch from. This attempts to finish that

60 - topic by teaching the default mechanism to choose branch in the

61 - remote repository to be updated by such a push.

86

63 - The 'current', 'matching' and 'nothing' modes (specified by the

64 - push.default configuration variable) extend to such a "triangular"

65 - workflow naturally, but 'upstream' and 'simple' have to be updated.

87 +* tf/gitweb-extra-breadcrumbs (2013-07-04) 1 commit

88 + (merged to 'next' on 2013-07-09 at 525331b)

89 + + gitweb: allow extra breadcrumbs to prefix the trail

90

67 - . 'upstream' is about pushing back to update the branch in the

68 - remote repository that the current branch fetches from and

69 - integrates with, it errors out in a triangular workflow.

91 + An Gitweb installation that is a part of larger site can optionally

92 + show extra links that point at the levels higher than the Gitweb

93 + pages itself in the link hierarchy of pages.

94

71 - . 'simple' is meant to help new people by avoiding mistakes, and

72 - will be the safe default in Git 2.0. In a non-triangular

73 - workflow, it will continue to act as a cross between 'upstream'

74 - and 'current' in that it pushes to the current branch's

75 - @{upstream} only when it is set to the same name as the current

76 - branch (e.g. your 'master' forks from the 'master' from the

77 - central repository). In a triangular workflow, this series

78 - tentatively defines it as the same as 'current', but we may have

79 - to tighten it to avoid surprises in some way.

95

96 +* tr/test-lint-no-export-assignment-in-shell (2013-07-08) 2 commits

97 + (merged to 'next' on 2013-07-09 at 6f10ea2)

98 + + test-lint: detect 'export FOO=bar'

99 + + t9902: fix 'test A == B' to use = operator

100

82 -* jg/status-config (2013-06-24) 4 commits

83 - (merged to 'next' on 2013-07-03 at 6ac1ada)

84 - + status/commit: make sure --porcelain is not affected by user-facing config

85 - + commit: make it work with status.short

86 - + status: introduce status.branch to enable --branch by default

87 - + status: introduce status.short to enable --short by default

101 +--------------------------------------------------

102 +[New Topics]

103

89 - "git status" learned status.branch and status.short configuration

90 - variables to use --branch and --short options by default (override

91 - with --no-branch and --no-short options from the command line).

104 +* es/check-mailmap (2013-07-11) 2 commits

105 + - t4203: test check-mailmap command invocation

106 + - builtin: add git-check-mailmap command

107

93 - The bottom two has been graduated to 'master' but then reverted.

94 - The tip two are quick attempts to fix the fallout. The one for

95 - status.short looks correct; the other one, while it is correct,

96 - is unfortunately overly complex in order not to introduce an

97 - unnecessary regression.

108 + A new command to allow scripts to query the mailmap information.

109

110 + Expecting a reroll to lose the -z option.

111

100 -* jk/bash-completion (2013-06-30) 2 commits

101 - (merged to 'next' on 2013-07-01 at 6daca44)

102 - + completion: learn about --man-path

103 - + completion: handle unstuck form of base git options

112

113 +* jc/check-x-z (2013-07-11) 4 commits

114 + - check-attr -z: a single -z should apply to both input and output

115 + - check-ignore -z: a single -z should apply to both input and output

116 + - check-attr: the name of the character is NUL, not NULL

117 + - check-ignore: the name of the character is NUL, not NULL

118

106 -* mh/maint-lockfile-overflow (2013-07-07) 1 commit

107 - (merged to 'next' on 2013-07-09 at e1a0eac)

108 - + lockfile: fix buffer overflow in path handling

119 + "git check-ignore -z" applied the NUL termination to both its input

120 + (with --stdin) and its output, but "git check-attr -z" ignored the

121 + option on the output side.

122

110 - Will merge later to 'maint'.

123 + This is potentially a backward incompatible fix. I am tempted to

124 + merge this to and keep it in 'next' for a while to see if anybody

125 + screams before deciding if we want to do anything to help existing

126 + users (there may be none).

127

128

113 -* pb/stash-refuse-to-kill (2013-07-01) 2 commits

114 - (merged to 'next' on 2013-07-05 at 78ecc59)

115 - + git stash: avoid data loss when "git stash save" kills a directory

116 - + treat_directory(): do not declare submodules to be untracked

129 +* jk/cat-file-batch-optim (2013-07-12) 8 commits

130 + - sha1_object_info_extended: pass object_info to helpers

131 + - sha1_object_info_extended: make type calculation optional

132 + - packed_object_info: make type lookup optional

133 + - packed_object_info: hoist delta type resolution to helper

134 + - sha1_loose_object_info: make type lookup optional

135 + - sha1_object_info_extended: rename "status" to "type"

136 + - cat-file: disable object/refname ambiguity check for batch mode

137 + - Merge branch 'nd/warn-ambiguous-object-name' into jk/cat-file-batch-optim

138 + (this branch uses jk/in-pack-size-measurement.)

139

118 - "git stash save" is not just about "saving" the local changes, but

119 - also is to restore the working tree state to that of HEAD. If you

120 - changed a non-directory into a directory in the local change, you

121 - may have untracked files in that directory, which have to be killed

122 - while doing so, unless you run it with --include-untracked. Teach

123 - the command to detect and error out before spreading the damage.

140 + If somebody wants to only know on-disk footprint of an object

141 + without having to know its type or payload size, we can bypass a

142 + lot of code to cheaply learn it.

143

125 - This needed a small fix to "ls-files --killed".

144

145 +* jk/t0008-sigpipe-fix (2013-07-12) 1 commit

146 + - t0008: avoid SIGPIPE race condition on fifo

147

128 -* rr/rebase-checkout-reflog (2013-06-17) 5 commits

129 - (merged to 'next' on 2013-07-01 at 27cfd27)

130 - + checkout: respect GIT_REFLOG_ACTION

131 - (merged to 'next' on 2013-06-27 at 4d99efa)

132 - + status: do not depend on rebase reflog messages

133 - + t/t2021-checkout-last: "checkout -" should work after a rebase finishes

134 - + wt-status: remove unused field in grab_1st_switch_cbdata

135 - + t7512: test "detached from" as well

136 - (this branch is used by rr/rebase-reflog-message-reword.)

148 + Fix for recent test breakage on 'master'.

149

138 - Invocations of "git checkout" used internally by "git rebase" were

139 - counted as "checkout", and affected later "git checkout -" to the

140 - the user to an unexpected place.

150 + Will merge to 'next'.

151

142 - The "bugfix" bits of the series is here. The follow-up part to

143 - reword reflog messages for steps in "rebase" are split to another

144 - topic.

152

153 +* mk/upload-pack-off-by-one-dead-code-removal (2013-07-11) 1 commit

154 + - upload-pack: Remove a piece of dead code

155

147 -* tr/test-v-and-v-subtest-only (2013-07-08) 1 commit

148 - (merged to 'next' on 2013-07-08 at 933d477)

149 - + t0000: do not use export X=Y

150 -

151 - Finishing touches to a topics that is already in master for the

152 - upcoming release.

153 -

154 ---------------------------------------------------

155 -[New Topics]

156 + Will merge to 'next'.

157

157 -* jk/gcc-function-attributes (2013-07-09) 2 commits

158 - - use "sentinel" function attribute for variadic lists

159 - - add missing "format" function attributes

160 - (this branch is used by jk/gcc-function-attributes-more.)

158

162 - Use the function attributes extension to catch mistakes in use of

163 - our own variadic functions that use NULL sentinel at the end

164 - (i.e. like execl(3)) and format strings (i.e. like printf(3)).

159 +* sb/mailmap-updates (2013-07-12) 1 commit

160 + - .mailmap: Map email addresses to names

161

162 Will merge to 'next'.

163

164

169 -* jk/gcc-function-attributes-more (2013-07-09) 2 commits

170 - . (squash???) workaround empty format string warning which we agreed is silly

171 - . wt-status: use "format" function attribute for status_printf

172 - (this branch uses jk/gcc-function-attributes.)

165 +* tf/gitweb-ss-tweak (2013-07-09) 2 commits

166 + - gitweb: vertically centre contents of page footer

167 + - gitweb: Ensure OPML text fits inside its box.

168

174 - The continuation of jk/gcc-function-attributes, but the code

175 - involved uses an equivalent of printf(""), which triggers an

176 - warning.

169 + Comments?

170

178 - I am inclined to remove the "fixup" workaround at the tip that

179 - turns them into a silly equivalent of printf("%s", "") and tell

180 - users who use -Werror to also use -Wno-format-zero-length.

171

172 +* tr/fd-gotcha-fixes (2013-07-12) 2 commits

173 + - run-command: dup_devnull(): guard against syscalls failing

174 + - git_mkstemps: correctly test return value of open()

175

183 -* km/http-curl-config-per-url (2013-07-11) 1 commit

184 - - config: add support for http.<url>.* settings

176 + Two places we did not check return value (expected to be a file

177 + descriptor) correctly.

178

186 - Allows custom curl configuration per URL when talking over http.

179

188 - Partial matching code was hard to grok, and requested for

189 - code clarification.

180 +* jc/mailmap-case-insensitivity (2013-07-12) 4 commits

181 + - add a testcase for checking case insensitivity of mailmap

182 + - mailmap: style fixes

183 + - mailmap: do not downcase mailmap entries

184 + - mailmap: do not lose single-letter names

185 +

186 + The test may need to be rerolled and enhanced.

187 +

188 +

189 +* ms/fetch-prune-configuration (2013-07-12) 2 commits

190 + - squash???

191 + - fetch: make --prune configurable

192 +

193 + Allow fetch.prune and remote.*.prune configuration variables to be set,

194 + and "git fetch" to behave as if "--prune" is given.

195

196 --------------------------------------------------

197 [Stalled]

@@ -322,7 +327,27 @@ of the repositories listed at

327 --------------------------------------------------

328 [Cooking]

329

325 -* hv/config-from-blob (2013-07-11) 5 commits

330 +* jk/gcc-function-attributes (2013-07-09) 3 commits

331 + (merged to 'next' on 2013-07-12 at 5a7081f)

332 + + wt-status: use "format" function attribute for status_printf

333 + + use "sentinel" function attribute for variadic lists

334 + + add missing "format" function attributes

335 +

336 + Use the function attributes extension to catch mistakes in use of

337 + our own variadic functions that use NULL sentinel at the end

338 + (i.e. like execl(3)) and format strings (i.e. like printf(3)).

339 +

340 + Will merge to 'master'.

341 +

342 +

343 +* km/http-curl-config-per-url (2013-07-12) 2 commits

344 + - config: add support for http.<url>.* settings

345 + - http.c: fix parsing of http.sslCertPasswordProtected variable

346 +

347 + Allows custom curl configuration per URL when talking over http.

348 +

349 +

350 +* hv/config-from-blob (2013-07-12) 5 commits

351 - do not die when error in config parsing of buf occurs

352 - teach config --blob option to parse config from database

353 - config: make parsing stack struct independent from actual data source

@@ -331,6 +356,8 @@ of the repositories listed at

356

357 Rerolled.

358

359 + Will merge to 'next'.

360 +

361

362 * bc/push-match-many-refs (2013-07-08) 1 commit

363 (merged to 'next' on 2013-07-11 at df4d56d)

@@ -342,13 +369,6 @@ of the repositories listed at

369 Will merge to 'master'.

370

371

345 -* ft/diff-rename-default-score-is-half (2013-07-05) 1 commit

346 - (merged to 'next' on 2013-07-09 at 6a6b57e)

347 - + diff-options: document default similarity index

348 -

349 - Will merge to 'master'.

350 -

351 -

372 * jc/name-rev-exact-ref (2013-07-09) 3 commits

373 (merged to 'next' on 2013-07-11 at fd5b30c)

374 + describe: use argv-array

@@ -362,22 +382,24 @@ of the repositories listed at

382 Will merge to 'master'.

383

384

365 -* jk/in-pack-size-measurement (2013-07-11) 10 commits

366 - - pack-revindex: radix-sort the revindex

367 - - pack-revindex: use unsigned to store number of objects

368 - - cat-file: split --batch input lines on whitespace

369 - - cat-file: add %(objectsize:disk) format atom

370 - - cat-file: add --batch-check=<format>

371 - - cat-file: refactor --batch option parsing

372 - - cat-file: teach --batch to stream blob objects

373 - - t1006: modernize output comparisons

374 - - teach sha1_object_info_extended a "disk_size" query

375 - - zero-initialize object_info structs

385 +* jk/in-pack-size-measurement (2013-07-12) 10 commits

386 + (merged to 'next' on 2013-07-12 at 5ba720f)

387 + + pack-revindex: radix-sort the revindex

388 + + pack-revindex: use unsigned to store number of objects

389 + + cat-file: split --batch input lines on whitespace

390 + + cat-file: add %(objectsize:disk) format atom

391 + + cat-file: add --batch-check=<format>

392 + + cat-file: refactor --batch option parsing

393 + + cat-file: teach --batch to stream blob objects

394 + + t1006: modernize output comparisons

395 + + teach sha1_object_info_extended a "disk_size" query

396 + + zero-initialize object_info structs

397 + (this branch is used by jk/cat-file-batch-optim.)

398

399 Allow on-disk footprint of objects in packfiles (often they are a

400 lot smaller than their true size, when expressed as deltas).

401

380 - Will merge to 'next'.

402 + Will merge to 'master'.

403

404

405 * jk/maint-clone-shared-no-connectivity-validation (2013-07-08) 1 commit

@@ -394,44 +416,14 @@ of the repositories listed at

416 Will merge to 'master'.

417

418

397 -* jk/maint-config-multi-order (2013-07-07) 1 commit

398 - (merged to 'next' on 2013-07-09 at 0db1db9)

399 - + git-config(1): clarify precedence of multiple values

400 -

401 - Will merge to 'master'.

402 -

403 -

404 -* jk/pull-to-integrate (2013-07-08) 2 commits

405 - (merged to 'next' on 2013-07-09 at 2ecac24)

406 - + pull: change the description to "integrate" changes

407 - + push: avoid suggesting "merging" remote changes

408 -

409 - Will merge to 'master'.

410 -

411 -

419 * km/svn-1.8-serf-only (2013-07-07) 2 commits

413 - - git-svn: allow git-svn fetching to work using serf

414 - - Git.pm: add new temp_is_locked function

420 + (merged to 'next' on 2013-07-12 at 70e0b95)

421 + + git-svn: allow git-svn fetching to work using serf

422 + + Git.pm: add new temp_is_locked function

423

424 Subversion 1.8.0 that was recently released breaks older subversion

425 clients coming over http/https in various ways.

426

419 - Will merge to 'next'.

420 -

421 -

422 -* rr/name-rev-stdin-doc (2013-07-07) 1 commit

423 - (merged to 'next' on 2013-07-09 at 7cfbff6)

424 - + name-rev doc: rewrite --stdin paragraph

425 -

426 - Will merge to 'master'.

427 -

428 -

429 -* rs/pickaxe-simplify (2013-07-07) 1 commit

430 - (merged to 'next' on 2013-07-11 at c5972f7)

431 - + diffcore-pickaxe: simplify has_changes and contains

432 -

433 - Will merge to 'master'.

434 -

427

428 * tr/merge-recursive-index-only (2013-07-07) 3 commits

429 - merge-recursive: -Xindex-only to leave worktree unchanged

@@ -439,14 +431,6 @@ of the repositories listed at

431 - merge-recursive: remove dead conditional in update_stages()

432

433

442 -* tr/test-lint-no-export-assignment-in-shell (2013-07-08) 2 commits

443 - (merged to 'next' on 2013-07-09 at 6f10ea2)

444 - + test-lint: detect 'export FOO=bar'

445 - + t9902: fix 'test A == B' to use = operator

446 -

447 - Will merge to 'master'.

448 -

449 -

434 * es/overlapping-range-set (2013-07-09) 2 commits

435 (merged to 'next' on 2013-07-11 at 3df5a94)

436 + range_set: fix coalescing bug when range is a subset of another

@@ -474,13 +458,6 @@ of the repositories listed at

458 Waiting for comments.

459

460

477 -* jc/remote-http-argv-array (2013-07-09) 1 commit

478 - (merged to 'next' on 2013-07-11 at 7fbe8bd)

479 - + remote-http: use argv-array

480 -

481 - Will merge to 'master'.

482 -

483 -

461 * nd/const-struct-cache-entry (2013-07-09) 1 commit

462 - Convert "struct cache_entry *" to "const ..." wherever possible

463

@@ -512,24 +489,6 @@ of the repositories listed at

489 Will merge to 'master'.

490

491

515 -* ms/remote-tracking-branches-in-doc (2013-07-03) 1 commit

516 - (merged to 'next' on 2013-07-09 at 411a8bd)

517 - + Change "remote tracking" to "remote-tracking"

518 -

519 - Will merge to 'master'.

520 -

521 -

522 -* tf/gitweb-extra-breadcrumbs (2013-07-04) 1 commit

523 - (merged to 'next' on 2013-07-09 at 525331b)

524 - + gitweb: allow extra breadcrumbs to prefix the trail

525 -

526 - An Gitweb installation that is a part of larger site can optionally

527 - show extra links that point at the levels higher than the Gitweb

528 - pages itself in the link hierarchy of pages.

529 -

530 - Will merge to 'master'.

531 -

532 -

492 * bc/commit-invalid-utf8 (2013-07-09) 3 commits

493 (merged to 'next' on 2013-07-11 at a2ee572)

494 + commit: reject non-characters

@@ -548,13 +507,6 @@ of the repositories listed at

507 Will merge to 'master'.

508

509

551 -* ml/cygwin-does-not-have-fifo (2013-07-05) 1 commit

552 - (merged to 'next' on 2013-07-09 at 7d6849d)

553 - + test-lib.sh - cygwin does not have usable FIFOs

554 -

555 - Will merge to 'master'.

556 -

557 -

510 * es/contacts (2013-07-03) 3 commits

511 - contrib: contacts: interpret committish akin to format-patch

512 - contrib: contacts: add ability to parse from committish

@@ -610,13 +562,14 @@ of the repositories listed at

562

563

564 * bp/mediawiki-preview (2013-07-08) 7 commits

613 - - git-remote-mediawiki: add preview subcommand into git mw

614 - - git-remote-mediawiki: add git-mw command

615 - - git-remote-mediawiki: factoring code between git-remote-mediawiki and Git::Mediawiki

616 - - git-remote-mediawiki: update tests to run with the new bin-wrapper

617 - - git-remote-mediawiki: add a git bin-wrapper for developement

618 - - wrap-for-bin: make bin-wrappers chainable

619 - - git-remote-mediawiki: introduction of Git::Mediawiki.pm

565 + (merged to 'next' on 2013-07-12 at 870890a)

566 + + git-remote-mediawiki: add preview subcommand into git mw

567 + + git-remote-mediawiki: add git-mw command

568 + + git-remote-mediawiki: factoring code between git-remote-mediawiki and Git::Mediawiki

569 + + git-remote-mediawiki: update tests to run with the new bin-wrapper

570 + + git-remote-mediawiki: add a git bin-wrapper for developement

571 + + wrap-for-bin: make bin-wrappers chainable

572 + + git-remote-mediawiki: introduction of Git::Mediawiki.pm

573

574 Add a command to allow previewing the contents locally before

575 pushing it out, when working with a MediaWiki remote.

@@ -630,7 +583,7 @@ of the repositories listed at

583

584 But I'll let it pass, as this is only a contrib/ thing.

585

633 - Will merge to 'next'.

586 + Will merge to 'master'.

587

588

589 * fg/submodule-clone-depth (2013-07-03) 1 commit

@@ -654,29 +607,6 @@ of the repositories listed at

607 logic with other people's support. Hint, hint...

608

609

657 -* as/log-output-encoding-in-user-format (2013-07-05) 11 commits

658 - (merged to 'next' on 2013-07-08 at 2e1bdd9)

659 - + t4205 (log-pretty-formats): avoid using `sed`

660 - + t6006 (rev-list-format): add tests for "%b" and "%s" for the case i18n.commitEncoding is not set

661 - + t4205, t6006, t7102: make functions better readable

662 - + t4205 (log-pretty-formats): revert back single quotes

663 - (merged to 'next' on 2013-07-05 at d2c99e5)

664 - + t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1

665 - (merged to 'next' on 2013-07-01 at 3318aa8)

666 - + t4205: replace .\+ with ..* in sed commands

667 - (merged to 'next' on 2013-06-28 at 4063330)

668 - + pretty: --format output should honor logOutputEncoding

669 - + pretty: Add failing tests: --format output should honor logOutputEncoding

670 - + t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

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

672 - + t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

673 -

674 - "log --format=" did not honor i18n.logoutputencoding configuration

675 - and this attempts to fix it.

676 -

677 - Will merge to 'master'.

678 -

679 -

610 * jk/fast-import-empty-ls (2013-06-23) 4 commits

611 - fast-import: allow moving the root tree

612 - fast-import: allow ls or filecopy of the root tree

@@ -719,16 +649,17 @@ of the repositories listed at

649

650

651 * jx/clean-interactive (2013-06-26) 16 commits

722 - - test: run testcases with POSIX absolute paths on Windows

723 - - test: add t7301 for git-clean--interactive

724 - - git-clean: add documentation for interactive git-clean

725 - - git-clean: add ask each interactive action

726 - - git-clean: add select by numbers interactive action

727 - - git-clean: add filter by pattern interactive action

728 - - git-clean: use a git-add-interactive compatible UI

729 - - git-clean: add colors to interactive git-clean

730 - - git-clean: show items of del_list in columns

731 - - git-clean: add support for -i/--interactive

652 + (merged to 'next' on 2013-07-12 at 61dd42d)

653 + + test: run testcases with POSIX absolute paths on Windows

654 + + test: add t7301 for git-clean--interactive

655 + + git-clean: add documentation for interactive git-clean

656 + + git-clean: add ask each interactive action

657 + + git-clean: add select by numbers interactive action

658 + + git-clean: add filter by pattern interactive action

659 + + git-clean: use a git-add-interactive compatible UI

660 + + git-clean: add colors to interactive git-clean

661 + + git-clean: show items of del_list in columns

662 + + git-clean: add support for -i/--interactive

663 (merged to 'next' on 2013-06-26 at f7be2d8)

664 + git-clean: refactor git-clean into two phases

665 + write_name{_quoted_relative,}(): remove redundant parameters

@@ -742,7 +673,7 @@ of the repositories listed at

673 The early part to refactor relative path related helper functions

674 looked sensible.

675

745 - Will merge to 'next'.

676 + Will merge to 'master'.

677

678

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

What's cooking (2013/07 #05)