f80fa9d502 · 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 (Dec 2019, #04; Tue, 17)

4 -X-master-at: b02fd2accad4d48078671adf38fe5b5976d77304

5 -X-next-at: 63ccf5415c3f64822b547b264c51e5537392acd7

3 +Subject: What's cooking in git.git (Dec 2019, #05; Thu, 26)

4 +X-master-at: 0a76bd7381ec0dbb7c43776eb6d1ac906bca29e6

5 +X-next-at: ca9f1ec99ff3ed584eec58c085a342c9c37d2919

6

7 -What's cooking in git.git (Dec 2019, #04; Tue, 17)

7 +What's cooking in git.git (Dec 2019, #05; Thu, 26)

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

9

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

@@ -12,8 +12,7 @@ Here are the topics that have been cooking. Commits prefixed with

12 '+' are in 'next'. The ones marked with '.' do not appear in any of

13 the integration branches, but I am still holding onto them.

14

15 -The fifth batch of topics are now in 'master', on top of merging the

16 -big security-related updates to the older maintenance tracks.

15 +The early preview for the upcoming Git 2.25 has been tagged.

16

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

18 of the repositories listed at

@@ -23,612 +22,471 @@ of the repositories listed at

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

23 [Graduated to "master"]

24

26 -* rs/test-cleanup (2019-11-30) 7 commits

27 - (merged to 'next' on 2019-12-02 at eabc2e30f5)

28 - + t7811: don't create unused file

29 - + t9300: don't create unused file

30 - + test: use test_must_be_empty F instead of test_cmp empty F

31 - + test: use test_must_be_empty F instead of test -z $(cat F)

32 - + t1400: use test_must_be_empty

33 - + t1410: use test_line_count

34 - + t1512: use test_line_count

35 -

36 - Test cleanup.

37 -

38 -

39 -* ag/sequencer-continue-leakfix (2019-11-30) 1 commit

40 - (merged to 'next' on 2019-12-05 at 923a6a7ab6)

41 - + sequencer: fix a memory leak in sequencer_continue()

42 -

43 - Leakfix.

44 -

45 -

46 -* ag/sequencer-todo-updates (2019-11-25) 5 commits

47 - (merged to 'next' on 2019-11-27 at 3258d51dfc)

48 - + sequencer: directly call pick_commits() from complete_action()

49 - + rebase: fill `squash_onto' in get_replay_opts()

50 - + sequencer: move the code writing total_nr on the disk to a new function

51 - + sequencer: update `done_nr' when skipping commands in a todo list

52 - + sequencer: update `total_nr' when adding an item to a todo list

53 - (this branch is used by ag/edit-todo-drop-check.)

54 -

55 - Reduce unnecessary reading of state variables back from the disk

56 - during sequencer operation.

57 -

58 -

59 -* am/pathspec-from-file (2019-11-20) 6 commits

60 - (merged to 'next' on 2019-11-27 at ee131b80fb)

61 - + commit: support the --pathspec-from-file option

62 - + doc: commit: synchronize <pathspec> description

63 - + reset: support the `--pathspec-from-file` option

64 - + doc: reset: synchronize <pathspec> description

65 - + pathspec: add new function to parse file

66 - + parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`

67 - (this branch is used by am/pathspec-f-f-checkout and es/pathspec-f-f-grep.)

68 -

69 - A few commands learned to take the pathspec from the

70 - standard input or a named file, instead of taking it as the command

71 - line arguments.

72 -

73 -

74 -* as/t7812-missing-redirects-fix (2019-12-01) 2 commits

75 - (merged to 'next' on 2019-12-05 at aa89a7945f)

76 - + t7812: expect failure for grep -i with invalid UTF-8 data

77 - + t7812: add missing redirects

78 -

79 - Test fix.

80 -

81 -

82 -* bc/t9001-zsh-in-posix-emulation-mode (2019-11-30) 1 commit

83 - (merged to 'next' on 2019-12-05 at d0ce4bcc90)

84 - + t9001: avoid including non-trailing NUL bytes in variables

85 -

86 - Test portability fix.

87 -

25 +* am/pathspec-f-f-checkout (2019-12-04) 7 commits

26 + (merged to 'next' on 2019-12-10 at 6b018bd997)

27 + + checkout, restore: support the --pathspec-from-file option

28 + + doc: restore: synchronize <pathspec> description

29 + + doc: checkout: synchronize <pathspec> description

30 + + doc: checkout: fix broken text reference

31 + + doc: checkout: remove duplicate synopsis

32 + + add: support the --pathspec-from-file option

33 + + cmd_add: prepare for next patch

34

89 -* cs/store-packfiles-in-hashmap (2019-12-03) 1 commit

90 - (merged to 'next' on 2019-12-05 at 887d5559bb)

91 - + packfile.c: speed up loading lots of packfiles

92 -

93 - In a repository with many packfiles, the cost of the procedure that

94 - avoids registering the same packfile twice was unnecessarily high

95 - by using an inefficient search algorithm, which has been corrected.

35 + A few more commands learned the "--pathspec-from-file" command line

36 + option.

37

38

98 -* dd/time-reentrancy (2019-12-01) 3 commits

99 - (merged to 'next' on 2019-12-05 at d0c91f4d1b)

100 - + mingw: use {gm,local}time_s as backend for {gm,local}time_r

101 - + archive-zip.c: switch to reentrant localtime_r

102 - + date.c: switch to reentrant {gm,local}time_r

39 +* am/pathspec-from-file (2019-12-18) 1 commit

40 + (merged to 'next' on 2019-12-19 at e250cc9b88)

41 + + commit: forbid --pathspec-from-file --all

42

104 - Avoid gmtime() and localtime() and prefer their reentrant

105 - counterparts.

43 + An earlier series to teach "--pathspec-from-file" to "git commit"

44 + forgot to make the option incompatible with "--all", which has been

45 + corrected.

46

47

108 -* dl/lore-is-the-archive (2019-12-04) 3 commits

109 - (merged to 'next' on 2019-12-05 at c87e168cd6)

110 - + doc: replace LKML link with lore.kernel.org

111 - + RelNotes: replace Gmane with real Message-IDs

112 - + doc: replace MARC links with lore.kernel.org

113 - (this branch uses jk/lore-is-the-archive.)

48 +* dl/format-patch-notes-config-fixup (2019-12-18) 8 commits

49 + (merged to 'next' on 2019-12-19 at 1abc6941e0)

50 + + notes.h: fix typos in comment

51 + (merged to 'next' on 2019-12-16 at e4da5b93bb)

52 + + notes: break set_display_notes() into smaller functions

53 + + config/format.txt: clarify behavior of multiple format.notes

54 + (merged to 'next' on 2019-12-10 at 2d8830090f)

55 + + format-patch: move git_config() before repo_init_revisions()

56 + + format-patch: use --notes behavior for format.notes

57 + + notes: extract logic into set_display_notes()

58 + + notes: create init_display_notes() helper

59 + + notes: rename to load_display_notes()

60

115 - Publicize lore.kernel.org mailing list archive and use URLs

116 - pointing into it to refer to notable messages in the documentation.

61 + "git format-patch" can take a set of configured format.notes values

62 + to specify which notes refs to use in the log message part of the

63 + output. The behaviour of this was not consistent with multiple

64 + --notes command line options, which has been corrected.

65

66

119 -* dl/pretty-reference (2019-11-20) 11 commits

120 - (merged to 'next' on 2019-12-05 at 0972133ad2)

121 - + SubmittingPatches: use `--pretty=reference`

122 - + pretty: implement 'reference' format

123 - + pretty: add struct cmt_fmt_map::default_date_mode_type

124 - + pretty: provide short date format

125 - + t4205: cover `git log --reflog -z` blindspot

126 - + pretty.c: inline initalize format_context

127 - + revision: make get_revision_mark() return const pointer

128 - + completion: complete `tformat:` pretty format

129 - + SubmittingPatches: remove dq from commit reference

130 - + pretty-formats.txt: use generic terms for hash

131 - + SubmittingPatches: use generic terms for hash

67 +* ds/sparse-cone (2019-12-20) 21 commits

68 + (merged to 'next' on 2019-12-20 at 4f33a10613)

69 + + sparse-checkout: improve OS ls compatibility

70 + (merged to 'next' on 2019-12-16 at c840c1d816)

71 + + sparse-checkout: respect core.ignoreCase in cone mode

72 + + sparse-checkout: check for dirty status

73 + + sparse-checkout: update working directory in-process for 'init'

74 + + sparse-checkout: cone mode should not interact with .gitignore

75 + + sparse-checkout: write using lockfile

76 + + sparse-checkout: use in-process update for disable subcommand

77 + + sparse-checkout: update working directory in-process

78 + + sparse-checkout: sanitize for nested folders

79 + + unpack-trees: add progress to clear_ce_flags()

80 + + unpack-trees: hash less in cone mode

81 + + sparse-checkout: init and set in cone mode

82 + + sparse-checkout: use hashmaps for cone patterns

83 + + sparse-checkout: add 'cone' mode

84 + + trace2: add region in clear_ce_flags

85 + + sparse-checkout: create 'disable' subcommand

86 + + sparse-checkout: add '--stdin' option to set subcommand

87 + + sparse-checkout: 'set' subcommand

88 + + clone: add --sparse mode

89 + + sparse-checkout: create 'init' subcommand

90 + + sparse-checkout: create builtin with 'list' subcommand

91

133 - "git log" family learned "--pretty=reference" that gives the name

134 - of a commit in the format that is often used to refer to it in log

135 - messages.

92 + Management of sparsely checked-out working tree has gained a

93 + dedicated "sparse-checkout" command.

94

95

138 -* dl/range-diff-with-notes (2019-12-06) 3 commits

139 - (merged to 'next' on 2019-12-10 at af8f441807)

140 - + range-diff: clear `other_arg` at end of function

141 - + range-diff: mark pointers as const

142 - + t3206: fix incorrect test name

143 -

144 - Code clean-up.

145 -

146 -

147 -* dl/rebase-with-autobase (2019-12-05) 5 commits

148 - (merged to 'next' on 2019-12-06 at 2d72b8cffe)

149 - + rebase: fix format.useAutoBase breakage

150 - + format-patch: teach --no-base

151 - + t4014: use test_config()

152 - + format-patch: fix indentation

153 - + t3400: demonstrate failure with format.useAutoBase

154 -

155 - "git rebase" did not work well when format.useAutoBase

156 - configuration variable is set, which has been corrected.

157 -

158 -

159 -* dl/submodule-set-url (2019-10-30) 1 commit

160 - (merged to 'next' on 2019-12-05 at a164eccad1)

161 - + submodule: teach set-url subcommand

162 -

163 - "git submodule" learned a subcommand "set-url".

164 -

165 -

166 -* dl/test-cleanup (2019-12-04) 26 commits

167 - (merged to 'next' on 2019-12-06 at 9129e71939)

168 - + t7700: stop losing return codes of git commands

169 - + t7700: make references to SHA-1 generic

170 - + t7700: replace egrep with grep

171 - + t7700: consolidate code into test_has_duplicate_object()

172 - + t7700: consolidate code into test_no_missing_in_packs()

173 - + t7700: s/test -f/test_path_is_file/

174 - + t7700: move keywords onto their own line

175 - + t7700: remove spaces after redirect operators

176 - + t7700: drop redirections to /dev/null

177 - + t7501: stop losing return codes of git commands

178 - + t7501: remove spaces after redirect operators

179 - + t5703: stop losing return codes of git commands

180 - + t5703: simplify one-time-sed generation logic

181 - + t5317: use ! grep to check for no matching lines

182 - + t5317: stop losing return codes of git commands

183 - + t4138: stop losing return codes of git commands

184 - + t4015: use test_write_lines()

185 - + t4015: stop losing return codes of git commands

186 - + t3600: comment on inducing SIGPIPE in `git rm`

187 - + t3600: stop losing return codes of git commands

188 - + t3600: use test_line_count() where possible

189 - + t3301: stop losing return codes of git commands

190 - + t0090: stop losing return codes of git commands

191 - + t0014: remove git command upstream of pipe

192 - + apply-one-time-sed.sh: modernize style

193 - + lib-bash.sh: move `then` onto its own line

96 +* en/fill-directory-fixes (2019-12-20) 9 commits

97 + (merged to 'next' on 2019-12-20 at 671cf755f4)

98 + + dir.c: use st_add3() for allocation size

99 + (merged to 'next' on 2019-12-19 at 80ad3150d6)

100 + + dir: consolidate similar code in treat_directory()

101 + + dir: synchronize treat_leading_path() and read_directory_recursive()

102 + + dir: fix checks on common prefix directory

103 + + dir: break part of read_directory_recursive() out for reuse

104 + + dir: exit before wildcard fall-through if there is no wildcard

105 + + dir: remove stray quote character in comment

106 + + Revert "dir.c: make 'git-status --ignored' work within leading directories"

107 + + t3011: demonstrate directory traversal failures

108

195 - Test cleanup.

109 + Assorted fixes to the directory traversal API.

110

111

198 -* dr/branch-usage-casefix (2019-12-09) 1 commit

199 - (merged to 'next' on 2019-12-10 at ad8a629fc6)

200 - + l10n: minor case fix in 'git branch' '--unset-upstream' description

112 +* ja/doc-markup-cleanup (2019-12-13) 2 commits

113 + (merged to 'next' on 2019-12-19 at 61abb4a06d)

114 + + doc: indent multi-line items in list

115 + + doc: remove non pure ASCII characters

116

202 - Message fix.

117 + Doc cleanup.

118

119

205 -* ds/commit-graph-delay-gen-progress (2019-11-27) 2 commits

206 - (merged to 'next' on 2019-12-05 at 9252a4b1b6)

207 - + commit-graph: use start_delayed_progress()

208 - + progress: create GIT_PROGRESS_DELAY

120 +* jc/drop-gen-hdrs (2019-12-13) 1 commit

121 + (merged to 'next' on 2019-12-19 at 4867cc601b)

122 + + Makefile: drop GEN_HDRS

123

210 - One kind of progress messages were always given during commit-graph

211 - generation, instead of following the "if it takes more than two

212 - seconds, show progress" pattern, which has been corrected.

124 + Code cleanup.

125

126

215 -* em/test-skip-regex-illseq (2019-11-30) 1 commit

216 - (merged to 'next' on 2019-12-05 at 85c7940aeb)

217 - + t4210: skip i18n tests that don't work on FreeBSD

127 +* js/add-p-in-c (2019-12-13) 19 commits

128 + (merged to 'next' on 2019-12-19 at c0deed90ab)

129 + + built-in add -p: show helpful hint when nothing can be staged

130 + + built-in add -p: only show the applicable parts of the help text

131 + + built-in add -p: implement the 'q' ("quit") command

132 + + built-in add -p: implement the '/' ("search regex") command

133 + + built-in add -p: implement the 'g' ("goto") command

134 + + built-in add -p: implement hunk editing

135 + + strbuf: add a helper function to call the editor "on an strbuf"

136 + + built-in add -p: coalesce hunks after splitting them

137 + + built-in add -p: implement the hunk splitting feature

138 + + built-in add -p: show different prompts for mode changes and deletions

139 + + built-in app -p: allow selecting a mode change as a "hunk"

140 + + built-in add -p: handle deleted empty files

141 + + built-in add -p: support multi-file diffs

142 + + built-in add -p: offer a helpful error message when hunk navigation failed

143 + + built-in add -p: color the prompt and the help text

144 + + built-in add -p: adjust hunk headers as needed

145 + + built-in add -p: show colored hunks by default

146 + + built-in add -i: wire up the new C code for the `patch` command

147 + + built-in add -i: start implementing the `patch` functionality in C

148 + (this branch is used by js/patch-mode-in-others-in-c.)

149

219 - Test portability fix.

150 + The effort to move "git-add--interactive" to C continues.

151

152

222 -* hi/gpg-use-check-signature (2019-11-30) 1 commit

223 - (merged to 'next' on 2019-12-05 at 35fc8e839a)

224 - + gpg-interface: prefer check_signature() for GPG verification

153 +* ln/userdiff-elixir (2019-12-13) 1 commit

154 + (merged to 'next' on 2019-12-17 at fcd1f5f18b)

155 + + userdiff: remove empty subexpression from elixir regex

156

226 - Hide lower-level verify_signed-buffer() API as a pure helper to

227 - implement the public check_signature() function, in order to

228 - encourage new callers to use the correct and more strict

229 - validation.

157 + Hotfix.

158

159

232 -* hi/grep-do-not-return-void (2019-11-30) 1 commit

233 - (merged to 'next' on 2019-12-02 at 4409c73cfa)

234 - + grep: don't return an expression from pcre2_free()

160 +* mr/bisect-save-pointer-to-const-string (2019-12-17) 1 commit

161 + (merged to 'next' on 2019-12-19 at 03bb33ae74)

162 + + bisect--helper: convert `*_warning` char pointers to char arrays.

163

164 Code cleanup.

165

166

239 -* hw/doc-in-header (2019-11-18) 20 commits

240 - (merged to 'next' on 2019-12-10 at 75ae310f9a)

241 - + trace2: move doc to trace2.h

242 - + submodule-config: move doc to submodule-config.h

243 - + tree-walk: move doc to tree-walk.h

244 - + trace: move doc to trace.h

245 - + run-command: move doc to run-command.h

246 - + parse-options: add link to doc file in parse-options.h

247 - + credential: move doc to credential.h

248 - + argv-array: move doc to argv-array.h

249 - + cache: move doc to cache.h

250 - + sigchain: move doc to sigchain.h

251 - + pathspec: move doc to pathspec.h

252 - + revision: move doc to revision.h

253 - + attr: move doc to attr.h

254 - + refs: move doc to refs.h

255 - + remote: move doc to remote.h and refspec.h

256 - + sha1-array: move doc to sha1-array.h

257 - + merge: move doc to ll-merge.h

258 - + graph: move doc to graph.h and graph.c

259 - + dir: move doc to dir.h

260 - + diff: move doc to diff.h and diffcore.h

261 -

262 - Move material from Documentation/technical/api-*.txt to header

263 - files.

264 -

265 -

266 -* jk/lore-is-the-archive (2019-11-30) 2 commits

267 - (merged to 'next' on 2019-12-02 at 603a2b0105)

268 - + doc: replace public-inbox links with lore.kernel.org

269 - + doc: recommend lore.kernel.org over public-inbox.org

270 - (this branch is used by dl/lore-is-the-archive.)

271 -

272 - Doc update for the mailing list archiving and nntp service.

273 -

274 -

275 -* jk/perf-wo-git-dot-pm (2019-11-27) 1 commit

276 - (merged to 'next' on 2019-12-05 at 6d9e3930ec)

277 - + t/perf: don't depend on Git.pm

167 +* mr/bisect-use-after-free (2019-12-11) 1 commit

168 + (merged to 'next' on 2019-12-17 at 64cd5c4622)

169 + + bisect--helper: avoid use-after-free

170

279 - Test cleanup.

171 + Use-after-free fix.

172

173

282 -* jk/send-pack-check-negative-with-quick (2019-11-30) 1 commit

283 - (merged to 'next' on 2019-12-02 at 2b01214601)

284 - + send-pack: use OBJECT_INFO_QUICK to check negative objects

174 +* pb/submodule-doc-xref (2019-12-11) 1 commit

175 + (merged to 'next' on 2019-12-19 at 3b52089f77)

176 + + gitmodules: link to gitsubmodules guide

177

286 - Performance tweak on "git push" into a repository with many refs

287 - that point at objects we have never heard of.

178 + Doc update.

179

180

290 -* js/add-i-a-bit-more-tests (2019-12-06) 7 commits

291 - (merged to 'next' on 2019-12-10 at d7ffb75a43)

292 - + apply --allow-overlap: fix a corner case

293 - + git add -p: use non-zero exit code when the diff generation failed

294 - + t3701: verify that the diff.algorithm config setting is handled

295 - + t3701: verify the shown messages when nothing can be added

296 - + t3701: add a test for the different `add -p` prompts

297 - + t3701: avoid depending on the TTY prerequisite

298 - + t3701: add a test for advanced split-hunk editing

299 - (this branch uses js/builtin-add-i-cmds.)

181 +* ra/t5150-depends-on-perl (2019-11-27) 1 commit

182 + (merged to 'next' on 2019-12-16 at 69bb280692)

183 + + t5150: skip request-pull test if Perl is disabled

184

301 - Test coverage update in preparation for further work on "git add -i".

185 + Some Porcelain commands are written in Perl, and tests on them are

186 + expected not to work when the platform lacks a working perl.

187

188

304 -* js/builtin-add-i-cmds (2019-12-01) 9 commits

305 - (merged to 'next' on 2019-12-05 at 30cfe5c15d)

306 - + built-in add -i: offer the `quit` command

307 - + built-in add -i: re-implement the `diff` command

308 - + built-in add -i: implement the `patch` command

309 - + built-in add -i: re-implement `add-untracked` in C

310 - + built-in add -i: re-implement `revert` in C

311 - + built-in add -i: implement the `update` command

312 - + built-in add -i: prepare for multi-selection commands

313 - + built-in add -i: allow filtering the modified files list

314 - + add-interactive: make sure to release `rev.prune_data`

315 - (this branch is used by js/add-i-a-bit-more-tests.)

189 +* rb/p4-lfs (2019-12-11) 1 commit

190 + (merged to 'next' on 2019-12-19 at 0e6e76a524)

191 + + git-p4: honor lfs.storage configuration variable

192

317 - "git add -i" that is getting rewritten in C has been extended to

318 - cover subcommands other than the "patch".

193 + "git p4" used to ignore lfs.storage configuration variable, which

194 + has been corrected.

195

196

321 -* js/mingw-inherit-only-std-handles (2019-12-02) 6 commits

322 - (merged to 'next' on 2019-12-05 at 289f13054b)

323 - + mingw: forbid translating ERROR_SUCCESS to an errno value

324 - (merged to 'next' on 2019-12-02 at 798a952eca)

325 - + mingw: do set `errno` correctly when trying to restrict handle inheritance

326 - (merged to 'next' on 2019-11-27 at 4736894af6)

327 - + mingw: restrict file handle inheritance only on Windows 7 and later

328 - + mingw: spawned processes need to inherit only standard handles

329 - + mingw: work around incorrect standard handles

330 - + mingw: demonstrate that all file handles are inherited by child processes

197 +* rs/ref-read-cleanup (2019-12-11) 2 commits

198 + (merged to 'next' on 2019-12-19 at 9eb61e8d53)

199 + + remote: pass NULL to read_ref_full() because object ID is not needed

200 + + refs: pass NULL to refs_read_ref_full() because object ID is not needed

201

332 - Work around a issue where a FD that is left open when spawning a

333 - child process and is kept open in the child can interfere with the

334 - operation in the parent process on Windows.

202 + Code cleanup.

203

204

337 -* js/t3404-indent-fix (2019-12-09) 1 commit

338 - (merged to 'next' on 2019-12-10 at 3a705a40d6)

339 - + t3404: fix indentation

205 +* rs/test-cleanup (2019-12-18) 5 commits

206 + (merged to 'next' on 2019-12-19 at 116f80bacd)

207 + + t6030: don't create unused file

208 + + t5580: don't create unused file

209 + + t3501: don't create unused file

210 + + t7004: don't create unused file

211 + + t4256: don't create unused file

212

213 Test cleanup.

214

215

344 -* jt/clone-recursesub-ref-advise (2019-12-03) 2 commits

345 - (merged to 'next' on 2019-12-05 at fc071dddfe)

346 - + submodule--helper: advise on fatal alternate error

347 - + Doc: explain submodule.alternateErrorStrategy

348 -

349 - The interaction between "git clone --recurse-submodules" and

350 - alternate object store was ill-designed. The documentation and

351 - code have been taught to make more clear recommendations when the

352 - users see failures.

353 -

354 -

355 -* po/bundle-doc-clonable (2019-10-21) 1 commit

356 - (merged to 'next' on 2019-12-02 at bd7fa24ad6)

357 - + Doc: Bundle file usage

358 -

359 - Doc update.

360 -

361 -

362 -* ra/rebase-i-more-options (2019-11-25) 7 commits

363 - (merged to 'next' on 2019-11-27 at e8a6d1e281)

364 - + rebase -i: finishing touches to --reset-author-date

365 - + rebase: add --reset-author-date

366 - + rebase -i: support --ignore-date

367 - + sequencer: rename amend_author to author_to_rename

368 - + rebase -i: support --committer-date-is-author-date

369 - + sequencer: allow callers of read_author_script() to ignore fields

370 - + rebase -i: add --ignore-whitespace flag

371 -

372 - "git rebase -i" learned a few options that are known by "git

373 - rebase" proper.

374 -

375 -

376 -* rs/archive-zip-code-cleanup (2019-12-09) 1 commit

377 - (merged to 'next' on 2019-12-10 at 5a0b530805)

378 - + archive-zip: use enum for compression method

379 -

380 - Code cleanup.

381 -

382 -

383 -* rs/commit-export-env-simplify (2019-12-09) 1 commit

384 - (merged to 'next' on 2019-12-10 at 591b24162c)

385 - + commit: use strbuf_add() to add a length-limited string

216 +* rs/xdiff-ignore-ws-w-func-context (2019-12-19) 1 commit

217 + (merged to 'next' on 2019-12-19 at 9e0cb7aa55)

218 + + t4015: improve coverage of function context test

219

387 - Code cleanup.

220 + Extend test coverage for a recent fix.

221

222

390 -* rs/patch-id-use-oid-to-hex (2019-12-09) 1 commit

391 - (merged to 'next' on 2019-12-10 at cf403a83da)

392 - + patch-id: use oid_to_hex() to print multiple object IDs

223 +* sg/name-rev-wo-recursion (2019-12-09) 14 commits

224 + (merged to 'next' on 2019-12-16 at ce57cd054f)

225 + + name-rev: cleanup name_ref()

226 + + name-rev: eliminate recursion in name_rev()

227 + + name-rev: use 'name->tip_name' instead of 'tip_name'

228 + + name-rev: drop name_rev()'s 'generation' and 'distance' parameters

229 + + name-rev: restructure creating/updating 'struct rev_name' instances

230 + + name-rev: restructure parsing commits and applying date cutoff

231 + + name-rev: pull out deref handling from the recursion

232 + + name-rev: extract creating/updating a 'struct name_rev' into a helper

233 + + t6120: add a test to cover inner conditions in 'git name-rev's name_rev()

234 + + name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation

235 + + name-rev: avoid unnecessary cast in name_ref()

236 + + name-rev: use strbuf_strip_suffix() in get_rev_name()

237 + + t6120-describe: modernize the 'check_describe' helper

238 + + t6120-describe: correct test repo history graph in comment

239

394 - Code cleanup.

240 + Redo "git name-rev" to avoid recursive calls.

241

242 +--------------------------------------------------

243 +[New Topics]

244

397 -* rs/simplify-prepare-cmd (2019-11-27) 1 commit

398 - (merged to 'next' on 2019-12-02 at 12e1a9e935)

399 - + run-command: use prepare_git_cmd() in prepare_cmd()

245 +* hw/commit-advise-while-rejecting (2019-12-19) 1 commit

246 + - commit: honor advice.statusHints when rejecting an empty commit

247

401 - Code cleanup.

248 + "git commit" gives output similar to "git status" when there is

249 + nothing to commit, but without honoring the advise.statusHints

250 + configuration variable, which has been corrected.

251

252

404 -* rs/use-skip-prefix-more (2019-11-27) 5 commits

405 - (merged to 'next' on 2019-12-02 at a2124db23e)

406 - + name-rev: use skip_prefix() instead of starts_with()

407 - + push: use skip_prefix() instead of starts_with()

408 - + shell: use skip_prefix() instead of starts_with()

409 - + fmt-merge-msg: use skip_prefix() instead of starts_with()

410 - + fetch: use skip_prefix() instead of starts_with()

253 +* yz/p4-py3 (2019-12-17) 14 commits

254 + - ci: also run linux-gcc pipeline with python3.5 environment

255 + - git-p4: use python3's input() everywhere

256 + - git-p4: simplify regex pattern generation for parsing diff-tree

257 + - git-p4: use dict.items() iteration for python3 compatibility

258 + - git-p4: use functools.reduce instead of reduce

259 + - git-p4: fix freezing while waiting for fast-import progress

260 + - git-p4: use marshal format version 2 when sending to p4

261 + - git-p4: open .gitp4-usercache.txt in text mode

262 + - git-p4: convert path to unicode before processing them

263 + - git-p4: encode/decode communication with git for python3

264 + - git-p4: encode/decode communication with p4 for python3

265 + - git-p4: remove string type aliasing

266 + - git-p4: change the expansion test from basestring to list

267 + - git-p4: make python2.7 the oldest supported version

268

412 - Code cleanup.

269 + Update "git p4" to work with Python 3.

270

271

415 -* rs/xdiff-ignore-ws-w-func-context (2019-12-05) 1 commit

416 - (merged to 'next' on 2019-12-06 at e0522318ac)

417 - + xdiff: unignore changes in function context

272 +* hi/gpg-mintrustlevel (2019-12-24) 1 commit

273 + - gpg-interface: add minTrustLevel as a configuration option

274

419 - The "diff" machinery learned not to lose added/removed blank lines

420 - in the context when --ignore-blank-lines and --function-context are

421 - used at the same time.

275 + gpg.minTrustLevel configuration variable has been introduced to

276 + tell various signature verification codepaths the required minimum

277 + trust level.

278

279 + Will merge to 'next'.

280

424 -* sg/assume-no-todo-update-in-cherry-pick (2019-11-24) 1 commit

425 - (merged to 'next' on 2019-11-27 at 6908186f85)

426 - + sequencer: don't re-read todo for revert and cherry-pick

281

428 - While running "revert" or "cherry-pick --edit" for multiple

429 - commits, a recent regression incorrectly detected "nothing to

430 - commit, working tree clean", instead of replaying the commits,

431 - which has been corrected.

282 +* sg/completion-worktree (2019-12-19) 6 commits

283 + (merged to 'next' on 2019-12-25 at 42c895ab3b)

284 + + completion: list paths and refs for 'git worktree add'

285 + + completion: list existing working trees for 'git worktree' subcommands

286 + + completion: simplify completing 'git worktree' subcommands and options

287 + + completion: return the index of found word from __git_find_on_cmdline()

288 + + completion: clean up the __git_find_on_cmdline() helper function

289 + + t9902-completion: add tests for the __git_find_on_cmdline() helper

290

291 + The command line completion (in contrib/) learned to complete

292 + subcommands and arguments to "git worktree".

293

434 -* sg/osx-force-gcc-9 (2019-11-29) 1 commit

435 - (merged to 'next' on 2019-12-02 at 4916f80e5e)

436 - + ci: build Git with GCC 9 in the 'osx-gcc' build job

294 + Will cook in 'next'.

295

438 - TravisCI update.

296

297 +* dl/credential-netrc (2019-12-20) 2 commits

298 + (merged to 'next' on 2019-12-25 at 1fd27f81ac)

299 + + contrib/credential/netrc: work outside a repo

300 + + contrib/credential/netrc: make PERL_PATH configurable

301

441 -* sg/t9300-robustify (2019-12-06) 2 commits

442 - (merged to 'next' on 2019-12-10 at dee7a9a945)

443 - + t9300-fast-import: don't hang if background fast-import exits too early

444 - + t9300-fast-import: store the PID in a variable instead of pidfile

302 + Sample credential helper for using .netrc has been updated to work

303 + out of the box.

304

446 - The test on "fast-import" used to get stuck when "fast-import" died

447 - in the middle.

305 + Will cook in 'next'.

306

307

450 -* sg/test-squelch-noise-in-commit-bulk (2019-11-27) 1 commit

451 - (merged to 'next' on 2019-12-05 at 7819efee07)

452 - + test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'

308 +* dl/test-must-fail-fixes (2019-12-20) 15 commits

309 + (merged to 'next' on 2019-12-25 at 3ef7c70bc5)

310 + + t1507: inline full_name()

311 + + t1507: run commands within test_expect_success

312 + + t1507: stop losing return codes of git commands

313 + + t1501: remove use of `test_might_fail cp`

314 + + t1409: use test_path_is_missing()

315 + + t1409: let sed open its own input file

316 + + t1307: reorder `nongit test_must_fail`

317 + + t1306: convert `test_might_fail rm` to `rm -f`

318 + + t0020: use ! check_packed_refs_marked

319 + + t0020: don't use `test_must_fail has_cr`

320 + + t0003: don't use `test_must_fail attr_check`

321 + + t0003: use test_must_be_empty()

322 + + t0003: use named parameters in attr_check()

323 + + t0000: replace test_must_fail with run_sub_test_lib_test_err()

324 + + t/lib-git-p4: use test_path_is_missing()

325

454 - Code cleanup.

326 + Test clean-up.

327

328 + Will cook in 'next'.

329

457 -* tg/perf-remove-stale-result (2019-11-27) 1 commit

458 - (merged to 'next' on 2019-12-05 at 466f07fb63)

459 - + perf-lib: use a single filename for all measurement types

330

461 - PerfTest fix to avoid stale result mixed up with the latest round

462 - of test results.

331 +* em/freebsd-cirrus-ci (2019-12-20) 1 commit

332 + (merged to 'next' on 2019-12-25 at b6b609fbf0)

333 + + CI: add FreeBSD CI support via Cirrus-CI

334

464 ---------------------------------------------------

465 -[New Topics]

335 + Will merge to 'master'.

336

467 -* pw/advise-rebase-skip (2019-12-06) 9 commits

468 - - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts

469 - - rebase: fix advice when a fixup creates an empty commit

470 - - commit: give correct advice for empty commit during a rebase

471 - - commit: encapsulate determine_whence() for sequencer

472 - - commit: use enum value for multiple cherry-picks

473 - - sequencer: write CHERRY_PICK_HEAD for reword and edit

474 - - cherry-pick: check commit error messages

475 - - cherry-pick: add test for `--skip` advice in `git commit`

476 - - t3404: use test_cmp_rev

337

478 - The mechanism to prevent "git commit" from making an empty commit

479 - or amending during an interrupted cherry-pick was broken during the

480 - rewrite of "git rebase" in C, which has been corrected.

338 +* en/rebase-backend (2019-12-26) 15 commits

339 + - rebase: change the default backend from "am" to "merge"

340 + - rebase: make the backend configurable via config setting

341 + - rebase tests: repeat some tests using the merge backend instead of am

342 + - rebase tests: mark tests specific to the am-backend with --am

343 + - git-prompt: change the prompt for interactive-based rebases

344 + - rebase: add an --am option

345 + - rebase: move incompatibility checks between backend options a bit earlier

346 + - git-rebase.txt: add more details about behavioral differences of backends

347 + - rebase: allow more types of rebases to fast-forward

348 + - t3432: make these tests work with either am or merge backends

349 + - rebase: fix handling of restrict_revision

350 + - rebase: make sure to pass along the quiet flag to the sequencer

351 + - rebase, sequencer: remove the broken GIT_QUIET handling

352 + - t3406: simplify an already simple test

353 + - rebase: extend the options for handling of empty commits

354

482 - Needs review.

483 - The tip two are still RFC.

355 + "git rebase" has learned to use the sequencer backend by default,

356 + while allowing "--am" option to go back to the traditional "am"

357 + backend.

358

359

486 -* dl/format-patch-notes-config-fixup (2019-12-13) 7 commits

487 - (merged to 'next' on 2019-12-16 at e4da5b93bb)

488 - + notes: break set_display_notes() into smaller functions

489 - + config/format.txt: clarify behavior of multiple format.notes

490 - (merged to 'next' on 2019-12-10 at 2d8830090f)

491 - + format-patch: move git_config() before repo_init_revisions()

492 - + format-patch: use --notes behavior for format.notes

493 - + notes: extract logic into set_display_notes()

494 - + notes: create init_display_notes() helper

495 - + notes: rename to load_display_notes()

360 +* en/rebase-signoff-fix (2019-12-20) 1 commit

361 + (merged to 'next' on 2019-12-25 at 96d84920b5)

362 + + rebase: fix saving of --signoff state for am-based rebases

363

497 - "git format-patch" can take a set of configured format.notes values

498 - to specify which notes refs to use in the log message part of the

499 - output. The behaviour of this was not consistent with multiple

500 - --notes command line options, which has been corrected.

364 + "git rebase --signoff" stopped working when the command was written

365 + in C, which has been corrected.

366

367 Will merge to 'master'.

368

369

505 -* bk/p4-misc-usability (2019-12-16) 4 commits

506 - - git-p4: failure because of RCS keywords should show help

507 - - git-p4: wrap patchRCSKeywords test to revert changes on failure

508 - - git-p4: show detailed help when parsing options fail

509 - - git-p4: yes/no prompts should sanitize user text

510 -

511 - Miscellaneous small UX improvements on "git-p4".

370 +* bc/hash-independent-tests-part-7 (2019-12-24) 20 commits

371 + - t5604: make hash independent

372 + - t5601: switch into repository to hash object

373 + - t5562: use $ZERO_OID

374 + - t5540: make hash size independent

375 + - t5537: make hash size independent

376 + - t5530: compute results based on object length

377 + - t5512: abstract away SHA-1-specific constants

378 + - t5510: make hash size independent

379 + - t5504: make hash algorithm independent

380 + - t5324: make hash size independent

381 + - t5319: make test work with SHA-256

382 + - t5319: change invalid offset for SHA-256 compatibility

383 + - t5318: update for SHA-256

384 + - t4300: abstract away SHA-1-specific constants

385 + - t4204: make hash size independent

386 + - t4202: abstract away SHA-1-specific constants

387 + - t4200: make hash size independent

388 + - t4134: compute appropriate length constant

389 + - t4066: compute index line in diffs

390 + - t4054: make hash-size independent

391 +

392 + Preparation of test scripts for the day when the object names will

393 + use SHA-256 continues.

394

395 Will merge to 'next'.

514 - cf. <xmqq8sncj991.fsf@gitster-ct.c.googlers.com>

396

397

517 -* en/fill-directory-fixes (2019-12-11) 8 commits

518 - - dir: consolidate similar code in treat_directory()

519 - - dir: synchronize treat_leading_path() and read_directory_recursive()

520 - - dir: fix checks on common prefix directory

521 - - dir: break part of read_directory_recursive() out for reuse

522 - - dir: exit before wildcard fall-through if there is no wildcard

523 - - dir: remove stray quote character in comment

524 - - Revert "dir.c: make 'git-status --ignored' work within leading directories"

525 - - t3011: demonstrate directory traversal failures

398 +* js/mingw-reserved-filenames (2019-12-21) 2 commits

399 + - mingw: refuse paths containing reserved names

400 + - mingw: short-circuit the conversion of `/dev/null` to UTF-16

401

527 - Assorted fixes to the directory traversal API.

402 + Forbid pathnames that the platform's filesystem cannot represent on

403 + MinGW.

404

529 - Will merge to 'next'.

530 -

531 -

532 -* ja/doc-markup-cleanup (2019-12-13) 2 commits

533 - - doc: indent multi-line items in list

534 - - doc: remove non pure ASCII characters

405 + Will merge to 'next' and then to 'master'.

406

536 - Doc cleanup.

407

538 - Will merge to 'next'.

408 +* bk/p4-exception-cleanup (2019-12-16) 2 commits

409 + - git-p4: failure because of RCS keywords should show help

410 + - git-p4: wrap patchRCSKeywords test to revert changes on failure

411 + (this branch uses bk/p4-misc-usability.)

412

413

541 -* jc/drop-gen-hdrs (2019-12-13) 1 commit

542 - - Makefile: drop GEN_HDRS

414 +* ew/packfile-syscall-optim (2019-12-26) 2 commits

415 + - packfile: replace lseek+read with pread

416 + - packfile: remove redundant fcntl F_GETFD/F_SETFD

417

418 Code cleanup.

419

420 Will merge to 'next'.

421

422

549 -* js/add-p-in-c (2019-12-13) 19 commits

550 - - built-in add -p: show helpful hint when nothing can be staged

551 - - built-in add -p: only show the applicable parts of the help text

552 - - built-in add -p: implement the 'q' ("quit") command

553 - - built-in add -p: implement the '/' ("search regex") command

554 - - built-in add -p: implement the 'g' ("goto") command

555 - - built-in add -p: implement hunk editing

556 - - strbuf: add a helper function to call the editor "on an strbuf"

557 - - built-in add -p: coalesce hunks after splitting them

558 - - built-in add -p: implement the hunk splitting feature

559 - - built-in add -p: show different prompts for mode changes and deletions

560 - - built-in app -p: allow selecting a mode change as a "hunk"

561 - - built-in add -p: handle deleted empty files

562 - - built-in add -p: support multi-file diffs

563 - - built-in add -p: offer a helpful error message when hunk navigation failed

564 - - built-in add -p: color the prompt and the help text

565 - - built-in add -p: adjust hunk headers as needed

566 - - built-in add -p: show colored hunks by default

567 - - built-in add -i: wire up the new C code for the `patch` command

568 - - built-in add -i: start implementing the `patch` functionality in C

569 - (this branch is used by js/patch-mode-in-others-in-c.)

423 +* jn/test-lint-one-shot-export-to-shell-function (2019-12-26) 2 commits

424 + - t/check-non-portable-shell: detect "FOO= shell_func", too

425 + - fetch test: avoid use of "VAR= cmd" with a shell function

426 + (this branch is used by jn/promote-proto2-to-default.)

427

571 - The effort to move "git-add--interactive" to C continues.

428 + The test-lint machinery knew to check "VAR=VAL shell_function"

429 + construct, but did not check "VAR= shell_funciton", which has been

430 + corrected.

431

432 Will merge to 'next'.

433

434

576 -* ln/userdiff-elixir (2019-12-13) 1 commit

577 - - userdiff: remove empty subexpression from elixir regex

578 -

579 - Hotfix.

580 -

581 - Will merge to 'next'.

435 +* js/add-p-leftover-bits (2019-12-24) 9 commits

436 + - ci: include the built-in `git add -i` in the `linux-gcc` job

437 + - built-in add -p: handle Escape sequences more efficiently

438 + - built-in add -p: handle Escape sequences in interactive.singlekey mode

439 + - built-in add -p: respect the `interactive.singlekey` config setting

440 + - terminal: add a new function to read a single keystroke

441 + - terminal: accommodate Git for Windows' default terminal

442 + - terminal: make the code of disable_echo() reusable

443 + - built-in add -p: handle diff.algorithm

444 + - built-in add -p: support interactive.diffFilter

445 + (this branch uses js/patch-mode-in-others-in-c.)

446

447

584 -* mr/bisect-use-after-free (2019-12-11) 1 commit

585 - - bisect--helper: avoid use-after-free

448 +* js/mingw-loosen-overstrict-tree-entry-checks (2019-12-26) 1 commit

449 + - mingw: only test index entries for backslashes, not tree entries

450

587 - Use-after-free fix.

451 + An earlier update to Git for Windows declared that a tree object is

452 + invalid if it has a path component with backslash in it, which was

453 + overly strict, which has been corrected. The only protection the

454 + Windows users need is to prevent such path (or any path that their

455 + filesystem cannot check out) from entering the index.

456

589 - Will merge to 'next'.

457

458

592 -* pb/submodule-doc-xref (2019-12-11) 1 commit

593 - - gitmodules: link to gitsubmodules guide

459 +* pb/clarify-line-log-doc (2019-12-26) 2 commits

460 + - doc: log, gitk: line-log arguments must exist in starting revision

461 + - doc: log, gitk: document accepted line-log diff formats

462

463 Doc update.

464

465 Will merge to 'next'.

466

467 +--------------------------------------------------

468 +[Stalled]

469

600 -* rb/p4-lfs (2019-12-11) 1 commit

601 - - git-p4: honor lfs.storage configuration variable

602 -

603 - "git p4" used to ignore lfs.storage configuration variable, which

604 - has been corrected.

605 -

606 - Will merge to 'next'.

607 -

470 +* ag/edit-todo-drop-check (2019-12-06) 2 commits

471 + - rebase-interactive: warn if commit is dropped with `rebase --edit-todo'

472 + - sequencer: move check_todo_list_from_file() to rebase-interactive.c

473

609 -* rs/ref-read-cleanup (2019-12-11) 2 commits

610 - - remote: pass NULL to read_ref_full() because object ID is not needed

611 - - refs: pass NULL to refs_read_ref_full() because object ID is not needed

474 + Allow the rebase.missingCommitsCheck configuration to kick in when

475 + "rebase --edit-todo" and "rebase --continue" restarts the procedure.

476

613 - Code cleanup.

477 + Broken.

478 + cf. <64aa4049-ee35-df4c-1e6c-80707f4f9070@gmail.com>

479

615 - Will merge to 'next'.

480

481 +* es/pathspec-f-f-grep (2019-12-13) 1 commit

482 + - grep: support the --pathspec-from-file option

483

618 -* js/patch-mode-in-others-in-c (2019-12-17) 7 commits

619 - - commit --interactive: make it work with the built-in `add -i`

620 - - built-in add -p: implement the "worktree" patch modes

621 - - built-in add -p: implement the "checkout" patch modes

622 - - built-in stash: use the built-in `git add -p` if so configured

623 - - legacy stash -p: respect the add.interactive.usebuiltin setting

624 - - built-in add -p: implement the "stash" and "reset" patch modes

625 - - built-in add -p: prepare for patch modes other than "stage"

626 - (this branch uses js/add-p-in-c.)

484 + "git grep" learned the "--pathspec-from-file" command line

485 + option.

486

628 - The effort to move "git-add--interactive" to C continues.

487 + Waiting for review responses.

488 + cf. <20191204203911.237056-1-emilyshaffer@google.com>

489

630 ---------------------------------------------------

631 -[Stalled]

490

491 * at/rebase-fork-point-regression-fix (2019-12-09) 1 commit

492 - rebase: fix --fork-point with short refname

@@ -639,6 +497,7 @@ of the repositories listed at

497 Was waiting for discussion to settle.

498 cf. <CAPig+cQ-3Ds41hr91fRo_GvuFMTP7zNVJtaSqi-Yccq4Pk-8Qg@mail.gmail.com>

499

500 +

501 * ma/config-bool-valex (2019-11-14) 8 commits

502 - builtin/config: die if "value_regex" doesn't canonicalize as boolean

503 - builtin/config: warn if "value_regex" doesn't canonicalize as boolean

@@ -749,103 +608,49 @@ of the repositories listed at

608 --------------------------------------------------

609 [Cooking]

610

752 -* ra/t5150-depends-on-perl (2019-11-27) 1 commit

753 - (merged to 'next' on 2019-12-16 at 69bb280692)

754 - + t5150: skip request-pull test if Perl is disabled

611 +* pw/advise-rebase-skip (2019-12-06) 9 commits

612 + - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts

613 + - rebase: fix advice when a fixup creates an empty commit

614 + - commit: give correct advice for empty commit during a rebase

615 + - commit: encapsulate determine_whence() for sequencer

616 + - commit: use enum value for multiple cherry-picks

617 + - sequencer: write CHERRY_PICK_HEAD for reword and edit

618 + - cherry-pick: check commit error messages

619 + - cherry-pick: add test for `--skip` advice in `git commit`

620 + - t3404: use test_cmp_rev

621

756 - Some Porcelain commands are written in Perl, and tests on them are

757 - expected not to work when the platform lacks a working perl.

622 + The mechanism to prevent "git commit" from making an empty commit

623 + or amending during an interrupted cherry-pick was broken during the

624 + rewrite of "git rebase" in C, which has been corrected.

625

759 - Will merge to 'master'.

626 + Needs review.

627 + The tip two are still RFC.

628

629

762 -* am/pathspec-f-f-checkout (2019-12-04) 7 commits

763 - (merged to 'next' on 2019-12-10 at 6b018bd997)

764 - + checkout, restore: support the --pathspec-from-file option

765 - + doc: restore: synchronize <pathspec> description

766 - + doc: checkout: synchronize <pathspec> description

767 - + doc: checkout: fix broken text reference

768 - + doc: checkout: remove duplicate synopsis

769 - + add: support the --pathspec-from-file option

770 - + cmd_add: prepare for next patch

630 +* bk/p4-misc-usability (2019-12-16) 2 commits

631 + (merged to 'next' on 2019-12-25 at b4789bcb08)

632 + + git-p4: show detailed help when parsing options fail

633 + + git-p4: yes/no prompts should sanitize user text

634 + (this branch is used by bk/p4-exception-cleanup.)

635

772 - A few more commands learned the "--pathspec-from-file" command line

773 - option.

636 + Miscellaneous small UX improvements on "git-p4".

637

638 Will merge to 'master'.

639

640

778 -* es/pathspec-f-f-grep (2019-12-13) 1 commit

779 - - grep: support the --pathspec-from-file option

780 -

781 - "git grep" learned the "--pathspec-from-file" command line

782 - option.

783 -

784 - Waiting for review responses.

785 - cf. <20191204203911.237056-1-emilyshaffer@google.com>

786 -

787 -

788 -* ag/edit-todo-drop-check (2019-12-06) 2 commits

789 - - rebase-interactive: warn if commit is dropped with `rebase --edit-todo'

790 - - sequencer: move check_todo_list_from_file() to rebase-interactive.c

791 -

792 - Allow the rebase.missingCommitsCheck configuration to kick in when

793 - "rebase --edit-todo" and "rebase --continue" restarts the procedure.

794 -

795 - Broken.

796 - cf. <64aa4049-ee35-df4c-1e6c-80707f4f9070@gmail.com>

797 -

798 -

799 -* ds/sparse-cone (2019-12-13) 20 commits

800 - (merged to 'next' on 2019-12-16 at c840c1d816)

801 - + sparse-checkout: respect core.ignoreCase in cone mode

802 - + sparse-checkout: check for dirty status

803 - + sparse-checkout: update working directory in-process for 'init'

804 - + sparse-checkout: cone mode should not interact with .gitignore

805 - + sparse-checkout: write using lockfile

806 - + sparse-checkout: use in-process update for disable subcommand

807 - + sparse-checkout: update working directory in-process

808 - + sparse-checkout: sanitize for nested folders

809 - + unpack-trees: add progress to clear_ce_flags()

810 - + unpack-trees: hash less in cone mode

811 - + sparse-checkout: init and set in cone mode

812 - + sparse-checkout: use hashmaps for cone patterns

813 - + sparse-checkout: add 'cone' mode

814 - + trace2: add region in clear_ce_flags

815 - + sparse-checkout: create 'disable' subcommand

816 - + sparse-checkout: add '--stdin' option to set subcommand

817 - + sparse-checkout: 'set' subcommand

818 - + clone: add --sparse mode

819 - + sparse-checkout: create 'init' subcommand

820 - + sparse-checkout: create builtin with 'list' subcommand

821 -

822 - Management of sparsely checked-out working tree has gained a

823 - dedicated "sparse-checkout" command.

824 -

825 - Possibly wait for Szeder?

826 - cf. <bea26b66-ac52-8f0e-9557-c958db7be628@gmail.com>

827 -

828 -

829 -* sg/name-rev-wo-recursion (2019-12-09) 14 commits

830 - (merged to 'next' on 2019-12-16 at ce57cd054f)

831 - + name-rev: cleanup name_ref()

832 - + name-rev: eliminate recursion in name_rev()

833 - + name-rev: use 'name->tip_name' instead of 'tip_name'

834 - + name-rev: drop name_rev()'s 'generation' and 'distance' parameters

835 - + name-rev: restructure creating/updating 'struct rev_name' instances

836 - + name-rev: restructure parsing commits and applying date cutoff

837 - + name-rev: pull out deref handling from the recursion

838 - + name-rev: extract creating/updating a 'struct name_rev' into a helper

839 - + t6120: add a test to cover inner conditions in 'git name-rev's name_rev()

840 - + name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation

841 - + name-rev: avoid unnecessary cast in name_ref()

842 - + name-rev: use strbuf_strip_suffix() in get_rev_name()

843 - + t6120-describe: modernize the 'check_describe' helper

844 - + t6120-describe: correct test repo history graph in comment

641 +* js/patch-mode-in-others-in-c (2019-12-21) 7 commits

642 + - commit --interactive: make it work with the built-in `add -i`

643 + - built-in add -p: implement the "worktree" patch modes

644 + - built-in add -p: implement the "checkout" patch modes

645 + - built-in stash: use the built-in `git add -p` if so configured

646 + - legacy stash -p: respect the add.interactive.usebuiltin setting

647 + - built-in add -p: implement the "stash" and "reset" patch modes

648 + - built-in add -p: prepare for patch modes other than "stage"

649 + (this branch is used by js/add-p-leftover-bits.)

650

846 - Redo "git name-rev" to avoid recursive calls.

651 + The effort to move "git-add--interactive" to C continues.

652

848 - Will merge to 'master'.

653 + Will merge to 'next'.

654

655

656 * jk/packfile-reuse-cleanup (2019-10-23) 9 commits

What's cooking (2019/11 #05)