What's cooking (2016/08 #03)
Junio C Hamano committed
Aug 8, 2016 at 15:32 UTC
03948b3e048060a1a0353085d135c831a9bee2cb
1 file changed
+288
-407
whats-cooking.txt
+288
-407
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2016, #02; Thu, 4)
4
-X-master-at: c6b0597e9ac7277e148e2fd4d7615ac6e0bfb661
5
-X-next-at: 24ed5d95aa3081ef814648bf890eb4d457ad30c6
3
+Subject: What's cooking in git.git (Aug 2016, #03; Mon, 8)
4
+X-master-at: a0a1831b034af10e5d5b37b99489a7558f9cc547
5
+X-next-at: 2eb946ae7c35488b71879c33eec3b14b822dee14
6
7
-What's cooking in git.git (Aug 2016, #02; Thu, 4)
7
+What's cooking in git.git (Aug 2016, #03; Mon, 8)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -18,13 +18,13 @@ unfortunate but with way many people wanting to throw random new
18
topics while too few people able/willing to review them, it is
19
inevitable.
20
21
-On the 'master' front, the individual commit count now getting closer
22
-to 500 since the last major release, which is a good pace. We may
23
-want to start slowing down once the current crop of topics in 'next'
24
-hits 'master' and switch our attention to regression hunting. The
25
-'maint' branch has been accumulating enough material to make it the
26
-next maintenance release v2.9.3, which hopefully happen early next
27
-week.
21
+On the 'master' front, the individual commit count now exceeds 500
22
+since the last major release, and the early preview -rc0 is expected
23
+to happen at the end of the week.
24
+
25
+The 'maint' branch has been accumulating enough material to make it
26
+the next maintenance release v2.9.3, which hopefully happen late
27
+this week.
28
29
You can find the changes described here in the integration branches
30
of the repositories listed at
@@ -34,291 +34,291 @@ of the repositories listed at
34
--------------------------------------------------
35
[Graduated to "master"]
36
37
-* da/subtree-2.9-regression (2016-07-26) 2 commits
38
- (merged to 'next' on 2016-07-26 at 9d71562)
39
- + subtree: fix "git subtree split --rejoin"
40
- + t7900-subtree.sh: fix quoting and broken && chains
41
- (this branch is used by da/subtree-modernize.)
37
+* ab/gitweb-link-html-escape (2016-08-01) 1 commit
38
+ (merged to 'next' on 2016-08-03 at 44b6088)
39
+ + gitweb: escape link body in format_ref_marker
40
43
- "git merge" in Git v2.9 was taught to forbid merging an unrelated
44
- lines of history by default, but that is exactly the kind of thing
45
- the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
46
- "git subtree" has been taught to use the "--allow-unrelated-histories"
47
- option to override the default.
41
+ The characters in the label shown for tags/refs for commits in
42
+ "gitweb" output are now properly escaped for proper HTML output.
43
44
50
-* ew/http-walker (2016-07-18) 4 commits
51
- (merged to 'next' on 2016-07-18 at a430a97)
52
- + list: avoid incompatibility with *BSD sys/queue.h
53
- (merged to 'next' on 2016-07-13 at 8585c03)
54
- + http-walker: reduce O(n) ops with doubly-linked list
55
- + http: avoid disconnecting on 404s for loose objects
56
- + http-walker: remove unused parameter from fetch_object
45
+* cp/completion-clone-recurse-submodules (2016-07-27) 1 commit
46
+ (merged to 'next' on 2016-08-03 at cbf0d94)
47
+ + completion: add option '--recurse-submodules' to 'git clone'
48
58
- Dumb http transport on the client side has been optimized.
49
50
61
-* jc/grep-commandline-vs-configuration (2016-07-25) 1 commit
62
- (merged to 'next' on 2016-07-28 at dd53273)
63
- + grep: further simplify setting the pattern type
51
+* da/subtree-modernize (2016-07-27) 2 commits
52
+ (merged to 'next' on 2016-08-03 at 06ad015)
53
+ + subtree: adjust function definitions to match CodingGuidelines
54
+ + subtree: adjust style to match CodingGuidelines
55
65
- "git -c grep.patternType=extended log --basic-regexp" misbehaved
66
- because the internal API to access the grep machinery was not
67
- designed well.
56
+ Style fixes for "git subtree" (in contrib/).
57
58
70
-* jk/diff-do-not-reuse-wtf-needs-cleaning (2016-07-22) 1 commit
71
- (merged to 'next' on 2016-07-28 at e3c5190)
72
- + diff: do not reuse worktree files that need "clean" conversion
59
+* ew/build-time-pager-tweaks (2016-08-04) 1 commit
60
+ (merged to 'next' on 2016-08-05 at 4f0b11b)
61
+ + pager: move pager-specific setup into the build
62
74
- There is an optimization used in "git diff $treeA $treeB" to borrow
75
- an already checked-out copy in the working tree when it is known to
76
- be the same as the blob being compared, expecting that open/mmap of
77
- such a file is faster than reading it from the object store, which
78
- involves inflating and applying delta. This however kicked in even
79
- when the checked-out copy needs to go through the convert-to-git
80
- conversion (including the clean filter), which defeats the whole
81
- point of the optimization. The optimization has been disabled when
82
- the conversion is necessary.
63
+ The build procedure learned PAGER_ENV knob that lists what default
64
+ environment variable settings to export for popular pagers. This
65
+ mechanism is used to tweak the default settings to MORE on FreeBSD.
66
67
85
-* jk/git-jump (2016-07-22) 3 commits
86
- (merged to 'next' on 2016-07-28 at 9ef9398)
87
- + contrib/git-jump: fix typo in README
88
- + contrib/git-jump: add whitespace-checking mode
89
- + contrib/git-jump: fix greedy regex when matching hunks
68
+* ew/git-svn-http-tests (2016-07-25) 2 commits
69
+ (merged to 'next' on 2016-08-03 at 2b23920)
70
+ + git svn: migrate tests to use lib-httpd
71
+ + t/t91*: do not say how to avoid the tests
72
91
- "git jump" script (in contrib/) has been updated a bit.
73
+ Tests for "git svn" have been taught to reuse the lib-httpd test
74
+ infrastructure when testing the subversion integration that
75
+ interacts with subversion repositories served over the http://
76
+ protocol.
77
78
94
-* jk/parse-options-concat (2016-07-06) 1 commit
95
- (merged to 'next' on 2016-07-28 at 219bc3a)
96
- + parse_options: allocate a new array when concatenating
79
+* ib/t3700-add-chmod-x-updates (2016-08-01) 3 commits
80
+ (merged to 'next' on 2016-08-03 at 1753346)
81
+ + t3700: add a test_mode_in_index helper function
82
+ + t3700: merge two tests into one
83
+ + t3700: remove unwanted leftover files before running new tests
84
98
- Users of the parse_options_concat() API function need to allocate
99
- extra slots in advance and fill them with OPT_END() when they want
100
- to decide the set of supported options dynamically, which makes the
101
- code error-prone and hard to read. This has been corrected by tweaking
102
- the API to allocate and return a new copy of "struct option" array.
85
+ The t3700 test about "add --chmod=-x" have been made a bit more
86
+ robust and generally cleaned up.
87
88
105
-* jk/push-progress (2016-07-20) 12 commits
106
- (merged to 'next' on 2016-07-28 at 39598fb)
107
- + receive-pack: send keepalives during quiet periods
108
- + receive-pack: turn on connectivity progress
109
- + receive-pack: relay connectivity errors to sideband
110
- + receive-pack: turn on index-pack resolving progress
111
- + index-pack: add flag for showing delta-resolution progress
112
- + clone: use a real progress meter for connectivity check
113
- + check_connected: add progress flag
114
- + check_connected: relay errors to alternate descriptor
115
- + check_everything_connected: use a struct with named options
116
- + check_everything_connected: convert to argv_array
117
- + rev-list: add optional progress reporting
118
- + check_everything_connected: always pass --quiet to rev-list
89
+* jc/hashmap-doc-init (2016-08-02) 1 commit
90
+ (merged to 'next' on 2016-08-05 at 2eb946a)
91
+ + hashmap: clarify that hashmap_entry can safely be discarded
92
120
- "git push" and "git clone" learned to give better progress meters
121
- to the end user who is waiting on the terminal.
93
+ The API documentation for hashmap was unclear if hashmap_entry
94
+ can be safely discarded without any other consideration. State
95
+ that it is safe to do so.
96
97
124
-* jt/fetch-large-handshake-window-on-http (2016-07-19) 1 commit
125
- (merged to 'next' on 2016-07-28 at 5606b14)
126
- + fetch-pack: grow stateless RPC windows exponentially
98
+* jh/clean-smudge-f-doc (2016-08-03) 1 commit
99
+ (merged to 'next' on 2016-08-04 at c2fc8e6)
100
+ + clarify %f documentation
101
128
- "git fetch" exchanges batched have/ack messages between the sender
129
- and the receiver, initially doubling every time and then falling
130
- back to enlarge the window size linearly. The "smart http"
131
- transport, being an half-duplex protocol, outgrows the preset limit
132
- too quickly and becomes inefficient when interacting with a large
133
- repository. The internal mechanism learned to grow the window size
134
- more aggressively when working with the "smart http" transport.
102
+ A minor documentation update.
103
104
+ This was split out from a stalled jh/clean-smudge-annex topic
105
+ before discarding it.
106
137
-* mm/status-suggest-merge-abort (2016-07-22) 1 commit
138
- (merged to 'next' on 2016-07-28 at b8b87d9)
139
- + status: suggest 'git merge --abort' when appropriate
107
141
- "git status" learned to suggest "merge --abort" during a conflicted
142
- merge, just like it already suggests "rebase --abort" during a
143
- conflicted rebase.
108
+* jk/difftool-in-subdir (2016-07-28) 3 commits
109
+ (merged to 'next' on 2016-08-03 at 90f195a)
110
+ + difftool: use Git::* functions instead of passing around state
111
+ + difftool: avoid $GIT_DIR and $GIT_WORK_TREE
112
+ + difftool: fix argument handling in subdirs
113
114
+ "git difftool <paths>..." started in a subdirectory failed to
115
+ interpret the paths relative to that directory, which has been
116
+ fixed.
117
146
-* os/no-verify-skips-commit-msg-too (2016-07-26) 1 commit
147
- (merged to 'next' on 2016-07-26 at 09b98b9)
148
- + commit: describe that --no-verify skips the commit-msg hook in the help text
118
150
- "git commit --help" said "--no-verify" is only about skipping the
151
- pre-commit hook, and failed to say that it also skipped the
152
- commit-msg hook.
119
+* jk/pack-objects-optim (2016-07-29) 6 commits
120
+ (merged to 'next' on 2016-08-03 at ad8caca)
121
+ + pack-objects: compute local/ignore_pack_keep early
122
+ + pack-objects: break out of want_object loop early
123
+ + find_pack_entry: replace last_found_pack with MRU cache
124
+ + add generic most-recently-used list
125
+ + sha1_file: drop free_pack_by_name
126
+ + t/perf: add tests for many-pack scenarios
127
+ (this branch is used by jk/pack-objects-optim-mru and ks/pack-objects-bitmap.)
128
129
+ "git pack-objects" has a few options that tell it not to pack
130
+ objects found in certain packfiles, which require it to scan .idx
131
+ files of all available packs. The codepaths involved in these
132
+ operations have been optimized for a common case of not having any
133
+ non-local pack and/or any .kept pack.
134
155
-* pm/build-persistent-https-with-recent-go (2016-07-22) 2 commits
156
- (merged to 'next' on 2016-07-28 at f6e9115)
157
- + contrib/persistent-https: use Git version for build label
158
- + contrib/persistent-https: update ldflags syntax for Go 1.7+
135
160
- The build procedure for "git persistent-https" helper (in contrib/)
161
- has been updated so that it can be built with more recent versions
162
- of Go.
136
+* jk/parseopt-string-list (2016-08-03) 1 commit
137
+ (merged to 'next' on 2016-08-04 at a7f0cd2)
138
+ + blame: drop strdup of string literal
139
140
+ A small memory leak in the command line parsing of "git blame"
141
+ has been plugged.
142
165
-* rs/submodule-config-code-cleanup (2016-07-28) 4 commits
166
- (merged to 'next' on 2016-07-28 at e25450e)
167
- + submodule-config: fix test binary crashing when no arguments given
168
- + submodule-config: combine early return code into one goto
169
- + submodule-config: passing name reference for .gitmodule blobs
170
- (merged to 'next' on 2016-07-19 at 59dbd58)
171
- + submodule-config: use explicit empty string instead of strbuf in config_from()
143
173
- Code cleanup.
144
+* jk/reflog-date (2016-07-27) 7 commits
145
+ (merged to 'next' on 2016-08-03 at cd8e92b)
146
+ + date: clarify --date=raw description
147
+ + date: add "unix" format
148
+ + date: document and test "raw-local" mode
149
+ + doc/pretty-formats: explain shortening of %gd
150
+ + doc/pretty-formats: describe index/time formats for %gd
151
+ + doc/rev-list-options: explain "-g" output formats
152
+ + doc/rev-list-options: clarify "commit@{Nth}" for "-g" option
153
154
+ The reflog output format is documented better, and a new format
155
+ --date=unix to report the seconds-since-epoch (without timezone)
156
+ has been added.
157
176
-* sb/pack-protocol-doc-nak (2016-07-22) 1 commit
177
- (merged to 'next' on 2016-07-28 at 5c94e0e)
178
- + Documentation: pack-protocol correct NAK response
158
180
- A doc update.
159
+* jk/t4205-cleanup (2016-07-27) 2 commits
160
+ (merged to 'next' on 2016-08-03 at ba9b594)
161
+ + t4205: indent here documents
162
+ + t4205: drop top-level &&-chaining
163
164
+ Test modernization.
165
183
-* sb/push-options (2016-07-14) 4 commits
184
- (merged to 'next' on 2016-07-19 at ee9a83a)
185
- + add a test for push options
186
- + push: accept push options
187
- + receive-pack: implement advertising and receiving push options
188
- + push options: {pre,post}-receive hook learns about push options
166
190
- "git push" learned to accept and pass extra options to the
191
- receiving end so that hooks can read and react to them.
167
+* js/nedmalloc-gcc6-warnings (2016-08-05) 2 commits
168
+ (merged to 'next' on 2016-08-05 at b31baa7)
169
+ + nedmalloc: work around overzealous GCC 6 warning
170
+ + nedmalloc: fix misleading indentation
171
172
+ Squelch compiler warnings for netmalloc (in compat/) library.
173
194
-* sb/submodule-clone-retry (2016-07-22) 2 commits
195
- (merged to 'next' on 2016-07-28 at 5487d28)
196
- + submodule-helper: fix indexing in clone retry error reporting path
197
- + git-submodule: forward exit code of git-submodule--helper more faithfully
174
199
- An earlier tweak to make "submodule update" retry a failing clone
200
- of submodules was buggy and caused segfault, which has been fixed.
175
+* js/rebase-i-progress-tidy (2016-07-28) 1 commit
176
+ (merged to 'next' on 2016-08-03 at bb1b414)
177
+ + rebase-interactive: trim leading whitespace from progress count
178
202
---------------------------------------------------
203
-[New Topics]
179
+ Regression fix for an i18n topic already in 'master'.
180
205
-* jh/clean-smudge-f-doc (2016-08-03) 1 commit
206
- (merged to 'next' on 2016-08-04 at c2fc8e6)
207
- + clarify %f documentation
181
209
- A minor documentation update.
182
+* js/t4130-rename-without-ino (2016-08-03) 1 commit
183
+ (merged to 'next' on 2016-08-04 at 044fb33)
184
+ + t4130: work around Windows limitation
185
211
- Will merge to 'master'.
186
+ Windows port was failing some tests in t4130, due to the lack of
187
+ inum in the returned values by its lstat(2) emulation.
188
213
- This was split out from a stalled jh/clean-smudge-annex topic
214
- before discarding it.
189
+ Will merge to 'maint'.
190
191
217
-* jh/status-v2-porcelain (2016-08-03) 8 commits
218
- - status: tests for --porcelain=v2
219
- - git-status.txt: describe --porcelain=v2 format
220
- - status: print branch info with --porcelain=v2 --branch
221
- - status: print per-file porcelain v2 status data
222
- - status: per-file data collection for --porcelain=v2
223
- - status: support --porcelain[=<version>]
224
- - status: cleanup API to wt_status_print
225
- - status: rename long-format print routines
192
+* nd/fbsd-lazy-mtime (2016-08-04) 1 commit
193
+ (merged to 'next' on 2016-08-05 at 7294870)
194
+ + t7063: work around FreeBSD's lazy mtime update feature
195
227
- Enhance "git status --porcelain" output by collecting more data on
228
- the state of the index and the working tree files, which may
229
- further be used to teach git-prompt (in contrib/) to make fewer
230
- calls to git.
196
+ FreeBSD can lie when asked mtime of a directory, which made the
197
+ untracked cache code to fall back to a slow-path, which in turn
198
+ caused tests in t7063 to fail because it wanted to verify the
199
+ behaviour of the fast-path.
200
232
- Needs review.
201
202
+* nd/fetch-ref-summary (2016-07-26) 1 commit
203
+ (merged to 'next' on 2016-08-03 at c045704)
204
+ + t5510: skip tests under GETTEXT_POISON build
205
235
-* jk/parseopt-string-list (2016-08-03) 1 commit
236
- (merged to 'next' on 2016-08-04 at a7f0cd2)
237
- + blame: drop strdup of string literal
206
+ Hotfix of a test in a topic that has already been merged to 'master'.
207
239
- A small memory leak in the command line parsing of "git blame"
240
- has been plugged.
208
242
- Will merge to 'master'.
209
+* nd/log-decorate-color-head-arrow (2016-07-12) 1 commit
210
+ (merged to 'next' on 2016-08-05 at a966c0e)
211
+ + log: decorate HEAD -> branch with the same color for arrow and HEAD
212
213
+ An entry "git log --decorate" for the tip of the current branch is
214
+ shown as "HEAD -> name" (where "name" is the name of the branch);
215
+ paint the arrow in the same color as "HEAD", not in the color for
216
+ commits.
217
245
-* js/import-tars-hardlinks (2016-08-03) 1 commit
246
- - import-tars: support hard links
218
248
- "import-tars" fast-import script (in contrib/) used to ignore a
249
- hardlink target and replaced it with an empty file, which has been
250
- corrected to record the same blob as the other file the hardlink is
251
- shared with.
219
+* rs/st-mult (2016-08-01) 1 commit
220
+ (merged to 'next' on 2016-08-03 at 5c6956a)
221
+ + pass constants as first argument to st_mult()
222
253
- Comments?
223
+ Micro optimization of st_mult() facility used to check the integer
224
+ overflow coming from multiplication to compute size of memory
225
+ allocation.
226
227
256
-* js/t4130-rename-without-ino (2016-08-03) 1 commit
257
- (merged to 'next' on 2016-08-04 at 044fb33)
258
- + t4130: work around Windows limitation
228
+* rs/use-strbuf-addstr (2016-08-05) 2 commits
229
+ (merged to 'next' on 2016-08-05 at 62d16d7)
230
+ + use strbuf_addstr() instead of strbuf_addf() with "%s"
231
+ (merged to 'next' on 2016-08-03 at 523422f)
232
+ + use strbuf_addstr() for adding constant strings to a strbuf
233
260
- Windows port was failing some tests in t4130, due to the lack of
261
- inum in the returned values by its lstat(2) emulation.
234
263
- Will merge to 'master' and then to 'maint'.
235
+* sb/submodule-recommend-shallowness (2016-08-03) 1 commit
236
+ (merged to 'next' on 2016-08-04 at 9f23a7e)
237
+ + gitmodules: document shallow recommendation
238
239
+ Doc update.
240
266
-* nd/fbsd-lazy-mtime (2016-08-04) 1 commit
267
- - t7063: work around FreeBSD's lazy mtime update feature
241
269
- FreeBSD can lie when asked mtime of a directory, which made the
270
- untracked cache code to fall back to a slow-path, which in turn
271
- caused tests in t7063 to fail because it wanted to verify the
272
- behaviour of the fast-path.
242
+* va/i18n (2016-07-28) 2 commits
243
+ (merged to 'next' on 2016-08-03 at cf753d2)
244
+ + i18n: config: unfold error messages marked for translation
245
+ + i18n: notes: mark comment for translation
246
+
247
+ More i18n marking.
248
+
249
+--------------------------------------------------
250
+[New Topics]
251
+
252
+* jk/big-and-future-archive-tar (2016-08-06) 1 commit
253
+ - archive-tar: make write_extended_header() void
254
+
255
+ A small code clean-up.
256
257
Will merge to 'next'.
258
259
277
-* sb/submodule-recommend-shallowness (2016-08-03) 1 commit
278
- (merged to 'next' on 2016-08-04 at 9f23a7e)
279
- + gitmodules: document shallow recommendation
260
+* js/mv-dir-to-new-directory (2016-08-08) 1 commit
261
+ - git mv: do not keep slash in `git mv dir non-existing-dir/`
262
281
- Doc update.
263
+ "git mv dir non-existing-dir/" did not work in some environments
264
+ the same way as existing mainstream platforms. The code now moves
265
+ "dir" to "non-existing-dir", without relying on rename("A", "B/")
266
+ that strips the trailing slash of '/'.
267
283
- Will merge to 'master'.
268
+ Will merge to 'next'.
269
270
286
-* jk/trace-fixup (2016-08-04) 7 commits
287
- - write_or_die: drop write_or_whine_pipe()
288
- - trace: disable key after write error
289
- - trace: correct variable name in write() error message
290
- - trace: cosmetic fixes for error messages
291
- - trace: use warning() for printing trace errors
292
- - trace: stop using write_or_whine_pipe()
293
- - trace: handle NULL argument in trace_disable()
271
+* ks/pack-objects-bitmap (2016-08-08) 2 commits
272
+ - pack-objects: use reachability bitmap index when generating non-stdout pack
273
+ - pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is in use
274
295
- Various small fixups to the "GIT_TRACE" facility.
275
+ Waiting for review discussion to settle.
276
+ cf. <20160808185541.6433-1-kirr@nexedi.com>
277
+ cf. <20160808181942.GD3995@teco.navytux.spb.ru>
278
279
298
-* js/nedmalloc-gcc6-warnings (2016-08-04) 2 commits
299
- - nedmalloc: work around overzealous GCC 6 warning
300
- - nedmalloc: fix misleading indentation
280
+* rs/child-process-init (2016-08-05) 1 commit
281
+ - use CHILD_PROCESS_INIT to initialize automatic variables
282
302
- Squelch compiler warnings for netmalloc (in compat/) library.
283
+ A small code clean-up.
284
285
Will merge to 'next'.
286
287
307
-* mh/diff-indent-heuristic (2016-08-04) 8 commits
308
- - diff: improve positioning of add/delete blocks in diffs
309
- - is_blank_line: take a single xrecord_t as argument
310
- - xdl_change_compact(): keep track of the earliest end
311
- - xdl_change_compact(): fix compaction heuristic to adjust io
312
- - xdl_change_compact(): do one final shift or the other, not both
313
- - xdl_change_compact(): rename i to end
314
- - xdl_change_compact(): clarify code
315
- - xdl_change_compact(): rename some local variables for clarity
288
+* rs/merge-add-strategies-simplification (2016-08-05) 1 commit
289
+ - merge: use string_list_split() in add_strategies()
290
317
- Output from "git diff" can be made easier to read by selecting
318
- which lines are common and which lines are added/deleted
319
- intelligently when the lines before and after the changed section
320
- are the same. A command line option is added to help with the
321
- experiment to find a good heuristics.
291
+ A small code clean-up.
292
+
293
+ Will merge to 'next'.
294
+
295
+
296
+* rs/merge-recursive-string-list-init (2016-08-05) 1 commit
297
+ - merge-recursive: use STRING_LIST_INIT_NODUP
298
+
299
+ A small code clean-up.
300
+
301
+ Will merge to 'next'.
302
+
303
+
304
+* rs/use-strbuf-add-unique-abbrev (2016-08-06) 1 commit
305
+ - use strbuf_add_unique_abbrev() for adding short hashes
306
+
307
+ A small code clean-up.
308
+
309
+ Will merge to 'next'.
310
+
311
+
312
+* sb/submodule-clone-rr (2016-08-06) 6 commits
313
+ - clone: reference flag is used for submodules as well
314
+ - submodule update: add super-reference flag
315
+ - submodule--helper update-clone: allow multiple references
316
+ - submodule--helper module-clone: allow multiple references
317
+ - t7408: merge short tests, factor out testing method
318
+ - t7408: modernize style
319
+
320
+ Waiting for review discussion to settle.
321
+ cf. <20160806012318.17968-1-sbeller@google.com>
322
323
--------------------------------------------------
324
[Stalled]
@@ -578,7 +578,6 @@ of the repositories listed at
578
Will discard.
579
580
581
-
581
* ec/annotate-deleted (2015-11-20) 1 commit
582
- annotate: skip checking working tree if a revision is provided
583
@@ -590,7 +589,6 @@ of the repositories listed at
589
Will discard.
590
591
593
-
592
* dk/gc-more-wo-pack (2016-01-13) 4 commits
593
- gc: clean garbage .bitmap files from pack dir
594
- t5304: ensure non-garbage files are not deleted
@@ -625,61 +623,82 @@ of the repositories listed at
623
--------------------------------------------------
624
[Cooking]
625
628
-* ab/gitweb-link-html-escape (2016-08-01) 1 commit
629
- (merged to 'next' on 2016-08-03 at 44b6088)
630
- + gitweb: escape link body in format_ref_marker
626
+* jh/status-v2-porcelain (2016-08-05) 10 commits
627
+ - status: unit tests for --porcelain=v2
628
+ - test-lib-functions.sh: Add lf_to_nul
629
+ - git-status.txt: describe --porcelain=v2 format
630
+ - status: print branch info with --porcelain=v2 --branch
631
+ - status: print per-file porcelain v2 status data
632
+ - SQUASH???
633
+ - status: collect per-file data for --porcelain=v2
634
+ - status: support --porcelain[=<version>]
635
+ - status: cleanup API to wt_status_print
636
+ - status: rename long-format print routines
637
632
- The characters in the label shown for tags/refs for commits in
633
- "gitweb" output are now properly escaped for proper HTML output.
638
+ Enhance "git status --porcelain" output by collecting more data on
639
+ the state of the index and the working tree files, which may
640
+ further be used to teach git-prompt (in contrib/) to make fewer
641
+ calls to git.
642
635
- Will merge to 'master'.
643
+ Waiting for review discussion to settle.
644
+ cf. <1470147137-17498-1-git-send-email-git@jeffhostetler.com>
645
646
638
-* ew/build-time-pager-tweaks (2016-08-04) 1 commit
639
- - pager: move pager-specific setup into the build
647
+* js/import-tars-hardlinks (2016-08-03) 1 commit
648
+ - import-tars: support hard links
649
641
- The build procedure learned PAGER_ENV knob that lists what default
642
- environment variable settings to export for popular pagers. This
643
- mechanism is used to tweak the default settings to MORE on FreeBSD.
650
+ "import-tars" fast-import script (in contrib/) used to ignore a
651
+ hardlink target and replaced it with an empty file, which has been
652
+ corrected to record the same blob as the other file the hardlink is
653
+ shared with.
654
655
Will merge to 'next'.
656
657
648
-* ib/t3700-add-chmod-x-updates (2016-08-01) 3 commits
649
- (merged to 'next' on 2016-08-03 at 1753346)
650
- + t3700: add a test_mode_in_index helper function
651
- + t3700: merge two tests into one
652
- + t3700: remove unwanted leftover files before running new tests
653
-
654
- The t3700 test about "add --chmod=-x" have been made a bit more
655
- robust and generally cleaned up.
656
-
657
- Will merge to 'master'.
658
-
659
-
660
-* jt/format-patch-from-config (2016-08-01) 1 commit
661
- - format-patch: format.from gives the default for --from
658
+* jk/trace-fixup (2016-08-05) 8 commits
659
+ - trace: do not fall back to stderr
660
+ - write_or_die: drop write_or_whine_pipe()
661
+ - trace: disable key after write error
662
+ - trace: correct variable name in write() error message
663
+ - trace: cosmetic fixes for error messages
664
+ - trace: use warning() for printing trace errors
665
+ - trace: stop using write_or_whine_pipe()
666
+ - trace: handle NULL argument in trace_disable()
667
663
- "git format-patch" learned format.from configuration variable to
664
- specify the default settings for its "--from" option.
668
+ Various small fixups to the "GIT_TRACE" facility.
669
670
Will merge to 'next'.
671
672
669
-* rs/st-mult (2016-08-01) 1 commit
670
- (merged to 'next' on 2016-08-03 at 5c6956a)
671
- + pass constants as first argument to st_mult()
673
+* mh/diff-indent-heuristic (2016-08-04) 8 commits
674
+ - diff: improve positioning of add/delete blocks in diffs
675
+ - is_blank_line: take a single xrecord_t as argument
676
+ - xdl_change_compact(): keep track of the earliest end
677
+ - xdl_change_compact(): fix compaction heuristic to adjust io
678
+ - xdl_change_compact(): do one final shift or the other, not both
679
+ - xdl_change_compact(): rename i to end
680
+ - xdl_change_compact(): clarify code
681
+ - xdl_change_compact(): rename some local variables for clarity
682
673
- Micro optimization of st_mult() facility used to check the integer
674
- overflow coming from multiplication to compute size of memory
675
- allocation.
683
+ Output from "git diff" can be made easier to read by selecting
684
+ which lines are common and which lines are added/deleted
685
+ intelligently when the lines before and after the changed section
686
+ are the same. A command line option is added to help with the
687
+ experiment to find a good heuristics.
688
677
- Will merge to 'master'.
689
+ Waiting for review discussion to settle.
690
+ cf. <cover.1470259583.git.mhagger@alum.mit.edu>
691
+ cf. <20160804072705.a53mospcccksiz4e@sigill.intra.peff.net>
692
+ cf. <20160804075631.jakbi5dbsbxsqcpr@sigill.intra.peff.net>
693
+ cf. <29c40cdd-363a-df09-f9e2-fe9070bb8a9c@ramsayjones.plus.com>
694
695
680
-* rs/use-strbuf-addstr (2016-08-01) 1 commit
681
- (merged to 'next' on 2016-08-03 at 523422f)
682
- + use strbuf_addstr() for adding constant strings to a strbuf
696
+* jt/format-patch-from-config (2016-08-01) 1 commit
697
+ (merged to 'next' on 2016-08-05 at 897e986)
698
+ + format-patch: format.from gives the default for --from
699
+
700
+ "git format-patch" learned format.from configuration variable to
701
+ specify the default settings for its "--from" option.
702
703
Will merge to 'master'.
704
@@ -699,16 +718,6 @@ of the repositories listed at
718
Will merge to 'master'.
719
720
702
-* jc/hashmap-doc-init (2016-08-02) 1 commit
703
- - hashmap: clarify that hashmap_entry can safely be discarded
704
-
705
- The API documentation for hashmap was unclear if hashmap_entry
706
- can be safely discarded without any other consideration. State
707
- that it is safe to do so.
708
-
709
- Will merge to 'next'.
710
-
711
-
721
* cc/apply-am (2016-08-01) 42 commits
722
. fixup! apply: make it possible to silently apply
723
. builtin/am: use apply api in run_apply()
@@ -763,57 +772,8 @@ of the repositories listed at
772
cf. <20160804212157.cn7ecyxcbyf4okd7@sigill.intra.peff.net>
773
774
766
-* da/subtree-modernize (2016-07-27) 2 commits
767
- (merged to 'next' on 2016-08-03 at 06ad015)
768
- + subtree: adjust function definitions to match CodingGuidelines
769
- + subtree: adjust style to match CodingGuidelines
770
-
771
- Style fixes for "git subtree" (in contrib/).
772
-
773
- Will merge to 'master'.
774
-
775
-
776
-* js/rebase-i-progress-tidy (2016-07-28) 1 commit
777
- (merged to 'next' on 2016-08-03 at bb1b414)
778
- + rebase-interactive: trim leading whitespace from progress count
779
-
780
- Regression fix for an i18n topic already in 'master'.
781
-
782
- Will merge to 'master'.
783
-
784
-
785
-* jk/t4205-cleanup (2016-07-27) 2 commits
786
- (merged to 'next' on 2016-08-03 at ba9b594)
787
- + t4205: indent here documents
788
- + t4205: drop top-level &&-chaining
789
-
790
- Test modernization.
791
-
792
- Will merge to 'master'.
793
-
794
-
795
-* jk/pack-objects-optim (2016-07-29) 6 commits
796
- (merged to 'next' on 2016-08-03 at ad8caca)
797
- + pack-objects: compute local/ignore_pack_keep early
798
- + pack-objects: break out of want_object loop early
799
- + find_pack_entry: replace last_found_pack with MRU cache
800
- + add generic most-recently-used list
801
- + sha1_file: drop free_pack_by_name
802
- + t/perf: add tests for many-pack scenarios
803
- (this branch is used by jk/pack-objects-optim-mru.)
804
-
805
- "git pack-objects" has a few options that tell it not to pack
806
- objects found in certain packfiles, which require it to scan .idx
807
- files of all available packs. The codepaths involved in these
808
- operations have been optimized for a common case of not having any
809
- non-local pack and/or any .kept pack.
810
-
811
- Will merge to 'master'.
812
-
813
-
775
* jk/pack-objects-optim-mru (2016-07-29) 1 commit
776
- pack-objects: use mru list when iterating over packs
816
- (this branch uses jk/pack-objects-optim.)
777
778
This is still questionable in that it can attempt to create a cycle
779
in delta-chain, only to be stopped by the last-ditch recovery logic
@@ -864,62 +824,6 @@ of the repositories listed at
824
Will merge to 'master'.
825
826
867
-* nd/fetch-ref-summary (2016-07-26) 1 commit
868
- (merged to 'next' on 2016-08-03 at c045704)
869
- + t5510: skip tests under GETTEXT_POISON build
870
-
871
- Hotfix of a test in a topic that has already been merged to 'master'.
872
-
873
- Will merge to 'master'.
874
-
875
-
876
-* cp/completion-clone-recurse-submodules (2016-07-27) 1 commit
877
- (merged to 'next' on 2016-08-03 at cbf0d94)
878
- + completion: add option '--recurse-submodules' to 'git clone'
879
-
880
- Will merge to 'master'.
881
-
882
-
883
-* va/i18n (2016-07-28) 2 commits
884
- (merged to 'next' on 2016-08-03 at cf753d2)
885
- + i18n: config: unfold error messages marked for translation
886
- + i18n: notes: mark comment for translation
887
-
888
- More i18n marking.
889
-
890
- Will merge to 'master'.
891
-
892
-
893
-* jk/reflog-date (2016-07-27) 7 commits
894
- (merged to 'next' on 2016-08-03 at cd8e92b)
895
- + date: clarify --date=raw description
896
- + date: add "unix" format
897
- + date: document and test "raw-local" mode
898
- + doc/pretty-formats: explain shortening of %gd
899
- + doc/pretty-formats: describe index/time formats for %gd
900
- + doc/rev-list-options: explain "-g" output formats
901
- + doc/rev-list-options: clarify "commit@{Nth}" for "-g" option
902
-
903
- The reflog output format is documented better, and a new format
904
- --date=unix to report the seconds-since-epoch (without timezone)
905
- has been added.
906
-
907
- Will merge to 'master'.
908
-
909
-
910
-* ew/git-svn-http-tests (2016-07-25) 2 commits
911
- (merged to 'next' on 2016-08-03 at 2b23920)
912
- + git svn: migrate tests to use lib-httpd
913
- + t/t91*: do not say how to avoid the tests
914
-
915
- Tests for "git svn" have been taught to reuse the lib-httpd test
916
- infrastructure when testing the subversion integration that
917
- interacts with subversion repositories served over the http://
918
- protocol.
919
-
920
- Will merge to 'master'.
921
-
922
-
827
* jk/push-force-with-lease-creation (2016-08-04) 4 commits
828
(merged to 'next' on 2016-08-04 at e42ce85)
829
+ t5533: make it pass on case-sensitive filesystems
@@ -938,58 +842,35 @@ of the repositories listed at
842
843
844
* js/am-3-merge-recursive-direct (2016-08-01) 16 commits
941
- - merge-recursive: flush output buffer even when erroring out
942
- - merge_trees(): ensure that the callers release output buffer
943
- - merge-recursive: offer an option to retain the output in 'obuf'
944
- - merge-recursive: write the commit title in one go
945
- - merge-recursive: flush output buffer before printing error messages
946
- - am -3: use merge_recursive() directly again
947
- - merge-recursive: switch to returning errors instead of dying
948
- - merge-recursive: handle return values indicating errors
949
- - merge-recursive: allow write_tree_from_memory() to error out
950
- - merge-recursive: avoid returning a wholesale struct
951
- - merge_recursive: abort properly upon errors
952
- - prepare the builtins for a libified merge_recursive()
953
- - merge-recursive: clarify code in was_tracked()
954
- - die(_("BUG")): avoid translating bug messages
955
- - die("bug"): report bugs consistently
956
- - t5520: verify that `pull --rebase` shows the helpful advice when failing
845
+ (merged to 'next' on 2016-08-05 at dc1c9bb)
846
+ + merge-recursive: flush output buffer even when erroring out
847
+ + merge_trees(): ensure that the callers release output buffer
848
+ + merge-recursive: offer an option to retain the output in 'obuf'
849
+ + merge-recursive: write the commit title in one go
850
+ + merge-recursive: flush output buffer before printing error messages
851
+ + am -3: use merge_recursive() directly again
852
+ + merge-recursive: switch to returning errors instead of dying
853
+ + merge-recursive: handle return values indicating errors
854
+ + merge-recursive: allow write_tree_from_memory() to error out
855
+ + merge-recursive: avoid returning a wholesale struct
856
+ + merge_recursive: abort properly upon errors
857
+ + prepare the builtins for a libified merge_recursive()
858
+ + merge-recursive: clarify code in was_tracked()
859
+ + die(_("BUG")): avoid translating bug messages
860
+ + die("bug"): report bugs consistently
861
+ + t5520: verify that `pull --rebase` shows the helpful advice when failing
862
863
"git am -3" calls "git merge-recursive" when it needs to fall back
864
to a three-way merge; this call has been turned into an internal
865
subroutine call instead of spawning a separate subprocess.
866
962
- Will merge to 'next'.
867
+ Will merge to 'master'.
868
869
Eyes from other people are highly appreciated, as my eyes (and the
870
original author's, too) have rotten by staring many rerolls of the
871
same topic and are not effective in spotting errors.
872
873
969
-* nd/log-decorate-color-head-arrow (2016-07-12) 1 commit
970
- - log: decorate HEAD -> branch with the same color for arrow and HEAD
971
-
972
- An entry "git log --decorate" for the tip of the current branch is
973
- shown as "HEAD -> name" (where "name" is the name of the branch);
974
- paint the arrow in the same color as "HEAD", not in the color for
975
- commits.
976
-
977
- Will merge to 'next'.
978
-
979
-
980
-* jk/difftool-in-subdir (2016-07-28) 3 commits
981
- (merged to 'next' on 2016-08-03 at 90f195a)
982
- + difftool: use Git::* functions instead of passing around state
983
- + difftool: avoid $GIT_DIR and $GIT_WORK_TREE
984
- + difftool: fix argument handling in subdirs
985
-
986
- "git difftool <paths>..." started in a subdirectory failed to
987
- interpret the paths relative to that directory, which has been
988
- fixed.
989
-
990
- Will merge to 'master'.
991
-
992
-
874
* dp/autoconf-curl-ssl (2016-06-28) 1 commit
875
- ./configure.ac: detect SSL in libcurl using curl-config
876