5427912c74 · 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 (Sep 2018, #01; Tue, 4)

4 -X-master-at: c05048d43925ab8edcb36663752c2b4541911231

5 -X-next-at: 5ba43deb5a82c56b2533ebd026d15666a2ce5c5a

3 +Subject: What's cooking in git.git (Sep 2018, #02; Tue, 11)

4 +X-master-at: 1d4361b0f344188ab5eec6dcea01f61a3a3a1670

5 +X-next-at: e8095fc6352aeb4e2deee7c9f2e1aeda5253cc31

6

7 -What's cooking in git.git (Sep 2018, #01; Tue, 4)

7 +What's cooking in git.git (Sep 2018, #02; Tue, 11)

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

9

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

@@ -12,8 +12,10 @@ 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 -Git 2.19-rc2 is out. Hopefully the tip of 'master' is more or less

16 -identical to the final one without needing much updates.

15 +Git 2.19 is out. The tip of 'next' has not been rewound yet; it is

16 +a rare occasion for topics that would want to restart from a clean

17 +slate to do so, so please raise your hand if you think that a topic

18 +that is in 'next' should be ejected and given a chance to restart.

19

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

21 of the repositories listed at

@@ -21,82 +23,168 @@ of the repositories listed at

23 http://git-blame.blogspot.com/p/git-public-repositories.html

24

25 --------------------------------------------------

24 -[Graduated to "master"]

26 +[New Topics]

27 +

28 +* ab/commit-graph-progress (2018-09-11) 2 commits

29 + - commit-graph verify: add progress output

30 + - commit-graph write: add progress output

31 +

32 +

33 +* bw/protocol-v2 (2018-09-10) 1 commit

34 + - config: document value 2 for protocol.version

35 +

36 +

37 +* en/double-semicolon-fix (2018-09-05) 1 commit

38 + - Remove superfluous trailing semicolons

39 +

40

26 -* ab/portable (2018-08-27) 6 commits

27 - (merged to 'next' on 2018-08-27 at 37640e66ef)

28 - + tests: fix and add lint for non-portable grep --file

29 - + tests: fix version-specific portability issue in Perl JSON

30 - + tests: use shorter labels in chainlint.sed for AIX sed

31 - + tests: fix comment syntax in chainlint.sed for AIX sed

32 - + tests: fix and add lint for non-portable seq

33 - + tests: fix and add lint for non-portable head -c N

34 - (this branch is used by ab/portable-more.)

41 +* en/rerere-multi-stage-1-fix (2018-09-11) 2 commits

42 + - rerere: avoid buffer overrun

43 + - t4200: demonstrate rerere segfault on specially crafted merge

44

36 - Portability fix.

45

46 +* jc/wt-status-state-cleanup (2018-09-07) 1 commit

47 + - WIP: roll wt_status_state into wt_status and populate in the collect phase

48 + (this branch uses ss/wt-status-committable.)

49

39 -* ab/portable-more (2018-08-29) 2 commits

40 - (merged to 'next' on 2018-08-31 at d7b44993e4)

41 - + tests: fix non-portable iconv invocation

42 - + tests: fix non-portable "${var:-"str"}" construct

43 - (this branch uses ab/portable.)

50

45 - Portability fix.

51 +* jk/dev-build-format-security (2018-09-11) 1 commit

52 + - config.mak.dev: add -Wformat-security

53

54

48 -* ds/commit-graph-lockfile-fix (2018-08-30) 1 commit

49 - (merged to 'next' on 2018-09-04 at 0876e6ddcc)

50 - + commit: don't use generation numbers if not needed

55 +* jk/reopen-tempfile-truncate (2018-09-05) 1 commit

56 + - reopen_tempfile(): truncate opened file

57

52 - "git merge-base" in 2.19-rc1 has performance regression when the

53 - (experimental) commit-graph feature is in use, which has been

54 - mitigated.

58

59 +* jn/http-backend-content-length (2018-09-11) 2 commits

60 + - SQUASH???? perhaps after reflowing

61 + - http-backend: treat empty CONTENT_LENGTH as zero

62

57 -* en/directory-renames-nothanks (2018-08-30) 3 commits

58 - (merged to 'next' on 2018-08-31 at 91d663d688)

59 - + am: avoid directory rename detection when calling recursive merge machinery

60 - + merge-recursive: add ability to turn off directory rename detection

61 - + t3401: add another directory rename testcase for rebase and am

63

63 - Recent addition of "directory rename" heuristics to the

64 - merge-recursive backend makes the command susceptible to false

65 - positives and false negatives. In the context of "git am -3",

66 - which does not know about surrounding unmodified paths and thus

67 - cannot inform the merge machinery about the full trees involved,

68 - this risk is particularly severe. As such, the heuristic is

69 - disabled for "git am -3" to keep the machinery "more stupid but

70 - predictable".

64 +* js/mingw-o-append (2018-09-11) 2 commits

65 + - mingw: fix mingw_open_append to work with named pipes

66 + - t0051: test GIT_TRACE to a windows named pipe

67

68

73 -* es/chain-lint-more (2018-08-29) 1 commit

74 - (merged to 'next' on 2018-08-31 at d456090b62)

75 - + chainlint: match "quoted" here-doc tags

69 +* mk/http-backend-content-length (2018-09-11) 1 commit

70 + (merged to 'next' on 2018-09-11 at e8095fc635)

71 + + http-backend test: make empty CONTENT_LENGTH test more realistic

72

77 - The test linter code has learned that the end of here-doc mark

78 - "EOF" can be quoted in a double-quote pair, not just in a

79 - single-quote pair.

73

74 +* nd/test-tool (2018-09-11) 6 commits

75 + - Makefile: add a hint about TEST_BUILTINS_OBJS

76 + - t/helper: merge test-dump-fsmonitor into test-tool

77 + - t/helper: merge test-parse-options into test-tool

78 + - t/helper: merge test-pkt-line into test-tool

79 + - t/helper: merge test-dump-untracked-cache into test-tool

80 + - t/helper: keep test-tool command list sorted

81

82 -* es/freebsd-iconv-portability (2018-08-31) 1 commit

83 - (merged to 'next' on 2018-09-04 at 52baa37dd7)

84 - + config.mak.uname: resolve FreeBSD iconv-related compilation warning

82

86 - Build fix.

83 +* sb/diff-color-move-more (2018-09-11) 1 commit

84 + - diff: fix --color-moved-ws=allow-indentation-change

85

86

89 -* pw/rebase-i-author-script-fix (2018-08-07) 2 commits

90 - (merged to 'next' on 2018-08-31 at 7b9f485407)

91 - + sequencer: fix quoting in write_author_script

92 - + sequencer: handle errors from read_author_ident()

87 +* sb/string-list-remove-unused (2018-09-11) 1 commit

88 + - string-list: remove unused function print_string_list

89

94 - Recent "git rebase -i" update started to write bogusly formatted

95 - author-script, with a matching broken reading code. These are

96 - fixed.

90 +

91 +* sg/t3701-tighten-trace (2018-09-11) 1 commit

92 + - t3701-add-interactive: tighten the check of trace output

93 +

94 +

95 +* ss/wt-status-committable (2018-09-07) 4 commits

96 + - wt-status.c: set the committable flag in the collect phase

97 + - t7501: add test of "commit --dry-run --short"

98 + - wt-status: rename commitable to committable

99 + - wt-status.c: move has_unmerged earlier in the file

100 + (this branch is used by jc/wt-status-state-cleanup.)

101 +

102 +

103 +* tz/t5551-with-curl-7.61.1 (2018-09-11) 1 commit

104 + - t5551-http-fetch-smart.sh: sort cookies before comparing

105

106 --------------------------------------------------

99 -[New Topics]

107 +[Stalled]

108 +

109 +* sl/commit-dry-run-with-short-output-fix (2018-07-30) 4 commits

110 + . commit: fix exit code when doing a dry run

111 + . wt-status: teach wt_status_collect about merges in progress

112 + . wt-status: rename commitable to committable

113 + . t7501: add coverage for flags which imply dry runs

114 +

115 + "git commit --dry-run" gave a correct exit status even during a

116 + conflict resolution toward a merge, but it did not with the

117 + "--short" option, which has been corrected.

118 +

119 + Seems to break 7512, 3404 and 7060 in 'pu'.

120 +

121 +

122 +* ma/wrapped-info (2018-05-28) 2 commits

123 + - usage: prefix all lines in `vreportf()`, not just the first

124 + - usage: extract `prefix_suffix_lines()` from `advise()`

125 +

126 + An attempt to help making multi-line messages fed to warning(),

127 + error(), and friends more easily translatable.

128 +

129 + Will discard and wait for a cleaned-up rewrite.

130 + cf. <20180529213957.GF7964@sigill.intra.peff.net>

131 +

132 +

133 +* hn/bisect-first-parent (2018-04-21) 1 commit

134 + - bisect: create 'bisect_flags' parameter in find_bisection()

135 + (this branch is used by tb/bisect-first-parent.)

136 +

137 + Preliminary code update to allow passing more flags down the

138 + bisection codepath in the future.

139 +

140 + We do not add random code that does not have real users to our

141 + codebase, so let's have it wait until such a real code materializes

142 + before too long.

143 +

144 +

145 +* pb/bisect-helper-2 (2018-07-23) 8 commits

146 + - t6030: make various test to pass GETTEXT_POISON tests

147 + - bisect--helper: `bisect_start` shell function partially in C

148 + - bisect--helper: `get_terms` & `bisect_terms` shell function in C

149 + - bisect--helper: `bisect_next_check` shell function in C

150 + - bisect--helper: `check_and_set_terms` shell function in C

151 + - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()

152 + - bisect--helper: `bisect_write` shell function in C

153 + - bisect--helper: `bisect_reset` shell function in C

154 +

155 + Expecting a reroll.

156 + cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>

157 +

158 + I just rebased the topic to a newer base as it did not build

159 + standalone with the base I originally queued the topic on, but

160 + otherwise there is no update to address any of the review comments

161 + in the thread above---we are still waiting for a reroll.

162 +

163 +

164 +* jk/drop-ancient-curl (2017-08-09) 5 commits

165 + - http: #error on too-old curl

166 + - curl: remove ifdef'd code never used with curl >=7.19.4

167 + - http: drop support for curl < 7.19.4

168 + - http: drop support for curl < 7.16.0

169 + - http: drop support for curl < 7.11.1

170 +

171 + Some code in http.c that has bitrot is being removed.

172 +

173 + Expecting a reroll.

174 +

175 +

176 +* mk/use-size-t-in-zlib (2017-08-10) 1 commit

177 + . zlib.c: use size_t for size

178 +

179 + The wrapper to call into zlib followed our long tradition to use

180 + "unsigned long" for sizes of regions in memory, which have been

181 + updated to use "size_t".

182 +

183 + Needs resurrecting by making sure the fix is good and still applies

184 + (or adjusted to today's codebase).

185 +

186 +--------------------------------------------------

187 +[Cooking]

188

189 * ab/fetch-tags-noclobber (2018-08-31) 9 commits

190 - fetch: stop clobbering existing tags without --force

@@ -120,7 +208,8 @@ of the repositories listed at

208 still need to be treated carefully.

209

210

123 -* es/worktree-forced-ops-fix (2018-08-30) 9 commits

211 +* es/worktree-forced-ops-fix (2018-09-05) 10 commits

212 + - doc-diff: force worktree add

213 - worktree: delete .git/worktrees if empty after 'remove'

214 - worktree: teach 'remove' to override lock when --force given twice

215 - worktree: teach 'move' to override lock when --force given twice

@@ -131,8 +220,12 @@ of the repositories listed at

220 - worktree: move delete_git_dir() earlier in file for upcoming new callers

221 - worktree: don't die() in library function find_worktree()

222

134 - Various subcommands of "git worktree" take '--force' but did not

135 - behave sensibly, which has been corrected.

223 + Fix a bug in which the same path could be registered under multiple

224 + worktree entries if the path was missing (for instance, was removed

225 + manually). Also, as a convenience, expand the number of cases in

226 + which --force is applicable.

227 +

228 + Will merge to 'next'.

229

230

231 * jk/patch-corrupted-delta-fix (2018-08-30) 6 commits

@@ -150,11 +243,6 @@ of the repositories listed at

243 Will merge to 'next'.

244

245

153 -* jc/rebase-in-c-9-fixes (2018-09-04) 1 commit

154 - - rebase: re-add forgotten -k that stands for --keep-empty

155 - (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.)

156 -

157 -

246 * jk/pack-objects-with-bitmap-fix (2018-09-04) 4 commits

247 - pack-bitmap: drop "loaded" flag

248 - traverse_bitmap_commit_list(): don't free result

@@ -202,103 +290,6 @@ of the repositories listed at

290

291 Will merge to 'next'.

292

205 ---------------------------------------------------

206 -[Stalled]

207 -

208 -* sl/commit-dry-run-with-short-output-fix (2018-07-30) 4 commits

209 - . commit: fix exit code when doing a dry run

210 - . wt-status: teach wt_status_collect about merges in progress

211 - . wt-status: rename commitable to committable

212 - . t7501: add coverage for flags which imply dry runs

213 -

214 - "git commit --dry-run" gave a correct exit status even during a

215 - conflict resolution toward a merge, but it did not with the

216 - "--short" option, which has been corrected.

217 -

218 - Seems to break 7512, 3404 and 7060 in 'pu'.

219 -

220 -

221 -* ma/wrapped-info (2018-05-28) 2 commits

222 - - usage: prefix all lines in `vreportf()`, not just the first

223 - - usage: extract `prefix_suffix_lines()` from `advise()`

224 -

225 - An attempt to help making multi-line messages fed to warning(),

226 - error(), and friends more easily translatable.

227 -

228 - Will discard and wait for a cleaned-up rewrite.

229 - cf. <20180529213957.GF7964@sigill.intra.peff.net>

230 -

231 -

232 -* hn/bisect-first-parent (2018-04-21) 1 commit

233 - - bisect: create 'bisect_flags' parameter in find_bisection()

234 - (this branch is used by tb/bisect-first-parent.)

235 -

236 - Preliminary code update to allow passing more flags down the

237 - bisection codepath in the future.

238 -

239 - We do not add random code that does not have real users to our

240 - codebase, so let's have it wait until such a real code materializes

241 - before too long.

242 -

243 -

244 -* av/fsmonitor-updates (2018-01-04) 6 commits

245 - - fsmonitor: use fsmonitor data in `git diff`

246 - - fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh

247 - - fsmonitor: make output of test-dump-fsmonitor more concise

248 - - fsmonitor: update helper tool, now that flags are filled later

249 - - fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid

250 - - dir.c: update comments to match argument name

251 -

252 - Code clean-up on fsmonitor integration, plus optional utilization

253 - of the fsmonitor data in diff-files.

254 -

255 - Waiting for an update.

256 - cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>

257 -

258 -

259 -* pb/bisect-helper-2 (2018-07-23) 8 commits

260 - - t6030: make various test to pass GETTEXT_POISON tests

261 - - bisect--helper: `bisect_start` shell function partially in C

262 - - bisect--helper: `get_terms` & `bisect_terms` shell function in C

263 - - bisect--helper: `bisect_next_check` shell function in C

264 - - bisect--helper: `check_and_set_terms` shell function in C

265 - - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()

266 - - bisect--helper: `bisect_write` shell function in C

267 - - bisect--helper: `bisect_reset` shell function in C

268 -

269 - Expecting a reroll.

270 - cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>

271 -

272 - I just rebased the topic to a newer base as it did not build

273 - standalone with the base I originally queued the topic on, but

274 - otherwise there is no update to address any of the review comments

275 - in the thread above---we are still waiting for a reroll.

276 -

277 -

278 -* jk/drop-ancient-curl (2017-08-09) 5 commits

279 - - http: #error on too-old curl

280 - - curl: remove ifdef'd code never used with curl >=7.19.4

281 - - http: drop support for curl < 7.19.4

282 - - http: drop support for curl < 7.16.0

283 - - http: drop support for curl < 7.11.1

284 -

285 - Some code in http.c that has bitrot is being removed.

286 -

287 - Expecting a reroll.

288 -

289 -

290 -* mk/use-size-t-in-zlib (2017-08-10) 1 commit

291 - . zlib.c: use size_t for size

292 -

293 - The wrapper to call into zlib followed our long tradition to use

294 - "unsigned long" for sizes of regions in memory, which have been

295 - updated to use "size_t".

296 -

297 - Needs resurrecting by making sure the fix is good and still applies

298 - (or adjusted to today's codebase).

299 -

300 ---------------------------------------------------

301 -[Cooking]

293

294 * ds/format-commit-graph-docs (2018-08-21) 2 commits

295 - commit-graph.txt: improve formatting for asciidoc

@@ -352,10 +343,10 @@ of the repositories listed at

343 Will cook in 'next'.

344

345

355 -* js/rebase-in-c-5.5-work-with-rebase-i-in-c (2018-08-29) 2 commits

346 +* js/rebase-in-c-5.5-work-with-rebase-i-in-c (2018-09-06) 2 commits

347 - builtin rebase: prepare for builtin rebase -i

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

358 - (this branch is used by jc/rebase-in-c-9-fixes 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.)

349 + (this branch is used by 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.)

350

351 "rebase" that has been rewritten learns the new calling convention

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

@@ -444,10 +435,7 @@ of the repositories listed at

435 - submodule.c: warn about missing submodule git directories

436 - t2013: add test for missing but active submodule

437

447 - A corner case in switching to a branch that needs to "check out" a

448 - submodule is handled a bit better now.

449 -

450 - Expecting a reroll.

438 + cf. <20180905191849.GB120842@aiede.svl.corp.google.com>

439

440

441 * tg/conflict-marker-size (2018-08-29) 1 commit

@@ -554,7 +542,7 @@ of the repositories listed at

542 obviously the author cared enough to write a patch, so...

543

544

557 -* pk/rebase-in-c-2-basic (2018-08-10) 11 commits

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

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

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

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

@@ -563,13 +551,13 @@ of the repositories listed at

551 - builtin rebase: require a clean worktree

552 - builtin rebase: support the `verbose` and `diffstat` options

553 - builtin rebase: support --quiet

566 - - builtin rebase: handle the pre-rebase hook (and add --no-verify)

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

555 - builtin rebase: support `git rebase --onto A...B`

556 - builtin rebase: support --onto

569 - (this branch is used by jc/rebase-in-c-9-fixes, 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.)

557 + (this branch is used by 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.)

558

559

572 -* pk/rebase-in-c-3-acts (2018-08-10) 7 commits

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

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

562 - builtin rebase: actions require a rebase in progress

563 - builtin rebase: support --edit-todo and --show-current-patch

@@ -577,10 +565,10 @@ of the repositories listed at

565 - builtin rebase: support --abort

566 - builtin rebase: support --skip

567 - builtin rebase: support --continue

580 - (this branch is used by jc/rebase-in-c-9-fixes, 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.)

568 + (this branch is used by 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.)

569

570

583 -* pk/rebase-in-c-4-opts (2018-08-10) 18 commits

571 +* pk/rebase-in-c-4-opts (2018-09-06) 18 commits

572 - builtin rebase: support --root

573 - builtin rebase: add support for custom merge strategies

574 - builtin rebase: support `fork-point` option

@@ -599,22 +587,22 @@ of the repositories listed at

587 - builtin rebase: support --rerere-autoupdate

588 - builtin rebase: support --signoff

589 - builtin rebase: allow selecting the rebase "backend"

602 - (this branch is used by jc/rebase-in-c-9-fixes, 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.)

590 + (this branch is used by 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.)

591

592

605 -* pk/rebase-in-c-5-test (2018-08-10) 6 commits

593 +* pk/rebase-in-c-5-test (2018-09-06) 6 commits

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

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

596 - builtin rebase: show progress when connected to a terminal

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

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

599 - builtin rebase: optionally auto-detect the upstream

612 - (this branch is used by jc/rebase-in-c-9-fixes, 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.)

600 + (this branch is used by 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.)

601

602

615 -* pk/rebase-in-c-6-final (2018-08-29) 1 commit

603 +* pk/rebase-in-c-6-final (2018-09-06) 1 commit

604 - rebase: default to using the builtin rebase

617 - (this branch is used by jc/rebase-in-c-9-fixes; 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.)

605 + (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 and pk/rebase-in-c-5-test.)

606

607

608 * ps/stash-in-c (2018-08-31) 20 commits

@@ -881,7 +869,7 @@ of the repositories listed at

869 - editor: add a function to launch the sequence editor

870 - rebase -i: rewrite append_todo_help() in C

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

884 - (this branch is used by jc/rebase-in-c-9-fixes, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)

872 + (this branch is used by js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)

873

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

875

@@ -900,7 +888,7 @@ of the repositories listed at

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

889 - rebase: refactor common shell functions into their own file

890 - rebase: start implementing it as a builtin

903 - (this branch is used by jc/rebase-in-c-9-fixes, 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.)

891 + (this branch is used by 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.)

892

893 Rewrite of the "rebase" machinery in C.

894

@@ -1036,3 +1024,31 @@ of the repositories listed at

1024 . structured-logging: design document

1025

1026 Being rerolled with an updated tracing API.

1027 +

1028 +

1029 +* av/fsmonitor-updates (2018-01-04) 6 commits

1030 + . fsmonitor: use fsmonitor data in `git diff`

1031 + . fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh

1032 + . fsmonitor: make output of test-dump-fsmonitor more concise

1033 + . fsmonitor: update helper tool, now that flags are filled later

1034 + . fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid

1035 + . dir.c: update comments to match argument name

1036 +

1037 + Code clean-up on fsmonitor integration, plus optional utilization

1038 + of the fsmonitor data in diff-files.

1039 +

1040 + Tired of waiting for an update.

1041 + cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>

1042 +

1043 + Also there were backward incompatible API changes brought by other

1044 + topics in flight; having to keep up with those disruptive changes

1045 + is not worth the maintenance effort for a stale topic.

1046 +

1047 +

1048 +* jc/rebase-in-c-9-fixes (2018-09-04) 1 commit

1049 + . rebase: re-add forgotten -k that stands for --keep-empty

1050 + (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.)

1051 +

1052 + The fix has been rolled into the original topic that introduced the

1053 + issue, hence this topic is no longer necessary.

1054 +

What's cooking (2018/09 #02)