What's cooking (2016/01 #04)
Junio C Hamano committed
Jan 20, 2016 at 15:20 UTC
a8269f4197408c1926b2a80009d3bcee8c09edb3
1 file changed
+412
-410
whats-cooking.txt
+412
-410
@@ -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, #03; Wed, 13)
4
-X-master-at: fc10eb5b87a75af2cb93a3932897572f2c544915
5
-X-next-at: dc08a1951c8b3cd3e311ff0c2612db06ab28ae13
3
+Subject: What's cooking in git.git (Jan 2016, #04; Wed, 20)
4
+X-master-at: 3ee1e0fe11e2eb617170d0487fccfffc67f2b82b
5
+X-next-at: 9df04547ff2623b1b0f211cc82ef42c01b6dd101
6
7
-What's cooking in git.git (Jan 2016, #03; Wed, 13)
7
+What's cooking in git.git (Jan 2016, #04; Wed, 20)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +12,10 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-The tip of 'next' has been rewound. A handful of topics have
16
-graduated to 'master'. A few topics that are fixes to 2.7.0 started
17
-cooking in 'next'.
15
+The tip of 'master' now has second batch 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
You can find the changes described here in the integration branches of the
21
repositories listed at
@@ -24,94 +25,163 @@ repositories listed at
25
--------------------------------------------------
26
[Graduated to "master"]
27
27
-* ea/blame-progress (2015-12-16) 1 commit
28
- (merged to 'next' on 2015-12-22 at f8e8643)
29
- + blame: add support for --[no-]progress option
28
+* dk/reflog-walk-with-non-commit (2016-01-05) 1 commit
29
+ (merged to 'next' on 2016-01-12 at 5f7b10e)
30
+ + reflog-walk: don't segfault on non-commit sha1's in the reflog
31
31
- Originally merged to 'next' on 2015-12-22
32
+ "git reflog" incorrectly assumed that all objects that used to be
33
+ at the tip of a ref must be commits, which caused it to segfault.
34
33
- "git blame" learned to produce the progress eye-candy when it takes
34
- too much time before emitting the first line of the result.
35
36
+* dw/signoff-doc (2016-01-05) 1 commit
37
+ (merged to 'next' on 2016-01-12 at 1b08b48)
38
+ + Expand documentation describing --signoff
39
37
-* ep/make-phoney (2015-12-16) 1 commit
38
- (merged to 'next' on 2015-12-22 at 27c7593)
39
- + Makefile: add missing phony target
40
+ The documentation has been updated to hint the connection between
41
+ the '--signoff' option and DCO.
42
41
- Originally merged to 'next' on 2015-12-22
43
43
- A slight update to the Makefile.
44
+* ew/for-each-ref-doc (2016-01-05) 1 commit
45
+ (merged to 'next' on 2016-01-12 at e5c4e75)
46
+ + for-each-ref: document `creatordate` and `creator` fields
47
48
46
-* nd/stop-setenv-work-tree (2015-12-22) 1 commit
47
- (merged to 'next' on 2015-12-22 at 6d7bb0c)
48
- + Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"
49
- (this branch is used by nd/clear-gitenv-upon-use-of-alias.)
49
+* ew/send-email-mutt-alias-fix (2016-01-04) 1 commit
50
+ (merged to 'next' on 2016-01-12 at 84d1329)
51
+ + git-send-email: do not double-escape quotes from mutt
52
51
- Originally merged to 'next' on 2015-12-22
53
+ "git send-email" was confused by escaped quotes stored in the alias
54
+ files saved by "mutt", which has been corrected.
55
53
- An earlier change in 2.5.x-era broke users' hooks and aliases by
54
- exporting GIT_WORK_TREE to point at the root of the working tree,
55
- interfering when they tried to use a different working tree without
56
- setting GIT_WORK_TREE environment themselves.
56
57
+* ho/gitweb-squelch-undef-warning (2016-01-12) 1 commit
58
+ (merged to 'next' on 2016-01-12 at ef4fc5f)
59
+ + gitweb: squelch "uninitialized value" warning
60
59
-* ps/push-delete-option (2015-12-16) 2 commits
60
- (merged to 'next' on 2015-12-22 at d83cc1d)
61
- + push: add '-d' as shorthand for '--delete'
62
- + push: add '--delete' flag to synopsis
61
+ Asking gitweb for a nonexistent commit left a warning in the server
62
+ log.
63
64
- Originally merged to 'next' on 2015-12-22
64
+ Somebody may want to follow this up with a new test, perhaps?
65
+ IIRC, we do test that no Perl warnings are given to the server log,
66
+ so this should have been caught if our test coverage were good.
67
66
- "branch --delete" has "branch -d" but "push --delete" does not.
68
69
+* jk/clang-pedantic (2016-01-04) 2 commits
70
+ (merged to 'next' on 2016-01-12 at b5be271)
71
+ + bswap: add NO_UNALIGNED_LOADS define
72
+ + avoid shifting signed integers 31 bits
73
69
-* sb/submodule-parallel-fetch (2015-12-16) 7 commits
70
- (merged to 'next' on 2015-12-22 at 44e84ff)
71
- + submodules: allow parallel fetching, add tests and documentation
72
- + fetch_populated_submodules: use new parallel job processing
73
- + run-command: add an asynchronous parallel child processor
74
- + sigchain: add command to pop all common signals
75
- + strbuf: add strbuf_read_once to read without blocking
76
- + xread: poll on non blocking fds
77
- + submodule.c: write "Fetching submodule <foo>" to stderr
78
- (this branch is used by sb/submodule-parallel-update.)
74
+ A few unportable C construct have been spotted by clang compiler
75
+ and have been fixed.
76
80
- Originally merged to 'next' on 2015-12-22
77
82
- Add a framework to spawn a group of processes in parallel, and use
83
- it to run "git fetch --recurse-submodules" in parallel.
78
+* jk/pack-revindex (2015-12-21) 2 commits
79
+ (merged to 'next' on 2016-01-12 at 2e39a16)
80
+ + pack-revindex: store entries directly in packed_git
81
+ + pack-revindex: drop hash table
82
85
- Rerolled and this seems to be a lot cleaner. The merge of the
86
- earlier one to 'next' has been reverted.
83
+ In-core storage of the reverse index for .pack files (which lets
84
+ you go from a pack offset to an object name) has been streamlined.
85
86
89
-* vl/grep-configurable-threads (2015-12-16) 3 commits
90
- (merged to 'next' on 2015-12-22 at 8954705)
91
- + grep: add --threads=<num> option and grep.threads configuration
92
- + grep: slight refactoring to the code that disables threading
93
- + grep: allow threading even on a single-core machine
87
+* js/fopen-harder (2016-01-11) 2 commits
88
+ (merged to 'next' on 2016-01-12 at c6ef194)
89
+ + Handle more file writes correctly in shared repos
90
+ + commit: allow editing the commit message even in shared repos
91
95
- Originally merged to 'next' on 2015-12-22
92
+ Some codepaths used fopen(3) when opening a fixed path in $GIT_DIR
93
+ (e.g. COMMIT_EDITMSG) that is meant to be left after the command is
94
+ done. This however did not work well if the repository is set to
95
+ be shared with core.sharedRepository and the umask of the previous
96
+ user is tighter. They have been made to work better by calling
97
+ unlink(2) and retrying after fopen(3) fails with EPERM.
98
97
- "git grep" can now be configured (or told from the command line)
98
- how many threads to use when searching in the working tree files.
99
100
---------------------------------------------------
101
-[New Topics]
100
+* mh/notes-allow-reading-treeish (2016-01-12) 1 commit
101
+ (merged to 'next' on 2016-01-12 at 7aa311f)
102
+ + notes: allow treeish expressions as notes ref
103
103
-* ho/gitweb-squelch-undef-warning (2016-01-12) 1 commit
104
- (merged to 'next' on 2016-01-12 at ef4fc5f)
105
- + gitweb: squelch "uninitialized value" warning
104
+ Originally merged to 'next' on 2015-10-23
105
107
- Asking gitweb for a nonexistent commit left a warning in the server
108
- log.
106
+ Some "git notes" operations, e.g. "git log --notes=<note>", should
107
+ be able to read notes from any tree-ish that is shaped like a notes
108
+ tree, but the notes infrastructure required that the argument must
109
+ be a ref under refs/notes/. Loosen it to require a valid ref only
110
+ when the operation would update the notes (in which case we must
111
+ have a place to store the updated notes tree, iow, a ref).
112
110
- Somebody may want to follow this up with a new test, perhaps?
111
- IIRC, we do test that no Perl warnings are given to the server log,
112
- so this should have been caught if our test coverage were good.
113
114
- Will merge to 'master'.
114
+* nd/clear-gitenv-upon-use-of-alias (2015-12-29) 5 commits
115
+ (merged to 'next' on 2016-01-12 at 696b1f5)
116
+ + run-command: don't warn on SIGPIPE deaths
117
+ + git.c: make sure we do not leak GIT_* to alias scripts
118
+ + setup.c: re-fix d95138e (setup: set env $GIT_WORK_TREE when ..
119
+ + git.c: make it clear save_env() is for alias handling only
120
+ + Merge branch 'nd/stop-setenv-work-tree' into nd/clear-gitenv-upon-use-of-alias
121
+
122
+ d95138e6 (setup: set env $GIT_WORK_TREE when work tree is set, like
123
+ $GIT_DIR, 2015-06-26) attempted to work around a glitch in alias
124
+ handling by overwriting GIT_WORK_TREE environment variable to
125
+ affect subprocesses when set_git_work_tree() gets called, which
126
+ resulted in a rather unpleasant regression to "clone" and "init".
127
+ Try to address the same issue by always restoring the environment
128
+ and respawning the real underlying command when handling alias.
129
+
130
+
131
+* nd/dir-exclude-cleanup (2015-12-28) 1 commit
132
+ (merged to 'next' on 2016-01-12 at e6584c9)
133
+ + dir.c: clean the entire struct in clear_exclude_list()
134
+
135
+ The "exclude_list" structure has the usual "alloc, nr" pair of
136
+ fields to be used by ALLOC_GROW(), but clear_exclude_list() forgot
137
+ to reset 'alloc' to 0 when it cleared 'nr' to discard the managed
138
+ array.
139
+
140
+
141
+* nd/exclusion-regression-fix (2016-01-08) 1 commit
142
+ (merged to 'next' on 2016-01-12 at 0eb98a5)
143
+ + Revert "dir.c: don't exclude whole dir prematurely if neg pattern may match"
144
+
145
+ The ignore mechanism saw a few regressions around untracked file
146
+ listing and sparse checkout selection areas in 2.7.0; the change
147
+ that is responsible for the regression has been reverted.
148
+
149
+
150
+* nd/ita-cleanup (2015-12-28) 3 commits
151
+ (merged to 'next' on 2016-01-12 at 008a6e3)
152
+ + grep: make it clear i-t-a entries are ignored
153
+ + add and use a convenience macro ce_intent_to_add()
154
+ + blame: remove obsolete comment
155
+
156
+ Paths that have been told the index about with "add -N" are not
157
+ quite yet in the index, but a few commands behaved as if they
158
+ already are in a harmful way.
159
+
160
+
161
+* sg/t6050-failing-editor-test-fix (2016-01-05) 1 commit
162
+ (merged to 'next' on 2016-01-12 at dc08a19)
163
+ + t6050-replace: make failing editor test more robust
164
+
165
+
166
+* ss/clone-depth-single-doc (2016-01-08) 3 commits
167
+ (merged to 'next' on 2016-01-12 at 16ded8c)
168
+ + docs: clarify that --depth for git-fetch works with newly initialized repos
169
+ + docs: say "commits" in the --depth option wording for git-clone
170
+ + docs: clarify that passing --depth to git-clone implies --single-branch
171
+
172
+ Documentation for "git fetch --depth" has been updated for clarity.
173
+
174
+
175
+* ss/user-manual (2015-12-30) 4 commits
176
+ (merged to 'next' on 2016-01-12 at c7f0328)
177
+ + user-manual: add addition gitweb information
178
+ + user-manual: add section documenting shallow clones
179
+ + glossary: define the term shallow clone
180
+ + user-manual: remove temporary branch entry from todo list
181
+
182
+ Drop a few old "todo" items by deciding that the change one of them
183
+ suggests is not such a good idea, and doing the change the other
184
+ one suggested to do.
185
186
187
* tg/grep-no-index-fallback (2016-01-12) 2 commits
@@ -119,81 +189,125 @@ repositories listed at
189
+ builtin/grep: add grep.fallbackToNoIndex config
190
+ t7810: correct --no-index test
191
122
- "git grep" by default does not fall back to its --no-index
192
+ "git grep" by default does not fall back to its "--no-index"
193
behaviour outside a directory under Git's control (otherwise the
194
user may by mistake end up running a huge recursive search); with a
195
new configuration (set in $HOME/.gitconfig--by definition this
196
cannot be set in the config file per project), this safety can be
197
disabled.
198
129
- Will merge to 'master'.
199
+--------------------------------------------------
200
+[New Topics]
201
202
+* dg/subtree-rebase-test (2016-01-19) 1 commit
203
+ - contrib/subtree: Add a test for subtree rebase that loses commits
204
132
-* js/pull-rebase-i (2016-01-13) 3 commits
133
- - completion: add missing branch.*.rebase values
134
- - remote: handle the config setting branch.*.rebase=interactive
135
- - pull: allow interactive rebase with --rebase=interactive
205
+ Reviewed up to v5.
206
+ Will be rerolled.
207
+ ($gmane/284426)
208
137
- "git pull --rebase" has been extended to allow invoking
138
- "rebase -i".
209
+
210
+* jk/shortlog (2016-01-19) 7 commits
211
+ - shortlog: don't warn on empty author
212
+ - shortlog: optimize out useless string list
213
+ - shortlog: optimize out useless "<none>" normalization
214
+ - shortlog: optimize "--summary" mode
215
+ - shortlog: replace hand-parsing of author with pretty-printer
216
+ - shortlog: use strbufs to read from stdin
217
+ - shortlog: match both "Author:" and "author" on stdin
218
+
219
+ "git shortlog" used to accumulate various pieces of information
220
+ regardless of what was asked to be shown in the final output. It
221
+ has been optimized by noticing what need not to be collected
222
+ (e.g. there is no need to collect the log messages when showing
223
+ only the number of changes).
224
225
Will merge to 'next'.
226
227
143
-* jk/ok-to-fail-gc-auto-in-rebase (2016-01-13) 1 commit
144
- - rebase: ignore failures from "gc --auto"
228
+* jc/peace-with-crlf (2016-01-15) 12 commits
229
+ - test-sha1-array: read command stream with strbuf_getline()
230
+ - grep: read -f file with strbuf_getline()
231
+ - send-pack: read list of refs with strbuf_getline()
232
+ - column: read lines with strbuf_getline()
233
+ - cat-file: read batch stream with strbuf_getline()
234
+ - transport-helper: read helper response with strbuf_getline()
235
+ - clone/sha1_file: read info/alternates with strbuf_getline()
236
+ - remote.c: read $GIT_DIR/remotes/* with strbuf_getline()
237
+ - ident.c: read /etc/mailname with strbuf_getline()
238
+ - rev-parse: read parseopt spec with strbuf_getline()
239
+ - revision: read --stdin with strbuf_getline()
240
+ - hash-object: read --stdin-paths with strbuf_getline()
241
+ (this branch uses jc/strbuf-getline.)
242
146
- "git rebase", unlike all other callers of "gc --auto", did not
147
- ignore the exit code from "gc --auto".
243
+ Teach codepaths that communicate with users by reading text files
244
+ to be more lenient to editors that write CRLF-terminated lines.
245
+ Note that this is only about communication with Git, like feeding
246
+ list of object names from the standard input instead of from the
247
+ command line, and does not involve files in the working tree.
248
249
Will merge to 'next'.
250
251
152
-* js/close-packs-before-gc (2016-01-13) 4 commits
153
- - receive-pack: release pack files before garbage-collecting
154
- - merge: release pack files before garbage-collecting
155
- - am: release pack files before garbage-collecting
156
- - fetch: release pack files before garbage-collecting
252
+* dg/subtree-test (2016-01-19) 1 commit
253
+ - contrib/subtree: Make testing easier
254
158
- Many codepaths that run "gc --auto" before exiting kept packfiles
159
- mapped and left the file descriptors to them open, which was not
160
- friendly to systems that cannot remove files that are open. They
161
- now close the packs before doing so.
255
+ Needs review.
256
+ ($gmane/284277)
257
163
- Will merge to 'next'.
258
259
+* jk/filter-branch-no-index (2016-01-19) 1 commit
260
+ - filter-branch: resolve $commit^{tree} in no-index case
261
166
-* js/msys2 (2016-01-13) 5 commits
167
- - compat/winansi: support compiling with MSys2
168
- - compat/mingw: support MSys2-based MinGW build
169
- - nedmalloc: allow compiling with MSys2's compiler
170
- - config.mak.uname: supporting 64-bit MSys2
171
- - config.mak.uname: support MSys2
262
+ A recent optimization to filter-branch in v2.7.0 introduced a
263
+ regression when --prune-empty filter is used, which has been
264
+ corrected.
265
173
- Beginning of the upstreaming process of Git for Windows effort.
266
+ Will merge to 'next'.
267
175
- Waiting for review.
176
- ($gmane/283975).
268
269
+* jk/sanity (2016-01-19) 1 commit
270
+ - test-lib: clarify and tighten SANITY
271
179
-* rp/p4-filetype-change (2016-01-13) 1 commit
180
- - git-p4.py: add support for filetype change
272
+ The description for SANITY prerequisite the test suite uses has
273
+ been clarified both in the comment and in the implementation.
274
275
Will merge to 'next'.
276
277
185
-* tk/interpret-trailers-in-place (2016-01-13) 2 commits
186
- - interpret-trailers: add option for in-place editing
187
- - trailer: use fprintf instead of printf
278
+* ls/travis-prove-order (2016-01-19) 1 commit
279
+ - travis-ci: run previously failed tests first, then slowest to fastest
280
189
- "interpret-trailers" has been taught to optionally update a file in
190
- place, instead of always writing the result to the standard output.
281
+ By persisting runtime statistics of previous "prove" run, execute
282
+ tests that take longer before other ones, to reduce the total
283
+ wallclock time when running with Travis CI.
284
192
- Test may need to be updated to ensure a failing rewrite does not
193
- clobber the original input.
285
+ Waiting for a reroll.
286
+ ($gmane/284431)
287
195
- Waiting for review.
196
- ($gmane/283959).
288
+
289
+* nd/do-not-move-worktree-manually (2016-01-19) 2 commits
290
+ - worktree: stop supporting moving worktrees manually
291
+ - worktree.c: fix indentation
292
+
293
+ "git worktree" had a broken code that attempted to auto-fix
294
+ possible inconsistency that results from end-users moving a
295
+ worktree to different places without telling Git (the original
296
+ repository needs to maintain backpointers to its worktrees, but
297
+ "mv" run by end-users who are not familiar with that fact will
298
+ obviously not adjust them), which actually made things worse
299
+ when triggered.
300
+
301
+ Will merge to 'next'.
302
+
303
+
304
+* sb/submodule-init (2016-01-20) 2 commits
305
+ - submodule: port init from shell to C
306
+ - submodule: port resolve_relative_url from shell to C
307
+ (this branch uses sb/submodule-parallel-update.)
308
+
309
+ Needs review.
310
+ ($gmane/284419)
311
312
--------------------------------------------------
313
[Stalled]
@@ -246,79 +360,86 @@ repositories listed at
360
--------------------------------------------------
361
[Cooking]
362
249
-* dw/signoff-doc (2016-01-05) 1 commit
250
- (merged to 'next' on 2016-01-12 at 1b08b48)
251
- + Expand documentation describing --signoff
363
+* js/pull-rebase-i (2016-01-13) 3 commits
364
+ (merged to 'next' on 2016-01-20 at a0c5440)
365
+ + completion: add missing branch.*.rebase values
366
+ + remote: handle the config setting branch.*.rebase=interactive
367
+ + pull: allow interactive rebase with --rebase=interactive
368
253
- The documentation has been updated to hint the connection between
254
- the '--signoff' option and DCO.
369
+ "git pull --rebase" has been extended to allow invoking
370
+ "rebase -i".
371
372
Will merge to 'master'.
373
374
259
-* ew/for-each-ref-doc (2016-01-05) 1 commit
260
- (merged to 'next' on 2016-01-12 at e5c4e75)
261
- + for-each-ref: document `creatordate` and `creator` fields
375
+* jk/ok-to-fail-gc-auto-in-rebase (2016-01-13) 1 commit
376
+ (merged to 'next' on 2016-01-20 at c9a8e82)
377
+ + rebase: ignore failures from "gc --auto"
378
263
- Will merge to 'master'.
379
+ "git rebase", unlike all other callers of "gc --auto", did not
380
+ ignore the exit code from "gc --auto".
381
382
+ Will merge to 'master'.
383
266
-* sg/t6050-failing-editor-test-fix (2016-01-05) 1 commit
267
- (merged to 'next' on 2016-01-12 at dc08a19)
268
- + t6050-replace: make failing editor test more robust
384
270
- Will merge to 'master'.
385
+* js/close-packs-before-gc (2016-01-13) 4 commits
386
+ (merged to 'next' on 2016-01-20 at 16cf87b)
387
+ + receive-pack: release pack files before garbage-collecting
388
+ + merge: release pack files before garbage-collecting
389
+ + am: release pack files before garbage-collecting
390
+ + fetch: release pack files before garbage-collecting
391
392
+ Many codepaths that run "gc --auto" before exiting kept packfiles
393
+ mapped and left the file descriptors to them open, which was not
394
+ friendly to systems that cannot remove files that are open. They
395
+ now close the packs before doing so.
396
273
-* js/dirname-basename (2016-01-12) 4 commits
274
- (merged to 'next' on 2016-01-12 at c3c970a)
275
- + t0060: verify that basename() and dirname() work as expected
276
- + compat/basename.c: provide a dirname() compatibility function
277
- + compat/basename: make basename() conform to POSIX
278
- + Refactor skipping DOS drive prefixes
397
+ Will merge to 'master'.
398
280
- dirname() emulation has been added, as Msys2 lacks it.
399
282
- The test needs to be loosened to allow implementation defined
283
- behaviour; currently it fails on Macs.
400
+* js/msys2 (2016-01-15) 9 commits
401
+ - mingw: uglify (a, 0) definitions to shut up warnings
402
+ - mingw: squash another warning about a cast
403
+ - mingw: avoid warnings when casting HANDLEs to int
404
+ - mingw: avoid redefining S_* constants
405
+ - compat/winansi: support compiling with MSys2
406
+ - compat/mingw: support MSys2-based MinGW build
407
+ - nedmalloc: allow compiling with MSys2's compiler
408
+ - config.mak.uname: supporting 64-bit MSys2
409
+ - config.mak.uname: support MSys2
410
285
- Waiting for an update.
286
- ($gmane/283968).
411
+ Beginning of the upstreaming process of Git for Windows effort.
412
413
+ Will merge to 'next'.
414
289
-* js/fopen-harder (2016-01-11) 2 commits
290
- (merged to 'next' on 2016-01-12 at c6ef194)
291
- + Handle more file writes correctly in shared repos
292
- + commit: allow editing the commit message even in shared repos
415
294
- Some codepaths used fopen(3) when opening a fixed path in $GIT_DIR
295
- (e.g. COMMIT_EDITMSG) that is meant to be left after the command is
296
- done. This however did not work well if the repository is set to
297
- be shared with core.sharedRepository and the umask of the previous
298
- user is tighter. Make them work better by calling unlink(2) and
299
- retrying after fopen(3) fails with EPERM.
416
+* rp/p4-filetype-change (2016-01-13) 1 commit
417
+ (merged to 'next' on 2016-01-20 at 7b5954b)
418
+ + git-p4.py: add support for filetype change
419
420
Will merge to 'master'.
421
422
304
-* nd/exclusion-regression-fix (2016-01-08) 1 commit
305
- (merged to 'next' on 2016-01-12 at 0eb98a5)
306
- + Revert "dir.c: don't exclude whole dir prematurely if neg pattern may match"
423
+* tk/interpret-trailers-in-place (2016-01-14) 2 commits
424
+ - interpret-trailers: add option for in-place editing
425
+ - trailer: allow to write to files other than stdout
426
308
- The ignore mechanism saw a few regressions around untracked file
309
- listing and sparse checkout selection areas in 2.7.0; the change
310
- that is responsible for the regression has been reverted.
427
+ "interpret-trailers" has been taught to optionally update a file in
428
+ place, instead of always writing the result to the standard output.
429
312
- Will merge to 'master'.
430
+ Will merge to 'next'.
431
432
315
-* ss/clone-depth-single-doc (2016-01-08) 3 commits
316
- (merged to 'next' on 2016-01-12 at 16ded8c)
317
- + docs: clarify that --depth for git-fetch works with newly initialized repos
318
- + docs: say "commits" in the --depth option wording for git-clone
319
- + docs: clarify that passing --depth to git-clone implies --single-branch
433
+* js/dirname-basename (2016-01-15) 5 commits
434
+ (merged to 'next' on 2016-01-20 at d198512)
435
+ + t0060: loosen overly strict expectations
436
+ (merged to 'next' on 2016-01-12 at c3c970a)
437
+ + t0060: verify that basename() and dirname() work as expected
438
+ + compat/basename.c: provide a dirname() compatibility function
439
+ + compat/basename: make basename() conform to POSIX
440
+ + Refactor skipping DOS drive prefixes
441
321
- Updates documents to clarify "git fetch --depth".
442
+ dirname() emulation has been added, as Msys2 lacks it.
443
444
Will merge to 'master'.
445
@@ -337,16 +458,17 @@ repositories listed at
458
459
460
* ak/format-patch-odir-config (2016-01-13) 1 commit
340
- - format-patch: introduce format.outputDirectory configuration
461
+ (merged to 'next' on 2016-01-20 at 97c699b)
462
+ + format-patch: introduce format.outputDirectory configuration
463
464
Allow "-o <dir>" option to be omitted on the command line of "git
465
format-patch" if you always use the same directory in your
466
workflow.
467
346
- Will merge to 'next'.
468
+ Will merge to 'master'.
469
470
349
-* jk/notes-merge-from-anywhere (2015-12-29) 1 commit
471
+* jk/notes-merge-from-anywhere (2016-01-17) 1 commit
472
- notes: allow merging from arbitrary references
473
474
"git notes merge" used to limit the source of the merged notes tree
@@ -355,214 +477,137 @@ repositories listed at
477
repositories using remote-tracking notes trees (located in e.g.
478
refs/remote-notes/ or somesuch).
479
358
- Needs review.
359
-
360
-
361
-* dk/reflog-walk-with-non-commit (2016-01-05) 1 commit
362
- (merged to 'next' on 2016-01-12 at 5f7b10e)
363
- + reflog-walk: don't segfault on non-commit sha1's in the reflog
364
-
365
- "git reflog" incorrectly assumed that all objects that used to be
366
- at the tip of a ref must be commits, which caused it to segfault.
367
-
368
- Will merge to 'master'.
369
-
370
-
371
-* ew/send-email-mutt-alias-fix (2016-01-04) 1 commit
372
- (merged to 'next' on 2016-01-12 at 84d1329)
373
- + git-send-email: do not double-escape quotes from mutt
374
-
375
- "git send-email" was confused by escaped quotes stored in the alias
376
- files saved by "mutt".
377
-
378
- Will merge to 'master'.
379
-
380
-
381
-* jk/clang-pedantic (2016-01-04) 2 commits
382
- (merged to 'next' on 2016-01-12 at b5be271)
383
- + bswap: add NO_UNALIGNED_LOADS define
384
- + avoid shifting signed integers 31 bits
385
-
386
- A few unportable C construct have been spotted by clang compiler
387
- and have been fixed.
388
-
389
- Will merge to 'master'.
390
-
391
-
392
-* dt/unpack-compare-entry-optim (2016-01-05) 1 commit
393
- - do_compare_entry: use already-computed path
394
-
480
Will merge to 'next'.
481
482
398
-* jk/pack-revindex (2015-12-21) 2 commits
399
- (merged to 'next' on 2016-01-12 at 2e39a16)
400
- + pack-revindex: store entries directly in packed_git
401
- + pack-revindex: drop hash table
483
+* dt/unpack-compare-entry-optim (2016-01-05) 1 commit
484
+ (merged to 'next' on 2016-01-20 at 180dccf)
485
+ + do_compare_entry: use already-computed path
486
487
Will merge to 'master'.
488
489
490
* jk/symbolic-ref (2016-01-13) 6 commits
407
- - lock_ref_sha1_basic: handle REF_NODEREF with invalid refs
408
- - lock_ref_sha1_basic: always fill old_oid while holding lock
409
- - checkout,clone: check return value of create_symref
410
- - create_symref: write reflog while holding lock
411
- - create_symref: use existing ref-lock code
412
- - create_symref: modernize variable names
491
+ (merged to 'next' on 2016-01-20 at 30b5408)
492
+ + lock_ref_sha1_basic: handle REF_NODEREF with invalid refs
493
+ + lock_ref_sha1_basic: always fill old_oid while holding lock
494
+ + checkout,clone: check return value of create_symref
495
+ + create_symref: write reflog while holding lock
496
+ + create_symref: use existing ref-lock code
497
+ + create_symref: modernize variable names
498
499
The low-level code that is used to create symbolic references has
500
been updated to share more code with the code that deals with
501
normal references.
502
418
- Will merge to 'next'.
503
+ Will merge to 'master'.
504
505
506
* ep/shell-command-substitution-style (2016-01-12) 92 commits
422
- - t9901-git-web--browse.sh: use the $( ... ) construct for command substitution
423
- - t9501-gitweb-standalone-http-status.sh: use the $( ... ) construct for command substitution
424
- - t9350-fast-export.sh: use the $( ... ) construct for command substitution
425
- - t9300-fast-import.sh: use the $( ... ) construct for command substitution
426
- - t9150-svk-mergetickets.sh: use the $( ... ) construct for command substitution
427
- - t9145-git-svn-master-branch.sh: use the $( ... ) construct for command substitution
428
- - t9138-git-svn-authors-prog.sh: use the $( ... ) construct for command substitution
429
- - t9137-git-svn-dcommit-clobber-series.sh: use the $( ... ) construct for command substitution
430
- - t9132-git-svn-broken-symlink.sh: use the $( ... ) construct for command substitution
431
- - t9130-git-svn-authors-file.sh: use the $( ... ) construct for command substitution
432
- - t9129-git-svn-i18n-commitencoding.sh: use the $( ... ) construct for command substitution
433
- - t9119-git-svn-info.sh: use the $( ... ) construct for command substitution
434
- - t9118-git-svn-funky-branch-names.sh: use the $( ... ) construct for command substitution
435
- - t9114-git-svn-dcommit-merge.sh: use the $( ... ) construct for command substitution
436
- - t9110-git-svn-use-svm-props.sh: use the $( ... ) construct for command substitution
437
- - t9109-git-svn-multi-glob.sh: use the $( ... ) construct for command substitution
438
- - t9108-git-svn-glob.sh: use the $( ... ) construct for command substitution
439
- - t9107-git-svn-migrate.sh: use the $( ... ) construct for command substitution
440
- - t9105-git-svn-commit-diff.sh: use the $( ... ) construct for command substitution
441
- - t9104-git-svn-follow-parent.sh: use the $( ... ) construct for command substitution
442
- - t9101-git-svn-props.sh: use the $( ... ) construct for command substitution
443
- - t9100-git-svn-basic.sh: use the $( ... ) construct for command substitution
444
- - t/t9001-send-email.sh: use the $( ... ) construct for command substitution
445
- - t/t8003-blame-corner-cases.sh: use the $( ... ) construct for command substitution
446
- - t/t7700-repack.sh: use the $( ... ) construct for command substitution
447
- - t/t7602-merge-octopus-many.sh: use the $( ... ) construct for command substitution
448
- - t/t7505-prepare-commit-msg-hook.sh: use the $( ... ) construct for command substitution
449
- - t/t7504-commit-msg-hook.sh: use the $( ... ) construct for command substitution
450
- - t/t7408-submodule-reference.sh: use the $( ... ) construct for command substitution
451
- - t/t7406-submodule-update.sh: use the $( ... ) construct for command substitution
452
- - t/t7103-reset-bare.sh: use the $( ... ) construct for command substitution
453
- - t/t7006-pager.sh: use the $( ... ) construct for command substitution
454
- - t/t7004-tag.sh: use the $( ... ) construct for command substitution
455
- - t/t7003-filter-branch.sh: use the $( ... ) construct for command substitution
456
- - t/t7001-mv.sh: use the $( ... ) construct for command substitution
457
- - t/t6132-pathspec-exclude.sh: use the $( ... ) construct for command substitution
458
- - t/t6032-merge-large-rename.sh: use the $( ... ) construct for command substitution
459
- - t/t6015-rev-list-show-all-parents.sh: use the $( ... ) construct for command substitution
460
- - t/t6002-rev-list-bisect.sh: use the $( ... ) construct for command substitution
461
- - t/t6001-rev-list-graft.sh: use the $( ... ) construct for command substitution
462
- - t/t5900-repo-selection.sh: use the $( ... ) construct for command substitution
463
- - t/t5710-info-alternate.sh: use the $( ... ) construct for command substitution
464
- - t/t5700-clone-reference.sh: use the $( ... ) construct for command substitution
465
- - t/t5601-clone.sh: use the $( ... ) construct for command substitution
466
- - t/t5570-git-daemon.sh: use the $( ... ) construct for command substitution
467
- - t/t5550-http-fetch-dumb.sh: use the $( ... ) construct for command substitution
468
- - t/t5538-push-shallow.sh: use the $( ... ) construct for command substitution
469
- - t/t5537-fetch-shallow.sh: use the $( ... ) construct for command substitution
470
- - t/t5532-fetch-proxy.sh: use the $( ... ) construct for command substitution
471
- - t/t5530-upload-pack-error.sh: use the $( ... ) construct for command substitution
472
- - t/t5522-pull-symlink.sh: use the $( ... ) construct for command substitution
473
- - t/t5517-push-mirror.sh: use the $( ... ) construct for command substitution
474
- - t/t5516-fetch-push.sh: use the $( ... ) construct for command substitution
475
- - t/t5515-fetch-merge-logic.sh: use the $( ... ) construct for command substitution
476
- - t/t5510-fetch.sh: use the $( ... ) construct for command substitution
477
- - t/t5506-remote-groups.sh: use the $( ... ) construct for command substitution
478
- - t/t5505-remote.sh: use the $( ... ) construct for command substitution
479
- - t/t5500-fetch-pack.sh: use the $( ... ) construct for command substitution
480
- - t/t5305-include-tag.sh: use the $( ... ) construct for command substitution
481
- - t/t5304-prune.sh: use the $( ... ) construct for command substitution
482
- - t/t5303-pack-corruption-resilience.sh: use the $( ... ) construct for command substitution
483
- - t/t5100: no need to use 'echo' command substitutions for globbing
484
- - t/t5302-pack-index.sh: use the $( ... ) construct for command substitution
485
- - t/t5301-sliding-window.sh: use the $( ... ) construct for command substitution
486
- - t/t5300-pack-object.sh: use the $( ... ) construct for command substitution
487
- - t/t5100-mailinfo.sh: use the $( ... ) construct for command substitution
488
- - t/t3700-add.sh: use the $( ... ) construct for command substitution
489
- - t/t3600-rm.sh: use the $( ... ) construct for command substitution
490
- - t/t3511-cherry-pick-x.sh: use the $( ... ) construct for command substitution
491
- - t/t3403-rebase-skip.sh: use the $( ... ) construct for command substitution
492
- - t/t3210-pack-refs.sh: use the $( ... ) construct for command substitution
493
- - t/t3101-ls-tree-dirname.sh: use the $( ... ) construct for command substitution
494
- - t/t3100-ls-tree-restrict.sh: use the $( ... ) construct for command substitution
495
- - t/t3030-merge-recursive.sh: use the $( ... ) construct for command substitution
496
- - t/t2102-update-index-symlinks.sh: use the $( ... ) construct for command substitution
497
- - t/t2025-worktree-add.sh: use the $( ... ) construct for command substitution
498
- - t/t1700-split-index.sh: use the $( ... ) construct for command substitution
499
- - t/t1512-rev-parse-disambiguation.sh: use the $( ... ) construct for command substitution
500
- - t/t1511-rev-parse-caret.sh: use the $( ... ) construct for command substitution
501
- - t/t1410-reflog.sh: use the $( ... ) construct for command substitution
502
- - t/t1401-symbolic-ref.sh: use the $( ... ) construct for command substitution
503
- - t/t1100-commit-tree-options.sh: use the $( ... ) construct for command substitution
504
- - unimplemented.sh: use the $( ... ) construct for command substitution
505
- - test-sha1.sh: use the $( ... ) construct for command substitution
506
- - t/lib-httpd.sh: use the $( ... ) construct for command substitution
507
- - git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution
508
- - contrib/thunderbird-patch-inline/appp.sh: use the $( ... ) construct for command substitution
509
- - contrib/examples/git-revert.sh: use the $( ... ) construct for command substitution
510
- - contrib/examples/git-repack.sh: use the $( ... ) construct for command substitution
511
- - contrib/examples/git-merge.sh: use the $( ... ) construct for command substitution
512
- - contrib/examples/git-fetch.sh: use the $( ... ) construct for command substitution
513
- - contrib/examples/git-commit.sh: use the $( ... ) construct for command substitution
507
+ (merged to 'next' on 2016-01-20 at ae1b1d8)
508
+ + t9901-git-web--browse.sh: use the $( ... ) construct for command substitution
509
+ + t9501-gitweb-standalone-http-status.sh: use the $( ... ) construct for command substitution
510
+ + t9350-fast-export.sh: use the $( ... ) construct for command substitution
511
+ + t9300-fast-import.sh: use the $( ... ) construct for command substitution
512
+ + t9150-svk-mergetickets.sh: use the $( ... ) construct for command substitution
513
+ + t9145-git-svn-master-branch.sh: use the $( ... ) construct for command substitution
514
+ + t9138-git-svn-authors-prog.sh: use the $( ... ) construct for command substitution
515
+ + t9137-git-svn-dcommit-clobber-series.sh: use the $( ... ) construct for command substitution
516
+ + t9132-git-svn-broken-symlink.sh: use the $( ... ) construct for command substitution
517
+ + t9130-git-svn-authors-file.sh: use the $( ... ) construct for command substitution
518
+ + t9129-git-svn-i18n-commitencoding.sh: use the $( ... ) construct for command substitution
519
+ + t9119-git-svn-info.sh: use the $( ... ) construct for command substitution
520
+ + t9118-git-svn-funky-branch-names.sh: use the $( ... ) construct for command substitution
521
+ + t9114-git-svn-dcommit-merge.sh: use the $( ... ) construct for command substitution
522
+ + t9110-git-svn-use-svm-props.sh: use the $( ... ) construct for command substitution
523
+ + t9109-git-svn-multi-glob.sh: use the $( ... ) construct for command substitution
524
+ + t9108-git-svn-glob.sh: use the $( ... ) construct for command substitution
525
+ + t9107-git-svn-migrate.sh: use the $( ... ) construct for command substitution
526
+ + t9105-git-svn-commit-diff.sh: use the $( ... ) construct for command substitution
527
+ + t9104-git-svn-follow-parent.sh: use the $( ... ) construct for command substitution
528
+ + t9101-git-svn-props.sh: use the $( ... ) construct for command substitution
529
+ + t9100-git-svn-basic.sh: use the $( ... ) construct for command substitution
530
+ + t/t9001-send-email.sh: use the $( ... ) construct for command substitution
531
+ + t/t8003-blame-corner-cases.sh: use the $( ... ) construct for command substitution
532
+ + t/t7700-repack.sh: use the $( ... ) construct for command substitution
533
+ + t/t7602-merge-octopus-many.sh: use the $( ... ) construct for command substitution
534
+ + t/t7505-prepare-commit-msg-hook.sh: use the $( ... ) construct for command substitution
535
+ + t/t7504-commit-msg-hook.sh: use the $( ... ) construct for command substitution
536
+ + t/t7408-submodule-reference.sh: use the $( ... ) construct for command substitution
537
+ + t/t7406-submodule-update.sh: use the $( ... ) construct for command substitution
538
+ + t/t7103-reset-bare.sh: use the $( ... ) construct for command substitution
539
+ + t/t7006-pager.sh: use the $( ... ) construct for command substitution
540
+ + t/t7004-tag.sh: use the $( ... ) construct for command substitution
541
+ + t/t7003-filter-branch.sh: use the $( ... ) construct for command substitution
542
+ + t/t7001-mv.sh: use the $( ... ) construct for command substitution
543
+ + t/t6132-pathspec-exclude.sh: use the $( ... ) construct for command substitution
544
+ + t/t6032-merge-large-rename.sh: use the $( ... ) construct for command substitution
545
+ + t/t6015-rev-list-show-all-parents.sh: use the $( ... ) construct for command substitution
546
+ + t/t6002-rev-list-bisect.sh: use the $( ... ) construct for command substitution
547
+ + t/t6001-rev-list-graft.sh: use the $( ... ) construct for command substitution
548
+ + t/t5900-repo-selection.sh: use the $( ... ) construct for command substitution
549
+ + t/t5710-info-alternate.sh: use the $( ... ) construct for command substitution
550
+ + t/t5700-clone-reference.sh: use the $( ... ) construct for command substitution
551
+ + t/t5601-clone.sh: use the $( ... ) construct for command substitution
552
+ + t/t5570-git-daemon.sh: use the $( ... ) construct for command substitution
553
+ + t/t5550-http-fetch-dumb.sh: use the $( ... ) construct for command substitution
554
+ + t/t5538-push-shallow.sh: use the $( ... ) construct for command substitution
555
+ + t/t5537-fetch-shallow.sh: use the $( ... ) construct for command substitution
556
+ + t/t5532-fetch-proxy.sh: use the $( ... ) construct for command substitution
557
+ + t/t5530-upload-pack-error.sh: use the $( ... ) construct for command substitution
558
+ + t/t5522-pull-symlink.sh: use the $( ... ) construct for command substitution
559
+ + t/t5517-push-mirror.sh: use the $( ... ) construct for command substitution
560
+ + t/t5516-fetch-push.sh: use the $( ... ) construct for command substitution
561
+ + t/t5515-fetch-merge-logic.sh: use the $( ... ) construct for command substitution
562
+ + t/t5510-fetch.sh: use the $( ... ) construct for command substitution
563
+ + t/t5506-remote-groups.sh: use the $( ... ) construct for command substitution
564
+ + t/t5505-remote.sh: use the $( ... ) construct for command substitution
565
+ + t/t5500-fetch-pack.sh: use the $( ... ) construct for command substitution
566
+ + t/t5305-include-tag.sh: use the $( ... ) construct for command substitution
567
+ + t/t5304-prune.sh: use the $( ... ) construct for command substitution
568
+ + t/t5303-pack-corruption-resilience.sh: use the $( ... ) construct for command substitution
569
+ + t/t5100: no need to use 'echo' command substitutions for globbing
570
+ + t/t5302-pack-index.sh: use the $( ... ) construct for command substitution
571
+ + t/t5301-sliding-window.sh: use the $( ... ) construct for command substitution
572
+ + t/t5300-pack-object.sh: use the $( ... ) construct for command substitution
573
+ + t/t5100-mailinfo.sh: use the $( ... ) construct for command substitution
574
+ + t/t3700-add.sh: use the $( ... ) construct for command substitution
575
+ + t/t3600-rm.sh: use the $( ... ) construct for command substitution
576
+ + t/t3511-cherry-pick-x.sh: use the $( ... ) construct for command substitution
577
+ + t/t3403-rebase-skip.sh: use the $( ... ) construct for command substitution
578
+ + t/t3210-pack-refs.sh: use the $( ... ) construct for command substitution
579
+ + t/t3101-ls-tree-dirname.sh: use the $( ... ) construct for command substitution
580
+ + t/t3100-ls-tree-restrict.sh: use the $( ... ) construct for command substitution
581
+ + t/t3030-merge-recursive.sh: use the $( ... ) construct for command substitution
582
+ + t/t2102-update-index-symlinks.sh: use the $( ... ) construct for command substitution
583
+ + t/t2025-worktree-add.sh: use the $( ... ) construct for command substitution
584
+ + t/t1700-split-index.sh: use the $( ... ) construct for command substitution
585
+ + t/t1512-rev-parse-disambiguation.sh: use the $( ... ) construct for command substitution
586
+ + t/t1511-rev-parse-caret.sh: use the $( ... ) construct for command substitution
587
+ + t/t1410-reflog.sh: use the $( ... ) construct for command substitution
588
+ + t/t1401-symbolic-ref.sh: use the $( ... ) construct for command substitution
589
+ + t/t1100-commit-tree-options.sh: use the $( ... ) construct for command substitution
590
+ + unimplemented.sh: use the $( ... ) construct for command substitution
591
+ + test-sha1.sh: use the $( ... ) construct for command substitution
592
+ + t/lib-httpd.sh: use the $( ... ) construct for command substitution
593
+ + git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution
594
+ + contrib/thunderbird-patch-inline/appp.sh: use the $( ... ) construct for command substitution
595
+ + contrib/examples/git-revert.sh: use the $( ... ) construct for command substitution
596
+ + contrib/examples/git-repack.sh: use the $( ... ) construct for command substitution
597
+ + contrib/examples/git-merge.sh: use the $( ... ) construct for command substitution
598
+ + contrib/examples/git-fetch.sh: use the $( ... ) construct for command substitution
599
+ + contrib/examples/git-commit.sh: use the $( ... ) construct for command substitution
600
601
A shell script style update to change `command substitution` into
602
$(command substitution). Coverts contrib/ and much of the t/
603
directory contents.
604
519
- Will merge to 'next'.
520
-
521
-
522
-* nd/dir-exclude-cleanup (2015-12-28) 1 commit
523
- (merged to 'next' on 2016-01-12 at e6584c9)
524
- + dir.c: clean the entire struct in clear_exclude_list()
525
-
526
- The "exclude_list" structure has the usual "alloc, nr" pair of
527
- fields to be used by ALLOC_GROW(), but clear_exclude_list() forgot
528
- to reset 'alloc' to 0 when it cleared 'nr' and discarded the
529
- managed array.
530
-
605
Will merge to 'master'.
606
607
534
-* ss/user-manual (2015-12-30) 4 commits
535
- (merged to 'next' on 2016-01-12 at c7f0328)
536
- + user-manual: add addition gitweb information
537
- + user-manual: add section documenting shallow clones
538
- + glossary: define the term shallow clone
539
- + user-manual: remove temporary branch entry from todo list
540
-
541
- Drop a few old "todo" items by deciding that the change one of them
542
- suggests is not such a good idea, and doing the change the other
543
- one suggested to do.
544
-
545
- Will merge to 'master'.
546
-
547
-
548
-* nd/ita-cleanup (2015-12-28) 3 commits
549
- (merged to 'next' on 2016-01-12 at 008a6e3)
550
- + grep: make it clear i-t-a entries are ignored
551
- + add and use a convenience macro ce_intent_to_add()
552
- + blame: remove obsolete comment
553
-
554
- Paths that have been told the index about with "add -N" are not
555
- quite yet in the index, but a few commands behaved as if they
556
- already are in a harmful way.
557
-
558
- Here are only the obviously correct bits; some other changes were
559
- in the posted series, but not quite ready to be queued here.
560
-
561
- Will merge to 'master'.
562
-
563
-
564
-* cc/untracked (2015-12-29) 10 commits
608
+* cc/untracked (2016-01-20) 11 commits
609
- t7063: add tests for core.untrackedCache
610
+ - test-dump-untracked-cache: don't modify the untracked cache
611
- config: add core.untrackedCache
612
- dir: simplify untracked cache "ident" field
613
- dir: add remove_untracked_cache()
@@ -576,8 +621,7 @@ repositories listed at
621
Update the untracked cache subsystem and change its primary UI from
622
"git update-index" to "git config".
623
579
- Still being discussed and worked on.
580
- $gmane/283080
624
+ Will merge to 'next'.
625
626
627
* dt/refs-backend-lmdb (2016-01-12) 22 commits
@@ -610,33 +654,13 @@ repositories listed at
654
Rerolled, but left out of 'pu' for now due to conflicts.
655
656
613
-* dw/subtree-split-do-not-drop-merge (2015-12-10) 1 commit
657
+* dw/subtree-split-do-not-drop-merge (2016-01-20) 1 commit
658
- contrib/subtree: fix "subtree split" skipped-merge bug
659
660
The "split" subcommand of "git subtree" (in contrib/) incorrectly
661
skipped merges when it shouldn't, which was corrected.
662
619
- Still being worked on.
620
- ($gmane/283874)
621
-
622
-
623
-* nd/clear-gitenv-upon-use-of-alias (2015-12-29) 5 commits
624
- (merged to 'next' on 2016-01-12 at 696b1f5)
625
- + run-command: don't warn on SIGPIPE deaths
626
- + git.c: make sure we do not leak GIT_* to alias scripts
627
- + setup.c: re-fix d95138e (setup: set env $GIT_WORK_TREE when ..
628
- + git.c: make it clear save_env() is for alias handling only
629
- + Merge branch 'nd/stop-setenv-work-tree' into nd/clear-gitenv-upon-use-of-alias
630
-
631
- d95138e6 (setup: set env $GIT_WORK_TREE when work tree is set, like
632
- $GIT_DIR, 2015-06-26) attempted to work around a glitch in alias
633
- handling by overwriting GIT_WORK_TREE environment variable to
634
- affect subprocesses when set_git_work_tree() gets called, which
635
- resulted in a rather unpleasant regression to "clone" and "init".
636
- Try to address the same issue by always restoring the environment
637
- and respawning the real underlying command when handling alias.
638
-
639
- Will merge to 'master'.
663
+ Will merge to 'next'.
664
665
666
* kn/ref-filter-atom-parsing (2016-01-05) 15 commits
@@ -683,11 +707,13 @@ repositories listed at
707
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
708
.bitmap and .keep files.
709
686
- Waiting for review.
710
+ Waiting for a reroll.
711
+ ($gmane/284368).
712
713
714
* rm/subtree-unwrap-tags (2015-11-24) 1 commit
690
- - contrib/subtree: unwrap tag refs
715
+ (merged to 'next' on 2016-01-20 at 6373d95)
716
+ + contrib/subtree: unwrap tag refs
717
718
"git subtree" (in contrib/) records the tag object name in the
719
commit log message when a subtree is added using a tag, without
@@ -695,7 +721,7 @@ repositories listed at
721
peeled when "git subtree split" wants to work on the commit, but
722
the command forgot to do so.
723
698
- Will merge to 'next'.
724
+ Will merge to 'master'.
725
726
727
* sg/sh-require-clean-orphan (2015-11-24) 2 commits
@@ -711,7 +737,7 @@ repositories listed at
737
Needs review.
738
739
714
-* tb/ls-files-eol (2016-01-07) 1 commit
740
+* tb/ls-files-eol (2016-01-18) 1 commit
741
- ls-files: add eol diagnostics
742
743
Add options to ls-files to help diagnose end-of-line problems.
@@ -737,6 +763,7 @@ repositories listed at
763
- submodule-config: remove name_and_item_from_var
764
- submodule-config: drop check against NULL
765
- submodule-config: keep update strategy around
766
+ (this branch is used by sb/submodule-init.)
767
768
Builds on top of the "fetch --recurse-submodules" work to introduce
769
parallel downloading into multiple submodules for "submodule update".
@@ -744,48 +771,21 @@ repositories listed at
771
Needs review.
772
773
747
-* jc/strbuf-gets (2015-12-16) 17 commits
748
- - test-sha1-array: read command stream with strbuf_getline_crlf()
749
- - grep: read -f file with strbuf_getline_crlf()
750
- - send-pack: read list of refs with strbuf_getline_crlf()
751
- - column: read lines with strbuf_getline_crlf()
752
- - cat-file: read batch stream with strbuf_getline_crlf()
753
- - transport-helper: read helper response with strbuf_getline_crlf()
754
- - clone/sha1_file: read info/alternates with strbuf_getline_crlf()
755
- - remote.c: read $GIT_DIR/remotes/* with strbuf_getline_crlf()
756
- - ident.c: read /etc/mailname with strbuf_getline_crlf()
757
- - rev-parse: read parseopt spec with strbuf_getline_crlf()
758
- - revision: read --stdin with strbuf_getline_crlf()
759
- - hash-object: read --stdin-paths with strbuf_getline_crlf()
760
- - mktree: read textual tree representation with strbuf_getline_crlf()
761
- - update-index: read list of paths with strbuf_getline_crlf() under --stdin
762
- - update-index: read --index-info with strbuf_getline_crlf()
763
- - check-attr, check-ignore, checkout-index: read paths with strbuf_getline_crlf()
774
+* jc/strbuf-getline (2016-01-15) 9 commits
775
+ - strbuf: give strbuf_getline() to the "most text friendly" variant
776
+ - checkout-index: there are only two possible line terminations
777
+ - update-index: there are only two possible line terminations
778
+ - check-ignore: there are only two possible line terminations
779
+ - check-attr: there are only two possible line terminations
780
+ - mktree: there are only two possible line terminations
781
+ - strbuf: introduce strbuf_getline_{lf,nul}()
782
- strbuf: make strbuf_getline_crlf() global
783
+ - strbuf: miniscule style fix
784
+ (this branch is used by jc/peace-with-crlf.)
785
766
- Teach codepaths that communicate with users by reading text files
767
- to be more lenient to editors that write CRLF-terminated lines.
768
- Note that this is only about communication with Git, like feeding
769
- list of object names from the standard input instead of from the
770
- command line, and does not involve files in the working tree.
771
-
772
- Will be rerolled.
773
-
774
-
775
-* mh/notes-allow-reading-treeish (2016-01-12) 1 commit
776
- (merged to 'next' on 2016-01-12 at 7aa311f)
777
- + notes: allow treeish expressions as notes ref
778
-
779
- Originally merged to 'next' on 2015-10-23
786
+ The preliminary clean-up for jc/peace-with-crlf topic.
787
781
- Some "git notes" operations, e.g. "git log --notes=<note>", should
782
- be able to read notes from any tree-ish that is shaped like a notes
783
- tree, but the notes infrastructure required that the argument must
784
- be a ref under refs/notes/. Loosen it to require a valid ref only
785
- when the operation would update the notes (in which case we must
786
- have a place to store the updated notes tree, iow, a ref).
787
-
788
- Will merge to 'master'.
788
+ Will merge to 'next'.
789
790
791
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
@@ -797,7 +797,9 @@ repositories listed at
797
call to the function when falling back to three-way merge.
798
799
Being able to make a direct call would be good in general, but as a
800
- performance thing, we would want to see it backed up by numbers.
800
+ performance thing, the change needs to be backed up by numbers.
801
+
802
+ Needs review.
803
804
I haven't gone through the "gently" change with fine toothed comb;
805
I can see that the change avoids calling die(), but I haven't made