What's cooking (2016/08 #01)
Junio C Hamano committed
Aug 2, 2016 at 15:23 UTC
c59d3a81f18e4571a6f6fbccdf5e886c138b8d61
1 file changed
+261
-245
whats-cooking.txt
+261
-245
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2016, #09; Fri, 29)
3
+Subject: What's cooking in git.git (Aug 2016, #01; Tue, 2)
4
X-master-at: f8f7adce9fc50a11a764d57815602dcb818d1816
5
X-next-at: f965a184db64b4fd46c6b74c02c0079537516c63
6
7
-What's cooking in git.git (Jul 2016, #09; Fri, 29)
7
+What's cooking in git.git (Aug 2016, #01; Tue, 2)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -25,190 +25,227 @@ of the repositories listed at
25
http://git-blame.blogspot.com/p/git-public-repositories.html
26
27
--------------------------------------------------
28
-[Graduated to "master"]
28
+[New Topics]
29
30
-* ew/daemon-socket-keepalive (2016-07-22) 2 commits
31
- (merged to 'next' on 2016-07-22 at d39c827)
32
- + Windows: add missing definition of ENOTSOCK
33
- (merged to 'next' on 2016-07-19 at 0140849)
34
- + daemon: ignore ENOTSOCK from setsockopt
30
+* ab/gitweb-link-html-escape (2016-08-01) 1 commit
31
+ - gitweb: escape link body in format_ref_marker
32
36
- Recent update to "git daemon" tries to enable the socket-level
37
- KEEPALIVE, but when it is spawned via inetd, the standard input
38
- file descriptor may not necessarily be connected to a socket.
39
- Suppress an ENOTSOCK error from setsockopt().
33
+ The characters in the label shown for tags/refs for commits shown
34
+ in "gitweb" output are now properly escaped for proper HTML output.
35
36
+ Will merge to 'next'.
37
42
-* ew/find-perl-on-freebsd-in-local (2016-07-26) 1 commit
43
- (merged to 'next' on 2016-07-26 at f76a962)
44
- + config.mak.uname: correct perl path on FreeBSD
38
46
- Recent FreeBSD stopped making perl available at /usr/bin/perl;
47
- switch the default the built-in path to /usr/local/bin/perl on not
48
- too ancient FreeBSD releases.
39
+* ew/build-time-pager-tweaks (2016-08-01) 1 commit
40
+ . pager: move pager-specific setup into the build
41
42
+ The build procedure learned PAGER_ENV knob that lists what default
43
+ environment variable settings to export for popular pagers. This
44
+ mechanism is used to tweak the default settings to MORE on FreeBSD.
45
51
-* js/rebase-i-tests (2016-07-07) 3 commits
52
- (merged to 'next' on 2016-07-13 at b06b28f)
53
- + rebase -i: we allow extra spaces after fixup!/squash!
54
- + rebase -i: demonstrate a bug with --autosquash
55
- + t3404: add a test for the --gpg-sign option
46
+ Waiting for a reroll.
47
57
- A few tests that specifically target "git rebase -i" have been
58
- added.
48
49
+* ib/t3700-add-chmod-x-updates (2016-08-01) 3 commits
50
+ - t3700: add a test_mode_in_index helper function
51
+ - t3700: merge two tests into one
52
+ - t3700: remove unwanted leftover files before running new tests
53
61
-* nd/pack-ofs-4gb-limit (2016-07-13) 7 commits
62
- (merged to 'next' on 2016-07-13 at 91e217d)
63
- + fsck: use streaming interface for large blobs in pack
64
- + pack-objects: do not truncate result in-pack object size on 32-bit systems
65
- + index-pack: correct "offset" type in unpack_entry_data()
66
- + index-pack: report correct bad object offsets even if they are large
67
- + index-pack: correct "len" type in unpack_data()
68
- + sha1_file.c: use type off_t* for object_info->disk_sizep
69
- + pack-objects: pass length to check_pack_crc() without truncation
54
+ The t3700 test about "add --chmod=-x" have been made a bit more
55
+ robust and generally cleaned up.
56
71
- "git pack-objects" and "git index-pack" mostly operate with off_t
72
- when talking about the offset of objects in a packfile, but there
73
- were a handful of places that used "unsigned long" to hold that
74
- value, leading to an unintended truncation.
57
+ Will merge to 'next'.
58
59
77
-* nd/worktree-lock (2016-07-08) 6 commits
78
- (merged to 'next' on 2016-07-13 at c768a85)
79
- + worktree.c: find_worktree() search by path suffix
80
- + worktree: add "unlock" command
81
- + worktree: add "lock" command
82
- + worktree.c: add is_worktree_locked()
83
- + worktree.c: add is_main_worktree()
84
- + worktree.c: add find_worktree()
60
+* jt/format-patch-from-config (2016-08-01) 1 commit
61
+ - format-patch: format.from gives the default for --from
62
86
- "git worktree prune" protected worktrees that are marked as
87
- "locked" by creating a file in a known location. "git worktree"
88
- command learned a dedicated command pair to create and remove such
89
- a file, so that the users do not have to do this with editor.
63
+ "git format-patch" learned format.from configuration variable to
64
+ specify the default settings for its "--from" option.
65
66
92
-* rs/notes-merge-no-toctou (2016-07-07) 1 commit
93
- (merged to 'next' on 2016-07-13 at f08b530)
94
- + notes-merge: use O_EXCL to avoid overwriting existing files
67
+* rs/st-mult (2016-08-01) 1 commit
68
+ - pass constants as first argument to st_mult()
69
96
- "git notes merge" had a code to see if a path exists (and fails if
97
- it does) and then open the path for writing (when it doesn't).
98
- Replace it with open with O_EXCL.
70
+ Micro optimization of st_mult() facility used to check the integer
71
+ overflow coming from multiplication to compute size of memory
72
+ allocation.
73
74
+ Will merge to 'next'.
75
101
-* sb/submodule-deinit-all (2016-07-26) 1 commit
102
- (merged to 'next' on 2016-07-26 at ca0b067)
103
- + submodule deinit: remove outdated comment
76
105
- A comment update for a topic that was merged to Git v2.8.
77
+* rs/use-strbuf-addstr (2016-08-01) 1 commit
78
+ - use strbuf_addstr() for adding constant strings to a strbuf
79
107
---------------------------------------------------
108
-[New Topics]
80
+ Will merge to 'next'.
81
110
-* da/subtree-modernize (2016-07-27) 2 commits
111
- - subtree: adjust function definitions to match CodingGuidelines
112
- - subtree: adjust style to match CodingGuidelines
113
- (this branch uses da/subtree-2.9-regression.)
82
115
- Style fixes for "git subtree" (in contrib/).
83
+* sb/submodule-update-dot-branch (2016-08-01) 7 commits
84
+ - submodule update: allow '.' for branch value
85
+ - submodule--helper: add remote-branch helper
86
+ - submodule-config: keep configured branch around
87
+ - submodule--helper: fix usage string for relative-path
88
+ - submodule update: narrow scope of local variable
89
+ - submodule update: respect depth in subsequent fetches
90
+ - t7406: future proof tests with hard coded depth
91
+
92
+ A few updates to "git submodule update".
93
94
Will merge to 'next'.
95
96
120
-* js/rebase-i-progress-tidy (2016-07-28) 1 commit
121
- - rebase-interactive: trim leading whitespace from progress count
97
+* jc/hashmap-doc-init (2016-08-02) 1 commit
98
+ - hashmap: clarify that hashmap_entry can safely be discarded
99
123
- Regression fix for an i18n topic already in 'master'.
100
+ The API documentation for hashmap was unclear if hashmap_entry
101
+ can be safely discarded without any other consideration. State
102
+ that it is safe to do so.
103
125
- Will merge to 'next'.
104
+--------------------------------------------------
105
+[Stalled]
106
107
+* jh/clean-smudge-annex (2016-08-01) 9 commits
108
+ - use smudgeToFile filter in recursive merge
109
+ - use smudgeToFile filter in git am
110
+ - better recovery from failure of smudgeToFile filter
111
+ - warn on unusable smudgeToFile/cleanFromFile config
112
+ - use smudgeToFile in git checkout etc
113
+ - use cleanFromFile in git add
114
+ - add smudgeToFile and cleanFromFile filter configs
115
+ - clarify %f documentation
116
+ - Merge branch 'cc/apply-am' into HEAD
117
+ (this branch uses cc/apply-am.)
118
128
-* jk/t4205-cleanup (2016-07-27) 2 commits
129
- - t4205: indent here documents
130
- - t4205: drop top-level &&-chaining
119
+ The interface to "clean/smudge" filters require Git to feed the
120
+ whole contents via pipe, which is suboptimal for some applications.
121
+ "cleanFromFile/smudgeToFile" commands are the moral equilvalents
122
+ for these filters but they interact with the files on the
123
+ filesystem directly.
124
132
- Test modernization.
125
+ This is starting to bit-rot, as the topic it is built upon keeps
126
+ getting rerolled. I _think_ I rebased it correctly, but I would
127
+ not be surprised if I made a mistake.
128
134
- Will merge to 'next'.
129
+ Will discard if/when I have to do another rebase, preferring to
130
+ have a fresh reroll directly from the author.
131
132
137
-* jk/pack-objects-optim (2016-07-29) 7 commits
138
- - pack-objects: use mru list when iterating over packs
139
- - pack-objects: compute local/ignore_pack_keep early
140
- - pack-objects: break out of want_object loop early
141
- - find_pack_entry: replace last_found_pack with MRU cache
142
- - add generic most-recently-used list
143
- - sha1_file: drop free_pack_by_name
144
- - t/perf: add tests for many-pack scenarios
133
+* sb/bisect (2016-04-15) 22 commits
134
+ . SQUASH???
135
+ . bisect: get back halfway shortcut
136
+ . bisect: compute best bisection in compute_relevant_weights()
137
+ . bisect: use a bottom-up traversal to find relevant weights
138
+ . bisect: prepare for different algorithms based on find_all
139
+ . bisect: rename count_distance() to compute_weight()
140
+ . bisect: make total number of commits global
141
+ . bisect: introduce distance_direction()
142
+ . bisect: extract get_distance() function from code duplication
143
+ . bisect: use commit instead of commit list as arguments when appropriate
144
+ . bisect: replace clear_distance() by unique markers
145
+ . bisect: use struct node_data array instead of int array
146
+ . bisect: get rid of recursion in count_distance()
147
+ . bisect: make algorithm behavior independent of DEBUG_BISECT
148
+ . bisect: make bisect compile if DEBUG_BISECT is set
149
+ . bisect: plug the biggest memory leak
150
+ . bisect: add test for the bisect algorithm
151
+ . t6030: generalize test to not rely on current implementation
152
+ . t: use test_cmp_rev() where appropriate
153
+ . t/test-lib-functions.sh: generalize test_cmp_rev
154
+ . bisect: allow 'bisect run' if no good commit is known
155
+ . bisect: write about `bisect next` in documentation
156
146
- "git pack-objects" has a few options that tell it not to pack
147
- objects found in certain packfiles, which require it to scan .idx
148
- files of all available packs. The codepaths involved in these
149
- operations have been optimized for a common case of not having any
150
- non-local pack and/or any .kept pack.
157
+ The internal algorithm used in "git bisect" to find the next commit
158
+ to check has been optimized greatly.
159
152
- The last patch is still questionable in that it can attempt to
153
- create a cycle in delta-chain, only to be stopped by the last-ditch
154
- recovery logic in there.
160
+ Was expecting a reroll, but now pb/bisect topic starts removinging
161
+ more and more parts from git-bisect.sh, this needs to see a fresh
162
+ reroll.
163
164
+ Will discard for now.
165
+ cf. <1460294354-7031-1-git-send-email-s-beyer@gmx.net>
166
157
-* kw/patch-ids-optim (2016-07-29) 4 commits
158
- - rebase: avoid computing unnecessary patch IDs
159
- - patch-ids: add flag to create the diff patch id using header only data
160
- - patch-ids: replace the seen indicator with a commit pointer
161
- - patch-ids: stop using a hand-rolled hashmap implementation
167
163
- When "git rebase" tries to compare set of changes on the updated
164
- upstream and our own branch, it computes patch-id for all of these
165
- changes and attempts to find matches. This has been optimized by
166
- lazily computing the full patch-id (which is expensive) to be
167
- compared only for changes that touch the same set of paths.
168
169
- Will merge to 'next'.
169
170
+* sg/completion-updates (2016-02-28) 21 commits
171
+ . completion: cache the path to the repository
172
+ . completion: extract repository discovery from __gitdir()
173
+ . completion: don't guard git executions with __gitdir()
174
+ . completion: consolidate silencing errors from git commands
175
+ . completion: don't use __gitdir() for git commands
176
+ . completion: respect 'git -C <path>'
177
+ . completion: fix completion after 'git -C <path>'
178
+ . completion: don't offer commands when 'git --opt' needs an argument
179
+ . rev-parse: add '--absolute-git-dir' option
180
+ . completion: list short refs from a remote given as a URL
181
+ . completion: don't list 'HEAD' when trying refs completion outside of a repo
182
+ . completion: list refs from remote when remote's name matches a directory
183
+ . completion: respect 'git --git-dir=<path>' when listing remote refs
184
+ . completion: fix most spots not respecting 'git --git-dir=<path>'
185
+ . completion: ensure that the repository path given on the command line exists
186
+ . completion tests: add tests for the __git_refs() helper function
187
+ . completion tests: check __gitdir()'s output in the error cases
188
+ . completion tests: consolidate getting path of current working directory
189
+ . completion tests: make the $cur variable local to the test helper functions
190
+ . completion tests: don't add test cruft to the test repository
191
+ . completion: improve __git_refs()'s in-code documentation
192
+
193
+ Will be rerolled.
194
+ cf. <1456754714-25237-1-git-send-email-szeder@ira.uka.de>
195
172
-* jk/rebase-i-drop-ident-check (2016-07-29) 1 commit
173
- - rebase-interactive: drop early check for valid ident
196
175
- Even when "git pull --rebase=preserve" (and the underlying "git
176
- rebase --preserve") can complete without creating any new commit
177
- (i.e. fast-forwards), it still insisted on having a usable ident
178
- information (read: user.email is set correctly), which was less
179
- than nice. As the underlying commands used inside "git rebase"
180
- would fail with a more meaningful error message and advice text
181
- when the bogus ident matters, this extra check was removed.
197
+* ec/annotate-deleted (2015-11-20) 1 commit
198
+ - annotate: skip checking working tree if a revision is provided
199
183
- Will hold.
184
- cf. <20160729224944.GA23242@sigill.intra.peff.net>
200
+ Usability fix for annotate-specific "<file> <rev>" syntax with deleted
201
+ files.
202
203
+ Waiting for review.
204
187
-* jk/reset-ident-time-per-commit (2016-07-29) 1 commit
188
- - reset cached ident date before creating objects
205
190
- Not-so-recent rewrite of "git am" that started making internal
191
- calls into the commit machinery had an unintended regression, in
192
- that no matter how many seconds it took to apply many patches, the
193
- resulting committer timestamp for the resulting commits were all
194
- the same.
206
+* dk/gc-more-wo-pack (2016-01-13) 4 commits
207
+ - gc: clean garbage .bitmap files from pack dir
208
+ - t5304: ensure non-garbage files are not deleted
209
+ - t5304: test .bitmap garbage files
210
+ - prepare_packed_git(): find more garbage
211
+
212
+ Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
213
+ .bitmap and .keep files.
214
+
215
+ Waiting for a reroll.
216
+ cf. <xmqq60ypbeng.fsf@gitster.mtv.corp.google.com>
217
196
- Will merge to 'next'.
218
+
219
+* jc/diff-b-m (2015-02-23) 5 commits
220
+ . WIPWIP
221
+ . WIP: diff-b-m
222
+ - diffcore-rename: allow easier debugging
223
+ - diffcore-rename.c: add locate_rename_src()
224
+ - diffcore-break: allow debugging
225
+
226
+ "git diff -B -M" produced incorrect patch when the postimage of a
227
+ completely rewritten file is similar to the preimage of a removed
228
+ file; such a resulting file must not be expressed as a rename from
229
+ other place.
230
+
231
+ The fix in this patch is broken, unfortunately.
232
+ Will discard.
233
234
--------------------------------------------------
199
-[Stalled]
235
+[Cooking]
236
201
-* cc/apply-am (2016-06-28) 41 commits
202
- - apply: use error_errno() where possible
237
+* cc/apply-am (2016-08-01) 42 commits
238
+ - fixup! apply: make it possible to silently apply
239
- builtin/am: use apply api in run_apply()
204
- - apply: change error_routine when be_silent is set
240
+ - apply: refactor `git apply` option parsing
241
+ - apply: change error_routine when silent
242
- usage: add get_error_routine() and get_warn_routine()
243
- usage: add set_warn_routine()
207
- - apply: don't print on stdout when be_silent is set
208
- - apply: make 'be_silent' incompatible with 'apply_verbosely'
209
- - apply: add 'be_silent' variable to 'struct apply_state'
244
+ - apply: don't print on stdout in verbosity_silent mode
245
+ - apply: make it possible to silently apply
246
- write_or_die: use warning() instead of fprintf(stderr, ...)
247
- environment: add set_index_file()
248
+ - apply: use error_errno() where possible
249
- apply: make some parsing functions static again
250
- apply: move libified code from builtin/apply.c to apply.{c,h}
251
- apply: rename and move opt constants to apply.h
@@ -248,103 +285,94 @@ of the repositories listed at
285
Needs review.
286
287
251
-* sb/bisect (2016-04-15) 22 commits
252
- - SQUASH???
253
- - bisect: get back halfway shortcut
254
- - bisect: compute best bisection in compute_relevant_weights()
255
- - bisect: use a bottom-up traversal to find relevant weights
256
- - bisect: prepare for different algorithms based on find_all
257
- - bisect: rename count_distance() to compute_weight()
258
- - bisect: make total number of commits global
259
- - bisect: introduce distance_direction()
260
- - bisect: extract get_distance() function from code duplication
261
- - bisect: use commit instead of commit list as arguments when appropriate
262
- - bisect: replace clear_distance() by unique markers
263
- - bisect: use struct node_data array instead of int array
264
- - bisect: get rid of recursion in count_distance()
265
- - bisect: make algorithm behavior independent of DEBUG_BISECT
266
- - bisect: make bisect compile if DEBUG_BISECT is set
267
- - bisect: plug the biggest memory leak
268
- - bisect: add test for the bisect algorithm
269
- - t6030: generalize test to not rely on current implementation
270
- - t: use test_cmp_rev() where appropriate
271
- - t/test-lib-functions.sh: generalize test_cmp_rev
272
- - bisect: allow 'bisect run' if no good commit is known
273
- - bisect: write about `bisect next` in documentation
288
+* da/subtree-modernize (2016-07-27) 2 commits
289
+ - subtree: adjust function definitions to match CodingGuidelines
290
+ - subtree: adjust style to match CodingGuidelines
291
+ (this branch uses da/subtree-2.9-regression.)
292
275
- The internal algorithm used in "git bisect" to find the next commit
276
- to check has been optimized greatly.
293
+ Style fixes for "git subtree" (in contrib/).
294
278
- Expecting a reroll.
279
- cf. <1460294354-7031-1-git-send-email-s-beyer@gmx.net>
295
+ Will merge to 'next'.
296
297
282
-* sg/completion-updates (2016-02-28) 21 commits
283
- . completion: cache the path to the repository
284
- . completion: extract repository discovery from __gitdir()
285
- . completion: don't guard git executions with __gitdir()
286
- . completion: consolidate silencing errors from git commands
287
- . completion: don't use __gitdir() for git commands
288
- . completion: respect 'git -C <path>'
289
- . completion: fix completion after 'git -C <path>'
290
- . completion: don't offer commands when 'git --opt' needs an argument
291
- . rev-parse: add '--absolute-git-dir' option
292
- . completion: list short refs from a remote given as a URL
293
- . completion: don't list 'HEAD' when trying refs completion outside of a repo
294
- . completion: list refs from remote when remote's name matches a directory
295
- . completion: respect 'git --git-dir=<path>' when listing remote refs
296
- . completion: fix most spots not respecting 'git --git-dir=<path>'
297
- . completion: ensure that the repository path given on the command line exists
298
- . completion tests: add tests for the __git_refs() helper function
299
- . completion tests: check __gitdir()'s output in the error cases
300
- . completion tests: consolidate getting path of current working directory
301
- . completion tests: make the $cur variable local to the test helper functions
302
- . completion tests: don't add test cruft to the test repository
303
- . completion: improve __git_refs()'s in-code documentation
298
+* js/rebase-i-progress-tidy (2016-07-28) 1 commit
299
+ - rebase-interactive: trim leading whitespace from progress count
300
305
- Will be rerolled.
306
- cf. <1456754714-25237-1-git-send-email-szeder@ira.uka.de>
301
+ Regression fix for an i18n topic already in 'master'.
302
303
+ Will merge to 'next'.
304
309
-* ec/annotate-deleted (2015-11-20) 1 commit
310
- - annotate: skip checking working tree if a revision is provided
305
312
- Usability fix for annotate-specific "<file> <rev>" syntax with deleted
313
- files.
306
+* jk/t4205-cleanup (2016-07-27) 2 commits
307
+ - t4205: indent here documents
308
+ - t4205: drop top-level &&-chaining
309
315
- Waiting for review.
310
+ Test modernization.
311
312
+ Will merge to 'next'.
313
318
-* dk/gc-more-wo-pack (2016-01-13) 4 commits
319
- - gc: clean garbage .bitmap files from pack dir
320
- - t5304: ensure non-garbage files are not deleted
321
- - t5304: test .bitmap garbage files
322
- - prepare_packed_git(): find more garbage
314
324
- Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
325
- .bitmap and .keep files.
315
+* jk/pack-objects-optim (2016-07-29) 7 commits
316
+ - pack-objects: use mru list when iterating over packs
317
+ - pack-objects: compute local/ignore_pack_keep early
318
+ - pack-objects: break out of want_object loop early
319
+ - find_pack_entry: replace last_found_pack with MRU cache
320
+ - add generic most-recently-used list
321
+ - sha1_file: drop free_pack_by_name
322
+ - t/perf: add tests for many-pack scenarios
323
327
- Waiting for a reroll.
328
- cf. <xmqq60ypbeng.fsf@gitster.mtv.corp.google.com>
324
+ "git pack-objects" has a few options that tell it not to pack
325
+ objects found in certain packfiles, which require it to scan .idx
326
+ files of all available packs. The codepaths involved in these
327
+ operations have been optimized for a common case of not having any
328
+ non-local pack and/or any .kept pack.
329
+
330
+ The last patch is still questionable in that it can attempt to
331
+ create a cycle in delta-chain, only to be stopped by the last-ditch
332
+ recovery logic in there.
333
334
331
-* jc/diff-b-m (2015-02-23) 5 commits
332
- . WIPWIP
333
- . WIP: diff-b-m
334
- - diffcore-rename: allow easier debugging
335
- - diffcore-rename.c: add locate_rename_src()
336
- - diffcore-break: allow debugging
335
+* kw/patch-ids-optim (2016-07-29) 4 commits
336
+ - rebase: avoid computing unnecessary patch IDs
337
+ - patch-ids: add flag to create the diff patch id using header only data
338
+ - patch-ids: replace the seen indicator with a commit pointer
339
+ - patch-ids: stop using a hand-rolled hashmap implementation
340
338
- "git diff -B -M" produced incorrect patch when the postimage of a
339
- completely rewritten file is similar to the preimage of a removed
340
- file; such a resulting file must not be expressed as a rename from
341
- other place.
341
+ When "git rebase" tries to compare set of changes on the updated
342
+ upstream and our own branch, it computes patch-id for all of these
343
+ changes and attempts to find matches. This has been optimized by
344
+ lazily computing the full patch-id (which is expensive) to be
345
+ compared only for changes that touch the same set of paths.
346
343
- The fix in this patch is broken, unfortunately.
344
- Will discard.
347
+ Will merge to 'next'.
348
+
349
+
350
+* jk/rebase-i-drop-ident-check (2016-07-29) 1 commit
351
+ - rebase-interactive: drop early check for valid ident
352
+
353
+ Even when "git pull --rebase=preserve" (and the underlying "git
354
+ rebase --preserve") can complete without creating any new commit
355
+ (i.e. fast-forwards), it still insisted on having a usable ident
356
+ information (read: user.email is set correctly), which was less
357
+ than nice. As the underlying commands used inside "git rebase"
358
+ would fail with a more meaningful error message and advice text
359
+ when the bogus ident matters, this extra check was removed.
360
+
361
+ Will hold.
362
+ cf. <20160729224944.GA23242@sigill.intra.peff.net>
363
+
364
+
365
+* jk/reset-ident-time-per-commit (2016-08-01) 1 commit
366
+ - am: reset cached ident date for each patch
367
+
368
+ Not-so-recent rewrite of "git am" that started making internal
369
+ calls into the commit machinery had an unintended regression, in
370
+ that no matter how many seconds it took to apply many patches, the
371
+ resulting committer timestamp for the resulting commits were all
372
+ the same.
373
+
374
+ Will merge to 'next'.
375
346
---------------------------------------------------
347
-[Cooking]
376
377
* da/subtree-2.9-regression (2016-07-26) 2 commits
378
(merged to 'next' on 2016-07-26 at 9d71562)
@@ -580,7 +608,7 @@ of the repositories listed at
608
Will merge to 'master'.
609
610
583
-* js/am-3-merge-recursive-direct (2016-07-26) 16 commits
611
+* js/am-3-merge-recursive-direct (2016-08-01) 16 commits
612
- merge-recursive: flush output buffer even when erroring out
613
- merge_trees(): ensure that the callers release output buffer
614
- merge-recursive: offer an option to retain the output in 'obuf'
@@ -602,8 +630,13 @@ of the repositories listed at
630
to a three-way merge; this call has been turned into an internal
631
subroutine call instead of spawning a separate subprocess.
632
605
- Needs review.
606
- I started re-reading them, but I do want eyes from other people.
633
+ These mostly looked sensible, but it is dubious if it is a good
634
+ feature to send what is meant to the standard error to the standard
635
+ output.
636
+
637
+ Eyes from other people are highly appreciated, as my eyes (and the
638
+ original author's, too) have rotten by staring many rerolls of the
639
+ same topic and are not effective in spotting errors.
640
641
642
* sb/push-options (2016-07-14) 4 commits
@@ -643,27 +676,6 @@ of the repositories listed at
676
Comments? Personally I find it more-or-less "Meh".
677
678
646
-* jh/clean-smudge-annex (2016-07-12) 9 commits
647
- - use smudgeToFile filter in recursive merge
648
- - use smudgeToFile filter in git am
649
- - better recovery from failure of smudgeToFile filter
650
- - warn on unusable smudgeToFile/cleanFromFile config
651
- - use smudgeToFile in git checkout etc
652
- - use cleanFromFile in git add
653
- - add smudgeToFile and cleanFromFile filter configs
654
- - clarify %f documentation
655
- - Merge branch 'cc/apply-am' into jh/clean-smudge-annex
656
- (this branch uses cc/apply-am.)
657
-
658
- The interface to "clean/smudge" filters require Git to feed the
659
- whole contents via pipe, which is suboptimal for some applications.
660
- "cleanFromFile/smudgeToFile" commands are the moral equilvalents
661
- for these filters but they interact with the files on the
662
- filesystem directly.
663
-
664
- Will hold.
665
-
666
-
679
* jk/difftool-in-subdir (2016-07-28) 3 commits
680
- difftool: use Git::* functions instead of passing around state
681
- difftool: avoid $GIT_DIR and $GIT_WORK_TREE
@@ -910,22 +922,26 @@ of the repositories listed at
922
back-burner the threading enhancement to another day.
923
924
913
-* pb/bisect (2016-07-12) 9 commits
914
- - bisect--helper: `bisect_write` shell function in C
915
- - bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
916
- - bisect--helper: `bisect_reset` shell function in C
917
- - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
918
- - t6030: explicitly test for bisection cleanup
919
- - bisect--helper: `bisect_clean_state` shell function in C
920
- - bisect--helper: `write_terms` shell function in C
921
- - bisect: rewrite `check_term_format` shell function in C
922
- - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
925
+* pb/bisect (2016-08-02) 13 commits
926
+ . bisect--helper: `bisect_start` shell function partially in C
927
+ . bisect--helper: `get_terms` & `bisect_terms` shell function in C
928
+ . bisect--helper: `bisect_next_check` shell function in C
929
+ . bisect--helper: `check_and_set_terms` shell function in C
930
+ . bisect--helper: `bisect_write` shell function in C
931
+ . bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
932
+ . bisect--helper: `bisect_reset` shell function in C
933
+ . wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
934
+ . t6030: explicitly test for bisection cleanup
935
+ . bisect--helper: `bisect_clean_state` shell function in C
936
+ . bisect--helper: `write_terms` shell function in C
937
+ . bisect: rewrite `check_term_format` shell function in C
938
+ . bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
939
940
GSoC "bisect" topic.
941
926
- Are people happy with this version? How much of the planned
927
- "porting" is finished by this part of the work? How much more to
928
- go?
942
+ I'd prefer to see early part solidified so that reviews can focus
943
+ on the later part that is still in flux. We are almost there but
944
+ not quite yet.
945
946
947
* sb/pathspec-label (2016-06-03) 6 commits