What's cooking (2016/05 #09)
Junio C Hamano committed
May 31, 2016 at 14:44 UTC
8790fc9f422a742a2873b50664ea0a0b7087549a
1 file changed
+296
-257
whats-cooking.txt
+296
-257
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2016, #08; Thu, 26)
4
-X-master-at: 7777322816a31edff4fb9f429847d11f8974f264
5
-X-next-at: 397704a2234a83bf7ba537e78d607ea550d3074c
3
+Subject: What's cooking in git.git (May 2016, #09; Tue, 31)
4
+X-master-at: 60bd4b1c513bb652cdffad44382046ca872140eb
5
+X-next-at: 534e6b4ae36749d2ee8ff48851a5939661db5ad6
6
7
-What's cooking in git.git (May 2016, #08; Thu, 26)
7
+What's cooking in git.git (May 2016, #09; Tue, 31)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,6 +12,11 @@ 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
+2.9-rc1 has been tagged. There still are a few topics yet to be
16
+merged to 'master' for the upcoming release, but otherwise this is
17
+pretty much "feature complete". One known brown-paper-bag breakage
18
+exists in t/perf/, whose fix is still in 'next'.
19
+
20
You can find the changes described here in the integration branches
21
of the repositories listed at
22
@@ -20,228 +25,236 @@ of the repositories listed at
25
--------------------------------------------------
26
[Graduated to "master"]
27
23
-* ar/diff-args-osx-precompose (2016-05-13) 1 commit
24
- (merged to 'next' on 2016-05-17 at 7b59b79)
25
- + diff: run arguments through precompose_argv
26
-
27
- Many commands normalize command line arguments from NFD to NFC
28
- variant of UTF-8 on OSX, but commands in the "diff" family did
29
- not, causing "git diff $path" to complain that no such path is
30
- known to Git. They have been taught to do the normalization.
28
+* ak/t0008-ksh88-workaround (2016-05-20) 1 commit
29
+ (merged to 'next' on 2016-05-26 at 9a34a2a)
30
+ + t0008: 4 tests fail with ksh88
31
+
32
+ Test portability workaround.
33
+
34
+
35
+* ak/t4204-shell-portability (2016-05-24) 1 commit
36
+ (merged to 'next' on 2016-05-27 at fd16e6d)
37
+ + t4204: do not let $name variable clobbered
38
+
39
+ Update a test to run also under ksh88.
40
+
41
+
42
+* es/t1500-modernize (2016-05-18) 5 commits
43
+ (merged to 'next' on 2016-05-26 at 274e39c)
44
+ + t1500: avoid setting environment variables outside of tests
45
+ + t1500: avoid setting configuration options outside of tests
46
+ + t1500: avoid changing working directory outside of tests
47
+ + t1500: test_rev_parse: facilitate future test enhancements
48
+ + t1500: be considerate to future potential tests
49
50
+ test updates to make it more readable and maintainable.
51
+
52
+
53
+* fc/fast-import-broken-marks-file (2016-05-17) 1 commit
54
+ (merged to 'next' on 2016-05-26 at 9962fcf)
55
+ + fast-import: do not truncate exported marks file
56
33
-* da/difftool (2016-05-16) 2 commits
34
- (merged to 'next' on 2016-05-17 at ef5a435)
35
- + difftool: handle unmerged files in dir-diff mode
36
- + difftool: initialize variables for readability
37
-
38
- "git difftool" learned to handle unmerged paths correctly in
39
- dir-diff mode.
40
-
41
-
42
-* jc/doc-lint (2016-05-10) 1 commit
43
- (merged to 'next' on 2016-05-17 at 9032aa5)
44
- + ci: validate "linkgit:" in documentation
45
-
46
- Find common mistakes when writing gitlink: in our documentation and
47
- drive the check from "make check-docs".
48
-
49
-
50
-* jc/rerere-multi (2016-05-19) 2 commits
51
- (merged to 'next' on 2016-05-19 at 0520c90)
52
- + rerere: remove an null statement
53
- (merged to 'next' on 2016-05-13 at f4d1d82)
54
- + rerere: plug memory leaks upon "rerere forget" failure
57
+ "git fast-import --export-marks" would overwrite the existing marks
58
+ file even when it makes a dump from its custom die routine.
59
+ Prevent it from doing so when we have an import-marks file but
60
+ haven't finished reading it.
61
62
57
-* jc/test-parse-options-expect (2016-05-10) 4 commits
58
- (merged to 'next' on 2016-05-10 at 3ca5783)
59
- + t0040: convert a few tests to use test-parse-options --expect
60
- + t0040: remove unused test helpers
61
- + test-parse-options: --expect=<string> option to simplify tests
62
- + test-parse-options: fix output when callback option fails
63
- (this branch uses pb/commit-verbose-config.)
63
+* jk/cat-file-buffered-batch-all (2016-05-18) 2 commits
64
+ (merged to 'next' on 2016-05-26 at 4da062d)
65
+ + cat-file: default to --buffer when --batch-all-objects is used
66
+ + cat-file: avoid noop calls to sha1_object_info_extended
67
65
- t0040 had too many unnecessary repetitions in its test data. Teach
66
- test-parse-options program so that a caller can tell what it
67
- expects in its output, so that these repetitions can be cleaned up.
68
+ "git cat-file --batch-all" has been sped up, by taking advantage
69
+ of the fact that it does not have to read a list of objects, in two
70
+ ways.
71
72
70
-* jk/test-z-n-unquoted (2016-05-14) 6 commits
71
- (merged to 'next' on 2016-05-17 at 65372cf)
72
- + always quote shell arguments to test -z/-n
73
- + t9103: modernize test style
74
- + t9107: switch inverted single/double quotes in test
75
- + t9107: use "return 1" instead of "exit 1"
76
- + t9100,t3419: enclose all test code in single-quotes
77
- + t/lib-git-svn: drop $remote_git_svn and $git_svn_id
73
+* js/t6044-use-test-seq (2016-05-18) 1 commit
74
+ (merged to 'next' on 2016-05-27 at d052a29)
75
+ + t6044: replace seq by test_seq
76
79
- t9xxx series has been updated primarily for readability, while
80
- fixing small bugs in it. A few scripted Porcelains have also been
81
- updated to fix possible bugs around their use of "test -z" and
82
- "test -n".
77
+ Test portability fix.
78
79
85
-* js/perf-rebase-i (2016-05-13) 3 commits
86
- (merged to 'next' on 2016-05-13 at eb51ddd)
87
- + perf: run "rebase -i" under perf
88
- + perf: make the tests work in worktrees
89
- + perf: let's disable symlinks when they are not available
80
+* kb/msys2-tty (2016-05-26) 1 commit
81
+ (merged to 'next' on 2016-05-27 at 588f76c)
82
+ + mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)
83
91
- Add perf test for "rebase -i"
84
+ The "are we talking with TTY, doing an interactive session?"
85
+ detection has been updated to work better for "Git for Windows".
86
87
94
-* nd/worktree-various-heads (2016-04-22) 13 commits
95
- (merged to 'next' on 2016-05-10 at 61d3415)
96
- + branch: do not rename a branch under bisect or rebase
97
- + worktree.c: check whether branch is bisected in another worktree
98
- + wt-status.c: split bisect detection out of wt_status_get_state()
99
- + worktree.c: check whether branch is rebased in another worktree
100
- + worktree.c: avoid referencing to worktrees[i] multiple times
101
- + wt-status.c: make wt_status_check_rebase() work on any worktree
102
- + wt-status.c: split rebase detection out of wt_status_get_state()
103
- + path.c: refactor and add worktree_git_path()
104
- + worktree.c: mark current worktree
105
- + worktree.c: make find_shared_symref() return struct worktree *
106
- + worktree.c: store "id" instead of "git_dir"
107
- + path.c: add git_common_path() and strbuf_git_common_path()
108
- + dir.c: rename str(n)cmp_icase to fspath(n)cmp
109
- (this branch is used by nd/worktree-cleanup-post-head-protection.)
88
+* mr/send-email-doc-gmail-2fa (2016-05-27) 1 commit
89
+ (merged to 'next' on 2016-05-27 at 19d6ba4)
90
+ + Documentation: add instructions to help setup gmail 2FA
91
111
- The experimental "multiple worktree" feature gains more safety to
112
- forbid operations on a branch that is checked out or being actively
113
- worked on elsewhere, by noticing that e.g. it is being rebased.
92
+ Give hints to GMail users with two-factor auth enabled that
93
+ they need app-specific-password when using send-email.
94
95
116
-* pb/commit-verbose-config (2016-05-10) 7 commits
117
- + commit: add a commit.verbose config variable
118
- + t7507-commit-verbose: improve test coverage by testing number of diffs
119
- + parse-options.c: make OPTION_COUNTUP respect "unspecified" values
120
- + t/t7507: improve test coverage
121
- + t0040-parse-options: improve test coverage
122
- + test-parse-options: print quiet as integer
123
- + t0040-test-parse-options.sh: fix style issues
124
- (this branch is used by jc/test-parse-options-expect.)
125
-
126
- "git commit" learned to pay attention to "commit.verbose"
127
- configuration variable and act as if "--verbose" option was
128
- given from the command line.
129
-
96
+* rj/log-decorate-auto (2016-05-27) 1 commit
97
+ (merged to 'next' on 2016-05-27 at 813112b)
98
+ + log: document the --decorate=auto option
99
131
-* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
132
- (merged to 'next' on 2016-05-10 at 2ada404)
133
- + wt-status.c: set commitable bit if there is a meaningful merge.
134
-
135
- "git commit --dry-run" reported "No, no, you cannot commit." in one
136
- case where "git commit" would have allowed you to commit, and this
137
- improves it a little bit ("git commit --dry-run --short" still does
138
- not give you the correct answer, for example). This is a stop-gap
139
- measure in that "commit --short --dry-run" still gives an incorrect
140
- result.
141
-
142
-
143
-* tb/core-eol-fix (2016-04-25) 4 commits
144
- (merged to 'next' on 2016-05-10 at fa8a200)
145
- + convert.c: ident + core.autocrlf didn't work
146
- + t0027: test cases for combined attributes
147
- + convert: allow core.autocrlf=input and core.eol=crlf
148
- + t0027: make commit_chk_wrnNNO() reliable
149
- (this branch is used by tb/convert-peek-in-index.)
150
-
151
- A couple of bugs around core.autocrlf have been fixed.
152
-
153
-
154
-* xy/format-patch-base (2016-04-26) 4 commits
155
- (merged to 'next' on 2016-05-10 at dd19e0a)
156
- + format-patch: introduce format.useAutoBase configuration
157
- + format-patch: introduce --base=auto option
158
- + format-patch: add '--base' option to record base tree info
159
- + patch-ids: make commit_patch_id() a public helper function
160
-
161
- "git format-patch" learned a new "--base" option to record what
162
- (public, well-known) commit the original series was built on in
163
- its output.
100
+ We forgot to add "git log --decorate=auto" to documentation when we
101
+ added the feature back in v2.1.0 timeframe.
102
103
--------------------------------------------------
104
[New Topics]
105
168
-* ak/t4204-shell-portability (2016-05-24) 1 commit
169
- - t4204: do not let $name variable clobbered
106
+* js/rebase-i-dedup-call-to-rerere (2016-05-31) 1 commit
107
+ (merged to 'next' on 2016-05-31 at db1f9e3)
108
+ + rebase -i: remove an unnecessary 'rerere' invocation
109
171
- Update a test to run also under ksh88.
110
+ "git rebase -i", after it fails to auto-resolve the conflict, had
111
+ an unnecessary call to "git rerere" from its very early days, which
112
+ was spotted recently; the call has been removed.
113
173
- Will merge to 'next' and to 'master'.
114
+ Will merge to 'master'.
115
116
176
-* et/pretty-format-c-auto (2016-05-25) 1 commit
177
- - format_commit_message: honor `color=auto` for `%C(auto)`
117
+* sb/submodule-recommend-shallowness (2016-05-27) 2 commits
118
+ (merged to 'next' on 2016-05-31 at 1ee161c)
119
+ + submodule update: learn `--[no-]recommend-shallow` option
120
+ + submodule-config: keep shallow recommendation around
121
179
- Expecting a reroll.
180
- ($gmane/295601)
122
+ An upstream project can make a recommendation to make only a
123
+ shallow clone for some submodules in the .gitmodules file it ship.
124
125
+ Will merge to 'master' after 2.9 final.
126
183
-* ew/daemon-socket-keepalive (2016-05-25) 1 commit
184
- - daemon: enable SO_KEEPALIVE for all sockets
127
186
- When "git daemon" is run without --[init-]timeout specified, a
187
- connection from a client that silently goes offline can hang around
188
- for a long time, wasting resources. The socket-level KEEPALIVE has
189
- been enabled to allow the OS to notice such failed connections.
128
+* tb/convert-peek-in-index (2016-05-24) 2 commits
129
+ - convert: ce_compare_data() checks for a sha1 of a path
130
+ - read-cache: factor out get_sha1_from_index() helper
131
+
132
+ The motivation is rather iffy.
133
+
134
+
135
+* va/i18n-even-more (2016-05-26) 22 commits
136
+ - t5523: use test_i18ngrep for negation
137
+ - t4153: fix negated test_i18ngrep call
138
+ - t9003: become resilient to GETTEXT_POISON
139
+ - tests: unpack-trees: update to use test_i18n* functions
140
+ - tests: use test_i18n* functions to suppress false positives
141
+ - i18n: setup: mark strings for translation
142
+ - i18n: rebase-interactive: mark comments of squash for translation
143
+ - i18n: rebase-interactive: mark here-doc strings for translation
144
+ - i18n: rebase-interactive: mark strings for translation
145
+ - i18n: git-sh-setup.sh: mark strings for translation
146
+ - t6030: update to use test_i18ncmp
147
+ - i18n: bisect: simplify error message for i18n
148
+ - i18n: rebase: mark placeholder for translation
149
+ - i18n: rebase: fix marked string to use eval_gettext variant
150
+ - merge-octupus: use die shell function from git-sh-setup.sh
151
+ - i18n: merge-octopus: mark messages for translation
152
+ - i18n: sequencer: mark string for translation
153
+ - i18n: sequencer: mark entire sentences for translation
154
+ - i18n: transport: mark strings for translation
155
+ - i18n: advice: internationalize message for conflicts
156
+ - i18n: advice: mark string about detached head for translation
157
+ - i18n: builtin/remote.c: fix mark for translation
158
+
159
+ More markings of messages for i18n, with updates to various tests
160
+ to pass GETTEXT_POISON tests.
161
+
162
+ Is everybody happy with this version?
163
+
164
+
165
+* bd/readme.markdown-more (2016-05-31) 1 commit
166
+ - README.md: format CLI commands with code syntax
167
168
Will merge to 'next'.
169
170
194
-* jk/upload-pack-hook (2016-05-24) 6 commits
195
- - upload-pack: provide a hook for running pack-objects
196
- - config: add a notion of "scope"
197
- - config: return configset value for current_config_ functions
198
- - config: set up config_source for command-line config
199
- - git_config_parse_parameter: refactor cleanup code
200
- - git_config_with_options: drop "found" counting
171
+* em/man-bold-literal (2016-05-31) 1 commit
172
+ - Documentation: bold literals in man
173
202
- Allow a custom "git upload-pack" replacement to respond to
203
- "fetch/clone" request.
174
+ The manpage output of our documentation did not render well in
175
+ terminal; typeset literals in bold by default to make them stand
176
+ out more.
177
178
Will merge to 'next'.
179
180
208
-* kb/msys2-tty (2016-05-26) 1 commit
209
- - mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)
181
+* jg/dash-is-last-branch-in-worktree-add (2016-05-31) 1 commit
182
+ - worktree: allow "-" short-hand for @{-1} in add command
183
211
- The "are we talking with TTY, doing an interactive session?"
212
- detection has been updated to work better for "Git for Windows".
184
+ "git worktree add" learned that '-' can be used as a short-hand for
185
+ "@{-1}", the previous branch.
186
187
+ Will merge to 'next'.
188
215
-* rs/xdiff-hunk-with-func-line (2016-05-26) 5 commits
216
- - grep: don't extend context to trailing empty lines with -W
217
- - xdiff: don't include common trailing empty lines with -W
218
- - xdiff: ignore empty lines before added functions with -W
219
- - xdiff: handle appended chunks better with -W
220
- - xdiff: factor out match_func_rec()
189
222
- "git show -W" (extend hunks to cover the entire function, delimited
223
- by lines that match the "funcname" pattern) used to show the entire
224
- file when a change added an entire function at the end of the file,
225
- which has been fixed.
190
+* js/perf-rebase-i (2016-05-31) 1 commit
191
+ (merged to 'next' on 2016-05-31 at 39d8dc8)
192
+ + perf: make the tests work without a worktree
193
194
+ The one in 'master' has a brown-paper-bag bug that breaks the perf
195
+ test when used inside a usual Git repository with a working tree.
196
228
-* sb/submodule-misc-cleanups (2016-05-25) 1 commit
229
- - submodule update: make use of the existing fetch_in_submodule function
197
+ Will merge to 'master'.
198
231
- Minor simplification.
199
+
200
+* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
201
+ - blame: require 0 context lines while finding moved lines with -M
202
+
203
+ "git blame -M" missed a single line that was moved within the file.
204
+
205
+ We may want to squash a test or two to this commit. Volunteers?
206
+
207
+
208
+* mm/makefile-developer-can-be-in-config-mak (2016-05-31) 1 commit
209
+ - Makefile: move 'ifdef DEVELOPER' after config.mak* inclusion
210
+
211
+ "make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in
212
+ config.mak didn't.
213
214
Will merge to 'next'.
215
216
236
-* sb/submodule-default-paths (2016-05-26) 7 commits
237
- - clone: add --init-submodule=<pathspec> switch
238
- - submodule update: add `--init-default-path` switch
239
- - Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
240
- - Merge branch 'jc/attr' into sb/submodule-default-paths
241
- - Merge branch 'sb/clone-shallow-passthru' into sb/submodule-default-paths
242
- - Merge branch 'sb/submodule-deinit-all' into sb/submodule-default-paths
243
- - Merge branch 'sb/submodule-parallel-update' into sb/submodule-default-paths
244
- (this branch uses jc/attr and sb/pathspec-label.)
217
+* nd/worktree-lock (2016-05-31) 6 commits
218
+ - worktree: add "unlock" command
219
+ - worktree: add "lock" command
220
+ - worktree.c: retrieve lock status (and optionally reason) in get_worktrees()
221
+ - worktree.c: add is_main_worktree()
222
+ - worktree.c: find_worktree() learns to identify worktrees by basename
223
+ - worktree.c: add find_worktree()
224
+ (this branch uses nd/worktree-cleanup-post-head-protection.)
225
+
226
+ "git worktree prune" protected worktrees that are marked as
227
+ "locked" by creating a file in a known location. "git worktree"
228
+ command learned a dedicated command pair to create and remoev such
229
+ a file, so that the users do not have to do this with editor.
230
+
231
+ The implementation was wasteful; expecting a reroll.
232
+
233
+
234
+* pa/cherry-pick-doc-typo (2016-05-29) 1 commit
235
+ - git-cherry-pick.txt: correct a small typo
236
+
237
+ "git cherry-pick --help" had three instances of word "behavior",
238
+ one of which was spelled "behaviour", which is updated to match the
239
+ other two.
240
+
241
+ Will merge to 'next'.
242
+
243
+
244
+* rs/apply-name-terminate (2016-05-29) 1 commit
245
+ - apply: remove unused parameters from name_terminate()
246
+
247
+ Code clean-up.
248
+
249
+ Will merge to 'next'.
250
+
251
+
252
+* rs/patch-id-use-skip-prefix (2016-05-29) 1 commit
253
+ - patch-id: use starts_with() and skip_prefix()
254
+
255
+ Code clean-up.
256
+
257
+ Will merge to 'next'.
258
259
--------------------------------------------------
260
[Stalled]
@@ -461,34 +474,93 @@ of the repositories listed at
474
--------------------------------------------------
475
[Cooking]
476
464
-* jk/cat-file-buffered-batch-all (2016-05-18) 2 commits
465
- (merged to 'next' on 2016-05-26 at 4da062d)
466
- + cat-file: default to --buffer when --batch-all-objects is used
467
- + cat-file: avoid noop calls to sha1_object_info_extended
477
+* et/pretty-format-c-auto (2016-05-27) 1 commit
478
+ (merged to 'next' on 2016-05-31 at 1e9c920)
479
+ + format_commit_message: honor `color=auto` for `%C(auto)`
480
469
- "git cat-file --batch-all" has been sped up, by taking advantage
470
- of the fact that it does not have to read a list of objects, in two
471
- ways.
481
+ %C(auto) in a custom format string that commands in `git log`
482
+ family takes unconditionally turned the color on, ignoring
483
+ --no-color or --color=auto with output not connected to a tty;
484
+ this was corrected to make the format truly behave as "auto".
485
473
- Will merge to 'master'.
486
+ Will merge to 'master' after 2.9 final.
487
488
476
-* ah/no-verify-signature-with-pull-rebase (2016-05-20) 1 commit
477
- - pull: warn on --verify-signatures with --rebase
489
+* ew/daemon-socket-keepalive (2016-05-25) 1 commit
490
+ (merged to 'next' on 2016-05-31 at c32acf1)
491
+ + daemon: enable SO_KEEPALIVE for all sockets
492
479
- "git pull --rebase --verify-signature" learned to warn the user
480
- that "--verify-signature" is a no-op.
493
+ When "git daemon" is run without --[init-]timeout specified, a
494
+ connection from a client that silently goes offline can hang around
495
+ for a long time, wasting resources. The socket-level KEEPALIVE has
496
+ been enabled to allow the OS to notice such failed connections.
497
+
498
+ Will merge to 'master' after 2.9 final.
499
+
500
+
501
+* jk/upload-pack-hook (2016-05-27) 6 commits
502
+ - upload-pack: provide a hook for running pack-objects
503
+ - config: add a notion of "scope"
504
+ - config: return configset value for current_config_ functions
505
+ - config: set up config_source for command-line config
506
+ - git_config_parse_parameter: refactor cleanup code
507
+ - git_config_with_options: drop "found" counting
508
+
509
+ Allow a custom "git upload-pack" replacement to respond to
510
+ "fetch/clone" request.
511
+
512
+ Still under discussion.
513
+ ($gmane/295705).
514
+
515
+
516
+* rs/xdiff-hunk-with-func-line (2016-05-31) 8 commits
517
+ - grep: -W: don't extend context to trailing empty lines
518
+ - t7810: add test for grep -W and trailing empty context lines
519
+ - xdiff: don't trim common tail with -W
520
+ - xdiff: -W: don't include common trailing empty lines in context
521
+ - xdiff: ignore empty lines before added functions with -W
522
+ - xdiff: handle appended chunks better with -W
523
+ - xdiff: factor out match_func_rec()
524
+ - t4051: rewrite, add more tests
525
+
526
+ "git show -W" (extend hunks to cover the entire function, delimited
527
+ by lines that match the "funcname" pattern) used to show the entire
528
+ file when a change added an entire function at the end of the file,
529
+ which has been fixed.
530
531
Will merge to 'next'.
532
533
485
-* ak/t0008-ksh88-workaround (2016-05-20) 1 commit
486
- (merged to 'next' on 2016-05-26 at 9a34a2a)
487
- + t0008: 4 tests fail with ksh88
534
+* sb/submodule-misc-cleanups (2016-05-25) 1 commit
535
+ (merged to 'next' on 2016-05-31 at 0d07b9c)
536
+ + submodule update: make use of the existing fetch_in_submodule function
537
489
- Test portability workaround.
538
+ Minor simplification.
539
491
- Will merge to 'master'.
540
+ Will merge to 'master' after 2.9 final.
541
+
542
+
543
+* sb/submodule-default-paths (2016-05-26) 7 commits
544
+ - clone: add --init-submodule=<pathspec> switch
545
+ - submodule update: add `--init-default-path` switch
546
+ - Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
547
+ - Merge branch 'jc/attr' into sb/submodule-default-paths
548
+ - Merge branch 'sb/clone-shallow-passthru' into sb/submodule-default-paths
549
+ - Merge branch 'sb/submodule-deinit-all' into sb/submodule-default-paths
550
+ - Merge branch 'sb/submodule-parallel-update' into sb/submodule-default-paths
551
+ (this branch uses jc/attr and sb/pathspec-label.)
552
+
553
+ Will merge to 'next'.
554
+
555
+
556
+* ah/no-verify-signature-with-pull-rebase (2016-05-20) 1 commit
557
+ (merged to 'next' on 2016-05-31 at 30add83)
558
+ + pull: warn on --verify-signatures with --rebase
559
+
560
+ "git pull --rebase --verify-signature" learned to warn the user
561
+ that "--verify-signature" is a no-op.
562
+
563
+ Will merge to 'master' after 2.9 final.
564
565
566
* ep/http-curl-trace (2016-05-24) 2 commits
@@ -498,61 +570,34 @@ of the repositories listed at
570
HTTP transport gained an option to produce more detailed debugging
571
trace.
572
501
- Rerolled.
573
+ Rerolled. Is everybody happy with this version?
574
575
576
* jc/attr (2016-05-25) 18 commits
505
- - attr: support quoting pathname patterns in C style
506
- - attr: expose validity check for attribute names
507
- - attr: add counted string version of git_attr()
508
- - attr: add counted string version of git_check_attr()
509
- - attr: retire git_check_attrs() API
510
- - attr: convert git_check_attrs() callers to use the new API
511
- - attr: convert git_all_attrs() to use "struct git_attr_check"
512
- - attr: (re)introduce git_check_attr() and struct git_attr_check
513
- - attr: rename function and struct related to checking attributes
514
- - attr.c: plug small leak in parse_attr_line()
515
- - attr.c: tighten constness around "git_attr" structure
516
- - attr.c: simplify macroexpand_one()
517
- - attr.c: mark where #if DEBUG ends more clearly
518
- - attr.c: complete a sentence in a comment
519
- - attr.c: explain the lack of attr-name syntax check in parse_attr()
520
- - attr.c: update a stale comment on "struct match_attr"
521
- - attr.c: use strchrnul() to scan for one line
522
- - commit.c: use strchrnul() to scan for one line
577
+ (merged to 'next' on 2016-05-31 at 5b2f08b)
578
+ + attr: support quoting pathname patterns in C style
579
+ + attr: expose validity check for attribute names
580
+ + attr: add counted string version of git_attr()
581
+ + attr: add counted string version of git_check_attr()
582
+ + attr: retire git_check_attrs() API
583
+ + attr: convert git_check_attrs() callers to use the new API
584
+ + attr: convert git_all_attrs() to use "struct git_attr_check"
585
+ + attr: (re)introduce git_check_attr() and struct git_attr_check
586
+ + attr: rename function and struct related to checking attributes
587
+ + attr.c: plug small leak in parse_attr_line()
588
+ + attr.c: tighten constness around "git_attr" structure
589
+ + attr.c: simplify macroexpand_one()
590
+ + attr.c: mark where #if DEBUG ends more clearly
591
+ + attr.c: complete a sentence in a comment
592
+ + attr.c: explain the lack of attr-name syntax check in parse_attr()
593
+ + attr.c: update a stale comment on "struct match_attr"
594
+ + attr.c: use strchrnul() to scan for one line
595
+ + commit.c: use strchrnul() to scan for one line
596
(this branch is used by sb/pathspec-label and sb/submodule-default-paths.)
597
598
The attributes API has been updated so that it can later be
599
optimized using the knowledge of which attributes are queried.
600
528
- Let's merge the early "clean-up" half to 'next', after splitting it
529
- into a separate topic.
530
-
531
-
532
-* fc/fast-import-broken-marks-file (2016-05-17) 1 commit
533
- (merged to 'next' on 2016-05-26 at 9962fcf)
534
- + fast-import: do not truncate exported marks file
535
-
536
- "git fast-import --export-marks" would overwrite the existing marks
537
- file even when it makes a dump from its custom die routine.
538
- Prevent it from doing so when we have an import-marks file but
539
- haven't finished reading it.
540
-
541
- Will merge to 'master'.
542
-
543
-
544
-* es/t1500-modernize (2016-05-18) 5 commits
545
- (merged to 'next' on 2016-05-26 at 274e39c)
546
- + t1500: avoid setting environment variables outside of tests
547
- + t1500: avoid setting configuration options outside of tests
548
- + t1500: avoid changing working directory outside of tests
549
- + t1500: test_rev_parse: facilitate future test enhancements
550
- + t1500: be considerate to future potential tests
551
-
552
- test updates to make it more readable and maintainable.
553
-
554
- Will merge to 'master'.
555
-
601
602
* cc/apply-introduce-state (2016-05-12) 48 commits
603
- builtin/apply: rename 'prefix_' parameter to 'prefix'
@@ -627,16 +672,17 @@ of the repositories listed at
672
673
674
* sb/pathspec-label (2016-05-25) 4 commits
630
- - pathspec: allow querying for attributes
631
- - pathspec: move prefix check out of the inner loop
632
- - pathspec: move long magic parsing out of prefix_pathspec
633
- - Documentation: fix a typo
675
+ (merged to 'next' on 2016-05-31 at e72b604)
676
+ + pathspec: allow querying for attributes
677
+ + pathspec: move prefix check out of the inner loop
678
+ + pathspec: move long magic parsing out of prefix_pathspec
679
+ + Documentation: fix a typo
680
(this branch is used by sb/submodule-default-paths; uses jc/attr.)
681
682
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
683
to limit paths that match $pattern further by attribute settings.
684
639
- Will merge to 'next'.
685
+ Will merge to 'master' after 2.9 final.
686
687
688
* nd/worktree-cleanup-post-head-protection (2016-05-24) 6 commits
@@ -646,6 +692,7 @@ of the repositories listed at
692
- git-worktree.txt: keep subcommand listing in alphabetical order
693
- worktree.c: rewrite mark_current_worktree() to avoid strbuf
694
- completion: support git-worktree
695
+ (this branch is used by nd/worktree-lock.)
696
697
Further preparatory clean-up for "worktree" feature.
698
@@ -704,9 +751,9 @@ of the repositories listed at
751
Will discard.
752
753
707
-* ew/fast-import-unpack-limit (2016-05-19) 2 commits
708
- (merged to 'next' on 2016-05-19 at 50137c5)
709
- + (DO NOT MERGE YET) fast-import: discard object-table after closing a pack
754
+* ew/fast-import-unpack-limit (2016-05-29) 2 commits
755
+ (merged to 'next' on 2016-05-29 at af32aba)
756
+ + fast-import: invalidate pack_id references after loosening
757
(merged to 'next' on 2016-05-11 at ffd4efb)
758
+ fast-import: implement unpack limit
759
@@ -809,11 +856,3 @@ of the repositories listed at
856
It has been reported that git-gui still uses the deprecated syntax,
857
which needs to be fixed before this final step can proceed.
858
($gmane/282594)
812
-
813
---------------------------------------------------
814
-[Discarded]
815
-
816
-* jc/diff-compact-always-use-blank-heuristics (2016-04-29) 1 commit
817
- . diff: enable "compaction heuristics" and lose experimentation knob
818
-
819
- Superseded by the tip commit on the jk/diff-compact-heuristic topic.