e068323acf · matheusbsbs/matheus-bagliano

@@ -1,21 +1,22 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jun 2014, #05; Fri, 20)

4 -X-master-at: 786a89d3477c339676ed36d5d2d7507251344952

5 -X-next-at: e727dec93ab54c06c072aed01968580556da9191

3 +Subject: What's cooking in git.git (Jun 2014, #06; Thu, 26)

4 +X-master-at: ea0e524ebd60f87546a9998e447d307d3f51a3e3

5 +X-next-at: 2fd69c3c8efbb671c0151b34525ef25f1f782297

6

7 -What's cooking in git.git (Jun 2014, #05; Fri, 20)

7 +What's cooking in git.git (Jun 2014, #06; Thu, 26)

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 -Many topics that have been cooking in 'next' during the previous

15 -cycle and also some new topics since this cycle opened, totalling

16 -slightly more than 300 individual patches are in 'master' now. We

17 -have also accumulated some fixes we need to merge down to 'maint'

18 -and cut a v2.0.1 sometime next week.

14 +Fixes accumulated on the 'master' front made into 2.0.1. The topics

15 +in flight continue to separate into two distinct layers (i.e.

16 +stalled-and-need-to-be-rerolld vs sure-to-graduate-soon).

17 +

18 +Four mingw series are still in limbo--are they in good enough shape

19 +for Windows folks who wanted to upstream them?

20

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

22 of the repositories listed at

@@ -25,162 +26,117 @@ of the repositories listed at

26 --------------------------------------------------

27 [Graduated to "master"]

28

28 -* jc/test-lazy-prereq (2014-06-13) 6 commits

29 - (merged to 'next' on 2014-06-10 at 4f774f7)

30 - + t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite

31 - + t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite

32 - + t3302: do not chdir around in the primary test process

33 - + t3302: coding style updates

34 - + test: turn USR_BIN_TIME into a lazy prerequisite

35 - + test: turn EXPENSIVE into a lazy prerequisite

36 -

37 - Test-script clean-up.

38 -

39 -

40 -* jc/revision-dash-count-parsing (2014-06-09) 1 commit

41 - (merged to 'next' on 2014-06-10 at 1aeca19)

42 - + revision: parse "git log -<count>" more carefully

43 -

44 - "git log -2master" is a common typo that shows two commits starting

45 - from whichever random branch that is not 'master' that happens to

46 - be checked out currently.

47 -

29 +* ep/avoid-test-a-o (2014-06-19) 20 commits

30 + (merged to 'next' on 2014-06-20 at c47322b)

31 + + git-submodule.sh: avoid "echo" path-like values

32 + + git-submodule.sh: avoid "test <cond> -a/-o <cond>"

33 + + t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"

34 + + t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"

35 + + t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"

36 + + t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"

37 + + t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"

38 + + t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"

39 + + t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"

40 + + t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"

41 + + t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"

42 + + git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"

43 + + git-mergetool.sh: avoid "test <cond> -a/-o <cond>"

44 + + git-bisect.sh: avoid "test <cond> -a/-o <cond>"

45 + + contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"

46 + + contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"

47 + + contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"

48 + + contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"

49 + + contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"

50 + + check_bindir: avoid "test <cond> -a/-o <cond>"

51

49 -* jm/api-strbuf-doc (2014-06-09) 1 commit

50 - (merged to 'next' on 2014-06-10 at 831aa30)

51 - + api-strbuf.txt minor typos

52 + Update tests and scripts to avoid "test ... -a ...", which is often

53 + more error-prone than "test ... && test ...".

54

55 + Squashed misconversion fix-up into git-submodule.sh updates.

56

54 -* mt/send-email-cover-to-cc (2014-06-10) 3 commits

55 - (merged to 'next' on 2014-06-10 at 6bb1465)

56 - + t9001: avoid non-portable '\n' with sed

57 - + test/send-email: to-cover, cc-cover tests

58 - + git-send-email: two new options: to-cover, cc-cover

57

60 - Originally merged to 'next' on 2014-06-10

58 +* fr/sequencer-fail-with-not-one-upon-no-ff (2014-06-09) 1 commit

59 + (merged to 'next' on 2014-06-16 at 29734cc)

60 + + sequencer: signal failed ff as an aborted, not a conflicted merge

61

62 - "git send-email" learns two new options.

62

63 +* jk/repack-pack-keep-objects (2014-06-10) 3 commits

64 + (merged to 'next' on 2014-06-16 at 89716c9)

65 + + repack: s/write_bitmap/&s/ in code

66 + + repack: respect pack.writebitmaps

67 + + repack: do not accidentally pack kept objects by default

68 + (this branch is used by jk/repack-pack-writebitmaps-config.)

69

65 -* rs/more-starts-with (2014-06-09) 1 commit

66 - (merged to 'next' on 2014-06-10 at efcd02e)

67 - + Use starts_with() for C strings instead of memcmp()

70 + Recent updates to "git repack" started to duplicate objects that

71 + are in packfiles marked with .keep flag into the new packfile by

72 + mistake.

73

74

70 -* tb/t5551-clone-notice-to-stderr (2014-06-09) 1 commit

71 - (merged to 'next' on 2014-06-10 at 374082c)

72 - + t5551: fix the 50,000 tag test

75 +* jk/repack-pack-writebitmaps-config (2014-06-12) 4 commits

76 + (merged to 'next' on 2014-06-16 at 777005d)

77 + + t7700: drop explicit --no-pack-kept-objects from .keep test

78 + + repack: introduce repack.writeBitmaps config option

79 + + repack: simplify handling of --write-bitmap-index

80 + + pack-objects: stop respecting pack.writebitmaps

81 + (this branch uses jk/repack-pack-keep-objects.)

82

83

84 +* jm/dedup-name-compare (2014-06-20) 2 commits

85 + + cleanup duplicate name_compare() functions

86 + + name-hash.c: replace cache_name_compare() with memcmp(3)

87

76 -* jc/fetch-pull-refmap (2014-06-12) 10 commits

77 - (merged to 'next' on 2014-06-12 at 5428530)

78 - + docs: Explain the purpose of fetch's and pull's <refspec> parameter.

79 - (merged to 'next' on 2014-06-10 at 13c13ae)

80 - + fetch: allow explicit --refmap to override configuration

81 - + fetch doc: add a section on configured remote-tracking branches

82 - + fetch doc: remove "short-cut" section

83 - + fetch doc: update refspec format description

84 - + fetch doc: on pulling multiple refspecs

85 - + fetch doc: remove notes on outdated "mixed layout"

86 - + fetch doc: update note on '+' in front of the refspec

87 - + fetch doc: move FETCH_HEAD material lower and add an example

88 - + fetch doc: update introductory part for clarity

88

90 ---------------------------------------------------

91 -[New Topics]

89 +* mc/doc-submodule-sync-recurse (2014-06-13) 1 commit

90 + (merged to 'next' on 2014-06-20 at 04815e3)

91 + + submodule: document "sync --recursive"

92

93 -* dt/refs-check-refname-component-sse (2014-06-18) 1 commit

94 - (merged to 'next' on 2014-06-20 at d286027)

95 - + refs.c: SSE2 optimizations for check_refname_component

93

97 - Further micro-optimization of a leaf-function.

94 +* mc/git-p4-prepare-p4-only (2014-06-13) 1 commit

95 + (merged to 'next' on 2014-06-16 at 3c05e19)

96 + + git-p4: fix submit in non --prepare-p4-only mode

97

98

100 -* tb/unicode-7.0-display-width (2014-06-18) 1 commit

101 - (merged to 'next' on 2014-06-20 at 111b246)

102 - + Update of unicode_width.h to Unicode Version 7.0

99 +* nd/init-restore-env (2014-06-10) 1 commit

100 + (merged to 'next' on 2014-06-16 at ecbbfca)

101 + + git potty: restore environments after alias expansion

102

104 - Will merge to 'master'.

103

104 +* pb/trim-trailing-spaces (2014-06-13) 1 commit

105 + (merged to 'next' on 2014-06-20 at 6985153)

106 + + t0008: do not depend on 'echo' handling backslashes specially

107

107 -* ye/http-extract-charset (2014-06-17) 1 commit

108 - (merged to 'next' on 2014-06-20 at 9492bae)

109 - + http: fix charset detection of extract_content_type()

108

111 - Will merge to 'master'.

109 +* rs/blame-refactor (2014-06-13) 2 commits

110 + (merged to 'next' on 2014-06-20 at ddaa722)

111 + + blame: simplify prepare_lines()

112 + + blame: factor out get_next_line()

113

114

114 -* jk/skip-prefix (2014-06-20) 18 commits

115 - - http-push: refactor parsing of remote object names

116 - - imap-send: use skip_prefix instead of using magic numbers

117 - - use skip_prefix to avoid repeated calculations

118 - - git: avoid magic number with skip_prefix

119 - - fetch-pack: refactor parsing in get_ack

120 - - fast-import: refactor parsing of spaces

121 - - stat_opt: check extra strlen call

122 - - daemon: use skip_prefix to avoid magic numbers

123 - - fast-import: use skip_prefix for parsing input

124 - - use skip_prefix to avoid repeating strings

125 - - use skip_prefix to avoid magic numbers

126 - - transport-helper: avoid reading past end-of-string

127 - - fast-import: fix read of uninitialized argv memory

128 - - apply: use skip_prefix instead of raw addition

129 - - refactor skip_prefix to return a boolean

130 - - avoid using skip_prefix as a boolean

131 - - daemon: mark some strings as const

132 - - parse_diff_color_slot: drop ofs parameter

115 +* sp/complete-ext-alias (2014-06-13) 1 commit

116 + (merged to 'next' on 2014-06-16 at 399679e)

117 + + completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases

118

134 - Will merge to 'next'.

119

120 +* tb/unicode-7.0-display-width (2014-06-18) 1 commit

121 + (merged to 'next' on 2014-06-20 at 111b246)

122 + + Update of unicode_width.h to Unicode Version 7.0

123

137 -* jk/xstrfmt (2014-06-19) 10 commits

138 - - unique_path: fix unlikely heap overflow

139 - - walker_fetch: fix minor memory leak

140 - - merge: use argv_array when spawning merge strategy

141 - - sequencer: use argv_array_pushf

142 - - setup_git_env: use git_pathdup instead of xmalloc + sprintf

143 - - use xstrfmt to replace xmalloc + strcpy/strcat

144 - - use xstrfmt to replace xmalloc + sprintf

145 - - use xstrdup instead of xmalloc + strcpy

146 - - use xstrfmt in favor of manual size calculations

147 - - strbuf: add xstrfmt helper

124

149 - Will merge to 'next'.

125 +* ye/doc-http-proto (2014-06-16) 1 commit

126 + (merged to 'next' on 2014-06-20 at 24f347d)

127 + + http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616

128

129 +--------------------------------------------------

130 +[New Topics]

131

152 -* jm/dedup-name-compare (2014-06-20) 2 commits

153 - - cleanup duplicate name_compare() functions

154 - - name-hash.c: replace cache_name_compare() with memcmp(3)

132 +* jc/fix-clone-single-starting-at-a-tag (2014-06-23) 1 commit

133 + - builtin/clone.c: detect a clone starting at a tag correctly

134

135 Will merge to 'next'.

136

158 -

159 -* kb/perf-trace (2014-06-17) 11 commits

160 - . git: add performance tracing for git's main() function to debug scripts

161 - . trace: add trace_performance facility to debug performance issues

162 - . trace: add high resolution timer function to debug performance issues

163 - . trace: add 'file:line' to all trace output

164 - . trace: move code around, in preparation to file:line output

165 - . trace: add current timestamp to all trace output

166 - . trace: add infrastructure to augment trace output with additional info

167 - . trace: factor out printing to the trace file

168 - . trace: remove redundant printf format attribute

169 - . trace: consistently name the format parameter

170 - . trace: move trace declarations from cache.h to new trace.h

171 -

137 --------------------------------------------------

138 [Stalled]

139

175 -* mg/verify-commit (2014-06-10) 3 commits

176 - - verify-commit: scriptable commit signature verification

177 - - gpg-interface: provide access to the payload

178 - - pretty: free the gpg status buf

179 -

180 - What is queued here is v1; v2 exists but I skipped it.

181 - Expecting a reroll.

182 -

183 -

140 * cc/replace-graft (2014-06-09) 5 commits

141 - DONTMERGE: wise to wait for peff's commit->buffer length series

142 - contrib: add convert-grafts-to-replace-refs.sh

@@ -441,6 +397,7 @@ of the repositories listed at

397

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

399

400 +

401 * jh/submodule-tests (2014-04-17) 1 commit

402 - t7410: 210 tests for various 'git submodule update' scenarios

403

@@ -481,50 +438,107 @@ of the repositories listed at

438 rely on symbolic links and make sharing of objects and refs safer

439 by making the borrowee and borrowers aware of each other.

440

484 -

441 --------------------------------------------------

442 [Cooking]

443

488 -* fr/sequencer-fail-with-not-one-upon-no-ff (2014-06-09) 1 commit

489 - (merged to 'next' on 2014-06-16 at 29734cc)

490 - + sequencer: signal failed ff as an aborted, not a conflicted merge

444 +* mg/verify-commit (2014-06-23) 5 commits

445 + - t7510: test verify-commit

446 + - t7510: exit for loop with test result

447 + - verify-commit: scriptable commit signature verification

448 + - gpg-interface: provide access to the payload

449 + - gpg-interface: provide clear helper for struct signature_check

450

492 - Will merge to 'master'.

451 + Add 'verify-commit' to be used in a way similar to 'verify-tag' is

452 + used. Further work on verifying the mergetags might be needed.

453

454 + Will merge to 'next'.

455

495 -* hv/submodule-config (2014-06-13) 6 commits

496 - - SQUASH compilation fix

497 - - do not die on error of parsing fetchrecursesubmodules option

498 - - use new config API for worktree configurations of submodules

499 - - extract functions for submodule config set and lookup

500 - - implement submodule config cache for lookup of submodule names

501 - - hashmap: add enum for hashmap free_entries option

456

457 +* dt/refs-check-refname-component-sse (2014-06-18) 1 commit

458 + (merged to 'next' on 2014-06-20 at d286027)

459 + + refs.c: SSE2 optimizations for check_refname_component

460

504 -* mc/git-p4-prepare-p4-only (2014-06-13) 1 commit

505 - (merged to 'next' on 2014-06-16 at 3c05e19)

506 - + git-p4: fix submit in non --prepare-p4-only mode

461 + Further micro-optimization of a leaf-function.

462

463 Will merge to 'master'.

464

465

511 -* sk/mingw-unicode-spawn-args (2014-06-16) 6 commits

512 - - Win32: Unicode arguments (incoming)

513 - - Win32: Unicode arguments (outgoing)

514 - - MinGW: disable CRT command line globbing

515 - - Win32: fix potential multi-threading issue

516 - - Win32: simplify internal mingw_spawn* APIs

517 - - Win32: let mingw_execve() return an int

518 - (this branch uses sk/mingw-main and sk/mingw-uni-console.)

466 +* ye/http-extract-charset (2014-06-17) 1 commit

467 + (merged to 'next' on 2014-06-20 at 9492bae)

468 + + http: fix charset detection of extract_content_type()

469

470 + Will merge to 'master'.

471

521 -* sp/complete-ext-alias (2014-06-13) 1 commit

522 - (merged to 'next' on 2014-06-16 at 399679e)

523 - + completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases

472 +

473 +* jk/skip-prefix (2014-06-20) 18 commits

474 + (merged to 'next' on 2014-06-23 at cd387a6)

475 + + http-push: refactor parsing of remote object names

476 + + imap-send: use skip_prefix instead of using magic numbers

477 + + use skip_prefix to avoid repeated calculations

478 + + git: avoid magic number with skip_prefix

479 + + fetch-pack: refactor parsing in get_ack

480 + + fast-import: refactor parsing of spaces

481 + + stat_opt: check extra strlen call

482 + + daemon: use skip_prefix to avoid magic numbers

483 + + fast-import: use skip_prefix for parsing input

484 + + use skip_prefix to avoid repeating strings

485 + + use skip_prefix to avoid magic numbers

486 + + transport-helper: avoid reading past end-of-string

487 + + fast-import: fix read of uninitialized argv memory

488 + + apply: use skip_prefix instead of raw addition

489 + + refactor skip_prefix to return a boolean

490 + + avoid using skip_prefix as a boolean

491 + + daemon: mark some strings as const

492 + + parse_diff_color_slot: drop ofs parameter

493

494 Will merge to 'master'.

495

496

497 +* jk/xstrfmt (2014-06-25) 11 commits

498 + (merged to 'next' on 2014-06-25 at 5031d4e)

499 + + setup_git_env(): introduce git_path_from_env() helper

500 + (merged to 'next' on 2014-06-23 at 64f2558)

501 + + unique_path: fix unlikely heap overflow

502 + + walker_fetch: fix minor memory leak

503 + + merge: use argv_array when spawning merge strategy

504 + + sequencer: use argv_array_pushf

505 + + setup_git_env: use git_pathdup instead of xmalloc + sprintf

506 + + use xstrfmt to replace xmalloc + strcpy/strcat

507 + + use xstrfmt to replace xmalloc + sprintf

508 + + use xstrdup instead of xmalloc + strcpy

509 + + use xstrfmt in favor of manual size calculations

510 + + strbuf: add xstrfmt helper

511 +

512 + Will merge to 'master'.

513 +

514 +

515 +* kb/perf-trace (2014-06-20) 11 commits

516 + - git: add performance tracing for git's main() function to debug scripts

517 + - trace: add trace_performance facility to debug performance issues

518 + - trace: add high resolution timer function to debug performance issues

519 + - trace: add 'file:line' to all trace output

520 + - trace: move code around, in preparation to file:line output

521 + - trace: add current timestamp to all trace output

522 + - trace: add infrastructure to augment trace output with additional info

523 + - trace: factor out printing to the trace file

524 + - trace: remove redundant printf format attribute

525 + - trace: consistently name the format parameter

526 + - trace: move trace declarations from cache.h to new trace.h

527 +

528 + Expecting a reroll.

529 +

530 +

531 +* hv/submodule-config (2014-06-13) 6 commits

532 + - SQUASH compilation fix

533 + - do not die on error of parsing fetchrecursesubmodules option

534 + - use new config API for worktree configurations of submodules

535 + - extract functions for submodule config set and lookup

536 + - implement submodule config cache for lookup of submodule names

537 + - hashmap: add enum for hashmap free_entries option

538 +

539 + Expecting a reroll.

540 +

541 +

542 * bc/fix-rebase-merge-skip (2014-06-16) 1 commit

543 (merged to 'next' on 2014-06-20 at 01f81f5)

544 + rebase--merge: fix --skip with two conflicts in a row

@@ -552,19 +566,7 @@ of the repositories listed at

566 - submodules: Add the lib-submodule-update.sh test library

567 - test-lib: add test_dir_is_empty()

568

555 -

556 -* mc/doc-submodule-sync-recurse (2014-06-13) 1 commit

557 - (merged to 'next' on 2014-06-20 at 04815e3)

558 - + submodule: document "sync --recursive"

559 -

560 - Will merge to 'master'.

561 -

562 -

563 -* pb/trim-trailing-spaces (2014-06-13) 1 commit

564 - (merged to 'next' on 2014-06-20 at 6985153)

565 - + t0008: do not depend on 'echo' handling backslashes specially

566 -

567 - Will merge to 'master'.

569 + Expecting a reroll.

570

571

572 * po/error-message-style (2014-06-16) 1 commit

@@ -573,14 +575,6 @@ of the repositories listed at

575 Expecting a reroll.

576

577

576 -* rs/blame-refactor (2014-06-13) 2 commits

577 - (merged to 'next' on 2014-06-20 at ddaa722)

578 - + blame: simplify prepare_lines()

579 - + blame: factor out get_next_line()

580 -

581 - Will merge to 'master'.

582 -

583 -

578 * rs/ref-transaction (2014-06-20) 48 commits

579 - refs.c: make write_ref_sha1 static

580 - fetch.c: change s_update_ref to use a ref transaction

@@ -633,17 +627,14 @@ of the repositories listed at

627

628 Updated in response to review comments from Michael.

629

636 - Seems to be getting ready for 'next'.

637 -

630 + Portability workaround may be needed on top ($gmane/252496).

631 + Will merge to 'next'.

632

639 -* ye/doc-http-proto (2014-06-16) 1 commit

640 - (merged to 'next' on 2014-06-20 at 24f347d)

641 - + http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616

633

643 - Will merge to 'master'.

634

645 -

646 -* jk/pretty-G-format-fixes (2014-06-17) 5 commits

635 +* jk/pretty-G-format-fixes (2014-06-25) 6 commits

636 + (merged to 'next' on 2014-06-26 at 7138407)

637 + + move "%G" format test from t7510 to t6006

638 (merged to 'next' on 2014-06-20 at f504bbc)

639 + pretty: avoid reading past end-of-string with "%G"

640 + t7510: check %G* pretty-format output

@@ -688,41 +679,16 @@ of the repositories listed at

679 - ewah: delete unused ewah_read_mmap_native declaration

680 - ewah: fix constness of ewah_read_mmap

681

691 -

692 -* ep/avoid-test-a-o (2014-06-19) 20 commits

693 - (merged to 'next' on 2014-06-20 at c47322b)

694 - + git-submodule.sh: avoid "echo" path-like values

695 - + git-submodule.sh: avoid "test <cond> -a/-o <cond>"

696 - + t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"

697 - + t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"

698 - + t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"

699 - + t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"

700 - + t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"

701 - + t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"

702 - + t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"

703 - + t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"

704 - + t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"

705 - + git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"

706 - + git-mergetool.sh: avoid "test <cond> -a/-o <cond>"

707 - + git-bisect.sh: avoid "test <cond> -a/-o <cond>"

708 - + contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"

709 - + contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"

710 - + contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"

711 - + contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"

712 - + contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"

713 - + check_bindir: avoid "test <cond> -a/-o <cond>"

714 -

715 - Update tests and scripts to avoid "test ... -a ...", which is often

716 - more error-prone than "test ... && test ...".

717 -

718 - Squashed misconversion fix-up into git-submodule.sh updates.

719 -

720 - Will merge to 'master'.

682 + What's the doneness of this one?

683

684

685 * jc/test-lazy-prereq (2014-06-13) 1 commit

686 - tests: drop GIT_*_TIMING_TESTS environment variable support

687

688 + Test-script clean-up.

689 +

690 + Will hold.

691 +

692

693 * jk/commit-buffer-length (2014-06-13) 18 commits

694 (merged to 'next' on 2014-06-16 at b2d2d7b)

@@ -752,6 +718,18 @@ of the repositories listed at

718 Will merge to 'master'.

719

720

721 +* sk/mingw-unicode-spawn-args (2014-06-16) 6 commits

722 + - Win32: Unicode arguments (incoming)

723 + - Win32: Unicode arguments (outgoing)

724 + - MinGW: disable CRT command line globbing

725 + - Win32: fix potential multi-threading issue

726 + - Win32: simplify internal mingw_spawn* APIs

727 + - Win32: let mingw_execve() return an int

728 + (this branch uses sk/mingw-main and sk/mingw-uni-console.)

729 +

730 + Are Windows folks happy with all four mingw topics?

731 +

732 +

733 * sk/mingw-dirent (2014-06-09) 5 commits

734 - Win32 dirent: improve dirent implementation

735 - Win32 dirent: clarify #include directives

@@ -759,12 +737,16 @@ of the repositories listed at

737 - Win32 dirent: remove unused dirent.d_reclen member

738 - Win32 dirent: remove unused dirent.d_ino member

739

740 + Are Windows folks happy with all four mingw topics?

741 +

742

743 * sk/mingw-main (2014-06-10) 2 commits

744 - mingw: avoid const warning

745 - Win32: move main macro to a function

746 (this branch is used by sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)

747

748 + Are Windows folks happy with all four mingw topics?

749 +

750

751 * sk/mingw-uni-console (2014-06-16) 7 commits

752 - Win32: reliably detect console pipe handles

@@ -776,61 +758,31 @@ of the repositories listed at

758 - Win32: support Unicode console output

759 (this branch is used by sk/mingw-unicode-spawn-args; uses sk/mingw-main.)

760

779 - Now, are Windows folks happy with all four mingw topics?

761 + Are Windows folks happy with all four mingw topics?

762

763

782 -* jk/repack-pack-keep-objects (2014-06-10) 3 commits

783 - (merged to 'next' on 2014-06-16 at 89716c9)

784 - + repack: s/write_bitmap/&s/ in code

785 - + repack: respect pack.writebitmaps

786 - + repack: do not accidentally pack kept objects by default

787 - (this branch is used by jk/repack-pack-writebitmaps-config.)

788 -

789 - Recent updates to "git repack" started to duplicate objects that

790 - are in packfiles marked with .keep flag into the new packfile by

791 - mistake.

792 -

793 - Will merge to 'master'.

794 -

795 -

796 -* jk/repack-pack-writebitmaps-config (2014-06-12) 4 commits

797 - (merged to 'next' on 2014-06-16 at 777005d)

798 - + t7700: drop explicit --no-pack-kept-objects from .keep test

799 - + repack: introduce repack.writeBitmaps config option

800 - + repack: simplify handling of --write-bitmap-index

801 - + pack-objects: stop respecting pack.writebitmaps

802 - (this branch uses jk/repack-pack-keep-objects.)

803 -

804 - Will merge to 'master'.

805 -

764 +* mt/patch-id-stable (2014-06-10) 1 commit

765 + - patch-id: change default to stable

766

807 -* nd/init-restore-env (2014-06-10) 1 commit

808 - (merged to 'next' on 2014-06-16 at ecbbfca)

809 - + git potty: restore environments after alias expansion

767 + Teaches "git patch-id" to compute the patch ID that does not change

768 + when the files in a single patch is reordered. As this new algorithm

769 + is backward incompatible, the last bit to flip it to be the default

770 + is left out of 'master' for now.

771

811 - Will merge to 'master'.

772 + Will hold.

773

774 +--------------------------------------------------

775 +[Discarded]

776

777 * jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit

815 - - git-gui: show staged submodules regardless of ignore config

778 + . git-gui: show staged submodules regardless of ignore config

779

817 - Tentatively queued what I expect to receive via Pat Thoyts.

780 + Merged to the upstream.

781

782

820 -* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits

821 - - gitk: show staged submodules regardless of ignore config

822 - - gitk: Merge branch 'new' of https://github.com/vnwildman/gitk

823 - - l10n: Init Vietnamese translation

783 +* jl/gitk-show-added-submodule-changes (2014-04-15) 1 commit

784 + . gitk: show staged submodules regardless of ignore config

785

825 - Will drop, as I heard from Paul that these are queued in his tree.

786 + Merged to the upstream.

787

788

828 -* mt/patch-id-stable (2014-06-10) 1 commit

829 - - patch-id: change default to stable

830 -

831 - Teaches "git patch-id" to compute the patch ID that does not change

832 - when the files in a single patch is reordered. As this new algorithm

833 - is backward incompatible, the last bit to flip it to be the default

834 - is left out of 'master' for now.

835 - * mt/patch-id-stable (2014-06-10) 1 commit

836 - - patch-id: change default to stable

What's cooking (2014/06 #06)