What's cooking (2016/06 #08)
Junio C Hamano committed
Jun 23, 2016 at 15:16 UTC
f10cb137a209cf5641c8b1c853b6879133a25b27
1 file changed
+302
-289
whats-cooking.txt
+302
-289
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2016, #07; Mon, 20)
3
+Subject: What's cooking in git.git (Jun 2016, #08; Thu, 23)
4
X-master-at: ab7797dbe95fff38d9265869ea367020046db118
5
-X-next-at: 4f205b8d7f8a436ff26120f4bf35d0ce5f463867
5
+X-next-at: 44ae68fed1736e48fe3c8224731bdda76bb82e75
6
7
-What's cooking in git.git (Jun 2016, #07; Mon, 20)
7
+What's cooking in git.git (Jun 2016, #08; Thu, 23)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -13,7 +13,7 @@ Here are the topics that have been cooking. Commits prefixed with
13
the integration branches, but I am still holding onto them.
14
15
The first batch for this cycle has been merged to 'master', the tip
16
-of 'next' has been rewound and rebuilt, while a few topics are
16
+of 'next' has been rewound and rebuilt, while a few topics got
17
temporarily ejected from 'next'.
18
19
You can find the changes described here in the integration branches
@@ -22,137 +22,266 @@ of the repositories listed at
22
http://git-blame.blogspot.com/p/git-public-repositories.html
23
24
--------------------------------------------------
25
-[Graduated to "master"]
25
+[New Topics]
26
27
-* ah/no-verify-signature-with-pull-rebase (2016-05-20) 1 commit
28
- (merged to 'next' on 2016-05-31 at 30add83)
29
- + pull: warn on --verify-signatures with --rebase
27
+* ak/t7800-wo-readlink (2016-06-21) 1 commit
28
+ - t7800: readlink may not be available
29
31
- "git pull --rebase --verify-signature" learned to warn the user
32
- that "--verify-signature" is a no-op when rebasing.
30
+ One among four invocations of readlink(1) in our test suite has
31
+ been rewritten so that the test can run on systems without the
32
+ command (others are in valgrind test framework and t9802).
33
34
+ Will merge to 'next'.
35
35
-* aq/upload-pack-use-parse-options (2016-05-31) 1 commit
36
- (merged to 'next' on 2016-06-06 at 505f1ee)
37
- + upload-pack.c: use parse-options API
36
39
- "git upload-pack" command has been updated to use the parse-options
40
- API.
37
+* js/perf-on-apple (2016-06-21) 1 commit
38
+ - perf: accommodate for MacOSX
39
40
+ t/perf needs /usr/bin/time with GNU extension; the invocation of it
41
+ is updated to "gtime" on Darwin.
42
43
-* et/pretty-format-c-auto (2016-05-27) 1 commit
44
- (merged to 'next' on 2016-05-31 at 1e9c920)
45
- + format_commit_message: honor `color=auto` for `%C(auto)`
43
+ Will merge to 'next'.
44
47
- The commands in `git log` family take %C(auto) in a custom format
48
- string. This unconditionally turned the color on, ignoring
49
- --no-color or with --color=auto when the output is not connected to
50
- a tty; this was corrected to make the format truly behave as
51
- "auto".
45
46
+* sb/t5614-modernize (2016-06-21) 1 commit
47
+ - t5614: don't use subshells
48
+ (this branch uses sb/clone-shallow-passthru.)
49
54
-* ew/daemon-socket-keepalive (2016-05-25) 1 commit
55
- (merged to 'next' on 2016-05-31 at c32acf1)
56
- + daemon: enable SO_KEEPALIVE for all sockets
50
+ Test clean-up.
51
58
- When "git daemon" is run without --[init-]timeout specified, a
59
- connection from a client that silently goes offline can hang around
60
- for a long time, wasting resources. The socket-level KEEPALIVE has
61
- been enabled to allow the OS to notice such failed connections.
52
+ Will merge to 'next'.
53
54
64
-* ew/fast-import-unpack-limit (2016-05-29) 2 commits
65
- (merged to 'next' on 2016-05-29 at af32aba)
66
- + fast-import: invalidate pack_id references after loosening
67
- (merged to 'next' on 2016-05-11 at ffd4efb)
68
- + fast-import: implement unpack limit
55
+* ao/p4-has-branch-prefix-fix (2016-06-22) 1 commit
56
+ - git-p4: correct hasBranchPrefix verbose output
57
70
- "git fast-import" learned the same performance trick to avoid
71
- creating too small a packfile as "git fetch" and "git push" have,
72
- using *.unpackLimit configuration.
58
+ A bug, which caused "git p4" while running under verbose mode to
59
+ report paths that are omitted due to branch prefix incorrectly, has
60
+ been fixed; the command said "Ignoring file outside of prefix" for
61
+ paths that are _inside_.
62
63
+ Will merge to 'next'.
64
75
-* jc/clear-pathspec (2016-06-02) 1 commit
76
- (merged to 'next' on 2016-06-06 at 9e7e291)
77
- + pathspec: rename free_pathspec() to clear_pathspec()
65
79
- We usually call a function that clears the contents a data
80
- structure X without freeing the structure itself clear_X(), and
81
- call a function that does clear_X() and also frees it free_X().
82
- free_pathspec() function has been renamed to clear_pathspec()
83
- to avoid confusion.
66
+* cb/t7810-test-label-fix (2016-06-21) 1 commit
67
+ - t7810: fix duplicated test title
68
69
+ Test clean-up.
70
86
-* jg/dash-is-last-branch-in-worktree-add (2016-05-31) 1 commit
87
- (merged to 'next' on 2016-06-02 at 3959ef6)
88
- + worktree: allow "-" short-hand for @{-1} in add command
71
+ Will merge to 'next'.
72
90
- "git worktree add" learned that '-' can be used as a short-hand for
91
- "@{-1}", the previous branch.
73
74
+* jc/t2300-setup (2016-06-22) 1 commit
75
+ - t2300: "git --exec-path" is not usable in $PATH on Windows as-is
76
94
-* jk/rev-list-count-with-bitmap (2016-06-03) 2 commits
95
- (merged to 'next' on 2016-06-06 at dd9b30f)
96
- + rev-list: disable bitmaps when "-n" is used with listing objects
97
- + rev-list: "adjust" results of "--count --use-bitmap-index -n"
77
+ Portability fix for Windows.
78
+
79
+ Will merge to 'next'.
80
99
- "git rev-list --count" whose walk-length is limited with "-n"
100
- option did not work well with the counting optimized to look at the
101
- bitmap index.
81
82
+* jk/perf-any-version (2016-06-22) 2 commits
83
+ - p4211: explicitly disable renames in no-rename test
84
+ - t/perf: fix regression in testing older versions of git
85
104
-* rs/xdiff-hunk-with-func-line (2016-06-09) 9 commits
105
- (merged to 'next' on 2016-06-10 at 9ff9ba8)
106
- + xdiff: fix merging of appended hunk with -W
107
- (merged to 'next' on 2016-06-02 at 0c2e335)
108
- + grep: -W: don't extend context to trailing empty lines
109
- + t7810: add test for grep -W and trailing empty context lines
110
- + xdiff: don't trim common tail with -W
111
- + xdiff: -W: don't include common trailing empty lines in context
112
- + xdiff: ignore empty lines before added functions with -W
113
- + xdiff: handle appended chunks better with -W
114
- + xdiff: factor out match_func_rec()
115
- + t4051: rewrite, add more tests
86
+ Allow t/perf framework to use the features from the most recent
87
+ version of Git even when testing an older installed version.
88
117
- "git show -W" (extend hunks to cover the entire function, delimited
118
- by lines that match the "funcname" pattern) used to show the entire
119
- file when a change added an entire function at the end of the file,
120
- which has been fixed.
89
+ Will merge to 'next'.
90
91
123
-* sb/submodule-misc-cleanups (2016-05-25) 1 commit
124
- (merged to 'next' on 2016-05-31 at 0d07b9c)
125
- + submodule update: make use of the existing fetch_in_submodule function
92
+* jn/preformatted-doc-url (2016-06-22) 1 commit
93
+ - doc: git-htmldocs.googlecode.com is no more
94
+
95
+ Will merge to 'next'.
96
127
- Minor simplification.
97
98
+* ex/deprecate-empty-pathspec-as-match-all (2016-06-22) 1 commit
99
+ - pathspec: warn on empty strings as pathspec
100
130
-* sb/submodule-recommend-shallowness (2016-05-27) 2 commits
131
- (merged to 'next' on 2016-05-31 at 1ee161c)
132
- + submodule update: learn `--[no-]recommend-shallow` option
133
- + submodule-config: keep shallow recommendation around
134
- (this branch is used by sb/submodule-clone-retry.)
101
+ An empty string used as a pathspec element has always meant
102
+ 'everything matches', but it is too easy to write a script that
103
+ finds a path to remove in $path and run 'git rm "$paht"', which
104
+ ends up removing everything. Start warning about this use of an
105
+ empty string used for 'everything matches' and ask users to use a
106
+ more explicit '.' for that instead.
107
136
- An upstream project can make a recommendation to shallowly clone
137
- some submodules in the .gitmodules file it ships.
108
+ The hope is that existing users will not mind this change, and
109
+ eventually the warning can be turned into a hard error, upgrading
110
+ the deprecation into removal of this (mis)feature.
111
112
+ Will wait for further comments for a bit before merging to 'next'.
113
140
-* wd/userdiff-css (2016-06-03) 1 commit
141
- (merged to 'next' on 2016-06-06 at 536102f)
142
- + userdiff: add built-in pattern for CSS
114
144
- Update the funcname definition to support css files.
115
+* jk/ansi-color (2016-06-23) 7 commits
116
+ - color: support strike-through attribute
117
+ - color: support "italic" attribute
118
+ - color: allow "no-" for negating attributes
119
+ - color: refactor parse_attr
120
+ - add skip_prefix_mem helper
121
+ - doc: refactor description of color format
122
+ - color: fix max-size comment
123
+
124
+ The output coloring scheme learned two new attributes, italic and
125
+ strike, in addition to existing bold, reverse, etc.
126
+
127
+ Will merge to 'next'.
128
129
--------------------------------------------------
147
-[New Topics]
130
+[Stalled]
131
+
132
+* tb/convert-peek-in-index (2016-06-07) 3 commits
133
+ - correct ce_compare_data() in a middle of a merge
134
+ - read-cache: factor out get_sha1_from_index() helper
135
+ - convert: unify the "auto" handling of CRLF
136
+ (this branch is used by jh/clean-smudge-annex.)
137
+
138
+ Needs review.
139
+
140
+
141
+* sb/bisect (2016-04-15) 22 commits
142
+ - SQUASH???
143
+ - bisect: get back halfway shortcut
144
+ - bisect: compute best bisection in compute_relevant_weights()
145
+ - bisect: use a bottom-up traversal to find relevant weights
146
+ - bisect: prepare for different algorithms based on find_all
147
+ - bisect: rename count_distance() to compute_weight()
148
+ - bisect: make total number of commits global
149
+ - bisect: introduce distance_direction()
150
+ - bisect: extract get_distance() function from code duplication
151
+ - bisect: use commit instead of commit list as arguments when appropriate
152
+ - bisect: replace clear_distance() by unique markers
153
+ - bisect: use struct node_data array instead of int array
154
+ - bisect: get rid of recursion in count_distance()
155
+ - bisect: make algorithm behavior independent of DEBUG_BISECT
156
+ - bisect: make bisect compile if DEBUG_BISECT is set
157
+ - bisect: plug the biggest memory leak
158
+ - bisect: add test for the bisect algorithm
159
+ - t6030: generalize test to not rely on current implementation
160
+ - t: use test_cmp_rev() where appropriate
161
+ - t/test-lib-functions.sh: generalize test_cmp_rev
162
+ - bisect: allow 'bisect run' if no good commit is known
163
+ - bisect: write about `bisect next` in documentation
164
+
165
+ The internal algorithm used in "git bisect" to find the next commit
166
+ to check has been optimized greatly.
167
+
168
+ Expecting a reroll.
169
+ ($gmane/291163)
170
+
171
+
172
+* sg/completion-updates (2016-02-28) 21 commits
173
+ . completion: cache the path to the repository
174
+ . completion: extract repository discovery from __gitdir()
175
+ . completion: don't guard git executions with __gitdir()
176
+ . completion: consolidate silencing errors from git commands
177
+ . completion: don't use __gitdir() for git commands
178
+ . completion: respect 'git -C <path>'
179
+ . completion: fix completion after 'git -C <path>'
180
+ . completion: don't offer commands when 'git --opt' needs an argument
181
+ . rev-parse: add '--absolute-git-dir' option
182
+ . completion: list short refs from a remote given as a URL
183
+ . completion: don't list 'HEAD' when trying refs completion outside of a repo
184
+ . completion: list refs from remote when remote's name matches a directory
185
+ . completion: respect 'git --git-dir=<path>' when listing remote refs
186
+ . completion: fix most spots not respecting 'git --git-dir=<path>'
187
+ . completion: ensure that the repository path given on the command line exists
188
+ . completion tests: add tests for the __git_refs() helper function
189
+ . completion tests: check __gitdir()'s output in the error cases
190
+ . completion tests: consolidate getting path of current working directory
191
+ . completion tests: make the $cur variable local to the test helper functions
192
+ . completion tests: don't add test cruft to the test repository
193
+ . completion: improve __git_refs()'s in-code documentation
194
+
195
+ Will be rerolled.
196
+ ($gmane/287839)
197
+
198
+
199
+* ec/annotate-deleted (2015-11-20) 1 commit
200
+ - annotate: skip checking working tree if a revision is provided
201
+
202
+ Usability fix for annotate-specific "<file> <rev>" syntax with deleted
203
+ files.
204
+
205
+ Waiting for review.
206
+
207
+
208
+* dg/subtree-rebase-test (2016-01-19) 1 commit
209
+ - contrib/subtree: Add a test for subtree rebase that loses commits
210
+
211
+ Reviewed up to v5.
212
+ Will be rerolled.
213
+ ($gmane/284426)
214
+
215
+
216
+* dk/gc-more-wo-pack (2016-01-13) 4 commits
217
+ - gc: clean garbage .bitmap files from pack dir
218
+ - t5304: ensure non-garbage files are not deleted
219
+ - t5304: test .bitmap garbage files
220
+ - prepare_packed_git(): find more garbage
221
+
222
+ Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
223
+ .bitmap and .keep files.
224
+
225
+ Waiting for a reroll.
226
+ ($gmane/284368).
227
+
228
+
229
+* jc/diff-b-m (2015-02-23) 5 commits
230
+ . WIPWIP
231
+ . WIP: diff-b-m
232
+ - diffcore-rename: allow easier debugging
233
+ - diffcore-rename.c: add locate_rename_src()
234
+ - diffcore-break: allow debugging
235
+
236
+ "git diff -B -M" produced incorrect patch when the postimage of a
237
+ completely rewritten file is similar to the preimage of a removed
238
+ file; such a resulting file must not be expressed as a rename from
239
+ other place.
240
+
241
+ The fix in this patch is broken, unfortunately.
242
+ Will discard.
243
+
244
+--------------------------------------------------
245
+[Cooking]
246
+
247
+* nd/icase (2016-06-23) 11 commits
248
+ - grep.c: reuse "icase" variable
249
+ - diffcore-pickaxe: support case insensitive match on non-ascii
250
+ - diffcore-pickaxe: "share" regex error handling code
251
+ - grep/pcre: support utf-8
252
+ - gettext: add is_utf8_locale()
253
+ - grep/pcre: prepare locale-dependent tables for icase matching
254
+ - grep/icase: avoid kwsset when -F is specified
255
+ - grep/icase: avoid kwsset on literal non-ascii strings
256
+ - test-regex: expose full regcomp() to the command line
257
+ - test-regex: isolate the bug test code
258
+ - grep: break down an "if" stmt in preparation for next changes
259
+
260
+ "git grep -i" has been taught to fold case in non-ascii locales
261
+ correctly.
262
+
263
+ Modulo minor possible nits, this round looked mostly sensible.
264
+
265
+
266
+* mj/log-show-signature-conf (2016-06-22) 3 commits
267
+ - log: add log.showSignature configuration variable
268
+ - log: add "--no-show-signature" command line option
269
+ - t4202: refactor test
270
+
271
+ "git log" learns log.showSignature configuration variable, and a
272
+ command line option "--no-show-signature" to countermand it.
273
+
274
+ The value of the first step is unclear. The top two looked OK.
275
+
276
277
* em/newer-freebsd-shells-are-fine-with-returns (2016-06-17) 1 commit
150
- - rebase: update comment about FreeBSD /bin/sh
278
+ (merged to 'next' on 2016-06-22 at dbee33c)
279
+ + rebase: update comment about FreeBSD /bin/sh
280
281
Comments about misbehaving FreeBSD shells have been clarified with
282
the version number (9.x and before are broken, newer ones are OK).
283
155
- Will merge to 'next'.
284
+ Will merge to 'master'.
285
286
287
* mg/signature-doc (2016-06-17) 4 commits
@@ -242,12 +371,18 @@ of the repositories listed at
371
Rebased on top of mh/split-under-lock.
372
373
245
-* jh/clean-smudge-annex (2016-06-17) 5 commits
374
+* jh/clean-smudge-annex (2016-06-22) 10 commits
375
+ - SQUASH???
376
+ - use smudgeToFile filter in recursive merge
377
+ - use smudgeToFile filter in git am
378
+ - better recovery from failure of smudgeToFile filter
379
- warn on unusable smudgeToFile/cleanFromFile config
380
- use smudgeToFile in git checkout etc
381
- use cleanFromFile in git add
382
- add smudgeToFile and cleanFromFile filter configs
383
- clarify %f documentation
384
+ - Merge branch 'tb/convert-peek-in-index' into jh/clean-smudge-annex
385
+ (this branch uses tb/convert-peek-in-index.)
386
387
The interface to "clean/smudge" filters require Git to feed the
388
whole contents via pipe, which is suboptimal for some
@@ -255,9 +390,6 @@ of the repositories listed at
390
equilvalents for these filters but they interact with the files on
391
the filesystem directly.
392
258
- This unfortunately does not build when merged to 'pu', as there are
259
- interactions with other topic(s).
260
-
393
394
* lc/shell-default-value-noexpand (2016-06-19) 1 commit
395
- sh-setup: enclose setting of ${VAR=default} in double-quotes
@@ -270,6 +402,7 @@ of the repositories listed at
402
403
* sb/clone-shallow-passthru (2016-06-20) 1 commit
404
- clone: do not let --depth imply --shallow-submodules
405
+ (this branch is used by sb/t5614-modernize.)
406
407
Fix an unintended regression in v2.9 that breaks "clone --depth"
408
that recurses down to submodules by forcing the submodules to also
@@ -279,12 +412,19 @@ of the repositories listed at
412
Will merge to 'next'.
413
414
282
-* js/find-commit-subject-ignore-leading-blanks (2016-06-20) 1 commit
283
- - commit: make find_commit_subject() more robust
415
+* js/find-commit-subject-ignore-leading-blanks (2016-06-22) 2 commits
416
+ - commit.c: make find_commit_subject() more robust
417
+ - pretty: make the skip_blank_lines() function public
418
419
+ A helper function that takes the contents of a commit object and
420
+ finds its subject line did not ignore leading blank lines, as is
421
+ commonly done by other codepaths. Make it ignore leading blank
422
+ lines to match.
423
286
-* js/log-diff-to-non-stdout (2016-06-20) 8 commits
287
- - SQUASH???
424
+ Will merge to 'next'.
425
+
426
+
427
+* js/log-to-diffopt-file (2016-06-21) 9 commits
428
- format-patch: use stdout directly
429
- format-patch: avoid freopen()
430
- format-patch: explicitly switch off color when writing to files
@@ -292,6 +432,8 @@ of the repositories listed at
432
- graph: respect the diffopt.file setting
433
- line-log: respect diffopt's configured output file stream
434
- log-tree: respect diffopt's configured output file stream
435
+ - Disallow diffopt.close_file when using the log_tree machinery
436
+ - am: stop ignoring errors reported by log_tree_diff()
437
438
The commands in the "log/diff" family had an optional FILE* pointer
439
in the data structure they pass around for a long time, but some
@@ -336,154 +478,17 @@ of the repositories listed at
478
+0000 instead and let "git log" going in such a case, instead
479
of aborting.
480
339
---------------------------------------------------
340
-[Stalled]
341
-
342
-* mj/log-show-signature-conf (2016-06-06) 2 commits
343
- - log: "--no-show-signature" commmand-line option
344
- - log: add "log.showsignature" configuration variable
345
-
346
- "git log" learns log.showSignature configuration variable, and a
347
- command line option "--no-show-signature" to countermand it.
348
-
349
- The order of the commits in the topic need to be reversed.
350
- Expecting a reroll.
351
-
352
-
353
-* sb/bisect (2016-04-15) 22 commits
354
- - SQUASH???
355
- - bisect: get back halfway shortcut
356
- - bisect: compute best bisection in compute_relevant_weights()
357
- - bisect: use a bottom-up traversal to find relevant weights
358
- - bisect: prepare for different algorithms based on find_all
359
- - bisect: rename count_distance() to compute_weight()
360
- - bisect: make total number of commits global
361
- - bisect: introduce distance_direction()
362
- - bisect: extract get_distance() function from code duplication
363
- - bisect: use commit instead of commit list as arguments when appropriate
364
- - bisect: replace clear_distance() by unique markers
365
- - bisect: use struct node_data array instead of int array
366
- - bisect: get rid of recursion in count_distance()
367
- - bisect: make algorithm behavior independent of DEBUG_BISECT
368
- - bisect: make bisect compile if DEBUG_BISECT is set
369
- - bisect: plug the biggest memory leak
370
- - bisect: add test for the bisect algorithm
371
- - t6030: generalize test to not rely on current implementation
372
- - t: use test_cmp_rev() where appropriate
373
- - t/test-lib-functions.sh: generalize test_cmp_rev
374
- - bisect: allow 'bisect run' if no good commit is known
375
- - bisect: write about `bisect next` in documentation
376
-
377
- The internal algorithm used in "git bisect" to find the next commit
378
- to check has been optimized greatly.
379
-
380
- Expecting a reroll.
381
- ($gmane/291163)
382
-
383
-
384
-* sg/completion-updates (2016-02-28) 21 commits
385
- . completion: cache the path to the repository
386
- . completion: extract repository discovery from __gitdir()
387
- . completion: don't guard git executions with __gitdir()
388
- . completion: consolidate silencing errors from git commands
389
- . completion: don't use __gitdir() for git commands
390
- . completion: respect 'git -C <path>'
391
- . completion: fix completion after 'git -C <path>'
392
- . completion: don't offer commands when 'git --opt' needs an argument
393
- . rev-parse: add '--absolute-git-dir' option
394
- . completion: list short refs from a remote given as a URL
395
- . completion: don't list 'HEAD' when trying refs completion outside of a repo
396
- . completion: list refs from remote when remote's name matches a directory
397
- . completion: respect 'git --git-dir=<path>' when listing remote refs
398
- . completion: fix most spots not respecting 'git --git-dir=<path>'
399
- . completion: ensure that the repository path given on the command line exists
400
- . completion tests: add tests for the __git_refs() helper function
401
- . completion tests: check __gitdir()'s output in the error cases
402
- . completion tests: consolidate getting path of current working directory
403
- . completion tests: make the $cur variable local to the test helper functions
404
- . completion tests: don't add test cruft to the test repository
405
- . completion: improve __git_refs()'s in-code documentation
406
-
407
- Will be rerolled.
408
- ($gmane/287839)
409
-
410
-
411
-* nd/icase (2016-02-15) 12 commits
412
- - grep.c: reuse "icase" variable
413
- - diffcore-pickaxe: support case insensitive match on non-ascii
414
- - diffcore-pickaxe: "share" regex error handling code
415
- - grep/pcre: support utf-8
416
- - gettext: add is_utf8_locale()
417
- - grep/pcre: prepare locale-dependent tables for icase matching
418
- - grep/icase: avoid kwsset when -F is specified
419
- - grep/icase: avoid kwsset on literal non-ascii strings
420
- - test-regex: expose full regcomp() to the command line
421
- - test-regex: isolate the bug test code
422
- - grep: break down an "if" stmt in preparation for next changes
423
- - grep: allow -F -i combination
424
-
425
- "git grep -i" has been taught to fold case in non-ascii locales.
426
-
427
- What it attempts to achieve is worthwhile, I would think, but
428
- it seems to be broken, unfortunately.
429
- ($gmane/286137, 297593, 297605).
430
-
431
-
432
-* ec/annotate-deleted (2015-11-20) 1 commit
433
- - annotate: skip checking working tree if a revision is provided
434
-
435
- Usability fix for annotate-specific "<file> <rev>" syntax with deleted
436
- files.
437
-
438
- Waiting for review.
439
-
440
-
441
-* dg/subtree-rebase-test (2016-01-19) 1 commit
442
- - contrib/subtree: Add a test for subtree rebase that loses commits
443
-
444
- Reviewed up to v5.
445
- Will be rerolled.
446
- ($gmane/284426)
447
-
448
-
449
-* dk/gc-more-wo-pack (2016-01-13) 4 commits
450
- - gc: clean garbage .bitmap files from pack dir
451
- - t5304: ensure non-garbage files are not deleted
452
- - t5304: test .bitmap garbage files
453
- - prepare_packed_git(): find more garbage
454
-
455
- Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
456
- .bitmap and .keep files.
457
-
458
- Waiting for a reroll.
459
- ($gmane/284368).
460
-
461
-
462
-* jc/diff-b-m (2015-02-23) 5 commits
463
- . WIPWIP
464
- . WIP: diff-b-m
465
- - diffcore-rename: allow easier debugging
466
- - diffcore-rename.c: add locate_rename_src()
467
- - diffcore-break: allow debugging
468
-
469
- "git diff -B -M" produced incorrect patch when the postimage of a
470
- completely rewritten file is similar to the preimage of a removed
471
- file; such a resulting file must not be expressed as a rename from
472
- other place.
473
-
474
- The fix in this patch is broken, unfortunately.
475
- Will discard.
481
+ Will merge to 'next'.
482
477
---------------------------------------------------
478
-[Cooking]
483
484
* ap/git-svn-propset-doc (2016-06-15) 1 commit
481
- - git-svn: document the 'git svn propset' command
485
+ (merged to 'next' on 2016-06-22 at 5a34f7d)
486
+ + git-svn: document the 'git svn propset' command
487
488
"git svn propset" subcommand that was added in 2.3 days is
489
documented now.
490
486
- Will merge to 'next'.
491
+ Will merge to 'master'.
492
493
494
* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
@@ -496,7 +501,7 @@ of the repositories listed at
501
Will merge to 'next'.
502
503
499
-* jk/big-and-future-archive-tar (2016-06-17) 2 commits
504
+* jk/big-and-future-archive-tar (2016-06-21) 2 commits
505
- archive-tar: write extended headers for far-future mtime
506
- archive-tar: write extended headers for file sizes >= 8GB
507
@@ -504,7 +509,7 @@ of the repositories listed at
509
commits far in the future than expressible by the traditional US-TAR
510
format.
511
507
- Will merge to 'next'.
512
+ Expecting a reroll.
513
514
515
* jk/gpg-interface-cleanup (2016-06-17) 7 commits
@@ -551,12 +556,13 @@ of the repositories listed at
556
557
558
* dn/gpg-doc (2016-06-16) 1 commit
554
- - Documentation: GPG capitalization
559
+ (merged to 'next' on 2016-06-22 at f467355)
560
+ + Documentation: GPG capitalization
561
562
The documentation tries to consistently spell "GPG"; when
563
referring to the specific program name, "gpg" is used.
564
559
- Will merge to 'next'.
565
+ Will merge to 'master'.
566
567
568
* jk/bisect-show-tree (2016-06-16) 1 commit
@@ -570,12 +576,13 @@ of the repositories listed at
576
577
578
* lv/status-say-working-tree-not-directory (2016-06-09) 1 commit
573
- - Use "working tree" instead of "working directory" for git status
579
+ (merged to 'next' on 2016-06-22 at c65c7c1)
580
+ + Use "working tree" instead of "working directory" for git status
581
582
"git status" used to say "working directory" when it meant "working
583
tree".
584
578
- Will merge to 'next'.
585
+ Will merge to 'master'.
586
587
588
* jk/parseopt-string-list (2016-06-13) 3 commits
@@ -622,10 +629,11 @@ of the repositories listed at
629
630
631
* pc/occurred (2016-06-10) 2 commits
625
- - config.c: fix misspelt "occurred" in an error message
626
- - refs.h: fix misspelt "occurred" in a comment
632
+ (merged to 'next' on 2016-06-22 at ce0b944)
633
+ + config.c: fix misspelt "occurred" in an error message
634
+ + refs.h: fix misspelt "occurred" in a comment
635
628
- Will merge to 'next'.
636
+ Will merge to 'master'.
637
638
639
* sb/submodule-clone-retry (2016-06-13) 2 commits
@@ -652,17 +660,19 @@ of the repositories listed at
660
661
662
* jc/deref-tag (2016-06-14) 1 commit
655
- - blame, line-log: do not loop around deref_tag()
663
+ (merged to 'next' on 2016-06-22 at 1075713)
664
+ + blame, line-log: do not loop around deref_tag()
665
666
Code clean-up.
667
659
- Will merge to 'next'.
668
+ Will merge to 'master'.
669
670
671
* jk/fetch-prune-doc (2016-06-14) 1 commit
663
- - fetch: document that pruning happens before fetching
672
+ (merged to 'next' on 2016-06-22 at 6563376)
673
+ + fetch: document that pruning happens before fetching
674
665
- Will merge to 'next'.
675
+ Will merge to 'master'.
676
677
678
* km/fetch-do-not-free-remote-name (2016-06-14) 1 commit
@@ -672,17 +682,19 @@ of the repositories listed at
682
683
684
* nb/gnome-keyring-build (2016-06-14) 1 commit
675
- - gnome-keyring: Don't hard-code pkg-config executable
685
+ (merged to 'next' on 2016-06-22 at 0dfb90c)
686
+ + gnome-keyring: Don't hard-code pkg-config executable
687
688
Build improvements for gnome-keyring (in contrib/)
689
679
- Will merge to 'next'.
690
+ Will merge to 'master'.
691
692
693
* pb/strbuf-read-file-doc (2016-06-14) 1 commit
683
- - strbuf: describe the return value of strbuf_read_file
694
+ (merged to 'next' on 2016-06-22 at 10e4b4f)
695
+ + strbuf: describe the return value of strbuf_read_file
696
685
- Will merge to 'next'.
697
+ Will merge to 'master'.
698
699
700
* nd/shallow-deepen (2016-06-13) 27 commits
@@ -728,9 +740,10 @@ of the repositories listed at
740
741
742
* jk/avoid-unbounded-alloca (2016-06-07) 1 commit
731
- - tree-diff: avoid alloca for large allocations
743
+ (merged to 'next' on 2016-06-22 at 93feb23)
744
+ + tree-diff: avoid alloca for large allocations
745
733
- Will merge to 'next'.
746
+ Will merge to 'master'.
747
748
749
* jk/send-pack-stdio (2016-06-10) 2 commits
@@ -802,84 +815,92 @@ of the repositories listed at
815
816
817
* lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
805
- - receive-pack: send auto-gc output over sideband 2
818
+ (merged to 'next' on 2016-06-22 at 92162f5)
819
+ + receive-pack: send auto-gc output over sideband 2
820
821
Allow messages that are generated by auto gc during "git push" on
822
the receiving end to be explicitly passed back to the sending end
823
over sideband, so that they are shown with "remote: " prefix to
824
avoid confusing the users.
825
812
- Will merge to 'next'.
826
+ Will merge to 'master'.
827
828
829
* mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
816
- - cherry-pick: allow to pick to unborn branches
830
+ (merged to 'next' on 2016-06-22 at 183295b)
831
+ + cherry-pick: allow to pick to unborn branches
832
833
"git cherry-pick A" worked on an unborn branch, but "git
834
cherry-pick A..B" didn't.
835
821
- Will merge to 'next'.
836
+ Will merge to 'master'.
837
838
839
* sg/reflog-past-root (2016-06-06) 1 commit
825
- - reflog: continue walking the reflog past root commits
840
+ (merged to 'next' on 2016-06-22 at c5d4e29)
841
+ + reflog: continue walking the reflog past root commits
842
843
"git reflog" stopped upon seeing an entry that denotes a branch
844
creation event (aka "unborn"), which made it appear as if the
845
reflog was truncated.
846
831
- Will merge to 'next'.
847
+ Will merge to 'master'.
848
849
850
* tb/complete-status (2016-06-10) 3 commits
835
- - completion: add git status
836
- - completion: add __git_get_option_value helper
837
- - completion: factor out untracked file modes into a variable
851
+ (merged to 'next' on 2016-06-22 at 44ae68f)
852
+ + completion: add git status
853
+ + completion: add __git_get_option_value helper
854
+ + completion: factor out untracked file modes into a variable
855
856
The completion script (in contrib/) learned to complete "git
857
status" options.
858
842
- Any further comments? Otherwise will merge to 'next'.
859
+ Will merge to 'master'.
860
861
862
* tr/doc-tt (2016-06-08) 4 commits
846
- - doc: change configuration variables format
847
- - doc: more consistency in environment variables format
848
- - doc: change environment variables format
849
- - doc: clearer rule about formatting literals
863
+ (merged to 'next' on 2016-06-22 at dc6df3b)
864
+ + doc: change configuration variables format
865
+ + doc: more consistency in environment variables format
866
+ + doc: change environment variables format
867
+ + doc: clearer rule about formatting literals
868
869
The documentation set has been updated so that literal commands,
870
configuration variables and environment variables are consistently
871
typeset in fixed-width font and bold in manpages.
872
855
- Will merge to 'next'.
873
+ Will merge to 'master'.
874
875
876
* vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
859
- - git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
877
+ (merged to 'next' on 2016-06-22 at 8bf21d3)
878
+ + git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
879
880
The git-prompt scriptlet (in contrib/) was not friendly with those
881
who uses "set -u", which has been fixed.
882
864
- Will merge to 'next'.
883
+ Will merge to 'master'.
884
885
886
* rj/compat-regex-size-max-fix (2016-06-06) 1 commit
868
- - regex: fix a SIZE_MAX macro redefinition warning
887
+ (merged to 'next' on 2016-06-22 at 376c5b1)
888
+ + regex: fix a SIZE_MAX macro redefinition warning
889
890
A compilation fix.
891
872
- Will merge to 'next'.
892
+ Will merge to 'master'.
893
894
895
* et/add-chmod-x (2016-06-07) 1 commit
876
- - add: add --chmod=+x / --chmod=-x options
896
+ (merged to 'next' on 2016-06-22 at 71d65a0)
897
+ + add: add --chmod=+x / --chmod=-x options
898
899
"git update-index --add --chmod=+x file" may be usable as an escape
900
hatch, but not a friendly thing to force for people who do need to
901
use it regularly. "git add --chmod=+x file" can be used instead.
902
882
- Will merge to 'next'.
903
+ Will merge to 'master'.
904
905
906
* mh/connect (2016-06-06) 10 commits
@@ -900,14 +921,6 @@ of the repositories listed at
921
Will merge to 'next'???
922
923
903
-* tb/convert-peek-in-index (2016-06-07) 3 commits
904
- - correct ce_compare_data() in a middle of a merge
905
- - read-cache: factor out get_sha1_from_index() helper
906
- - convert: unify the "auto" handling of CRLF
907
-
908
- Needs review.
909
-
910
-
924
* va/i18n-even-more (2016-06-17) 38 commits
925
- i18n: branch: mark comment when editing branch description for translation
926
- i18n: unmark die messages for translation