565da246a1 · 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 (Nov 2018, #02; Fri, 2)

4 -X-master-at: d582ea202b626dcc6c3b01e1e11a296d9badd730

5 -X-next-at: 96ac06677ac950c97d331f0ef4892125027eff39

3 +Subject: What's cooking in git.git (Nov 2018, #03; Wed, 7)

4 +X-master-at: 8858448bb49332d353febc078ce4a3abcc962efe

5 +X-next-at: 8438c0b2453a7207c9c45756f5e37dfe283db602

6

7 -What's cooking in git.git (Nov 2018, #02; Fri, 2)

7 +What's cooking in git.git (Nov 2018, #03; Wed, 7)

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

9

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

@@ -20,206 +20,360 @@ of the repositories listed at

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

21 [Graduated to "master"]

22

23 -* ag/rebase-i-in-c (2018-10-09) 20 commits

24 - (merged to 'next' on 2018-10-19 at 1b24712d46)

25 - + rebase -i: move rebase--helper modes to rebase--interactive

26 - + rebase -i: remove git-rebase--interactive.sh

27 - + rebase--interactive2: rewrite the submodes of interactive rebase in C

28 - + rebase -i: implement the main part of interactive rebase as a builtin

29 - + rebase -i: rewrite init_basic_state() in C

30 - + rebase -i: rewrite write_basic_state() in C

31 - + rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in C

32 - + rebase -i: implement the logic to initialize $revisions in C

33 - + rebase -i: remove unused modes and functions

34 - + rebase -i: rewrite complete_action() in C

35 - + t3404: todo list with commented-out commands only aborts

36 - + sequencer: change the way skip_unnecessary_picks() returns its result

37 - + sequencer: refactor append_todo_help() to write its message to a buffer

38 - + rebase -i: rewrite checkout_onto() in C

39 - + rebase -i: rewrite setup_reflog_action() in C

40 - + sequencer: add a new function to silence a command, except if it fails

41 - + rebase -i: rewrite the edit-todo functionality in C

42 - + editor: add a function to launch the sequence editor

43 - + rebase -i: rewrite append_todo_help() in C

44 - + sequencer: make three functions and an enum from sequencer.c public

45 - (this branch is used by ag/sequencer-reduce-rewriting-todo, cb/printf-empty-format, js/rebase-autostash-fix, js/rebase-i-break, js/rebase-i-shortopt, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)

46 -

47 - Rewrite of the remaining "rebase -i" machinery in C.

48 -

49 -

50 -* cb/printf-empty-format (2018-10-27) 1 commit

51 - (merged to 'next' on 2018-11-01 at 9fcb05f22c)

52 - + sequencer: cleanup for gcc warning in non developer mode

53 - (this branch uses ag/rebase-i-in-c; is tangled with ag/sequencer-reduce-rewriting-todo, js/rebase-autostash-fix, js/rebase-i-break, js/rebase-i-shortopt, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)

54 -

55 - Build fix for a topic in flight.

56 -

57 -

58 -* jc/rebase-in-c-5-test-typofix (2018-10-11) 1 commit

59 - (merged to 'next' on 2018-10-19 at 08c9d86ffd)

60 - + rebase: fix typoes in error messages

61 - (this branch uses pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)

62 -

63 - Typofix.

64 -

65 -

66 -* js/rebase-autostash-fix (2018-10-24) 5 commits

67 - (merged to 'next' on 2018-10-29 at 680e648001)

68 - + rebase --autostash: fix issue with dirty submodules

69 - + rebase --autostash: demonstrate a problem with dirty submodules

70 - + rebase (autostash): use an explicit OID to apply the stash

71 - + rebase (autostash): store the full OID in <state-dir>/autostash

72 - + rebase (autostash): avoid duplicate call to state_dir_path()

73 - (this branch uses ag/rebase-i-in-c, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; is tangled with ag/sequencer-reduce-rewriting-todo, cb/printf-empty-format, jc/rebase-in-c-5-test-typofix, js/rebase-i-break and js/rebase-i-shortopt.)

74 -

75 - "git rebase" that has recently been rewritten in C had a few issues

76 - in its "--autstash" feature, which have been corrected.

77 -

78 -

79 -* js/rebase-i-break (2018-10-12) 2 commits

80 - (merged to 'next' on 2018-10-19 at 6db9b14495)

81 - + rebase -i: introduce the 'break' command

82 - + rebase -i: clarify what happens on a failed `exec`

83 - (this branch is used by js/rebase-i-shortopt; uses ag/rebase-i-in-c; is tangled with ag/sequencer-reduce-rewriting-todo, cb/printf-empty-format, js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)

84 -

85 - "git rebase -i" learned a new insn, 'break', that the user can

86 - insert in the to-do list. Upon hitting it, the command returns

87 - control back to the user.

88 -

89 -

90 -* js/rebase-i-shortopt (2018-10-26) 1 commit

91 - (merged to 'next' on 2018-11-01 at 4e9da19145)

92 - + rebase -i: recognize short commands without arguments

93 - (this branch uses ag/rebase-i-in-c and js/rebase-i-break; is tangled with ag/sequencer-reduce-rewriting-todo, cb/printf-empty-format, js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)

94 -

95 - "git rebase -i" learned to take 'b' as the short form of 'break'

96 - option in the todo list.

97 -

98 -

99 -* js/rebase-in-c-5.5-work-with-rebase-i-in-c (2018-10-11) 2 commits

100 - (merged to 'next' on 2018-10-19 at b734d81006)

101 - + builtin rebase: prepare for builtin rebase -i

102 - + Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c

103 - (this branch is used by js/rebase-autostash-fix and pk/rebase-in-c-6-final; uses ag/rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with ag/sequencer-reduce-rewriting-todo, cb/printf-empty-format, jc/rebase-in-c-5-test-typofix, js/rebase-i-break and js/rebase-i-shortopt.)

104 -

105 - "rebase" that has been rewritten learns the new calling convention

106 - used by "rebase -i" that was rewritten in C, tying the loose end

107 - between two GSoC topics that stomped on each other's toes.

108 -

109 -

110 -* pk/rebase-in-c (2018-08-06) 3 commits

111 - (merged to 'next' on 2018-10-19 at 26c29ace53)

112 - + builtin/rebase: support running "git rebase <upstream>"

113 - + rebase: refactor common shell functions into their own file

114 - + rebase: start implementing it as a builtin

115 - (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final.)

116 -

117 - Rewrite of the "rebase" machinery in C.

118 -

119 -

120 -* pk/rebase-in-c-2-basic (2018-09-06) 11 commits

121 - (merged to 'next' on 2018-10-19 at c2a0046e52)

122 - + builtin rebase: support `git rebase <upstream> <switch-to>`

123 - + builtin rebase: only store fully-qualified refs in `options.head_name`

124 - + builtin rebase: start a new rebase only if none is in progress

125 - + builtin rebase: support --force-rebase

126 - + builtin rebase: try to fast forward when possible

127 - + builtin rebase: require a clean worktree

128 - + builtin rebase: support the `verbose` and `diffstat` options

129 - + builtin rebase: support --quiet

130 - + builtin rebase: handle the pre-rebase hook and --no-verify

131 - + builtin rebase: support `git rebase --onto A...B`

132 - + builtin rebase: support --onto

133 - (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c.)

134 -

135 - Rewrite "git rebase" in C.

136 -

137 -

138 -* pk/rebase-in-c-3-acts (2018-09-06) 7 commits

139 - (merged to 'next' on 2018-10-19 at 9275677430)

140 - + builtin rebase: stop if `git am` is in progress

141 - + builtin rebase: actions require a rebase in progress

142 - + builtin rebase: support --edit-todo and --show-current-patch

143 - + builtin rebase: support --quit

144 - + builtin rebase: support --abort

145 - + builtin rebase: support --skip

146 - + builtin rebase: support --continue

147 - (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c and pk/rebase-in-c-2-basic.)

23 +* en/merge-cleanup-more (2018-10-18) 2 commits

24 + (merged to 'next' on 2018-10-26 at c706319c26)

25 + + merge-recursive: avoid showing conflicts with merge branch before HEAD

26 + + merge-recursive: improve auto-merging messages with path collisions

27 + (this branch is used by en/merge-path-collision.)

28 +

29 + Further clean-up of merge-recursive machinery.

30 +

31 +

32 +* jc/http-curlver-warnings (2018-10-26) 1 commit

33 + (merged to 'next' on 2018-10-26 at 870e125cec)

34 + + http: give curl version warnings consistently

35 + (this branch uses js/mingw-http-ssl; is tangled with nd/config-split.)

36 +

37 + Warning message fix.

38 +

39 +

40 +* js/mingw-http-ssl (2018-10-26) 3 commits

41 + (merged to 'next' on 2018-10-26 at 318e82e101)

42 + + http: when using Secure Channel, ignore sslCAInfo by default

43 + + http: add support for disabling SSL revocation checks in cURL

44 + + http: add support for selecting SSL backends at runtime

45 + (this branch is used by jc/http-curlver-warnings and nd/config-split.)

46 +

47 + On platforms with recent cURL library, http.sslBackend configuration

48 + variable can be used to choose a different SSL backend at runtime.

49 + The Windows port uses this mechanism to switch between OpenSSL and

50 + Secure Channel while talking over the HTTPS protocol.

51 +

52 +

53 +* js/mingw-ns-filetime (2018-10-24) 3 commits

54 + (merged to 'next' on 2018-10-29 at 4563a0d9d0)

55 + + mingw: implement nanosecond-precision file times

56 + + mingw: replace MSVCRT's fstat() with a Win32-based implementation

57 + + mingw: factor out code to set stat() data

58 +

59 + Windows port learned to use nano-second resolution file timestamps.

60 +

61 +

62 +* js/remote-archive-dwimfix (2018-10-26) 1 commit

63 + (merged to 'next' on 2018-10-26 at f5bf6946bd)

64 + + archive: initialize archivers earlier

65 +

66 + The logic to determine the archive type "git archive" uses did not

67 + correctly kick in for "git archive --remote", which has been

68 + corrected.

69 +

70 +

71 +* js/shallow-and-fetch-prune (2018-10-25) 3 commits

72 + (merged to 'next' on 2018-10-26 at 93b7196560)

73 + + repack -ad: prune the list of shallow commits

74 + + shallow: offer to prune only non-existing entries

75 + + repack: point out a bug handling stale shallow info

76 +

77 + "git repack" in a shallow clone did not correctly update the

78 + shallow points in the repository, leading to a repository that

79 + does not pass fsck.

80 +

81 +

82 +* jt/upload-pack-v2-fix-shallow (2018-10-19) 3 commits

83 + (merged to 'next' on 2018-10-29 at d9010b3c7b)

84 + + upload-pack: clear flags before each v2 request

85 + + upload-pack: make want_obj not global

86 + + upload-pack: make have_obj not global

87 +

88 + "git fetch" over protocol v2 into a shallow repository failed to

89 + fetch full history behind a new tip of history that was diverged

90 + before the cut-off point of the history that was previously fetched

91 + shallowly.

92 +

93 +

94 +* jw/send-email-no-auth (2018-10-23) 1 commit

95 + (merged to 'next' on 2018-10-29 at a3fbbdb889)

96 + + send-email: explicitly disable authentication

97 +

98 + "git send-email" learned to disable SMTP authentication via the

99 + "--smtp-auth=none" option, even when the smtp username is given

100 + (which turns the authentication on by default).

101 +

102 +

103 +* md/exclude-promisor-objects-fix (2018-10-23) 2 commits

104 + (merged to 'next' on 2018-10-29 at fb36a5dcbe)

105 + + exclude-promisor-objects: declare when option is allowed

106 + + Documentation/git-log.txt: do not show --exclude-promisor-objects

107 +

108 + Operations on promisor objects make sense in the context of only a

109 + small subset of the commands that internally use the revisions

110 + machinery, but the "--exclude-promisor-objects" option were taken

111 + and led to nonsense results by commands like "log", to which it

112 + didn't make much sense. This has been corrected.

113 +

114 +

115 +* mg/gpg-fingerprint (2018-10-23) 3 commits

116 + (merged to 'next' on 2018-10-26 at 1e219cb754)

117 + + gpg-interface.c: obtain primary key fingerprint as well

118 + + gpg-interface.c: support getting key fingerprint via %GF format

119 + + gpg-interface.c: use flags to determine key/signer info presence

120 + (this branch uses mg/gpg-parse-tighten; is tangled with jc/gpg-cocci-preincr.)

121 +

122 + New "--pretty=format:" placeholders %GF and %GP that show the GPG

123 + key fingerprints have been invented.

124 +

125 +

126 +* mg/gpg-parse-tighten (2018-10-22) 1 commit

127 + (merged to 'next' on 2018-10-26 at efdec77193)

128 + + gpg-interface.c: detect and reject multiple signatures on commits

129 + (this branch is used by jc/gpg-cocci-preincr and mg/gpg-fingerprint.)

130 +

131 + Detect and reject a signature block that has more than one GPG

132 + signature.

133 +

134 +

135 +* nd/completion-negation (2018-10-22) 1 commit

136 + (merged to 'next' on 2018-10-29 at 87e73b0c72)

137 + + completion: fix __gitcomp_builtin no longer consider extra options

138 +

139 + The command line completion machinery (in contrib/) has been

140 + updated to allow the completion script to tweak the list of options

141 + that are reported by the parse-options machinery correctly.

142 +

143 +

144 +* nd/submodule-unused-vars (2018-10-22) 1 commit

145 + (merged to 'next' on 2018-10-29 at 33641dcc89)

146 + + submodule.c: remove some of the_repository references

147 +

148 + Code clean-up.

149 +

150 +

151 +* nd/unpack-trees-with-cache-tree (2018-10-22) 1 commit

152 + (merged to 'next' on 2018-10-29 at de51b606da)

153 + + read-cache: use of memory after it is freed

154 +

155 + Trivial bugfix.

156 +

157 +

158 +* rj/header-cleanup (2018-10-29) 3 commits

159 + (merged to 'next' on 2018-11-01 at 975e56048f)

160 + + commit-reach.h: add missing declarations (hdr-check)

161 + + ewok_rlw.h: add missing 'inline' to function definition

162 + + fetch-object.h: add missing declaration (hdr-check)

163 +

164 + Code cleanup.

165 +

166 +

167 +* sb/submodule-url-to-absolute (2018-10-18) 1 commit

168 + (merged to 'next' on 2018-10-29 at 4264c150cb)

169 + + submodule helper: convert relative URL to absolute URL if needed

170 +

171 + Some codepaths failed to form a proper URL when .gitmodules record

172 + the URL to a submodule repository as relative to the repository of

173 + superproject, which has been corrected.

174 +

175 +

176 +* sg/test-rebase-editor-fix (2018-10-29) 1 commit

177 + (merged to 'next' on 2018-11-01 at 271e0fc663)

178 + + t3404-rebase-interactive: test abbreviated commands

179 +

180 +

181 +* sg/test-verbose-log (2018-10-30) 1 commit

182 + (merged to 'next' on 2018-11-01 at 0c4a18a71f)

183 + + test-lib: introduce the '-V' short option for '--verbose-log'

184 +

185 + Our test scripts can now take the '-V' option as a synonym for the

186 + '--verbose-log' option.

187 +

188 +

189 +* ss/travis-ci-force-vm-mode (2018-10-26) 1 commit

190 + (merged to 'next' on 2018-11-01 at 8596bb2a65)

191 + + travis-ci: no longer use containers

192 + (this branch is used by sg/travis-install-dependencies.)

193 +

194 + The "container" mode of TravisCI is going away. Our .travis.yml

195 + file is getting prepared for the transition.

196 +

197

149 - Rewrite "git rebase" in C.

150 -

151 -

152 -* pk/rebase-in-c-4-opts (2018-10-11) 18 commits

153 - (merged to 'next' on 2018-10-19 at 2770b2f5d5)

154 - + builtin rebase: support --root

155 - + builtin rebase: add support for custom merge strategies

156 - + builtin rebase: support `fork-point` option

157 - + merge-base --fork-point: extract libified function

158 - + builtin rebase: support --rebase-merges[=[no-]rebase-cousins]

159 - + builtin rebase: support `--allow-empty-message` option

160 - + builtin rebase: support `--exec`

161 - + builtin rebase: support `--autostash` option

162 - + builtin rebase: support `-C` and `--whitespace=<type>`

163 - + builtin rebase: support `--gpg-sign` option

164 - + builtin rebase: support `--autosquash`

165 - + builtin rebase: support `keep-empty` option

166 - + builtin rebase: support `ignore-date` option

167 - + builtin rebase: support `ignore-whitespace` option

168 - + builtin rebase: support --committer-date-is-author-date

169 - + builtin rebase: support --rerere-autoupdate

170 - + builtin rebase: support --signoff

171 - + builtin rebase: allow selecting the rebase "backend"

172 - (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic and pk/rebase-in-c-3-acts.)

173 -

174 - Rewrite "git rebase" in C.

175 -

176 -

177 -* pk/rebase-in-c-5-test (2018-10-11) 6 commits

178 - (merged to 'next' on 2018-10-19 at 0e48bc8243)

179 - + builtin rebase: error out on incompatible option/mode combinations

180 - + builtin rebase: use no-op editor when interactive is "implied"

181 - + builtin rebase: show progress when connected to a terminal

182 - + builtin rebase: fast-forward to onto if it is a proper descendant

183 - + builtin rebase: optionally pass custom reflogs to reset_head()

184 - + builtin rebase: optionally auto-detect the upstream

185 - (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts and pk/rebase-in-c-4-opts.)

186 -

187 - Rewrite "git rebase" in C.

188 -

189 -

190 -* pk/rebase-in-c-6-final (2018-10-11) 1 commit

191 - (merged to 'next' on 2018-10-19 at 52f1dadf69)

192 - + rebase: default to using the builtin rebase

193 - (this branch is used by js/rebase-autostash-fix; uses ag/rebase-i-in-c, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with ag/sequencer-reduce-rewriting-todo, cb/printf-empty-format, jc/rebase-in-c-5-test-typofix, js/rebase-i-break and js/rebase-i-shortopt.)

194 -

195 - The final step of rewriting "rebase -i" in C.

198 +* tb/char-may-be-unsigned (2018-10-26) 1 commit

199 + (merged to 'next' on 2018-11-01 at 9e14f289f8)

200 + + path.c: char is not (always) signed

201 +

202 + Build portability fix.

203

204 --------------------------------------------------

205 [New Topics]

206

200 -* ab/dynamic-gettext-poison (2018-11-02) 1 commit

201 - - i18n: make GETTEXT_POISON a runtime option

207 +* jk/misc-unused-fixes (2018-11-07) 4 commits

208 + (merged to 'next' on 2018-11-07 at 8438c0b245)

209 + + approxidate: fix NULL dereference in date_time()

210 + (merged to 'next' on 2018-11-05 at 03429f23c4)

211 + + pathspec: handle non-terminated strings with :(attr)

212 + + approxidate: handle pending number for "specials"

213 + + rev-list: handle flags for --indexed-objects

214

215 + Assorted fixes for bugs found while auditing -Wunused-parameter

216 + warnings.

217

204 -* js/rebase-p-tests (2018-11-02) 3 commits

205 - - tests: optionally skip `git rebase -p` tests

206 - - t3418: decouple test cases from a previous `rebase -p` test case

207 - - t3404: decouple some test cases from outcomes of previous test cases

218 + Will merge to 'master'.

219

209 - In preparation to the day when we can deprecate and remove the

210 - "rebase -p", make sure we can skip and later remove tests for

211 - it.

220 +

221 +* jk/xdiff-interface (2018-11-05) 9 commits

222 + (merged to 'next' on 2018-11-05 at 0edd69cdad)

223 + + xdiff-interface: drop parse_hunk_header()

224 + + range-diff: use a hunk callback

225 + + diff: convert --check to use a hunk callback

226 + + combine-diff: use an xdiff hunk callback

227 + + diff: use hunk callback for word-diff

228 + + diff: discard hunk headers for patch-ids earlier

229 + + diff: avoid generating unused hunk header lines

230 + + xdiff-interface: provide a separate consume callback for hunks

231 + + xdiff: provide a separate emit callback for hunks

232 +

233 + The interface into "xdiff" library used to discover the offset and

234 + size of a generated patch hunk by first formatting it into the

235 + textual hunk header "@@ -n,m +k,l @@" and then parsing the numbers

236 + out. A new interface has been introduced to allow callers a more

237 + direct access to them.

238 +

239 + Will merge to 'master'.

240 +

241 +

242 +* al/send-email-auto-cte-fixup (2018-11-02) 1 commit

243 + (merged to 'next' on 2018-11-05 at 4ecb1133ce)

244 + + send-email: avoid empty transfer encoding header

245 +

246 + "git send-email --transfer-encoding=..." in recent versions of Git

247 + sometimes produced an empty "Content-Transfer-Encoding:" header,

248 + which has been corrected.

249 +

250 + Will merge to 'master'.

251 +

252 +

253 +* bp/add-diff-files-optim (2018-11-03) 1 commit

254 + (merged to 'next' on 2018-11-06 at cdaeb7924a)

255 + + add: speed up cmd_add() by utilizing read_cache_preload()

256 +

257 + "git add" needs to internally run "diff-files" equivalent, and the

258 + codepath learned the same optimization as "diff-files" has to run

259 + lstat(2) in parallel to find which paths have been updated in the

260 + working tree.

261 +

262 + Will merge to 'master'.

263 +

264 +

265 +* ds/add-missing-tags (2018-11-03) 3 commits

266 + (merged to 'next' on 2018-11-05 at 8388baf76d)

267 + + remote: make add_missing_tags() linear

268 + + test-reach: test get_reachable_subset

269 + + commit-reach: implement get_reachable_subset

270 +

271 + The history traversal used to implement the tag-following has been

272 + optimized by introducing a new helper.

273 +

274 + Will merge to 'master'.

275 +

276 +

277 +* ag/rebase-i-in-c (2018-11-05) 1 commit

278 + (merged to 'next' on 2018-11-06 at 8fa9d64898)

279 + + sequencer.c: remove a stray semicolon

280 +

281 + Code clean-up for a topic already in 'master'.

282 +

283 + Will merge to 'master'.

284 +

285 +

286 +* jk/curl-ldflags (2018-11-05) 1 commit

287 + - build: link with curl-defined linker flags

288 +

289 + The way -lcurl library gets linked has been simplified by taking

290 + advantage of the fact that we can just ask curl-config command how.

291

292 Will merge to 'next'.

293

294

216 -* sg/travis-install-dependencies (2018-11-02) 1 commit

217 - - travis-ci: install packages in 'ci/install-dependencies.sh'

218 - (this branch uses ss/travis-ci-force-vm-mode.)

295 +* mg/gpg-fingerprint-test (2018-11-05) 2 commits

296 + - t/t7510-signed-commit.sh: add signing subkey to Eris Discordia key

297 + - t/t7510-signed-commit.sh: Add %GP to custom format checks

298 +

299 + Add a few tests for a topic already in 'master'.

300 +

301 + Will merge to 'next'.

302 +

303 +

304 +* nd/tree-walk-path-exclusion (2018-11-05) 1 commit

305 + (merged to 'next' on 2018-11-06 at 6499b2d327)

306 + + tree-walk.c: fix overoptimistic inclusion in :(exclude) matching

307 +

308 + Pathspec matching against a tree object were buggy when negative

309 + pathspec elements were involved, which has been fixed.

310 +

311 + Will merge to 'master'.

312

220 - The procedure to install dependencies before testing at Travis CI

221 - is getting revamped for both simplicity and flexibility, taking

222 - advantage of the recent move to the vm-based environment.

313 +

314 +* sb/diff-color-moved-config-option-fixup (2018-11-05) 1 commit

315 + - diff: differentiate error handling in parse_color_moved_ws

316 +

317 +

318 +* ab/range-diff-no-patch (2018-11-07) 1 commit

319 + - range-diff: add a --no-patch option to show a summary

320 +

321 + "range-diff" learns the "--no-patch" option, which can be used to

322 + get a high-level overview without the actual line-by-line patch

323 + difference shown.

324 +

325 + Will merge to 'next'.

326 +

327 +

328 +* jk/unused-parameter-fixes (2018-11-06) 14 commits

329 + - midx: double-check large object write loop

330 + - assert NOARG/NONEG behavior of parse-options callbacks

331 + - parse-options: drop OPT_DATE()

332 + - apply: return -1 from option callback instead of calling exit(1)

333 + - cat-file: report an error on multiple --batch options

334 + - tag: mark "--message" option with NONEG

335 + - show-branch: mark --reflog option as NONEG

336 + - format-patch: mark "--no-numbered" option with NONEG

337 + - status: mark --find-renames option with NONEG

338 + - cat-file: mark batch options with NONEG

339 + - pack-objects: mark index-version option as NONEG

340 + - ls-files: mark exclude options as NONEG

341 + - am: handle --no-patch-format option

342 + - apply: mark include/exclude options as NONEG

343 +

344 + Various functions have been audited for "-Wunused-parameter" warnings

345 + and bugs in them got fixed.

346 +

347 + Will merge to 'next'.

348 +

349 +

350 +* ds/push-squelch-ambig-warning (2018-11-07) 1 commit

351 + - pack-objects: ignore ambiguous object warnings

352 +

353 + "git push" used to check ambiguities between object-names and

354 + refnames while processing the list of refs' old and new values,

355 + which was unnecessary (as it knew that it is feeding raw object

356 + names). This has been optimized out.

357 +

358 +

359 +* jk/verify-sig-merge-into-void (2018-11-07) 3 commits

360 + - pull: handle --verify-signatures for unborn branch

361 + - merge: handle --verify-signatures for unborn branch

362 + - merge: extract verify_merge_signature() helper

363 +

364 + "git merge" and "git pull" that merges into an unborn branch used

365 + to completely ignore "--verify-signatures", which has been

366 + corrected.

367 +

368 + Will merge to 'next'.

369 +

370 +

371 +* js/mingw-res-rebuild (2018-11-07) 1 commit

372 + - Windows: force-recompile git.res for differing architectures

373 +

374 + Windows build update.

375 +

376 + Will merge to 'next'.

377

378 --------------------------------------------------

379 [Stalled]

@@ -236,6 +390,37 @@ of the repositories listed at

390 --------------------------------------------------

391 [Cooking]

392

393 +* ab/dynamic-gettext-poison (2018-11-02) 1 commit

394 + - i18n: make GETTEXT_POISON a runtime option

395 +

396 + On hold.

397 + cf. <20181102163725.GY30222@szeder.dev>

398 +

399 +

400 +* js/rebase-p-tests (2018-11-02) 3 commits

401 + (merged to 'next' on 2018-11-03 at fc8d97465f)

402 + + tests: optionally skip `git rebase -p` tests

403 + + t3418: decouple test cases from a previous `rebase -p` test case

404 + + t3404: decouple some test cases from outcomes of previous test cases

405 +

406 + In preparation to the day when we can deprecate and remove the

407 + "rebase -p", make sure we can skip and later remove tests for

408 + it.

409 +

410 + Will merge to 'master'.

411 +

412 +

413 +* sg/travis-install-dependencies (2018-11-02) 1 commit

414 + (merged to 'next' on 2018-11-06 at b86e3a2792)

415 + + travis-ci: install packages in 'ci/install-dependencies.sh'

416 +

417 + The procedure to install dependencies before testing at Travis CI

418 + is getting revamped for both simplicity and flexibility, taking

419 + advantage of the recent move to the vm-based environment.

420 +

421 + Will merge to 'master'.

422 +

423 +

424 * ab/push-dwim-dst (2018-10-29) 9 commits

425 - SQUASH???

426 - push doc: document the DWYM behavior pushing to unqualified <dst>

@@ -270,15 +455,19 @@ of the repositories listed at

455 diagnosed as an error, not swept under the rug silently.

456

457

273 -* nd/i18n (2018-10-29) 12 commits

458 +* nd/i18n (2018-11-06) 16 commits

459 - fsck: mark strings for translation

460 + - fsck: reduce word legos to help i18n

461 - parse-options.c: mark more strings for translation

462 + - parse-options.c: turn some die() to BUG()

463 - parse-options: replace opterror() with optname()

464 - repack: mark more strings for translation

465 - remote.c: mark messages for translation

466 + - remote.c: turn some error() or die() to BUG()

467 - reflog: mark strings for translation

468 - read-cache.c: add missing colon separators

469 - read-cache.c: mark more strings for translation

470 + - read-cache.c: turn die("internal error") to BUG()

471 - attr.c: mark more string for translation

472 - archive.c: mark more strings for translation

473 - alias.c: mark split_cmdline_strerror() strings for translation

@@ -286,60 +475,43 @@ of the repositories listed at

475

476 More _("i18n") markings.

477

289 - Some changes seem not to be mere mechanical convesions and needs

290 - a careful review.

478

292 -

293 -* nd/pthreads (2018-10-29) 10 commits

294 - - read-cache.c: initialize copy_len to shut up gcc 8

479 +* nd/pthreads (2018-11-05) 14 commits

480 - Clean up pthread_create() error handling

481 + - read-cache.c: initialize copy_len to shut up gcc 8

482 + - read-cache.c: reduce branching based on HAVE_THREADS

483 - read-cache.c: remove #ifdef NO_PTHREADS

484 - pack-objects: remove #ifdef NO_PTHREADS

485 - preload-index.c: remove #ifdef NO_PTHREADS

486 + - grep: clean up num_threads handling

487 - grep: remove #ifdef NO_PTHREADS

488 - attr.c: remove #ifdef NO_PTHREADS

301 - - name-hash.c: remove #ifdef NO_PTHREADS

302 - - index-pack: remove #ifdef NO_PTHREADS

303 - - thread-utils: macros to unconditionally compile pthreads API

304 -

305 - The codebase has been cleaned up to reduce "#ifndef NO_PTHREADS".

306 -

307 -

308 -* nd/wildmatch-double-asterisk (2018-10-29) 1 commit

309 - (merged to 'next' on 2018-11-01 at 627186d020)

310 - + wildmatch: change behavior of "foo**bar" in WM_PATHNAME mode

311 -

312 - A pattern with '**' that does not have a slash on either side used

313 - to be an invalid one, but the code now treats such double-asterisks

314 - the same way as two normal asterisks that happen to be adjacent to

315 - each other.

316 -

317 - Will merge to 'master'.

318 -

319 -

320 -* rj/header-cleanup (2018-10-29) 3 commits

321 - (merged to 'next' on 2018-11-01 at 975e56048f)

322 - + commit-reach.h: add missing declarations (hdr-check)

323 - + ewok_rlw.h: add missing 'inline' to function definition

324 - + fetch-object.h: add missing declaration (hdr-check)

489 + - name-hash.c: remove #ifdef NO_PTHREADS

490 + - index-pack: remove #ifdef NO_PTHREADS

491 + - send-pack.c: move async's #ifdef NO_PTHREADS back to run-command.c

492 + - run-command.h: include thread-utils.h instead of pthread.h

493 + - thread-utils: macros to unconditionally compile pthreads API

494

326 - Code cleanup.

495 + The codebase has been cleaned up to reduce "#ifndef NO_PTHREADS".

496

328 - Will merge to 'master'.

497 + Will merge to 'next'.

498

499

331 -* js/mingw-ns-filetime (2018-10-24) 3 commits

332 - (merged to 'next' on 2018-10-29 at 4563a0d9d0)

333 - + mingw: implement nanosecond-precision file times

334 - + mingw: replace MSVCRT's fstat() with a Win32-based implementation

335 - + mingw: factor out code to set stat() data

500 +* nd/wildmatch-double-asterisk (2018-10-29) 1 commit

501 + (merged to 'next' on 2018-11-01 at 627186d020)

502 + + wildmatch: change behavior of "foo**bar" in WM_PATHNAME mode

503

337 - Windows port learned to use nano-second resolution file timestamps.

504 + A pattern with '**' that does not have a slash on either side used

505 + to be an invalid one, but the code now treats such double-asterisks

506 + the same way as two normal asterisks that happen to be adjacent to

507 + each other.

508

509 Will merge to 'master'.

510

511

342 -* bp/refresh-index-using-preload (2018-10-30) 1 commit

512 +* bp/refresh-index-using-preload (2018-11-06) 2 commits

513 + (merged to 'next' on 2018-11-06 at d9b9d8f559)

514 + + refresh_index: remove unnecessary calls to preload_index()

515 (merged to 'next' on 2018-11-01 at 289e6bcece)

516 + speed up refresh_index() by utilizing preload_index()

517

@@ -350,109 +522,109 @@ of the repositories listed at

522 Will merge to 'master'.

523

524

353 -* sg/test-verbose-log (2018-10-30) 1 commit

354 - (merged to 'next' on 2018-11-01 at 0c4a18a71f)

355 - + test-lib: introduce the '-V' short option for '--verbose-log'

356 -

357 - Our test scripts can now take the '-V' option as a synonym for the

358 - '--verbose-log' option.

359 -

360 - Will merge to 'master'.

361 -

362 -

525 * ab/pack-tests-cleanup (2018-10-31) 3 commits

364 - - index-pack tests: don't leave test repo dirty at end

365 - - pack-objects tests: don't leave test .git corrupt at end

366 - - pack-objects test: modernize style

526 + (merged to 'next' on 2018-11-03 at b4a39595bb)

527 + + index-pack tests: don't leave test repo dirty at end

528 + + pack-objects tests: don't leave test .git corrupt at end

529 + + pack-objects test: modernize style

530

531 A couple of tests used to leave the repository in a state that is

532 deliberately corrupt, which have been corrected.

533

371 - Will merge to 'next'.

534 + Will merge to 'master'.

535

536

537 * jk/detect-truncated-zlib-input (2018-10-31) 4 commits

375 - - Adjust for 2.19.x series

376 - - cat-file: handle streaming failures consistently

377 - - check_stream_sha1(): handle input underflow

378 - - t1450: check large blob in trailing-garbage test

538 + (merged to 'next' on 2018-11-03 at 4952b4412b)

539 + + Adjust for 2.19.x series

540 + + cat-file: handle streaming failures consistently

541 + + check_stream_sha1(): handle input underflow

542 + + t1450: check large blob in trailing-garbage test

543

544 A regression in Git 2.12 era made "git fsck" fall into an infinite

545 loop while processing truncated loose objects.

546

383 - Will merge to 'next'.

547 + Will merge to 'master'.

548

549

550 * jk/proto-v2-ref-prefix-fix (2018-10-31) 2 commits

387 - - ls-remote: pass heads/tags prefixes to transport

388 - - ls-remote: do not send ref prefixes for patterns

551 + (merged to 'next' on 2018-11-03 at 3a203db692)

552 + + ls-remote: pass heads/tags prefixes to transport

553 + + ls-remote: do not send ref prefixes for patterns

554

555 "git ls-remote $there foo" was broken by recent update for the

556 protocol v2 and stopped showing refs that match 'foo' that are not

557 refs/{heads,tags}/foo, which has been fixed.

558

394 - Will merge to 'next'.

559 + Will merge to 'master'.

560

561

562 * jk/stream-pack-non-delta-clarification (2018-10-31) 1 commit

398 - - read_istream_pack_non_delta(): document input handling

563 + (merged to 'next' on 2018-11-03 at bd386692c8)

564 + + read_istream_pack_non_delta(): document input handling

565

566 Additional comment on a tricky piece of code to help developers.

567

402 - Will merge to 'next'.

568 + Will merge to 'master'.

569

570

571 * js/mingw-isatty-and-dup2 (2018-10-31) 1 commit

406 - - mingw: fix isatty() after dup2()

572 + (merged to 'next' on 2018-11-03 at 0616899d9e)

573 + + mingw: fix isatty() after dup2()

574

575 Windows fix.

576

410 - Will merge to 'next'.

577 + Will merge to 'master'.

578

579

580 * js/mingw-perl5lib (2018-10-31) 4 commits

414 - - mingw: unset PERL5LIB by default

415 - - config: move Windows-specific config settings into compat/mingw.c

416 - - config: allow for platform-specific core.* config settings

417 - - config: rename `dummy` parameter to `cb` in git_default_config()

581 + (merged to 'next' on 2018-11-03 at 2fa516f3ae)

582 + + mingw: unset PERL5LIB by default

583 + + config: move Windows-specific config settings into compat/mingw.c

584 + + config: allow for platform-specific core.* config settings

585 + + config: rename `dummy` parameter to `cb` in git_default_config()

586

587 Windows fix.

588

421 - Will merge to 'next'.

589 + Will merge to 'master'.

590

591

592 * js/mingw-utf8-env (2018-10-31) 2 commits

425 - - mingw: reencode environment variables on the fly (UTF-16 <-> UTF-8)

426 - - t7800: fix quoting

593 + (merged to 'next' on 2018-11-03 at f6c5a8b609)

594 + + mingw: reencode environment variables on the fly (UTF-16 <-> UTF-8)

595 + + t7800: fix quoting

596

597 Windows fix.

598

430 - Will merge to 'next'.

599 + Will merge to 'master'.

600

601

602 * ma/sequencer-do-reset-saner-loop-termination (2018-10-31) 1 commit

434 - - sequencer: break out of loop explicitly

603 + (merged to 'next' on 2018-11-03 at 99da78997d)

604 + + sequencer: break out of loop explicitly

605

606 Code readability fix.

607

438 - Will merge to 'next'.

608 + Will merge to 'master'.

609

610

611 * nb/worktree-api-doc (2018-10-31) 2 commits

442 - - worktree: rename is_worktree_locked to worktree_lock_reason

443 - - worktree: update documentation for lock_reason and lock_reason_valid

612 + (merged to 'next' on 2018-11-03 at de9befb1f3)

613 + + worktree: rename is_worktree_locked to worktree_lock_reason

614 + + worktree: update documentation for lock_reason and lock_reason_valid

615

616 Code readability fix.

617

447 - Will merge to 'next'.

618 + Will merge to 'master'.

619

620

450 -* sh/mingw-safer-compat-poll (2018-11-01) 1 commit

451 - - poll: use GetTickCount64() to avoid wrap-around issues

621 +* sh/mingw-safer-compat-poll (2018-11-05) 1 commit

622 + (merged to 'next' on 2018-11-05 at 933a940a68)

623 + + poll: use GetTickCount64() to avoid wrap-around issues

624

625 Windows fix.

626

455 - Will merge to 'next'.

627 + Will merge to 'master'.

628

629

630 * sb/more-repo-in-api (2018-10-19) 19 commits

@@ -485,7 +657,9 @@ of the repositories listed at

657 cf. <20181030220817.61691-1-sbeller@google.com>

658

659

488 -* en/merge-path-collision (2018-10-22) 8 commits

660 +* en/merge-path-collision (2018-11-05) 10 commits

661 + - fixup! merge-recursive: improve rename/rename(1to2)/add[/add] handling

662 + - fixup! merge-recursive: fix rename/add conflict handling

663 - merge-recursive: improve rename/rename(1to2)/add[/add] handling

664 - merge-recursive: use handle_file_collision for add/add conflicts

665 - merge-recursive: improve handling for rename/rename(2to1) conflicts

@@ -494,127 +668,118 @@ of the repositories listed at

668 - merge-recursive: increase marker length with depth of recursion

669 - t6036, t6042: testcases for rename collision of already conflicting files

670 - Add testcases for consistency in file collision conflict handling

497 - (this branch uses en/merge-cleanup-more.)

671

672 Updates for corner cases in merge-recursive.

673

501 - Expecting a reroll.

502 - cf. <CABPp-BGq1YDdzZ6CqzCp9QXPZy6XxV8sujyRxwBc-EnS+ygSrg@mail.gmail.com>

503 -

674

675 * jt/tighten-fetch-proto-v2-response (2018-11-01) 1 commit

506 - - fetch-pack: be more precise in parsing v2 response

676 + (merged to 'next' on 2018-11-03 at 310fe3f2c3)

677 + + fetch-pack: be more precise in parsing v2 response

678

679 "git fetch" was a bit loose in parsing resposes from the other side

680 when talking over the protocol v2.

681

511 - Will merge to 'next'.

512 -

513 -

514 -* nd/complete-format-patch (2018-10-22) 1 commit

515 - . completion: use __gitcomp_builtin for format-patch

516 -

517 - Expecting a reroll.

682 + Will merge to 'master'.

683

684

520 -* nd/completion-negation (2018-10-22) 1 commit

521 - (merged to 'next' on 2018-10-29 at 87e73b0c72)

522 - + completion: fix __gitcomp_builtin no longer consider extra options

685 +* nd/complete-format-patch (2018-11-06) 1 commit

686 + (merged to 'next' on 2018-11-06 at 7f4c58c9d0)

687 + + completion: use __gitcomp_builtin for format-patch

688

524 - The command line completion machinery (in contrib/) has been

525 - updated to allow the completion script to tweak the list of options

526 - that are reported by the parse-options machinery correctly.

689 + The support for format-patch (and send-email) by the command-line

690 + completion script (in contrib/) has been simplified a bit.

691

692 Will merge to 'master'.

693

694

695 * nd/config-split (2018-10-29) 79 commits

532 - - config.txt: remove config/dummy.txt

533 - - config.txt: move worktree.* to a separate file

534 - - config.txt: move web.* to a separate file

535 - - config.txt: move versionsort.* to a separate file

536 - - config.txt: move user.* to a separate file

537 - - config.txt: move url.* to a separate file

538 - - config.txt: move uploadpack.* to a separate file

539 - - config.txt: move uploadarchive.* to a separate file

540 - - config.txt: move transfer.* to a separate file

541 - - config.txt: move tag.* to a separate file

542 - - config.txt: move submodule.* to a separate file

543 - - config.txt: move stash.* to a separate file

544 - - config.txt: move status.* to a separate file

545 - - config.txt: move splitIndex.* to a separate file

546 - - config.txt: move showBranch.* to a separate file

547 - - config.txt: move sequencer.* to a separate file

548 - - config.txt: move sendemail-config.txt to config/

549 - - config.txt: move reset.* to a separate file

550 - - config.txt: move rerere.* to a separate file

551 - - config.txt: move repack.* to a separate file

552 - - config.txt: move remotes.* to a separate file

553 - - config.txt: move remote.* to a separate file

554 - - config.txt: move receive-config.txt to config/

555 - - config.txt: move rebase-config.txt to config/

556 - - config.txt: move push-config.txt to config/

557 - - config.txt: move pull-config.txt to config/

558 - - config.txt: move protocol.* to a separate file

559 - - config.txt: move pretty.* to a separate file

560 - - config.txt: move pager.* to a separate file

561 - - config.txt: move pack.* to a separate file

562 - - config.txt: move notes.* to a separate file

563 - - config.txt: move mergetool.* to a separate file

564 - - config.txt: move merge-config.txt to config/

565 - - config.txt: move man.* to a separate file

566 - - config.txt: move mailmap.* to a separate file

567 - - config.txt: move mailinfo.* to a separate file

568 - - config.txt: move log.* to a separate file

569 - - config.txt: move interactive.* to a separate file

570 - - config.txt: move instaweb.* to a separate file

571 - - config.txt: move init.* to a separate file

572 - - config.txt: move index.* to a separate file

573 - - git-imap-send.txt: move imap.* to a separate file

574 - - config.txt: move i18n.* to a separate file

575 - - config.txt: move http.* to a separate file

576 - - config.txt: move ssh.* to a separate file

577 - - config.txt: move help.* to a separate file

578 - - config.txt: move guitool.* to a separate file

579 - - config.txt: move gui-config.txt to config/

580 - - config.txt: move gpg.* to a separate file

581 - - config.txt: move grep.* to a separate file

582 - - config.txt: move gitweb.* to a separate file

583 - - config.txt: move gitcvs-config.txt to config/

584 - - config.txt: move gc.* to a separate file

585 - - config.txt: move fsck.* to a separate file

586 - - config.txt: move fmt-merge-msg-config.txt to config/

587 - - config.txt: move format-config.txt to config/

588 - - config.txt: move filter.* to a separate file

589 - - config.txt: move fetch-config.txt to config/

590 - - config.txt: move fastimport.* to a separate file

591 - - config.txt: move difftool.* to a separate file

592 - - config.txt: move diff-config.txt to config/

593 - - config.txt: move completion.* to a separate file

594 - - config.txt: move credential.* to a separate file

595 - - config.txt: move commit.* to a separate file

596 - - config.txt: move column.* to a separate file

597 - - config.txt: move color.* to a separate file

598 - - config.txt: move clean.* to a separate file

599 - - config.txt: move checkout.* to a separate file

600 - - config.txt: move browser.* to a separate file

601 - - config.txt: move branch.* to a separate file

602 - - config.txt: move blame.* to a separate file

603 - - config.txt: move apply.* to a separate file

604 - - config.txt: move am.* to a separate file

605 - - config.txt: move alias.* to a separate file

606 - - config.txt: move add.* to a separate file

607 - - config.txt: move core.* to a separate file

608 - - config.txt: move advice.* to a separate file

609 - - Update makefile in preparation for Documentation/config/*.txt

610 - - Merge branches 'bp/reset-quiet' and 'js/mingw-http-ssl' into nd/config-split

611 - (this branch uses bp/reset-quiet and js/mingw-http-ssl; is tangled with jc/http-curlver-warnings.)

696 + (merged to 'next' on 2018-11-03 at a336559101)

697 + + config.txt: remove config/dummy.txt

698 + + config.txt: move worktree.* to a separate file

699 + + config.txt: move web.* to a separate file

700 + + config.txt: move versionsort.* to a separate file

701 + + config.txt: move user.* to a separate file

702 + + config.txt: move url.* to a separate file

703 + + config.txt: move uploadpack.* to a separate file

704 + + config.txt: move uploadarchive.* to a separate file

705 + + config.txt: move transfer.* to a separate file

706 + + config.txt: move tag.* to a separate file

707 + + config.txt: move submodule.* to a separate file

708 + + config.txt: move stash.* to a separate file

709 + + config.txt: move status.* to a separate file

710 + + config.txt: move splitIndex.* to a separate file

711 + + config.txt: move showBranch.* to a separate file

712 + + config.txt: move sequencer.* to a separate file

713 + + config.txt: move sendemail-config.txt to config/

714 + + config.txt: move reset.* to a separate file

715 + + config.txt: move rerere.* to a separate file

716 + + config.txt: move repack.* to a separate file

717 + + config.txt: move remotes.* to a separate file

718 + + config.txt: move remote.* to a separate file

719 + + config.txt: move receive-config.txt to config/

720 + + config.txt: move rebase-config.txt to config/

721 + + config.txt: move push-config.txt to config/

722 + + config.txt: move pull-config.txt to config/

723 + + config.txt: move protocol.* to a separate file

724 + + config.txt: move pretty.* to a separate file

725 + + config.txt: move pager.* to a separate file

726 + + config.txt: move pack.* to a separate file

727 + + config.txt: move notes.* to a separate file

728 + + config.txt: move mergetool.* to a separate file

729 + + config.txt: move merge-config.txt to config/

730 + + config.txt: move man.* to a separate file

731 + + config.txt: move mailmap.* to a separate file

732 + + config.txt: move mailinfo.* to a separate file

733 + + config.txt: move log.* to a separate file

734 + + config.txt: move interactive.* to a separate file

735 + + config.txt: move instaweb.* to a separate file

736 + + config.txt: move init.* to a separate file

737 + + config.txt: move index.* to a separate file

738 + + git-imap-send.txt: move imap.* to a separate file

739 + + config.txt: move i18n.* to a separate file

740 + + config.txt: move http.* to a separate file

741 + + config.txt: move ssh.* to a separate file

742 + + config.txt: move help.* to a separate file

743 + + config.txt: move guitool.* to a separate file

744 + + config.txt: move gui-config.txt to config/

745 + + config.txt: move gpg.* to a separate file

746 + + config.txt: move grep.* to a separate file

747 + + config.txt: move gitweb.* to a separate file

748 + + config.txt: move gitcvs-config.txt to config/

749 + + config.txt: move gc.* to a separate file

750 + + config.txt: move fsck.* to a separate file

751 + + config.txt: move fmt-merge-msg-config.txt to config/

752 + + config.txt: move format-config.txt to config/

753 + + config.txt: move filter.* to a separate file

754 + + config.txt: move fetch-config.txt to config/

755 + + config.txt: move fastimport.* to a separate file

756 + + config.txt: move difftool.* to a separate file

757 + + config.txt: move diff-config.txt to config/

758 + + config.txt: move completion.* to a separate file

759 + + config.txt: move credential.* to a separate file

760 + + config.txt: move commit.* to a separate file

761 + + config.txt: move column.* to a separate file

762 + + config.txt: move color.* to a separate file

763 + + config.txt: move clean.* to a separate file

764 + + config.txt: move checkout.* to a separate file

765 + + config.txt: move browser.* to a separate file

766 + + config.txt: move branch.* to a separate file

767 + + config.txt: move blame.* to a separate file

768 + + config.txt: move apply.* to a separate file

769 + + config.txt: move am.* to a separate file

770 + + config.txt: move alias.* to a separate file

771 + + config.txt: move add.* to a separate file

772 + + config.txt: move core.* to a separate file

773 + + config.txt: move advice.* to a separate file

774 + + Update makefile in preparation for Documentation/config/*.txt

775 + + Merge branches 'bp/reset-quiet' and 'js/mingw-http-ssl' into nd/config-split

776 + (this branch uses bp/reset-quiet.)

777

778 Split the overly large Documentation/config.txt file into million

779 little pieces. This potentially allows each individual piece

780 included into the manual page of the command it affects more easily.

781

617 - Will merge to 'next'.

782 + Will merge to 'master'.

783

784 This is a painful conversions while many other topics in flight

785 wants to add to or edit the documentation of configuration

@@ -635,26 +800,9 @@ of the repositories listed at

800 Will merge to 'master'.

801

802

638 -* nd/submodule-unused-vars (2018-10-22) 1 commit

639 - (merged to 'next' on 2018-10-29 at 33641dcc89)

640 - + submodule.c: remove some of the_repository references

641 -

642 - Code clean-up.

643 -

644 - Will merge to 'master'.

645 -

646 -

647 -* nd/unpack-trees-with-cache-tree (2018-10-22) 1 commit

648 - (merged to 'next' on 2018-10-29 at de51b606da)

649 - + read-cache: use of memory after it is freed

650 -

651 - Trivial bugfix.

652 -

653 - Will merge to 'master'.

654 -

655 -

803 * ag/rev-parse-all-exclude-fix (2018-11-01) 1 commit

657 - - rev-parse: clear --exclude list after 'git rev-parse --all'

804 + (merged to 'next' on 2018-11-03 at 49730558fa)

805 + + rev-parse: clear --exclude list after 'git rev-parse --all'

806

807 "git rev-parse --exclude=* --branches --branches" (i.e. first

808 saying "add only things that do not match '*' out of all branches"

@@ -662,7 +810,7 @@ of the repositories listed at

810 worked as expected, but "--exclude=* --all --all" did not work the

811 same way, which has been fixed.

812

665 - Will merge to 'next'.

813 + Will merge to 'master'.

814

815

816 * bp/reset-quiet (2018-10-24) 3 commits

@@ -678,172 +826,27 @@ of the repositories listed at

826 Will merge to 'master'.

827

828

681 -* js/remote-archive-dwimfix (2018-10-26) 1 commit

682 - (merged to 'next' on 2018-10-26 at f5bf6946bd)

683 - + archive: initialize archivers earlier

684 -

685 - The logic to determine the archive type "git archive" uses did not

686 - correctly kick in for "git archive --remote", which has been

687 - corrected.

688 -

689 - Will merge to 'master'.

690 -

691 -

692 -* js/shallow-and-fetch-prune (2018-10-25) 3 commits

693 - (merged to 'next' on 2018-10-26 at 93b7196560)

694 - + repack -ad: prune the list of shallow commits

695 - + shallow: offer to prune only non-existing entries

696 - + repack: point out a bug handling stale shallow info

697 -

698 - "git repack" in a shallow clone did not correctly update the

699 - shallow points in the repository, leading to a repository that

700 - does not pass fsck.

701 -

702 - Will merge to 'master'.

703 -

704 -

705 -* jw/send-email-no-auth (2018-10-23) 1 commit

706 - (merged to 'next' on 2018-10-29 at a3fbbdb889)

707 - + send-email: explicitly disable authentication

708 -

709 - "git send-email" learned to disable SMTP authentication via the

710 - "--smtp-auth=none" option, even when the smtp username is given

711 - (which turns the authentication on by default).

712 -

713 - Will merge to 'master'.

714 -

715 -

716 -* md/exclude-promisor-objects-fix (2018-10-23) 2 commits

717 - (merged to 'next' on 2018-10-29 at fb36a5dcbe)

718 - + exclude-promisor-objects: declare when option is allowed

719 - + Documentation/git-log.txt: do not show --exclude-promisor-objects

720 -

721 - Operations on promisor objects make sense in the context of only a

722 - small subset of the commands that internally use the revisions

723 - machinery, but the "--exclude-promisor-objects" option were taken

724 - and led to nonsense results by commands like "log", to which it

725 - didn't make much sense. This has been corrected.

726 -

727 - Will merge to 'master'.

728 -

729 -

730 -* mg/gpg-fingerprint (2018-10-23) 3 commits

731 - (merged to 'next' on 2018-10-26 at 1e219cb754)

732 - + gpg-interface.c: obtain primary key fingerprint as well

733 - + gpg-interface.c: support getting key fingerprint via %GF format

734 - + gpg-interface.c: use flags to determine key/signer info presence

735 - (this branch uses mg/gpg-parse-tighten; is tangled with jc/gpg-cocci-preincr.)

736 -

737 - New "--pretty=format:" placeholders %GF and %GP that show the GPG

738 - key fingerprints have been invented.

739 -

740 - Will merge to 'master'.

741 -

742 -

743 -* jc/http-curlver-warnings (2018-10-26) 1 commit

744 - (merged to 'next' on 2018-10-26 at 870e125cec)

745 - + http: give curl version warnings consistently

746 - (this branch uses js/mingw-http-ssl; is tangled with nd/config-split.)

747 -

748 - Warning message fix.

749 -

750 - Will merge to 'master'.

751 -

752 -

829 * sd/stash-wo-user-name (2018-11-02) 1 commit

830 - t3903-stash: test without configured user.name and user.email

831

832 An early part of a wip.

833

834

759 -* sg/test-rebase-editor-fix (2018-10-29) 1 commit

760 - (merged to 'next' on 2018-11-01 at 271e0fc663)

761 - + t3404-rebase-interactive: test abbreviated commands

762 -

763 - Will merge to 'master'.

764 -

765 -

766 -* ss/travis-ci-force-vm-mode (2018-10-26) 1 commit

767 - (merged to 'next' on 2018-11-01 at 8596bb2a65)

768 - + travis-ci: no longer use containers

769 - (this branch is used by sg/travis-install-dependencies.)

770 -

771 - The "container" mode of TravisCI is going away. Our .travis.yml

772 - file is getting prepared for the transition.

773 -

774 - Will merge to 'master'.

775 -

776 -

777 -* tb/char-may-be-unsigned (2018-10-26) 1 commit

778 - (merged to 'next' on 2018-11-01 at 9e14f289f8)

779 - + path.c: char is not (always) signed

780 -

781 - Build portability fix.

782 -

783 - Will merge to 'master'.

784 -

785 -

786 -* jt/upload-pack-v2-fix-shallow (2018-10-19) 3 commits

787 - (merged to 'next' on 2018-10-29 at d9010b3c7b)

788 - + upload-pack: clear flags before each v2 request

789 - + upload-pack: make want_obj not global

790 - + upload-pack: make have_obj not global

791 -

792 - "git fetch" over protocol v2 into a shallow repository failed to

793 - fetch full history behind a new tip of history that was diverged

794 - before the cut-off point of the history that was previously fetched

795 - shallowly.

796 -

797 - Will merge to 'master'.

798 -

799 -

835 * pw/am-rebase-read-author-script (2018-11-01) 5 commits

801 - - sequencer: use read_author_script()

802 - - add read_author_script() to libgit

803 - - am: rename read_author_script()

804 - - am: improve author-script error reporting

805 - - am: don't die in read_author_script()

836 + (merged to 'next' on 2018-11-03 at bb6c32fe16)

837 + + sequencer: use read_author_script()

838 + + add read_author_script() to libgit

839 + + am: rename read_author_script()

840 + + am: improve author-script error reporting

841 + + am: don't die in read_author_script()

842

843 Unify code to read the author-script used in "git am" and the

844 commands that use the sequencer machinery, e.g. "git rebase -i".

845

810 - Will merge to 'next'.

811 -

812 -

813 -* sb/submodule-url-to-absolute (2018-10-18) 1 commit

814 - (merged to 'next' on 2018-10-29 at 4264c150cb)

815 - + submodule helper: convert relative URL to absolute URL if needed

816 -

817 - Some codepaths failed to form a proper URL when .gitmodules record

818 - the URL to a submodule repository as relative to the repository of

819 - superproject, which has been corrected.

820 -

821 - Will merge to 'master'.

822 -

823 -

824 -* en/merge-cleanup-more (2018-10-18) 2 commits

825 - (merged to 'next' on 2018-10-26 at c706319c26)

826 - + merge-recursive: avoid showing conflicts with merge branch before HEAD

827 - + merge-recursive: improve auto-merging messages with path collisions

828 - (this branch is used by en/merge-path-collision.)

829 -

830 - Further clean-up of merge-recursive machinery.

831 -

832 - Will merge to 'master'.

833 -

834 -

835 -* mg/gpg-parse-tighten (2018-10-22) 1 commit

836 - (merged to 'next' on 2018-10-26 at efdec77193)

837 - + gpg-interface.c: detect and reject multiple signatures on commits

838 - (this branch is used by jc/gpg-cocci-preincr and mg/gpg-fingerprint.)

839 -

840 - Detect and reject a signature block that has more than one GPG

841 - signature.

842 -

846 Will merge to 'master'.

847

848

846 -* bc/sha-256 (2018-10-25) 12 commits

849 +* bc/sha-256 (2018-11-05) 12 commits

850 - hash: add an SHA-256 implementation using OpenSSL

851 - sha256: add an SHA-256 implementation using libgcrypt

852 - Add a base implementation of SHA-256 support

@@ -860,24 +863,6 @@ of the repositories listed at

863 Add sha-256 hash and plug it through the code to allow building Git

864 with the "NewHash".

865

863 - Expecting a reroll.

864 - cf. <20181031225521.GA573515@genre.crustytoothpaste.net>

865 -

866 -

867 -* js/mingw-http-ssl (2018-10-26) 3 commits

868 - (merged to 'next' on 2018-10-26 at 318e82e101)

869 - + http: when using Secure Channel, ignore sslCAInfo by default

870 - + http: add support for disabling SSL revocation checks in cURL

871 - + http: add support for selecting SSL backends at runtime

872 - (this branch is used by jc/http-curlver-warnings and nd/config-split.)

873 -

874 - On platforms with recent cURL library, http.sslBackend configuration

875 - variable can be used to choose a different SSL backend at runtime.

876 - The Windows port uses this mechanism to switch between OpenSSL and

877 - Secure Channel while talking over the HTTPS protocol.

878 -

879 - Will merge to 'master'.

880 -

866

867 * js/vsts-ci (2018-10-16) 13 commits

868 - travis: fix skipping tagged releases

@@ -919,12 +904,13 @@ of the repositories listed at

904

905

906 * jc/war-on-string-list (2018-11-01) 1 commit

922 - - fetch: replace string-list used as a look-up table with a hashmap

907 + (merged to 'next' on 2018-11-03 at 2ff65073f1)

908 + + fetch: replace string-list used as a look-up table with a hashmap

909

910 Replace three string-list instances used as look-up tables in "git

911 fetch" with hashmaps.

912

927 - Will merge to 'next'.

913 + Will merge to 'master'.

914

915

916 * js/remote-archive-v2 (2018-09-28) 4 commits

@@ -974,32 +960,36 @@ of the repositories listed at

960

961

962 * ds/test-multi-pack-index (2018-10-26) 4 commits

977 - - packfile: close multi-pack-index in close_all_packs

978 - - multi-pack-index: define GIT_TEST_MULTI_PACK_INDEX

979 - - midx: close multi-pack-index on repack

980 - - midx: fix broken free() in close_midx()

963 + (merged to 'next' on 2018-11-03 at 624c415a45)

964 + + packfile: close multi-pack-index in close_all_packs

965 + + multi-pack-index: define GIT_TEST_MULTI_PACK_INDEX

966 + + midx: close multi-pack-index on repack

967 + + midx: fix broken free() in close_midx()

968

969 Tests for the recently introduced multi-pack index machinery.

970

984 - Will merge to 'next'.

971 + Will merge to 'master'.

972

973

987 -* nd/per-worktree-ref-iteration (2018-10-22) 8 commits

988 - - reflog expire: cover reflog from all worktrees

989 - - fsck: check HEAD and reflog from other worktrees

990 - - fsck: move fsck_head_link() to get_default_heads() to avoid some globals

991 - - revision.c: better error reporting on ref from different worktrees

992 - - revision.c: correct a parameter name

993 - - refs: new ref types to make per-worktree refs visible to all worktrees

994 - - Add a place for (not) sharing stuff between worktrees

995 - - refs.c: indent with tabs, not spaces

974 +* nd/per-worktree-ref-iteration (2018-11-05) 9 commits

975 + (merged to 'next' on 2018-11-06 at 53803cedf3)

976 + + git-worktree.txt: correct linkgit command name

977 + (merged to 'next' on 2018-11-03 at 4cbe49a704)

978 + + reflog expire: cover reflog from all worktrees

979 + + fsck: check HEAD and reflog from other worktrees

980 + + fsck: move fsck_head_link() to get_default_heads() to avoid some globals

981 + + revision.c: better error reporting on ref from different worktrees

982 + + revision.c: correct a parameter name

983 + + refs: new ref types to make per-worktree refs visible to all worktrees

984 + + Add a place for (not) sharing stuff between worktrees

985 + + refs.c: indent with tabs, not spaces

986

987 The code to traverse objects for reachability, used to decide what

988 objects are unreferenced and expendable, have been taught to also

989 consider per-worktree refs of other worktrees as starting points to

990 prevent data loss.

991

1002 - Will merge to 'next'.

992 + Will merge to 'master'.

993

994

995 * ds/reachable-topo-order (2018-11-02) 7 commits

@@ -1014,6 +1004,8 @@ of the repositories listed at

1004 The revision walker machinery learned to take advantage of the

1005 commit generation numbers stored in the commit-graph file.

1006

1007 + Will merge to 'next'.

1008 +

1009

1010 * sb/submodule-recursive-fetch-gets-the-tip (2018-10-31) 11 commits

1011 - builtin/fetch: check for submodule updates in any ref update

@@ -1047,23 +1039,24 @@ of the repositories listed at

1039

1040

1041 * ao/submodule-wo-gitmodules-checked-out (2018-10-31) 10 commits

1050 - - t/helper: add test-submodule-nested-repo-config

1051 - - submodule: support reading .gitmodules when it's not in the working tree

1052 - - submodule: add a helper to check if it is safe to write to .gitmodules

1053 - - t7506: clean up .gitmodules properly before setting up new scenario

1054 - - submodule: use the 'submodule--helper config' command

1055 - - submodule--helper: add a new 'config' subcommand

1056 - - t7411: be nicer to future tests and really clean things up

1057 - - t7411: merge tests 5 and 6

1058 - - submodule: factor out a config_set_in_gitmodules_file_gently function

1059 - - submodule: add a print_config_from_gitmodules() helper

1042 + (merged to 'next' on 2018-11-03 at 00c3377ef0)

1043 + + t/helper: add test-submodule-nested-repo-config

1044 + + submodule: support reading .gitmodules when it's not in the working tree

1045 + + submodule: add a helper to check if it is safe to write to .gitmodules

1046 + + t7506: clean up .gitmodules properly before setting up new scenario

1047 + + submodule: use the 'submodule--helper config' command

1048 + + submodule--helper: add a new 'config' subcommand

1049 + + t7411: be nicer to future tests and really clean things up

1050 + + t7411: merge tests 5 and 6

1051 + + submodule: factor out a config_set_in_gitmodules_file_gently function

1052 + + submodule: add a print_config_from_gitmodules() helper

1053 (this branch is used by sb/submodule-recursive-fetch-gets-the-tip.)

1054

1055 The submodule support has been updated to read from the blob at

1056 HEAD:.gitmodules when the .gitmodules file is missing from the

1057 working tree.

1058

1066 - Will merge to 'next'.

1059 + Will merge to 'master'.

1060

1061

1062 * ps/stash-in-c (2018-10-15) 21 commits

What's cooking (2018/11 #03)