What's cooking (2016/12 #06)
Junio C Hamano committed
Dec 21, 2016 at 15:06 UTC
8a6c16a673d35e16dcbeb9fc168cf35a8c0cef00
1 file changed
+165
-392
whats-cooking.txt
+165
-392
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2016, #05; Mon, 19)
4
-X-master-at: 6610af872f6494a061780ec738c8713a034b848b
5
-X-next-at: 4f4050513f839a9c6e56bdec20cbd1a1cb924ef8
3
+Subject: What's cooking in git.git (Dec 2016, #06; Wed, 21)
4
+X-master-at: 1d1bdafd64266e5ee3bd46c6965228f32e4022ea
5
+X-next-at: 71d7989c69ecdcefd19d2521182237e1294395ca
6
7
-What's cooking in git.git (Dec 2016, #05; Mon, 19)
7
+What's cooking in git.git (Dec 2016, #06; Wed, 21)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +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 second (rather large) batch of topics have been merged to
16
-'master'. Please test and catch possible regressions early.
17
-
15
You can find the changes described here in the integration branches
16
of the repositories listed at
17
@@ -23,311 +20,126 @@ of the repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
26
-* ah/grammos (2016-12-05) 3 commits
27
- (merged to 'next' on 2016-12-12 at 13ad487b28)
28
- + clone,fetch: explain the shallow-clone option a little more clearly
29
- + receive-pack: improve English grammar of denyCurrentBranch message
30
- + bisect: improve English grammar of not-ancestors message
31
-
32
- A few messages have been fixed for their grammatical errors.
33
-
34
-
35
-* ak/commit-only-allow-empty (2016-12-09) 2 commits
36
- (merged to 'next' on 2016-12-12 at 54188ab23c)
37
- + commit: remove 'Clever' message for --only --amend
38
- + commit: make --only --allow-empty work without paths
39
-
40
- "git commit --allow-empty --only" (no pathspec) with dirty index
41
- ought to be an acceptable way to create a new commit that does not
42
- change any paths, but it was forbidden, perhaps because nobody
43
- needed it so far.
44
-
45
-
46
-* bb/unicode-9.0 (2016-12-14) 6 commits
47
- (merged to 'next' on 2016-12-16 at be2531431a)
48
- + unicode_width.h: update the width tables to Unicode 9.0
49
- + update_unicode.sh: remove the plane filter
50
- + update_unicode.sh: automatically download newer definition files
51
- + update_unicode.sh: pin the uniset repo to a known good commit
52
- + update_unicode.sh: remove an unnecessary subshell level
53
- + update_unicode.sh: move it into contrib/update-unicode
54
-
55
- The character width table has been updated to match Unicode 9.0
56
-
57
-
58
-* da/difftool-dir-diff-fix (2016-12-08) 1 commit
59
- (merged to 'next' on 2016-12-12 at fd31a92ad6)
60
- + difftool: fix dir-diff index creation when in a subdirectory
61
-
62
- "git difftool --dir-diff" had a minor regression when started from
63
- a subdirectory, which has been fixed.
64
-
65
-
66
-* da/mergetool-xxdiff-hotkey (2016-12-11) 1 commit
67
- (merged to 'next' on 2016-12-13 at a08f375c81)
68
- + mergetools: fix xxdiff hotkeys
69
-
70
- The way to specify hotkeys to "xxdiff" that is used by "git
71
- mergetool" has been modernized to match recent versions of xxdiff.
72
-
73
-
74
-* jb/diff-no-index-no-abbrev (2016-12-08) 1 commit
75
- (merged to 'next' on 2016-12-12 at 959981ef50)
76
- + diff: handle --no-abbrev in no-index case
77
-
78
- "git diff --no-index" did not take "--no-abbrev" option.
79
-
80
-
81
-* jc/lock-report-on-error (2016-12-07) 3 commits
82
- (merged to 'next' on 2016-12-13 at cb6c07ee92)
83
- + lockfile: LOCK_REPORT_ON_ERROR
84
- + hold_locked_index(): align error handling with hold_lockfile_for_update()
85
- + wt-status: implement opportunisitc index update correctly
86
-
87
- Git 2.11 had a minor regression in "merge --ff-only" that competed
88
- with another process that simultanously attempted to update the
89
- index. We used to explain what went wrong with an error message,
90
- but the new code silently failed. The error message has been
91
- resurrected.
92
-
93
-
94
-* jc/pull-rebase-ff (2016-11-29) 1 commit
95
- (merged to 'next' on 2016-12-16 at c1a0cedd9e)
96
- + pull: fast-forward "pull --rebase=true"
97
-
98
- "git pull --rebase", when there is no new commits on our side since
99
- we forked from the upstream, should be able to fast-forward without
100
- invoking "git rebase", but it didn't.
101
-
102
-
103
-* jc/renormalize-merge-kill-safer-crlf (2016-12-01) 4 commits
104
- (merged to 'next' on 2016-12-12 at 041b834f81)
105
- + convert: git cherry-pick -Xrenormalize did not work
106
- + Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlf
107
- + merge-recursive: handle NULL in add_cacheinfo() correctly
108
- + cherry-pick: demonstrate a segmentation fault
109
-
110
- Fix a corner case in merge-recursive regression that crept in
111
- during 2.10 development cycle.
112
-
113
-
114
-* jk/http-walker-limit-redirect (2016-12-06) 2 commits
115
- (merged to 'next' on 2016-12-12 at 8b58025e3a)
116
- + http-walker: complain about non-404 loose object errors
117
- + Merge branch 'ew/http-walker' into jk/http-walker-limit-redirect
118
- (this branch is used by bw/transport-protocol-policy; uses jk/http-walker-limit-redirect-2.9.)
119
-
120
- Update the error messages from the dumb-http client when it fails
121
- to obtain loose objects; we used to give sensible error message
122
- only upon 404 but we now forbid unexpected redirects that needs to
123
- be reported with something sensible.
124
-
125
-
126
-* jk/http-walker-limit-redirect-2.9 (2016-12-06) 5 commits
127
- (merged to 'next' on 2016-12-12 at 3e4bcd7bca)
128
- + http: treat http-alternates like redirects
129
- + http: make redirects more obvious
130
- + remote-curl: rename shadowed options variable
131
- + http: always update the base URL for redirects
132
- + http: simplify update_url_from_redirect
133
- (this branch is used by bw/transport-protocol-policy and jk/http-walker-limit-redirect.)
134
-
135
- Transport with dumb http can be fooled into following foreign URLs
136
- that the end user does not intend to, especially with the server
137
- side redirects and http-alternates mechanism, which can lead to
138
- security issues. Tighten the redirection and make it more obvious
139
- to the end user when it happens.
140
-
141
-
142
-* jk/make-tags-find-sources-tweak (2016-12-14) 4 commits
143
- (merged to 'next' on 2016-12-16 at 06d0b0fbfd)
144
- + Makefile: exclude contrib from FIND_SOURCE_FILES
145
- + Makefile: match shell scripts in FIND_SOURCE_FILES
146
- + Makefile: exclude test cruft from FIND_SOURCE_FILES
147
- + Makefile: reformat FIND_SOURCE_FILES
148
-
149
- Update the procedure to generate "tags" for developer support.
150
-
151
-
152
-* jk/readme-gmane-is-no-more (2016-12-15) 1 commit
153
- (merged to 'next' on 2016-12-16 at 44ad5c5205)
154
- + README: replace gmane link with public-inbox
155
-
156
-
157
-* jk/stash-disable-renames-internally (2016-12-06) 1 commit
158
- (merged to 'next' on 2016-12-12 at e2b97aae68)
159
- + stash: prefer plumbing over git-diff
160
-
161
- When diff.renames configuration is on (and with Git 2.9 and later,
162
- it is enabled by default, which made it worse), "git stash"
163
- misbehaved if a file is removed and another file with a very
164
- similar content is added.
165
-
166
-
167
-* jk/trailers-placeholder-in-pretty (2016-12-11) 2 commits
168
- (merged to 'next' on 2016-12-12 at 57de4e699a)
169
- + ref-filter: add support to display trailers as part of contents
170
- + pretty: add %(trailers) format for displaying trailers of a commit message
171
- (this branch uses jt/use-trailer-api-in-commands.)
172
-
173
- In addition to %(subject), %(body), "log --pretty=format:..."
174
- learned a new placeholder %(trailers).
175
-
176
-
177
-* jk/xdiff-drop-xdl-fast-hash (2016-12-06) 1 commit
178
- (merged to 'next' on 2016-12-13 at 914e306217)
179
- + xdiff: drop XDL_FAST_HASH
180
-
181
- Retire the "fast hash" that had disastrous performance issues in
182
- some corner cases.
183
-
184
-
185
-* js/normalize-path-copy-ceil (2016-12-16) 1 commit
186
- (merged to 'next' on 2016-12-16 at 634ba4debc)
187
- + normalize_path_copy(): fix pushing to //server/share/dir on Windows
188
-
189
- A pathname that begins with "//" or "\\" on Windows is special but
190
- path normalization logic was unaware of it.
191
-
192
-
193
-* jt/use-trailer-api-in-commands (2016-11-29) 5 commits
194
- (merged to 'next' on 2016-12-12 at da1f140ad4)
195
- + sequencer: use trailer's trailer layout
196
- + trailer: have function to describe trailer layout
197
- + trailer: avoid unnecessary splitting on lines
198
- + commit: make ignore_non_trailer take buf/len
199
- + trailer: be stricter in parsing separators
200
- (this branch is used by jk/trailers-placeholder-in-pretty.)
201
-
202
- Commands that operate on a log message and add lines to the trailer
203
- blocks, such as "format-patch -s", "cherry-pick (-x|-s)", and
204
- "commit -s", have been taught to use the logic of and share the
205
- code with "git interpret-trailer".
206
-
207
-
208
-* kh/tutorial-grammofix (2016-12-09) 4 commits
209
- (merged to 'next' on 2016-12-13 at a951db78bc)
210
- + doc: omit needless "for"
211
- + doc: make the intent of sentence clearer
212
- + doc: add verb in front of command to run
213
- + doc: add articles (grammar)
214
-
215
-
216
-* ld/p4-worktree (2016-12-13) 1 commit
217
- (merged to 'next' on 2016-12-16 at 5210ab9973)
218
- + git-p4: support git worktrees
219
-
220
- "git p4" didn't interact with the internal of .git directory
221
- correctly in the modern "git-worktree"-enabled world.
222
-
223
-
224
-* lr/doc-fix-cet (2016-12-12) 1 commit
225
- (merged to 'next' on 2016-12-13 at dbc9e07e57)
226
- + date-formats.txt: Typo fix
23
+* jk/index-pack-wo-repo-from-stdin (2016-12-16) 4 commits
24
+ (merged to 'next' on 2016-12-19 at 9a88221347)
25
+ + index-pack: skip collision check when not in repository
26
+ + t: use nongit() function where applicable
27
+ + index-pack: complain when --stdin is used outside of a repo
28
+ + t5000: extract nongit function to test-lib-functions.sh
29
30
+ "git index-pack --stdin" needs an access to an existing repository,
31
+ but "git index-pack file.pack" to generate an .idx file that
32
+ corresponds to a packfile does not.
33
229
-* ls/t0021-fixup (2016-12-05) 1 commit
230
- (merged to 'next' on 2016-12-12 at db652e691a)
231
- + t0021: minor filter process test cleanup
34
35
+* jk/parseopt-usage-msg-opt (2016-12-14) 1 commit
36
+ (merged to 'next' on 2016-12-19 at c488c7c6e1)
37
+ + parse-options: print "fatal:" before usage_msg_opt()
38
234
-* ls/travis-update-p4-and-lfs (2016-12-05) 1 commit
235
- (merged to 'next' on 2016-12-12 at 5496caa048)
236
- + travis-ci: update P4 to 16.2 and GitLFS to 1.5.2 in Linux build
39
+ The function usage_msg_opt() has been updated to say "fatal:"
40
+ before the custom message programs give, when they want to die
41
+ with a message about wrong command line options followed by the
42
+ standard usage string.
43
238
- The default Travis-CI configuration specifies newer P4 and GitLFS.
44
45
+* jk/quote-env-path-list-component (2016-12-21) 5 commits
46
+ (merged to 'next' on 2016-12-21 at 729971d31e)
47
+ + t5615-alternate-env: double-quotes in file names do not work on Windows
48
+ (merged to 'next' on 2016-12-16 at d2cd6008b9)
49
+ + t5547-push-quarantine: run the path separator test on Windows, too
50
+ + tmp-objdir: quote paths we add to alternates
51
+ + alternates: accept double-quoted paths
52
+ + Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-component
53
241
-* nd/for-each-ref-ignore-case (2016-12-05) 1 commit
242
- (merged to 'next' on 2016-12-12 at 527cc4f275)
243
- + tag, branch, for-each-ref: add --ignore-case for sorting and filtering
54
+ A recent update to receive-pack to make it easier to drop garbage
55
+ objects made it clear that GIT_ALTERNATE_OBJECT_DIRECTORIES cannot
56
+ have a pathname with a colon in it (no surprise!), and this in turn
57
+ made it impossible to push into a repository at such a path. This
58
+ has been fixed by introducing a quoting mechanism used when
59
+ appending such a path to the colon-separated list.
60
245
- "git branch --list" and friends learned "--ignore-case" option to
246
- optionally sort branches and tags case insensitively.
61
62
+* jt/mailinfo-fold-in-body-headers (2016-12-20) 1 commit
63
+ (merged to 'next' on 2016-12-20 at ec9ae616aa)
64
+ + mailinfo.c: move side-effects outside of assert
65
249
-* nd/rebase-forget (2016-12-11) 1 commit
250
- (merged to 'next' on 2016-12-12 at 50b5d28af4)
251
- + rebase: add --quit to cleanup rebase, leave everything else untouched
66
+ Fix for NDEBUG builds.
67
253
- "git rebase" learned "--quit" option, which allows a user to
254
- remove the metadata left by an earlier "git rebase" that was
255
- manually aborted without using "git rebase --abort".
68
69
+* nd/shallow-fixup (2016-12-07) 6 commits
70
+ (merged to 'next' on 2016-12-13 at 1a3edb8bce)
71
+ + shallow.c: remove useless code
72
+ + shallow.c: bit manipulation tweaks
73
+ + shallow.c: avoid theoretical pointer wrap-around
74
+ + shallow.c: make paint_alloc slightly more robust
75
+ + shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory pools
76
+ + shallow.c: rename fields in paint_info to better express their purposes
77
258
-* rj/git-version-gen-do-not-force-abbrev (2016-12-06) 1 commit
259
- (merged to 'next' on 2016-12-12 at e37970c3f5)
260
- + GIT-VERSION-GEN: do not force abbreviation length used by 'describe'
78
+ Code cleanup in shallow boundary computation.
79
262
- A minor build update.
80
81
+* sb/sequencer-abort-safety (2016-12-14) 6 commits
82
+ (merged to 'next' on 2016-12-16 at ec71fb1217)
83
+ + Revert "sequencer: remove useless get_dir() function"
84
+ (merged to 'next' on 2016-12-13 at 6107e43d65)
85
+ + sequencer: remove useless get_dir() function
86
+ + sequencer: make sequencer abort safer
87
+ + t3510: test that cherry-pick --abort does not unsafely change HEAD
88
+ + am: change safe_to_abort()'s not rewinding error into a warning
89
+ + am: fix filename in safe_to_abort() error message
90
265
-* sb/t3600-cleanup (2016-12-12) 2 commits
266
- (merged to 'next' on 2016-12-13 at e06e6e702f)
267
- + t3600: slightly modernize style
268
- (merged to 'next' on 2016-12-12 at d9996af5e8)
269
- + t3600: remove useless redirect
91
+ Unlike "git am --abort", "git cherry-pick --abort" moved HEAD back
92
+ to where cherry-pick started while picking multiple changes, when
93
+ the cherry-pick stopped to ask for help from the user, and the user
94
+ did "git reset --hard" to a different commit in order to re-attempt
95
+ the operation.
96
271
- Code cleanup.
97
98
+* vs/submodule-clone-nested-submodules-alternates (2016-12-12) 1 commit
99
+ (merged to 'next' on 2016-12-13 at 8a317ab745)
100
+ + submodule--helper: set alternateLocation for cloned submodules
101
274
-* sb/unpack-trees-grammofix (2016-12-05) 1 commit
275
- (merged to 'next' on 2016-12-12 at 29e536f590)
276
- + unpack-trees: fix grammar for untracked files in directories
102
+ "git clone --reference $there --recurse-submodules $super" has been
103
+ taught to guess repositories usable as references for submodules of
104
+ $super that are embedded in $there while making a clone of the
105
+ superproject borrow objects from $there; extend the mechanism to
106
+ also allow submodules of these submodules to borrow repositories
107
+ embedded in these clones of the submodules embedded in the clone of
108
+ the superproject.
109
110
--------------------------------------------------
111
[New Topics]
112
281
-* gv/p4-multi-path-commit-fix (2016-12-19) 1 commit
282
- - git-p4: fix multi-path changelist empty commits
283
-
284
- "git p4" that tracks multile p4 paths imported a single changelist
285
- that touches files in these multiple paths as one commit, followed
286
- by many empty commits. This has been fixed.
287
-
288
- Will merge to 'next'.
289
-
290
-
291
-* js/mingw-isatty (2016-12-18) 1 commit
292
- - winansi_isatty(): fix when Git is used from CMD
293
-
294
- Update the isatty() emulation for Windows to make it interact
295
- better with the cmd.exe console.
296
-
297
- Waiting for an ack.
298
-
299
-
300
-* jt/mailinfo-fold-in-body-headers (2016-12-19) 1 commit
301
- - mailinfo.c: move side-effects outside of assert
302
-
303
- Fix for NDEBUG builds.
113
+* bw/push-submodule-only (2016-12-20) 3 commits
114
+ - push: add option to push only submodules
115
+ - submodules: add RECURSE_SUBMODULES_ONLY value
116
+ - transport: reformat flag #defines to be more readable
117
305
- Will merge to 'next'.
118
+ "git submodule push" learned "--recurse-submodules=only option to
119
+ push submodules out without pushing the top-level superproject.
120
121
308
-* ls/p4-lfs (2016-12-18) 1 commit
309
- - git-p4: add diff/merge properties to .gitattributes for GitLFS files
310
-
311
- Update GitLFS integration with "git p4".
122
+* mk/mingw-winansi-ttyname-termination-fix (2016-12-20) 1 commit
123
+ (merged to 'next' on 2016-12-21 at 1e8e994605)
124
+ + mingw: consider that UNICODE_STRING::Length counts bytes
125
313
- Waiting for an ack.
126
+ A potential but unlikely buffer overflow in Windows port has been
127
+ fixed.
128
129
+ Will merge to 'master'.
130
316
-* ls/p4-path-encoding (2016-12-18) 1 commit
317
- - git-p4: fix git-p4.pathEncoding for removed files
131
319
- When "git p4" imports changelist that removes paths, it failed to
320
- convert pathnames when the p4 used encoding different from the one
321
- used on the Git side. This has been corrected.
132
+* nd/config-misc-fixes (2016-12-20) 4 commits
133
+ - SQUASH???
134
+ - config.c: handle lock file in error case in git_config_rename_...
135
+ - config.c: rename label unlock_and_out
136
+ - config.c: handle error case for fstat() calls
137
323
- Waiting for an ack.
138
+ Leakage of lockfiles in the config subsystem has been fixed.
139
140
326
-* mh/fast-import-notes-fix-new (2016-12-19) 1 commit
327
- - fast-import: properly fanout notes when tree is imported
328
-
329
- "git fast-import" sometimes mishandled while rebalancing notes
330
- tree, which has been fixed.
141
+* va/i18n-even-more (2016-12-20) 1 commit
142
+ - i18n: fix misconversion in shell scripts
143
144
Will merge to 'next'.
145
@@ -470,6 +282,54 @@ of the repositories listed at
282
--------------------------------------------------
283
[Cooking]
284
285
+* gv/p4-multi-path-commit-fix (2016-12-19) 1 commit
286
+ (merged to 'next' on 2016-12-21 at f7ba714387)
287
+ + git-p4: fix multi-path changelist empty commits
288
+
289
+ "git p4" that tracks multile p4 paths imported a single changelist
290
+ that touches files in these multiple paths as one commit, followed
291
+ by many empty commits. This has been fixed.
292
+
293
+ Will merge to 'master'.
294
+
295
+
296
+* js/mingw-isatty (2016-12-21) 2 commits
297
+ - mingw: replace isatty() hack
298
+ - mingw: adjust is_console() to work with stdin
299
+
300
+ Update the isatty() emulation for Windows by updating the previous
301
+ hack that depended on internals of (older) MSVC runtime.
302
+
303
+ Waiting for review to conclude.
304
+
305
+
306
+* ls/p4-lfs (2016-12-20) 1 commit
307
+ - git-p4: add diff/merge properties to .gitattributes for GitLFS files
308
+
309
+ Update GitLFS integration with "git p4".
310
+
311
+ Will merge to 'next'.
312
+
313
+
314
+* ls/p4-path-encoding (2016-12-18) 1 commit
315
+ - git-p4: fix git-p4.pathEncoding for removed files
316
+
317
+ When "git p4" imports changelist that removes paths, it failed to
318
+ convert pathnames when the p4 used encoding different from the one
319
+ used on the Git side. This has been corrected.
320
+
321
+ Waiting for review to conclude.
322
+
323
+
324
+* mh/fast-import-notes-fix-new (2016-12-20) 1 commit
325
+ - fast-import: properly fanout notes when tree is imported
326
+
327
+ "git fast-import" sometimes mishandled while rebalancing notes
328
+ tree, which has been fixed.
329
+
330
+ Will merge to 'next'.
331
+
332
+
333
* bw/pathspec-cleanup (2016-12-14) 16 commits
334
- pathspec: rename prefix_pathspec to init_pathspec_item
335
- pathspec: small readability changes
@@ -506,24 +366,13 @@ of the repositories listed at
366
Will merge to 'master'.
367
368
509
-* jk/parseopt-usage-msg-opt (2016-12-14) 1 commit
510
- (merged to 'next' on 2016-12-19 at c488c7c6e1)
511
- + parse-options: print "fatal:" before usage_msg_opt()
512
-
513
- The function usage_msg_opt() has been updated to say "fatal:"
514
- before the custom message programs give, when they want to die
515
- with a message about wrong command line options followed by the
516
- standard usage string.
517
-
518
- Will merge to 'master'.
519
-
520
-
369
* ld/p4-compare-dir-vs-symlink (2016-12-18) 1 commit
522
- - git-p4: avoid crash adding symlinked directory
370
+ (merged to 'next' on 2016-12-20 at f58fed9ef8)
371
+ + git-p4: avoid crash adding symlinked directory
372
373
"git p4" misbehaved when swapping a directory and a symbolic link.
374
526
- Will merge to 'next'.
375
+ Will merge to 'master'.
376
377
378
* js/prepare-sequencer-more (2016-12-14) 34 commits
@@ -565,24 +414,12 @@ of the repositories listed at
414
The sequencer has further been extended in preparation to act as a
415
back-end for "rebase -i".
416
568
- Waiting for review.
569
-
570
-
571
-* jk/index-pack-wo-repo-from-stdin (2016-12-16) 4 commits
572
- (merged to 'next' on 2016-12-19 at 9a88221347)
573
- + index-pack: skip collision check when not in repository
574
- + t: use nongit() function where applicable
575
- + index-pack: complain when --stdin is used outside of a repo
576
- + t5000: extract nongit function to test-lib-functions.sh
577
-
578
- "git index-pack --stdin" needs an access to an existing repository,
579
- but "git index-pack file.pack" to generate an .idx file that
580
- corresponds to a packfile does not.
581
-
582
- Will merge to 'master'.
417
+ Waiting for review to conclude.
418
419
585
-* lt/shortlog-by-committer (2016-12-16) 2 commits
420
+* lt/shortlog-by-committer (2016-12-20) 3 commits
421
+ (merged to 'next' on 2016-12-21 at c72e6e7f76)
422
+ + t4201: make tests work with and without the MINGW prerequiste
423
(merged to 'next' on 2016-12-19 at 555976fc0a)
424
+ shortlog: test and document --committer option
425
+ shortlog: group by committer information
@@ -590,8 +427,6 @@ of the repositories listed at
427
"git shortlog" learned "--committer" option to group commits by
428
committer, instead of author.
429
593
- Will merge to 'master'.
594
-
430
431
* bw/realpath-wo-chdir (2016-12-12) 4 commits
432
- real_path: have callers use real_pathdup and strbuf_realpath
@@ -605,84 +440,21 @@ of the repositories listed at
440
threaded environment. Rewrite it to manually resolve relative
441
paths including symbolic links in path components.
442
608
- Will merge to 'next'.
609
-
610
-
611
-* jk/quote-env-path-list-component (2016-12-13) 4 commits
612
- (merged to 'next' on 2016-12-16 at d2cd6008b9)
613
- + t5547-push-quarantine: run the path separator test on Windows, too
614
- + tmp-objdir: quote paths we add to alternates
615
- + alternates: accept double-quoted paths
616
- + Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-component
617
-
618
- A recent update to receive-pack to make it easier to drop garbage
619
- objects made it clear that GIT_ALTERNATE_OBJECT_DIRECTORIES cannot
620
- have a pathname with a colon in it (no surprise!), and this in turn
621
- made it impossible to push into a repository at such a path. This
622
- has been fixed by introducing a quoting mechanism used when
623
- appending such a path to the colon-separated list.
624
-
625
- Will merge to 'master'.
626
-
627
-
628
-* nd/shallow-fixup (2016-12-07) 6 commits
629
- (merged to 'next' on 2016-12-13 at 1a3edb8bce)
630
- + shallow.c: remove useless code
631
- + shallow.c: bit manipulation tweaks
632
- + shallow.c: avoid theoretical pointer wrap-around
633
- + shallow.c: make paint_alloc slightly more robust
634
- + shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory pools
635
- + shallow.c: rename fields in paint_info to better express their purposes
636
-
637
- Code cleanup in shallow boundary computation.
638
-
639
- Will merge to 'master'.
640
-
641
-
642
-* sb/sequencer-abort-safety (2016-12-14) 6 commits
643
- (merged to 'next' on 2016-12-16 at ec71fb1217)
644
- + Revert "sequencer: remove useless get_dir() function"
645
- (merged to 'next' on 2016-12-13 at 6107e43d65)
646
- + sequencer: remove useless get_dir() function
647
- + sequencer: make sequencer abort safer
648
- + t3510: test that cherry-pick --abort does not unsafely change HEAD
649
- + am: change safe_to_abort()'s not rewinding error into a warning
650
- + am: fix filename in safe_to_abort() error message
651
-
652
- Unlike "git am --abort", "git cherry-pick --abort" moved HEAD back
653
- to where cherry-pick started while picking multiple changes, when
654
- the cherry-pick stopped to ask for help from the user, and the user
655
- did "git reset --hard" to a different commit in order to re-attempt
656
- the operation.
657
-
658
- Will merge to 'master'.
443
+ Will wait for an issue on Windows to be resolved.
444
+ cf. <097e3e2e-f46d-b0aa-be9c-68c274c5e3dc@kdbg.org>
445
446
447
* jk/difftool-in-subdir (2016-12-11) 4 commits
662
- - difftool: rename variables for consistency
663
- - difftool: chdir as early as possible
664
- - difftool: sanitize $workdir as early as possible
665
- - difftool: fix dir-diff index creation when in a subdirectory
448
+ (merged to 'next' on 2016-12-21 at c1056e014b)
449
+ + difftool: rename variables for consistency
450
+ + difftool: chdir as early as possible
451
+ + difftool: sanitize $workdir as early as possible
452
+ + difftool: fix dir-diff index creation when in a subdirectory
453
454
Even though an fix was attempted in Git 2.9.3 days, but running
455
"git difftool --dir-diff" from a subdirectory never worked. This
456
has been fixed.
457
671
- Will merge to 'next'.
672
-
673
-
674
-* vs/submodule-clone-nested-submodules-alternates (2016-12-12) 1 commit
675
- (merged to 'next' on 2016-12-13 at 8a317ab745)
676
- + submodule--helper: set alternateLocation for cloned submodules
677
-
678
- "git clone --reference $there --recurse-submodules $super" has been
679
- taught to guess repositories usable as references for submodules of
680
- $super that are embedded in $there while making a clone of the
681
- superproject borrow objects from $there; extend the mechanism to
682
- also allow submodules of these submodules to borrow repositories
683
- embedded in these clones of the submodules embedded in the clone of
684
- the superproject.
685
-
458
Will merge to 'master'.
459
460
@@ -718,19 +490,20 @@ of the repositories listed at
490
491
492
* sb/submodule-embed-gitdir (2016-12-12) 6 commits
721
- - submodule: add absorb-git-dir function
722
- - move connect_work_tree_and_git_dir to dir.h
723
- - worktree: check if a submodule uses worktrees
724
- - test-lib-functions.sh: teach test_commit -C <dir>
725
- - submodule helper: support super prefix
726
- - submodule: use absolute path for computing relative path connecting
493
+ (merged to 'next' on 2016-12-21 at e6cdbcf013)
494
+ + submodule: add absorb-git-dir function
495
+ + move connect_work_tree_and_git_dir to dir.h
496
+ + worktree: check if a submodule uses worktrees
497
+ + test-lib-functions.sh: teach test_commit -C <dir>
498
+ + submodule helper: support super prefix
499
+ + submodule: use absolute path for computing relative path connecting
500
501
A new submodule helper "git submodule embedgitdirs" to make it
502
easier to move embedded .git/ directory for submodules in a
503
superproject to .git/modules/ (and point the latter with the former
504
that is turned into a "gitdir:" file) has been added.
505
733
- Will merge to 'next'.
506
+ Will merge to 'master'.
507
508
509
* bw/grep-recurse-submodules (2016-12-16) 7 commits
@@ -743,9 +516,9 @@ of the repositories listed at
516
- submodules: add helper to determine if a submodule is populated
517
(this branch uses bw/realpath-wo-chdir.)
518
746
- "git grep" learns to optionally recurse into submodules
519
+ "git grep" learns to optionally recurse into submodules.
520
748
- Will merge to 'next'.
521
+ Will hold until bw/realpath-wo-chdir settles.
522
523
524
* dt/smart-http-detect-server-going-away (2016-11-18) 2 commits
@@ -988,7 +761,7 @@ of the repositories listed at
761
762
Move more parts of "git bisect" to C.
763
991
- Waiting for review.
764
+ Waiting for review to conclude.
765
766
767
* st/verify-tag (2016-10-10) 7 commits
@@ -1106,7 +879,7 @@ of the repositories listed at
879
same release were present (e.g. when 2.0, 2.0-beta1, and 2.0-beta2
880
are there and the code needs to compare 2.0-beta1 and 2.0-beta2).
881
1109
- Waiting for review.
882
+ Waiting for review to conclude.
883
cf. <20161208142401.1329-1-szeder.dev@gmail.com>
884
885