What's cooking (2016/02 #01)
Junio C Hamano committed
Feb 2, 2016 at 16:40 UTC
eb8a3b3996ebcbc68659d8147ca9ad26a38183a2
1 file changed
+320
-434
whats-cooking.txt
+320
-434
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2016, #05; Tue, 26)
4
-X-master-at: d10e2cb9d0299a26f43d57dd5bdcf2b3f86a30b3
5
-X-next-at: 2d793f61b3b211a574b86fbf9750d86a2ebf6ae1
3
+Subject: What's cooking in git.git (Feb 2016, #01; Tue, 2)
4
+X-master-at: 07c314d22dc8b0a982e76e7498a3f4d384062491
5
+X-next-at: 0765b0dbbbbf563f024948d74efb0d971872c22d
6
7
-What's cooking in git.git (Jan 2016, #05; Tue, 26)
7
+What's cooking in git.git (Feb 2016, #01; Tue, 2)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,14 +12,6 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-The tip of 'master' now has a few batches of topics merged, some of
16
-which should later be merged to 'maint'. There are a few topics
17
-that are v2.7.0 regression fixes still cooking outside 'master',
18
-which also need to be merged to 'maint' for the maintenance release.
19
-
20
-A big thank-you to Elia Pinto for resurrecting a long-stalled http
21
-proxy-auth topic.
22
-
15
You can find the changes described here in the integration branches of the
16
repositories listed at
17
@@ -28,181 +20,279 @@ repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
31
-* ak/format-patch-odir-config (2016-01-13) 1 commit
32
- (merged to 'next' on 2016-01-20 at 97c699b)
33
- + format-patch: introduce format.outputDirectory configuration
34
-
35
- "git format-patch" learned to notice format.outputDirectory
36
- configuration variable. This allows "-o <dir>" option to be
37
- omitted on the command line if you always use the same directory in
38
- your workflow.
39
-
40
-
41
-* ep/shell-command-substitution-style (2016-01-12) 92 commits
42
- (merged to 'next' on 2016-01-20 at ae1b1d8)
43
- + t9901-git-web--browse.sh: use the $( ... ) construct for command substitution
44
- + t9501-gitweb-standalone-http-status.sh: use the $( ... ) construct for command substitution
45
- + t9350-fast-export.sh: use the $( ... ) construct for command substitution
46
- + t9300-fast-import.sh: use the $( ... ) construct for command substitution
47
- + t9150-svk-mergetickets.sh: use the $( ... ) construct for command substitution
48
- + t9145-git-svn-master-branch.sh: use the $( ... ) construct for command substitution
49
- + t9138-git-svn-authors-prog.sh: use the $( ... ) construct for command substitution
50
- + t9137-git-svn-dcommit-clobber-series.sh: use the $( ... ) construct for command substitution
51
- + t9132-git-svn-broken-symlink.sh: use the $( ... ) construct for command substitution
52
- + t9130-git-svn-authors-file.sh: use the $( ... ) construct for command substitution
53
- + t9129-git-svn-i18n-commitencoding.sh: use the $( ... ) construct for command substitution
54
- + t9119-git-svn-info.sh: use the $( ... ) construct for command substitution
55
- + t9118-git-svn-funky-branch-names.sh: use the $( ... ) construct for command substitution
56
- + t9114-git-svn-dcommit-merge.sh: use the $( ... ) construct for command substitution
57
- + t9110-git-svn-use-svm-props.sh: use the $( ... ) construct for command substitution
58
- + t9109-git-svn-multi-glob.sh: use the $( ... ) construct for command substitution
59
- + t9108-git-svn-glob.sh: use the $( ... ) construct for command substitution
60
- + t9107-git-svn-migrate.sh: use the $( ... ) construct for command substitution
61
- + t9105-git-svn-commit-diff.sh: use the $( ... ) construct for command substitution
62
- + t9104-git-svn-follow-parent.sh: use the $( ... ) construct for command substitution
63
- + t9101-git-svn-props.sh: use the $( ... ) construct for command substitution
64
- + t9100-git-svn-basic.sh: use the $( ... ) construct for command substitution
65
- + t/t9001-send-email.sh: use the $( ... ) construct for command substitution
66
- + t/t8003-blame-corner-cases.sh: use the $( ... ) construct for command substitution
67
- + t/t7700-repack.sh: use the $( ... ) construct for command substitution
68
- + t/t7602-merge-octopus-many.sh: use the $( ... ) construct for command substitution
69
- + t/t7505-prepare-commit-msg-hook.sh: use the $( ... ) construct for command substitution
70
- + t/t7504-commit-msg-hook.sh: use the $( ... ) construct for command substitution
71
- + t/t7408-submodule-reference.sh: use the $( ... ) construct for command substitution
72
- + t/t7406-submodule-update.sh: use the $( ... ) construct for command substitution
73
- + t/t7103-reset-bare.sh: use the $( ... ) construct for command substitution
74
- + t/t7006-pager.sh: use the $( ... ) construct for command substitution
75
- + t/t7004-tag.sh: use the $( ... ) construct for command substitution
76
- + t/t7003-filter-branch.sh: use the $( ... ) construct for command substitution
77
- + t/t7001-mv.sh: use the $( ... ) construct for command substitution
78
- + t/t6132-pathspec-exclude.sh: use the $( ... ) construct for command substitution
79
- + t/t6032-merge-large-rename.sh: use the $( ... ) construct for command substitution
80
- + t/t6015-rev-list-show-all-parents.sh: use the $( ... ) construct for command substitution
81
- + t/t6002-rev-list-bisect.sh: use the $( ... ) construct for command substitution
82
- + t/t6001-rev-list-graft.sh: use the $( ... ) construct for command substitution
83
- + t/t5900-repo-selection.sh: use the $( ... ) construct for command substitution
84
- + t/t5710-info-alternate.sh: use the $( ... ) construct for command substitution
85
- + t/t5700-clone-reference.sh: use the $( ... ) construct for command substitution
86
- + t/t5601-clone.sh: use the $( ... ) construct for command substitution
87
- + t/t5570-git-daemon.sh: use the $( ... ) construct for command substitution
88
- + t/t5550-http-fetch-dumb.sh: use the $( ... ) construct for command substitution
89
- + t/t5538-push-shallow.sh: use the $( ... ) construct for command substitution
90
- + t/t5537-fetch-shallow.sh: use the $( ... ) construct for command substitution
91
- + t/t5532-fetch-proxy.sh: use the $( ... ) construct for command substitution
92
- + t/t5530-upload-pack-error.sh: use the $( ... ) construct for command substitution
93
- + t/t5522-pull-symlink.sh: use the $( ... ) construct for command substitution
94
- + t/t5517-push-mirror.sh: use the $( ... ) construct for command substitution
95
- + t/t5516-fetch-push.sh: use the $( ... ) construct for command substitution
96
- + t/t5515-fetch-merge-logic.sh: use the $( ... ) construct for command substitution
97
- + t/t5510-fetch.sh: use the $( ... ) construct for command substitution
98
- + t/t5506-remote-groups.sh: use the $( ... ) construct for command substitution
99
- + t/t5505-remote.sh: use the $( ... ) construct for command substitution
100
- + t/t5500-fetch-pack.sh: use the $( ... ) construct for command substitution
101
- + t/t5305-include-tag.sh: use the $( ... ) construct for command substitution
102
- + t/t5304-prune.sh: use the $( ... ) construct for command substitution
103
- + t/t5303-pack-corruption-resilience.sh: use the $( ... ) construct for command substitution
104
- + t/t5100: no need to use 'echo' command substitutions for globbing
105
- + t/t5302-pack-index.sh: use the $( ... ) construct for command substitution
106
- + t/t5301-sliding-window.sh: use the $( ... ) construct for command substitution
107
- + t/t5300-pack-object.sh: use the $( ... ) construct for command substitution
108
- + t/t5100-mailinfo.sh: use the $( ... ) construct for command substitution
109
- + t/t3700-add.sh: use the $( ... ) construct for command substitution
110
- + t/t3600-rm.sh: use the $( ... ) construct for command substitution
111
- + t/t3511-cherry-pick-x.sh: use the $( ... ) construct for command substitution
112
- + t/t3403-rebase-skip.sh: use the $( ... ) construct for command substitution
113
- + t/t3210-pack-refs.sh: use the $( ... ) construct for command substitution
114
- + t/t3101-ls-tree-dirname.sh: use the $( ... ) construct for command substitution
115
- + t/t3100-ls-tree-restrict.sh: use the $( ... ) construct for command substitution
116
- + t/t3030-merge-recursive.sh: use the $( ... ) construct for command substitution
117
- + t/t2102-update-index-symlinks.sh: use the $( ... ) construct for command substitution
118
- + t/t2025-worktree-add.sh: use the $( ... ) construct for command substitution
119
- + t/t1700-split-index.sh: use the $( ... ) construct for command substitution
120
- + t/t1512-rev-parse-disambiguation.sh: use the $( ... ) construct for command substitution
121
- + t/t1511-rev-parse-caret.sh: use the $( ... ) construct for command substitution
122
- + t/t1410-reflog.sh: use the $( ... ) construct for command substitution
123
- + t/t1401-symbolic-ref.sh: use the $( ... ) construct for command substitution
124
- + t/t1100-commit-tree-options.sh: use the $( ... ) construct for command substitution
125
- + unimplemented.sh: use the $( ... ) construct for command substitution
126
- + test-sha1.sh: use the $( ... ) construct for command substitution
127
- + t/lib-httpd.sh: use the $( ... ) construct for command substitution
128
- + git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution
129
- + contrib/thunderbird-patch-inline/appp.sh: use the $( ... ) construct for command substitution
130
- + contrib/examples/git-revert.sh: use the $( ... ) construct for command substitution
131
- + contrib/examples/git-repack.sh: use the $( ... ) construct for command substitution
132
- + contrib/examples/git-merge.sh: use the $( ... ) construct for command substitution
133
- + contrib/examples/git-fetch.sh: use the $( ... ) construct for command substitution
134
- + contrib/examples/git-commit.sh: use the $( ... ) construct for command substitution
135
-
136
- A shell script style update to change `command substitution` into
137
- $(command substitution). Coverts contrib/ and much of the t/
138
- directory contents.
139
-
140
-
141
-* jk/ok-to-fail-gc-auto-in-rebase (2016-01-13) 1 commit
142
- (merged to 'next' on 2016-01-20 at c9a8e82)
143
- + rebase: ignore failures from "gc --auto"
144
-
145
- "git rebase", unlike all other callers of "gc --auto", did not
146
- ignore the exit code from "gc --auto".
147
-
148
-
149
-* jk/symbolic-ref (2016-01-13) 6 commits
150
- (merged to 'next' on 2016-01-20 at 30b5408)
151
- + lock_ref_sha1_basic: handle REF_NODEREF with invalid refs
152
- + lock_ref_sha1_basic: always fill old_oid while holding lock
153
- + checkout,clone: check return value of create_symref
154
- + create_symref: write reflog while holding lock
155
- + create_symref: use existing ref-lock code
156
- + create_symref: modernize variable names
157
-
158
- The low-level code that is used to create symbolic references has
159
- been updated to share more code with the code that deals with
160
- normal references.
161
-
162
-
163
-* js/close-packs-before-gc (2016-01-13) 4 commits
164
- (merged to 'next' on 2016-01-20 at 16cf87b)
165
- + receive-pack: release pack files before garbage-collecting
166
- + merge: release pack files before garbage-collecting
167
- + am: release pack files before garbage-collecting
168
- + fetch: release pack files before garbage-collecting
169
-
170
- Many codepaths that run "gc --auto" before exiting kept packfiles
171
- mapped and left the file descriptors to them open, which was not
172
- friendly to systems that cannot remove files that are open. They
173
- now close the packs before doing so.
174
-
175
-
176
-* js/pull-rebase-i (2016-01-13) 3 commits
177
- (merged to 'next' on 2016-01-20 at a0c5440)
178
- + completion: add missing branch.*.rebase values
179
- + remote: handle the config setting branch.*.rebase=interactive
180
- + pull: allow interactive rebase with --rebase=interactive
181
-
182
- "git pull --rebase" has been extended to allow invoking
183
- "rebase -i".
184
-
185
-
186
-* rm/subtree-unwrap-tags (2015-11-24) 1 commit
187
- (merged to 'next' on 2016-01-20 at 6373d95)
188
- + contrib/subtree: unwrap tag refs
189
-
190
- "git subtree" (in contrib/) records the tag object name in the
191
- commit log message when a subtree is added using a tag, without
192
- peeling it down to the underlying commit. The tag needs to be
193
- peeled when "git subtree split" wants to work on the commit, but
194
- the command forgot to do so.
195
-
196
-
197
-* rp/p4-filetype-change (2016-01-13) 1 commit
198
- (merged to 'next' on 2016-01-20 at 7b5954b)
199
- + git-p4.py: add support for filetype change
200
-
201
- "git p4" learned to cope with the type of a file getting changed.
23
+* ew/svn-1.9.0-auth (2016-01-26) 1 commit
24
+ (merged to 'next' on 2016-01-28 at 61a4a8f)
25
+ + git-svn: fix auth parameter handling on SVN 1.9.0+
26
+
27
+
28
+* jc/strbuf-getline (2016-01-15) 9 commits
29
+ (merged to 'next' on 2016-01-22 at 8c4e051)
30
+ + strbuf: give strbuf_getline() to the "most text friendly" variant
31
+ + checkout-index: there are only two possible line terminations
32
+ + update-index: there are only two possible line terminations
33
+ + check-ignore: there are only two possible line terminations
34
+ + check-attr: there are only two possible line terminations
35
+ + mktree: there are only two possible line terminations
36
+ + strbuf: introduce strbuf_getline_{lf,nul}()
37
+ + strbuf: make strbuf_getline_crlf() global
38
+ + strbuf: miniscule style fix
39
+ (this branch is used by jc/peace-with-crlf.)
40
+
41
+ The preliminary clean-up for jc/peace-with-crlf topic.
42
+
43
+
44
+* jk/filter-branch-no-index (2016-01-19) 1 commit
45
+ (merged to 'next' on 2016-01-22 at 312aa2c)
46
+ + filter-branch: resolve $commit^{tree} in no-index case
47
+
48
+ A recent optimization to filter-branch in v2.7.0 introduced a
49
+ regression when --prune-empty filter is used, which has been
50
+ corrected.
51
+
52
+
53
+* jk/list-tag-2.7-regression (2016-01-26) 2 commits
54
+ (merged to 'next' on 2016-01-26 at fb9ccee)
55
+ + tag: do not show ambiguous tag names as "tags/foo"
56
+ + t6300: use test_atom for some un-modern tests
57
+ (this branch is used by kn/ref-filter-atom-parsing.)
58
+
59
+ "git tag" started listing a tag "foo" as "tags/foo" when a branch
60
+ named "foo" exists in the same repository; remove this unnecessary
61
+ disambiguation, which is a regression introduced in v2.7.0.
62
+
63
+
64
+* jk/sanity (2016-01-19) 1 commit
65
+ (merged to 'next' on 2016-01-22 at 612cc5f)
66
+ + test-lib: clarify and tighten SANITY
67
+
68
+ The description for SANITY prerequisite the test suite uses has
69
+ been clarified both in the comment and in the implementation.
70
+
71
+
72
+* jk/shortlog (2016-01-19) 7 commits
73
+ (merged to 'next' on 2016-01-22 at f1c688c)
74
+ + shortlog: don't warn on empty author
75
+ + shortlog: optimize out useless string list
76
+ + shortlog: optimize out useless "<none>" normalization
77
+ + shortlog: optimize "--summary" mode
78
+ + shortlog: replace hand-parsing of author with pretty-printer
79
+ + shortlog: use strbufs to read from stdin
80
+ + shortlog: match both "Author:" and "author" on stdin
81
+
82
+ "git shortlog" used to accumulate various pieces of information
83
+ regardless of what was asked to be shown in the final output. It
84
+ has been optimized by noticing what need not to be collected
85
+ (e.g. there is no need to collect the log messages when showing
86
+ only the number of changes).
87
+
88
+
89
+* js/msys2 (2016-01-15) 9 commits
90
+ (merged to 'next' on 2016-01-22 at 8bab6ab)
91
+ + mingw: uglify (a, 0) definitions to shut up warnings
92
+ + mingw: squash another warning about a cast
93
+ + mingw: avoid warnings when casting HANDLEs to int
94
+ + mingw: avoid redefining S_* constants
95
+ + compat/winansi: support compiling with MSys2
96
+ + compat/mingw: support MSys2-based MinGW build
97
+ + nedmalloc: allow compiling with MSys2's compiler
98
+ + config.mak.uname: supporting 64-bit MSys2
99
+ + config.mak.uname: support MSys2
100
+ (this branch is used by js/mingw-tests.)
101
+
102
+ Beginning of the upstreaming process of Git for Windows effort.
103
+
104
+
105
+* tk/interpret-trailers-in-place (2016-01-14) 2 commits
106
+ (merged to 'next' on 2016-01-22 at 5db0cf8)
107
+ + interpret-trailers: add option for in-place editing
108
+ + trailer: allow to write to files other than stdout
109
+
110
+ "interpret-trailers" has been taught to optionally update a file in
111
+ place, instead of always writing the result to the standard output.
112
113
--------------------------------------------------
114
[New Topics]
115
116
+* aw/push-force-with-lease-reporting (2016-02-01) 1 commit
117
+ - push: fix ref status reporting for --force-with-lease
118
+
119
+ "git push --force-with-lease" has been taught to report if the push
120
+ needed to force (or fast-forwarded).
121
+
122
+ Will merge to 'next'.
123
+
124
+
125
+* ew/connect-verbose (2016-01-28) 1 commit
126
+ - pass transport verbosity down to git_connect
127
+
128
+ There were a few "now I am doing this thing" progress messages in
129
+ the TCP connection code that can be triggered by setting a verbose
130
+ option internally in the code, but "git fetch -v" and friends never
131
+ passed the verbose option down to that codepath.
132
+
133
+ There was a brief discussion about the impact on the end-user
134
+ experience by not limiting this to "fetch -v -v", but I think the
135
+ conclusion is that this is OK to enable with a single "-v" as it is
136
+ not too noisy.
137
+
138
+ Will merge to 'next'.
139
+
140
+
141
+* ls/clean-smudge-override-in-config (2016-01-29) 1 commit
142
+ - convert: treat an empty string for clean/smudge filters as "cat"
143
+
144
+ Allow clean and smudge filter commands defined in a configuration
145
+ file to be disabled by redefining it to an empty string.
146
+
147
+ Will merge to 'next'.
148
+
149
+
150
+* ah/stripspace-optstring (2016-01-29) 1 commit
151
+ - stripspace: call U+0020 a "space" instead of a "blank"
152
+
153
+ Comments?
154
+
155
+
156
+* dw/mergetool-vim-window-shuffle (2016-01-29) 1 commit
157
+ - mergetool: reorder vim/gvim buffers in three-way diffs
158
+
159
+ Comments from real vim/gvim users?
160
+
161
+
162
+* jk/drop-rsync-transport (2016-02-01) 1 commit
163
+ - transport: drop support for git-over-rsync
164
+
165
+ It turns out "git clone" over rsync transport has been broken when
166
+ the source repository has packed references for a long time, and
167
+ nobody noticed nor complained about it.
168
+
169
+ Will merge to 'next'.
170
+
171
+
172
+* jk/options-cleanup (2016-02-01) 6 commits
173
+ - apply, ls-files: simplify "-z" parsing
174
+ - checkout-index: disallow "--no-stage" option
175
+ - checkout-index: handle "--no-index" option
176
+ - checkout-index: handle "--no-prefix" option
177
+ - checkout-index: simplify "-z" option parsing
178
+ - give "nbuf" strbuf a more meaningful name
179
+
180
+ Various clean-ups to the command line option parsing.
181
+
182
+ Will merge to 'next'.
183
+
184
+
185
+* dv/http-try-negotiate-at-least-once (2016-02-02) 1 commit
186
+ - remote-curl: don't fall back to Basic auth if we haven't tried Negotiate
187
+
188
+ Needs review.
189
+
190
+
191
+* js/test-lib-windows-emulated-yes (2016-02-02) 1 commit
192
+ - test-lib: limit the output of the yes utility
193
+
194
+ The emulated "yes" command used in our test scripts has been
195
+ tweaked not to spend too much time generating unnecessary output
196
+ that is not used, to help those who test on Windows where it would
197
+ not stop until it fills the pipe buffer due to lack of SIGPIPE.
198
+
199
+ Will merge to 'next'.
200
+
201
+--------------------------------------------------
202
+[Stalled]
203
+
204
+* dk/gc-more-wo-pack (2016-01-13) 4 commits
205
+ - gc: clean garbage .bitmap files from pack dir
206
+ - t5304: ensure non-garbage files are not deleted
207
+ - t5304: test .bitmap garbage files
208
+ - prepare_packed_git(): find more garbage
209
+
210
+ Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
211
+ .bitmap and .keep files.
212
+
213
+ Waiting for a reroll.
214
+ ($gmane/284368).
215
+
216
+
217
+* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
218
+ - t/lib-git-svn: check same httpd module dirs as lib-httpd
219
+ - t/lib-httpd: load mod_unixd
220
+
221
+ This is the first two commits in a three-patch series $gmane/266962
222
+
223
+ Becoming tired of waiting for a reroll.
224
+ with updated log message ($gmane/268061).
225
+ Will discard.
226
+
227
+
228
+* jc/diff-b-m (2015-02-23) 5 commits
229
+ . WIPWIP
230
+ . WIP: diff-b-m
231
+ - diffcore-rename: allow easier debugging
232
+ - diffcore-rename.c: add locate_rename_src()
233
+ - diffcore-break: allow debugging
234
+
235
+ "git diff -B -M" produced incorrect patch when the postimage of a
236
+ completely rewritten file is similar to the preimage of a removed
237
+ file; such a resulting file must not be expressed as a rename from
238
+ other place.
239
+
240
+ The fix in this patch is broken, unfortunately.
241
+ Will discard.
242
+
243
+--------------------------------------------------
244
+[Cooking]
245
+
246
+* sb/submodule-parallel-update (2016-01-12) 8 commits
247
+ - clone: allow an explicit argument for parallel submodule clones
248
+ - submodule update: expose parallelism to the user
249
+ - git submodule update: have a dedicated helper for cloning
250
+ - fetching submodules: respect `submodule.fetchJobs` config option
251
+ - submodule-config: introduce parse_generic_submodule_config
252
+ - submodule-config: remove name_and_item_from_var
253
+ - submodule-config: drop check against NULL
254
+ - submodule-config: keep update strategy around
255
+ (this branch is used by dt/refs-backend-lmdb and sb/submodule-init.)
256
+
257
+ Builds on top of the "fetch --recurse-submodules" work to introduce
258
+ parallel downloading into multiple submodules for "submodule update".
259
+
260
+ Needs review.
261
+
262
+
263
+* dt/refs-backend-lmdb (2016-02-02) 21 commits
264
+ - refs: tests for lmdb backend
265
+ - refs: add LMDB refs backend
266
+ - svn: learn ref-storage argument
267
+ - refs: allow ref backend to be set for clone
268
+ - refs: check submodules ref storage config
269
+ - init: allow alternate backends to be set for new repos
270
+ - refs: always handle non-normal refs in files backend
271
+ - refs: resolve symbolic refs first
272
+ - refs: allow log-only updates
273
+ - refs: move duplicate check to common code
274
+ - refs: make lock generic
275
+ - refs: add method to rename refs
276
+ - refs: add methods to init refs db
277
+ - refs: add method for delete_refs
278
+ - refs: add method for initial ref transaction commit
279
+ - refs: add methods for reflog
280
+ - refs: add do_for_each_per_worktree_ref
281
+ - refs: add methods for the ref iterators
282
+ - refs: add methods for misc ref operations
283
+ - refs: add a backend method structure with transaction functions
284
+ - Merge branch 'sb/submodule-parallel-update' into dt/refs-backend-lmdb
285
+ (this branch uses sb/submodule-parallel-update; is tangled with sb/submodule-init.)
286
+
287
+ Building on top of a few refs-backend preparatory series, LMDB
288
+ based refs backend has been plugged into the system.
289
+
290
+ This can now be reviewed and polished as it no longer depends on
291
+ too many topics in flight ;-)
292
+
293
+ Needs review.
294
+
295
+
296
* lv/add-doc-working-tree (2016-01-21) 1 commit
297
(merged to 'next' on 2016-01-26 at c5b1ab1)
298
+ git-add doc: do not say working directory when you mean working tree
@@ -268,18 +358,6 @@ repositories listed at
358
Will merge to 'master'.
359
360
271
-* jk/list-tag-2.7-regression (2016-01-26) 2 commits
272
- (merged to 'next' on 2016-01-26 at fb9ccee)
273
- + tag: do not show ambiguous tag names as "tags/foo"
274
- + t6300: use test_atom for some un-modern tests
275
-
276
- "git tag" started listing a tag "foo" as "tags/foo" when a branch
277
- named "foo" exists in the same repository; remove this unnecessary
278
- disambiguation, which is a regression introduced in v2.7.0.
279
-
280
- Will merge to 'master'.
281
-
282
-
361
* pw/completion-show-branch (2016-01-25) 1 commit
362
(merged to 'next' on 2016-01-26 at d0d7735)
363
+ completion: complete show-branch "--date-order"
@@ -287,13 +365,13 @@ repositories listed at
365
Will merge to 'master'.
366
367
290
-* js/mingw-tests (2016-01-26) 20 commits
291
- - mingw: skip a test in t9130 that cannot pass on Windows
368
+* js/mingw-tests (2016-01-28) 20 commits
369
- mingw: do not bother to test funny file names
370
+ - mingw: skip a test in t9130 that cannot pass on Windows
371
- mingw: handle the missing POSIXPERM prereq in t9124
372
- mingw: avoid illegal filename in t9118
373
- mingw: mark t9100's test cases with appropriate prereqs
296
- - Avoid absolute path in t0008
374
+ - t0008: avoid absolute path
375
- mingw: work around pwd issues in the tests
376
- mingw: fix t9700's assumption about directory separators
377
- mingw: skip test in t1508 that fails due to path conversion
@@ -308,28 +386,28 @@ repositories listed at
386
- Git.pm: stop assuming that absolute paths start with a slash
387
- mingw: do not trust MSYS2's MinGW gettext.sh
388
- mingw: let's use gettext with MSYS2
311
- (this branch uses js/msys2.)
389
390
Updates test scripts to remove assumptions that are not portable
391
between Git for POSIX and Git for Windows, or to skip ones with
392
expectations that are not satisfiable on Git for Windows.
393
317
- Looks mostly done, but I had to tweak a few things, so
318
- Waiting for re-test.
394
+ Will merge to 'next'.
395
396
321
-* js/xmerge-maker-eol (2016-01-26) 2 commits
322
- - merge-file: ensure that conflict sections match eol style
323
- - merge-file: let conflict markers match end-of-line style of the context
397
+* js/xmerge-marker-eol (2016-01-27) 2 commits
398
+ (merged to 'next' on 2016-02-01 at 05d91a4)
399
+ + merge-file: ensure that conflict sections match eol style
400
+ + merge-file: let conflict markers match end-of-line style of the context
401
402
The low-level merge machinery has been taught to use CRLF line
403
termination when inserting conflict markers to merged contents that
404
are themselves CRLF line-terminated.
405
329
- Will merge to 'next'.
406
+ Will merge to 'master'.
407
408
332
-* nd/clear-gitenv-upon-use-of-alias (2016-01-26) 3 commits
409
+* nd/clear-gitenv-upon-use-of-alias (2016-02-02) 4 commits
410
+ - restore_env(): free the saved environment variable once we are done
411
- git: simplify environment save/restore logic
412
- git: protect against unbalanced calls to {save,restore}_env()
413
- git: remove an early return from save_env_before_alias()
@@ -337,9 +415,7 @@ repositories listed at
415
The automatic typo correction applied to an alias was broken
416
with a recent change already in 'master'.
417
340
- Waiting for a response.
341
- This is my attempt to clarify an original from Duy by splitting it
342
- into a minimal fix and clean-up.
418
+ Needs review.
419
420
421
* pw/completion-stash (2016-01-26) 1 commit
@@ -348,41 +424,11 @@ repositories listed at
424
425
Will merge to 'master'.
426
351
---------------------------------------------------
352
-[Stalled]
353
-
354
-* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
355
- - t/lib-git-svn: check same httpd module dirs as lib-httpd
356
- - t/lib-httpd: load mod_unixd
357
-
358
- This is the first two commits in a three-patch series $gmane/266962
359
-
360
- Becoming tired of waiting for a reroll.
361
- with updated log message ($gmane/268061).
362
- Will discard.
363
-
364
-
365
-* jc/diff-b-m (2015-02-23) 5 commits
366
- . WIPWIP
367
- . WIP: diff-b-m
368
- - diffcore-rename: allow easier debugging
369
- - diffcore-rename.c: add locate_rename_src()
370
- - diffcore-break: allow debugging
371
-
372
- "git diff -B -M" produced incorrect patch when the postimage of a
373
- completely rewritten file is similar to the preimage of a removed
374
- file; such a resulting file must not be expressed as a rename from
375
- other place.
376
-
377
- The fix in this patch is broken, unfortunately.
378
- Will discard.
379
-
380
---------------------------------------------------
381
-[Cooking]
427
428
* kf/http-proxy-auth-methods (2016-01-26) 2 commits
384
- - http: use credential API to handle proxy authentication
385
- - http: allow selection of proxy authentication method
429
+ (merged to 'next' on 2016-02-01 at b0956b2)
430
+ + http: use credential API to handle proxy authentication
431
+ + http: allow selection of proxy authentication method
432
433
New http.proxyAuthMethod configuration variable can be used to
434
specify what authentication method to use, as a way to work around
@@ -391,7 +437,7 @@ repositories listed at
437
has been taught to use credential API to store the authentication
438
material in user's keyrings.
439
394
- Will merge to 'next'.
440
+ Will merge to 'master'.
441
442
443
* dg/subtree-rebase-test (2016-01-19) 1 commit
@@ -402,25 +448,6 @@ repositories listed at
448
($gmane/284426)
449
450
405
-* jk/shortlog (2016-01-19) 7 commits
406
- (merged to 'next' on 2016-01-22 at f1c688c)
407
- + shortlog: don't warn on empty author
408
- + shortlog: optimize out useless string list
409
- + shortlog: optimize out useless "<none>" normalization
410
- + shortlog: optimize "--summary" mode
411
- + shortlog: replace hand-parsing of author with pretty-printer
412
- + shortlog: use strbufs to read from stdin
413
- + shortlog: match both "Author:" and "author" on stdin
414
-
415
- "git shortlog" used to accumulate various pieces of information
416
- regardless of what was asked to be shown in the final output. It
417
- has been optimized by noticing what need not to be collected
418
- (e.g. there is no need to collect the log messages when showing
419
- only the number of changes).
420
-
421
- Will merge to 'master'.
422
-
423
-
451
* jc/peace-with-crlf (2016-01-15) 12 commits
452
(merged to 'next' on 2016-01-26 at 08724bc)
453
+ test-sha1-array: read command stream with strbuf_getline()
@@ -435,7 +462,6 @@ repositories listed at
462
+ rev-parse: read parseopt spec with strbuf_getline()
463
+ revision: read --stdin with strbuf_getline()
464
+ hash-object: read --stdin-paths with strbuf_getline()
438
- (this branch uses jc/strbuf-getline.)
465
466
Teach codepaths that communicate with users by reading text files
467
to be more lenient to editors that write CRLF-terminated lines.
@@ -453,27 +479,6 @@ repositories listed at
479
Will merge to 'master'.
480
481
456
-* jk/filter-branch-no-index (2016-01-19) 1 commit
457
- (merged to 'next' on 2016-01-22 at 312aa2c)
458
- + filter-branch: resolve $commit^{tree} in no-index case
459
-
460
- A recent optimization to filter-branch in v2.7.0 introduced a
461
- regression when --prune-empty filter is used, which has been
462
- corrected.
463
-
464
- Will merge to 'master'.
465
-
466
-
467
-* jk/sanity (2016-01-19) 1 commit
468
- (merged to 'next' on 2016-01-22 at 612cc5f)
469
- + test-lib: clarify and tighten SANITY
470
-
471
- The description for SANITY prerequisite the test suite uses has
472
- been clarified both in the comment and in the implementation.
473
-
474
- Will merge to 'master'.
475
-
476
-
482
* ls/travis-prove-order (2016-01-26) 2 commits
483
(merged to 'next' on 2016-01-26 at d8e2a4a)
484
+ travis-ci: explicity use container-based infrastructure
@@ -502,45 +507,16 @@ repositories listed at
507
Will merge to 'master'.
508
509
505
-* sb/submodule-init (2016-01-25) 2 commits
510
+* sb/submodule-init (2016-01-28) 2 commits
511
- submodule: port init from shell to C
512
- submodule: port resolve_relative_url from shell to C
508
- (this branch uses sb/submodule-parallel-update.)
513
+ (this branch uses sb/submodule-parallel-update; is tangled with dt/refs-backend-lmdb.)
514
515
Major part of "git submodule init" has been ported to C.
516
517
Will have to wait for 'sb/submodule-parallel-update'.
518
519
515
-* js/msys2 (2016-01-15) 9 commits
516
- (merged to 'next' on 2016-01-22 at 8bab6ab)
517
- + mingw: uglify (a, 0) definitions to shut up warnings
518
- + mingw: squash another warning about a cast
519
- + mingw: avoid warnings when casting HANDLEs to int
520
- + mingw: avoid redefining S_* constants
521
- + compat/winansi: support compiling with MSys2
522
- + compat/mingw: support MSys2-based MinGW build
523
- + nedmalloc: allow compiling with MSys2's compiler
524
- + config.mak.uname: supporting 64-bit MSys2
525
- + config.mak.uname: support MSys2
526
- (this branch is used by js/mingw-tests.)
527
-
528
- Beginning of the upstreaming process of Git for Windows effort.
529
-
530
- Will merge to 'master'.
531
-
532
-
533
-* tk/interpret-trailers-in-place (2016-01-14) 2 commits
534
- (merged to 'next' on 2016-01-22 at 5db0cf8)
535
- + interpret-trailers: add option for in-place editing
536
- + trailer: allow to write to files other than stdout
537
-
538
- "interpret-trailers" has been taught to optionally update a file in
539
- place, instead of always writing the result to the standard output.
540
-
541
- Will merge to 'master'.
542
-
543
-
520
* js/dirname-basename (2016-01-25) 6 commits
521
(merged to 'next' on 2016-01-26 at b16b2b8)
522
+ mingw: avoid linking to the C library's isalpha()
@@ -557,17 +533,14 @@ repositories listed at
533
Will merge to 'master'.
534
535
560
-* wp/sha1-name-negative-match (2016-01-13) 2 commits
536
+* wp/sha1-name-negative-match (2016-02-01) 2 commits
537
- object name: introduce '^{/!-<negative pattern>}' notation
538
- test for '!' handling in rev-parse's named commits
539
540
Introduce "<branch>^{/!-<pattern>}" notation to name a commit
541
reachable from <branch> that does not match the given <pattern>.
542
567
- A questionable corner case where commit has no message remains.
568
-
569
- Waiting for review.
570
- ($gmane/283971)
543
+ Will merge to 'next'.
544
545
546
* jk/notes-merge-from-anywhere (2016-01-17) 1 commit
@@ -595,53 +568,24 @@ repositories listed at
568
Will merge to 'master'.
569
570
598
-* cc/untracked (2016-01-25) 11 commits
599
- - t7063: add tests for core.untrackedCache
600
- - test-dump-untracked-cache: don't modify the untracked cache
601
- - config: add core.untrackedCache
602
- - dir: simplify untracked cache "ident" field
603
- - dir: add remove_untracked_cache()
604
- - dir: add {new,add}_untracked_cache()
605
- - update-index: move 'uc' var declaration
606
- - update-index: add untracked cache notifications
607
- - update-index: add --test-untracked-cache
608
- - update-index: use enum for untracked cache options
609
- - dir: free untracked cache when removing it
571
+* cc/untracked (2016-01-27) 11 commits
572
+ (merged to 'next' on 2016-02-01 at 8203631)
573
+ + t7063: add tests for core.untrackedCache
574
+ + test-dump-untracked-cache: don't modify the untracked cache
575
+ + config: add core.untrackedCache
576
+ + dir: simplify untracked cache "ident" field
577
+ + dir: add remove_untracked_cache()
578
+ + dir: add {new,add}_untracked_cache()
579
+ + update-index: move 'uc' var declaration
580
+ + update-index: add untracked cache notifications
581
+ + update-index: add --test-untracked-cache
582
+ + update-index: use enum for untracked cache options
583
+ + dir: free untracked cache when removing it
584
585
Update the untracked cache subsystem and change its primary UI from
586
"git update-index" to "git config".
587
614
- Will merge to 'next'.
615
-
616
-
617
-* dt/refs-backend-lmdb (2016-01-12) 22 commits
618
- . DONTMERGE: compilation fix
619
- . refs: tests for lmdb backend
620
- . refs: add LMDB refs backend
621
- . svn: learn ref-storage argument
622
- . refs: allow ref backend to be set for clone
623
- . clone: use child_process for recursive checkouts
624
- . refs: check submodules ref storage config
625
- . init: allow alternate backends to be set for new repos
626
- . refs: always handle non-normal refs in files backend
627
- . refs: resolve symbolic refs first
628
- . refs: allow log-only updates
629
- . refs: move duplicate check to common code
630
- . refs: make lock generic
631
- . refs: add method to rename refs
632
- . refs: add methods to init refs db
633
- . refs: add method for delete_refs
634
- . refs: add method for initial ref transaction commit
635
- . refs: add methods for reflog
636
- . refs: add do_for_each_per_worktree_ref
637
- . refs: add methods for the ref iterators
638
- . refs: add methods for misc ref operations
639
- . refs: add a backend method structure with transaction functions
640
-
641
- Building on top of a few refs-backend preparatory series, LMDB
642
- based refs backend has been plugged into the system.
643
-
644
- Rerolled, but left out of 'pu' for now due to conflicts.
588
+ Will merge to 'master'.
589
590
591
* dw/subtree-split-do-not-drop-merge (2016-01-20) 1 commit
@@ -654,46 +598,23 @@ repositories listed at
598
Will merge to 'master'.
599
600
657
-* kn/ref-filter-atom-parsing (2016-01-05) 15 commits
658
- . ref-filter: introduce objectname_atom_parser()
659
- . ref-filter: introduce contents_atom_parser()
660
- . ref-filter: introduce remote_ref_atom_parser()
661
- . ref-filter: align: introduce long-form syntax
662
- . ref-filter: convert variable 'width' to an unsigned int
663
- . ref-filter: introduce parse_align_position()
664
- . ref-filter: introduce align_atom_parser()
665
- . ref-filter: introduce color_atom_parser()
666
- . ref-filter: skip deref specifier in match_atom_name()
667
- . ref-fitler: bump match_atom() name to the top
668
- . ref-filter: introduce parsing functions for each valid atom
669
- . ref-filter: introduce struct used_atom
670
- . ref-filter: bump 'used_atom' and related code to the top
671
- . ref-filter: use strbuf_split_str_omit_term()
672
- . strbuf: introduce strbuf_split_str_omit_term()
601
+* kn/ref-filter-atom-parsing (2016-02-02) 12 commits
602
+ - ref-filter: introduce objectname_atom_parser()
603
+ - ref-filter: introduce contents_atom_parser()
604
+ - ref-filter: introduce remote_ref_atom_parser()
605
+ - ref-filter: align: introduce long-form syntax
606
+ - ref-filter: introduce align_atom_parser()
607
+ - ref-filter: introduce parse_align_position()
608
+ - ref-filter: introduce color_atom_parser()
609
+ - ref-filter: introduce parsing functions for each valid atom
610
+ - ref-filter: introduce struct used_atom
611
+ - ref-filter: bump 'used_atom' and related code to the top
612
+ - ref-filter: use strbuf_split_str_omit_term()
613
+ - strbuf: introduce strbuf_split_str_omit_term()
614
615
Refactoring of ref-filter's format-parsing code, in preparation
616
for "branch --format" and friends.
617
677
- Ejected as this will need to be rerolled on top of regression fix
678
- for "git tag" that started sharing the internal machinery with
679
- ref-filter that happened in v2.7.0.
680
-
681
- Needs reroll.
682
- ($gmane/284776).
683
-
684
-
685
-* dk/gc-more-wo-pack (2016-01-13) 4 commits
686
- - gc: clean garbage .bitmap files from pack dir
687
- - t5304: ensure non-garbage files are not deleted
688
- - t5304: test .bitmap garbage files
689
- - prepare_packed_git(): find more garbage
690
-
691
- Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
692
- .bitmap and .keep files.
693
-
694
- Waiting for a reroll.
695
- ($gmane/284368).
696
-
618
619
* tb/ls-files-eol (2016-01-18) 1 commit
620
(merged to 'next' on 2016-01-26 at bc9246f)
@@ -713,41 +634,6 @@ repositories listed at
634
Waiting for review.
635
636
716
-* sb/submodule-parallel-update (2016-01-12) 8 commits
717
- - clone: allow an explicit argument for parallel submodule clones
718
- - submodule update: expose parallelism to the user
719
- - git submodule update: have a dedicated helper for cloning
720
- - fetching submodules: respect `submodule.fetchJobs` config option
721
- - submodule-config: introduce parse_generic_submodule_config
722
- - submodule-config: remove name_and_item_from_var
723
- - submodule-config: drop check against NULL
724
- - submodule-config: keep update strategy around
725
- (this branch is used by sb/submodule-init.)
726
-
727
- Builds on top of the "fetch --recurse-submodules" work to introduce
728
- parallel downloading into multiple submodules for "submodule update".
729
-
730
- Needs review.
731
-
732
-
733
-* jc/strbuf-getline (2016-01-15) 9 commits
734
- (merged to 'next' on 2016-01-22 at 8c4e051)
735
- + strbuf: give strbuf_getline() to the "most text friendly" variant
736
- + checkout-index: there are only two possible line terminations
737
- + update-index: there are only two possible line terminations
738
- + check-ignore: there are only two possible line terminations
739
- + check-attr: there are only two possible line terminations
740
- + mktree: there are only two possible line terminations
741
- + strbuf: introduce strbuf_getline_{lf,nul}()
742
- + strbuf: make strbuf_getline_crlf() global
743
- + strbuf: miniscule style fix
744
- (this branch is used by jc/peace-with-crlf.)
745
-
746
- The preliminary clean-up for jc/peace-with-crlf topic.
747
-
748
- Will merge to 'master'.
749
-
750
-
637
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
638
- am: make a direct call to merge_recursive
639
- merge_recursive_options: introduce the "gently" flag