What's cooking (2016/05 #06)
Junio C Hamano committed
May 17, 2016 at 15:45 UTC
702927b6669ae2a9a9f8d2ab0a5707ddc861695e
1 file changed
+471
-504
whats-cooking.txt
+471
-504
@@ -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, #05; Fri, 13)
4
-X-master-at: edec3709db124a96134a64d8fd1117ca50f90f7c
5
-X-next-at: 78b384c29366e199741393e56030a8384110760d
3
+Subject: What's cooking in git.git (May 2016, #06; Tue, 17)
4
+X-master-at: 1f66975deb8402131fbf7c14330d0c7cdebaeaa2
5
+X-next-at: 927f4258f48da33cf64d9a9f47fd3a0ac725a748
6
7
-What's cooking in git.git (May 2016, #05; Fri, 13)
7
+What's cooking in git.git (May 2016, #06; Tue, 17)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +12,10 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-The 'master' branch now has the eleventh batch of topics of this
16
-cycle. On the 'maint' front, 2.8.2 is out and fixes that have been
17
-in 'master' accumulates on it for 2.8.3.
15
+The 'master' branch now has 390 non-merge commits in this cycle. On
16
+the 'maint' front, 2.8.2 is out and fixes that have been in 'master'
17
+accumulates on it for 2.8.3, which probably should be tagged sometime
18
+late this week.
19
20
You can find the changes described here in the integration branches
21
of the repositories listed at
@@ -24,111 +25,160 @@ of the repositories listed at
25
--------------------------------------------------
26
[Graduated to "master"]
27
27
-* jc/commit-tree-ignore-commit-gpgsign (2016-05-03) 1 commit
28
- (merged to 'next' on 2016-05-06 at 08eccb2)
29
- + commit-tree: do not pay attention to commit.gpgsign
28
+* ab/hooks (2016-05-04) 4 commits
29
+ (merged to 'next' on 2016-05-09 at 23cf808)
30
+ + hooks: allow customizing where the hook directory is
31
+ + githooks.txt: minor improvements to the grammar & phrasing
32
+ + githooks.txt: amend dangerous advice about 'update' hook ACL
33
+ + githooks.txt: improve the intro section
34
31
- "git commit-tree" plumbing command required the user to always sign
32
- its result when the user sets the commit.gpgsign configuration
33
- variable, which was an ancient mistake. Rework "git rebase" that
34
- relied on this mistake so that it reads commit.gpgsign and pass (or
35
- not pass) the -S option to "git commit-tree" to keep the end-user
36
- expectation the same, while teaching "git commit-tree" to ignore
37
- the configuration variable. This will stop requiring the users to
38
- sign commit objects used internally as an implementation detail of
39
- "git stash".
35
+ A new configuration variable core.hooksPath allows customizing
36
+ where the hook directory is.
37
38
42
-* sb/submodule-module-list-pathspec-fix (2016-05-03) 1 commit
43
- (merged to 'next' on 2016-05-06 at ab6dac3)
44
- + submodule deinit test: fix broken && chain in subshell
39
+* ak/t4151-ls-files-could-be-empty (2016-05-09) 1 commit
40
+ (merged to 'next' on 2016-05-10 at 36ae38c)
41
+ + t4151: make sure argument to 'test -z' is given
42
46
---------------------------------------------------
47
-[New Topics]
43
+ Test fix.
44
49
-* jc/rerere-multi (2016-05-11) 1 commit
50
- (merged to 'next' on 2016-05-13 at f4d1d82)
51
- + rerere: plug memory leaks upon "rerere forget" failure
45
53
- Will merge to 'master'.
46
+* bn/config-doc-tt-varnames (2016-05-05) 1 commit
47
+ (merged to 'next' on 2016-05-10 at aa7b834)
48
+ + config: consistently format $variables in monospaced font
49
+ (this branch uses jc/config-pathname-type.)
50
51
+ Doc formatting fixes.
52
56
-* cc/apply-introduce-state (2016-05-12) 48 commits
57
- - builtin/apply: rename 'prefix_' parameter to 'prefix'
58
- - builtin/apply: move applying patches into apply_all_patches()
59
- - builtin/apply: move 'state' check into check_apply_state()
60
- - builtin/apply: move 'symlink_changes' global into 'struct apply_state'
61
- - builtin/apply: move 'fn_table' global into 'struct apply_state'
62
- - builtin/apply: move 'state_linenr' global into 'struct apply_state'
63
- - builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
64
- - builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
65
- - builtin/apply: move 'ws_error_action' into 'struct apply_state'
66
- - builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
67
- - builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
68
- - builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
69
- - builtin/apply: move 'whitespace_option' into 'struct apply_state'
70
- - builtin/apply: move 'whitespace_error' global into 'struct apply_state'
71
- - builtin/apply: move 'root' global into 'struct apply_state'
72
- - builtin/apply: move 'p_value_known' global into 'struct apply_state'
73
- - builtin/apply: move 'p_value' global into 'struct apply_state'
74
- - builtin/apply: move 'has_include' global into 'struct apply_state'
75
- - builtin/apply: move 'limit_by_name' global into 'struct apply_state'
76
- - builtin/apply: move 'patch_input_file' global into 'struct apply_state'
77
- - builtin/apply: move 'apply' global into 'struct apply_state'
78
- - builtin/apply: move 'p_context' global into 'struct apply_state'
79
- - builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
80
- - builtin/apply: move 'line_termination' global into 'struct apply_state'
81
- - builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
82
- - builtin/apply: move 'no_add' global into 'struct apply_state'
83
- - builtin/apply: move 'threeway' global into 'struct apply_state'
84
- - builtin/apply: move 'summary' global into 'struct apply_state'
85
- - builtin/apply: move 'numstat' global into 'struct apply_state'
86
- - builtin/apply: move 'diffstat' global into 'struct apply_state'
87
- - builtin/apply: move 'cached' global into 'struct apply_state'
88
- - builtin/apply: move 'allow_overlap' global into 'struct apply_state'
89
- - builtin/apply: move 'update_index' global into 'struct apply_state'
90
- - builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
91
- - builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
92
- - builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
93
- - builtin/apply: move 'check_index' global into 'struct apply_state'
94
- - builtin/apply: move 'check' global into 'struct apply_state'
95
- - builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
96
- - builtin/apply: move 'state' init into init_apply_state()
97
- - builtin/apply: introduce 'struct apply_state' to start libifying
98
- - builtin/apply: move 'read_stdin' global into cmd_apply()
99
- - builtin/apply: move 'options' variable into cmd_apply()
100
- - builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
101
- - builtin/apply: avoid local variable shadowing 'len' parameter
102
- - builtin/apply: avoid parameter shadowing 'linenr' global
103
- - builtin/apply: avoid parameter shadowing 'p_value' global
104
- - builtin/apply: make gitdiff_verify_name() return void
53
106
- The "git apply" standalone program is being libified; this is the
107
- first step to move many state variables into a structure that can
108
- be explicitly (re)initialized to make the machinery callable more
109
- than once.
54
+* bn/http-cookiefile-config (2016-05-04) 2 commits
55
+ (merged to 'next' on 2016-05-09 at d519b13)
56
+ + http: expand http.cookieFile as a path
57
+ + Documentation: config: improve word ordering for http.cookieFile
58
111
- The next step that moves some remaining state variables into the
112
- structure and turns die()s into an error return that propagates up
113
- to the caller is not queued yet but in flight. It would be good to
114
- review the above first and give the remainder of the series a solid
115
- base to build on.
59
+ "http.cookieFile" configuration variable clearly wants a pathname,
60
+ but we forgot to treat it as such by e.g. applying tilde expansion.
61
+
62
+
63
+* es/test-gpg-tags (2016-05-09) 1 commit
64
+ (merged to 'next' on 2016-05-10 at 9fcb98b)
65
+ + t6302: simplify non-gpg cases
66
67
+ Test fix.
68
118
-* jk/test-z-n-unquoted (2016-05-13) 6 commits
119
- - always quote shell arguments to test -z/-n
120
- - t9103: modernize test style
121
- - t9107: switch inverted single/double quotes in test
122
- - t9107: use "return 1" instead of "exit 1"
123
- - t9100,t3419: enclose all test code in single-quotes
124
- - t/lib-git-svn: drop $remote_git_svn and $git_svn_id
69
126
- t9xxx series has been updated primarily for readability, while
127
- fixing small bugs in it. A few scripted Porcelains have also been
128
- updated to fix possible bugs around their use of "test -z" and
129
- "test -n".
70
+* jc/config-pathname-type (2016-05-04) 1 commit
71
+ (merged to 'next' on 2016-05-09 at 0876e55)
72
+ + config: describe 'pathname' value type
73
+ (this branch is used by bn/config-doc-tt-varnames.)
74
+
75
+ Consolidate description of tilde-expansion that is done to
76
+ configuration variables that take pathname to a single place.
77
+
78
+
79
+* jc/fsck-nul-in-commit (2016-05-10) 2 commits
80
+ (merged to 'next' on 2016-05-10 at 3bc3ca3)
81
+ + fsck: detect and warn a commit with embedded NUL
82
+ + fsck_commit_buffer(): do not special case the last validation
83
+
84
+ "git fsck" learned to catch NUL byte in a commit object as
85
+ potential error and warn.
86
+
87
+
88
+* jc/linkgit-fix (2016-05-09) 1 commit
89
+ (merged to 'next' on 2016-05-10 at 0e5ba60)
90
+ + Documentation: fix linkgit references
91
+
92
+ Many 'linkgit:<git documentation page>' references were broken,
93
+ which are all fixed with this.
94
+
95
+
96
+* jc/ll-merge-internal (2016-05-09) 3 commits
97
+ (merged to 'next' on 2016-05-10 at a6bf1d0)
98
+ + t6036: remove pointless test that expects failure
99
+ + ll-merge: use a longer conflict marker for internal merge
100
+ + ll-merge: fix typo in comment
101
+
102
+ "git rerere" can get confused by conflict markers deliberately left
103
+ by the inner merge step, because they are indistinguishable from
104
+ the real conflict markers left by the outermost merge which are
105
+ what the end user and "rerere" need to look at. This was fixed by
106
+ making the conflict markers left by the inner merges a bit longer.
107
131
- Will merge to 'next'.
108
+
109
+* jc/test-seq (2016-05-09) 2 commits
110
+ (merged to 'next' on 2016-05-10 at 1512890)
111
+ + test-lib-functions.sh: rewrite test_seq without Perl
112
+ + test-lib-functions.sh: remove misleading comment on test_seq
113
+
114
+ Test fix.
115
+
116
+
117
+* jk/rebase-interative-eval-fix (2016-05-10) 1 commit
118
+ (merged to 'next' on 2016-05-11 at 4fdf387)
119
+ + rebase--interactive: avoid empty list in shell for-loop
120
+
121
+ Portability enhancement for "rebase -i" to help platforms whose
122
+ shell does not like "for i in <empty>" (which is not POSIX-kosher).
123
+
124
+
125
+* jk/submodule-c-credential (2016-05-06) 6 commits
126
+ (merged to 'next' on 2016-05-10 at 4abe871)
127
+ + submodule: stop sanitizing config options
128
+ + submodule: use prepare_submodule_repo_env consistently
129
+ + submodule--helper: move config-sanitizing to submodule.c
130
+ + submodule: export sanitized GIT_CONFIG_PARAMETERS
131
+ + t5550: break submodule config test into multiple sub-tests
132
+ + t5550: fix typo in $HTTPD_URL
133
+ (this branch is used by js/http-custom-headers.)
134
+
135
+ An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
136
+ submodule honor -c credential.* from command line, 2016-02-29)
137
+ turned out to be a convoluted no-op; implement what it wanted to do
138
+ correctly, and stop filtering settings given via "git -c var=val".
139
+
140
+
141
+* jk/test-send-sh-x-trace-elsewhere (2016-05-11) 1 commit
142
+ (merged to 'next' on 2016-05-11 at 273a137)
143
+ + test-lib: set BASH_XTRACEFD automatically
144
+
145
+ Running tests with '-x' option to trace the individual command
146
+ executions is a useful way to debug test scripts, but some tests
147
+ that capture the standard error stream and check what the command
148
+ said can be broken with the trace output mixed in. When running
149
+ our tests under "bash", however, we can redirect the trace output
150
+ to another file descriptor to keep the standard error of programs
151
+ being tested intact.
152
+
153
+
154
+* js/http-custom-headers (2016-05-10) 4 commits
155
+ (merged to 'next' on 2016-05-10 at 7cf5cca)
156
+ + submodule: ensure that -c http.extraheader is heeded
157
+ + Merge branch 'jk/submodule-c-credential' into js/http-custom-headers
158
+ + t5551: make the test for extra HTTP headers more robust
159
+ + tests: adjust the configuration for Apache 2.2
160
+ (this branch uses jk/submodule-c-credential.)
161
+
162
+ Update tests for "http.extraHeaders=<header>" to be portable back
163
+ to Apache 2.2 (the original depended on <RequireAll/> which is a
164
+ more recent feature).
165
+
166
+
167
+* js/t3404-typofix (2016-05-10) 1 commit
168
+ (merged to 'next' on 2016-05-10 at cbeabc0)
169
+ + t3404: fix typo
170
+
171
+ Test fix.
172
+
173
+
174
+* js/windows-dotgit (2016-05-11) 2 commits
175
+ (merged to 'next' on 2016-05-11 at d10caa2)
176
+ + mingw: remove unnecessary definition
177
+ + mingw: introduce the 'core.hideDotFiles' setting
178
+
179
+ On Windows, .git and optionally any files whose name starts with a
180
+ dot are now marked as hidden, with a core.hideDotFiles knob to
181
+ customize this behaviour.
182
183
184
* kf/gpg-sig-verification-doc (2016-05-13) 1 commit
@@ -140,48 +190,198 @@ of the repositories listed at
190
verified. Also the phrasing used for signature and key validity is
191
adjusted to align with that used by OpenPGP.
192
143
- Will merge to 'master'.
193
194
+* lp/typofixes (2016-05-06) 1 commit
195
+ (merged to 'next' on 2016-05-09 at 59683be)
196
+ + typofix: assorted typofixes in comments, documentation and messages
197
+
198
+ Typofixes.
199
146
-* pb/bisect (2016-05-13) 4 commits
147
- - t6030: explicitly test for bisection cleanup
148
- - bisect--helper: `write_terms` shell function in C
149
- - bisect: rewrite `check_term_format` shell function in C
150
- - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
200
152
- Beginning of GSoC "git bisect" project.
201
+* ls/travis-build-doc (2016-05-10) 1 commit
202
+ (merged to 'next' on 2016-05-10 at 7f63497)
203
+ + travis-ci: build documentation
204
205
+ CI test was taught to build documentation pages.
206
+
207
+
208
+* nd/error-errno (2016-05-09) 41 commits
209
+ (merged to 'next' on 2016-05-10 at 1cdeda8)
210
+ + wrapper.c: use warning_errno()
211
+ + vcs-svn: use error_errno()
212
+ + upload-pack.c: use error_errno()
213
+ + unpack-trees.c: use error_errno()
214
+ + transport-helper.c: use error_errno()
215
+ + sha1_file.c: use {error,die,warning}_errno()
216
+ + server-info.c: use error_errno()
217
+ + sequencer.c: use error_errno()
218
+ + run-command.c: use error_errno()
219
+ + rerere.c: use error_errno() and warning_errno()
220
+ + reachable.c: use error_errno()
221
+ + mailmap.c: use error_errno()
222
+ + ident.c: use warning_errno()
223
+ + http.c: use error_errno() and warning_errno()
224
+ + grep.c: use error_errno()
225
+ + gpg-interface.c: use error_errno()
226
+ + fast-import.c: use error_errno()
227
+ + entry.c: use error_errno()
228
+ + editor.c: use error_errno()
229
+ + diff-no-index.c: use error_errno()
230
+ + credential-cache--daemon.c: use warning_errno()
231
+ + copy.c: use error_errno()
232
+ + connected.c: use error_errno()
233
+ + config.c: use error_errno()
234
+ + compat/win32/syslog.c: use warning_errno()
235
+ + combine-diff.c: use error_errno()
236
+ + check-racy.c: use error_errno()
237
+ + builtin/worktree.c: use error_errno()
238
+ + builtin/upload-archive.c: use error_errno()
239
+ + builtin/update-index.c: prefer "err" to "errno" in process_lstat_error
240
+ + builtin/rm.c: use warning_errno()
241
+ + builtin/pack-objects.c: use die_errno() and warning_errno()
242
+ + builtin/merge-file.c: use error_errno()
243
+ + builtin/mailsplit.c: use error_errno()
244
+ + builtin/help.c: use warning_errno()
245
+ + builtin/fetch.c: use error_errno()
246
+ + builtin/branch.c: use error_errno()
247
+ + builtin/am.c: use error_errno()
248
+ + bisect.c: use die_errno() and warning_errno()
249
+ + usage.c: add warning_errno() and error_errno()
250
+ + usage.c: move format processing out of die_errno()
251
+
252
+ The code for warning_errno/die_errno has been refactored and a new
253
+ error_errno() reporting helper is introduced.
254
+
255
+
256
+* nd/remote-plural-ours-plus-theirs (2016-05-06) 1 commit
257
+ (merged to 'next' on 2016-05-10 at aea08dc)
258
+ + remote.c: specify correct plural form in "commit diverge" message
259
+
260
+ Message fix.
261
+
262
+
263
+* nd/test-helpers (2016-05-10) 1 commit
264
+ (merged to 'next' on 2016-05-10 at e8ad58d)
265
+ + wrap-for-bin.sh: regenerate bin-wrappers when switching branches
266
+
267
+ Switching between 'master' and 'next', between which the paths to
268
+ test helper binaries have changed, did not update bin-wrappers/*
269
+ scripts used in tests, causing false test failures.
270
+
271
+
272
+* sb/submodule-deinit-all (2016-05-05) 1 commit
273
+ (merged to 'next' on 2016-05-09 at 0fd4518)
274
+ + submodule deinit: require '--all' instead of '.' for all submodules
275
+
276
+ Correct faulty recommendation to use "git submodule deinit ." when
277
+ de-initialising all submodules, which would result in a strange
278
+ error message in a pathological corner case.
279
+
280
+
281
+* sb/submodule-init (2016-05-03) 7 commits
282
+ (merged to 'next' on 2016-05-03 at 8a5fce4)
283
+ + submodule init: redirect stdout to stderr
284
+ (merged to 'next' on 2016-04-29 at 3e81ee88)
285
+ + submodule--helper update-clone: abort gracefully on missing .gitmodules
286
+ + submodule init: fail gracefully with a missing .gitmodules file
287
+ (merged to 'next' on 2016-04-27 at afaad81)
288
+ + submodule: port init from shell to C
289
+ + submodule: port resolve_relative_url from shell to C
290
+ + Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init
291
+ + Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init
292
+
293
+ Update of "git submodule" to move pieces of logic to C continues.
294
+
295
+
296
+* sb/z-is-gnutar-ism (2016-05-09) 2 commits
297
+ (merged to 'next' on 2016-05-09 at 51d527d)
298
+ + t6041: do not compress backup tar file
299
+ + t3513: do not compress backup tar file
300
+
301
+ Test fix.
302
+
303
+
304
+* tb/t5601-sed-fix (2016-05-09) 1 commit
305
+ (merged to 'next' on 2016-05-10 at d3e54e8)
306
+ + t5601: Remove trailing space in sed expression
307
+
308
+ Test fix.
309
+
310
+
311
+* va/i18n-misc-updates (2016-05-12) 10 commits
312
+ (merged to 'next' on 2016-05-13 at 0361b16)
313
+ + i18n: unpack-trees: avoid substituting only a verb in sentences
314
+ (merged to 'next' on 2016-05-10 at b5dbd0d)
315
+ + i18n: builtin/pull.c: split strings marked for translation
316
+ + i18n: builtin/pull.c: mark placeholders for translation
317
+ + i18n: git-parse-remote.sh: mark strings for translation
318
+ + i18n: branch: move comment for translators
319
+ + i18n: branch: unmark string for translation
320
+ + i18n: builtin/rm.c: remove a comma ',' from string
321
+ + i18n: unpack-trees: mark strings for translation
322
+ + i18n: builtin/branch.c: mark option for translation
323
+ + i18n: index-pack: use plural string instead of normal one
324
+
325
+ Mark several messages for translation.
326
+
327
+
328
+* va/i18n-remote-comment-to-align (2016-05-09) 1 commit
329
+ (merged to 'next' on 2016-05-10 at edbacbb)
330
+ + i18n: remote: add comment for translators
331
+
332
+ Message fix.
333
+
334
+
335
+* va/mailinfo-doc-typofix (2016-05-11) 1 commit
336
+ (merged to 'next' on 2016-05-11 at 7180176)
337
+ + Documentation/git-mailinfo: fix typo
338
155
-* sb/pathspec-label (2016-05-12) 5 commits
156
- - pathspec: record labels
157
- - pathspec: move prefix check out of the inner loop
158
- - pathspec: move long magic parsing out of prefix_pathspec
159
- - Documentation: correct typo in example for querying attributes
160
- - Documentation: fix a typo
339
+ Typofix.
340
162
- The pathspec mechanism learned ":(label=X)$pattern" pathspec magic
163
- to limit paths that match $pattern further by labels defined by the
164
- attributes mechanism for the paths.
341
+--------------------------------------------------
342
+[New Topics]
343
166
- (RFC/WIP)
344
+* da/difftool (2016-05-16) 2 commits
345
+ (merged to 'next' on 2016-05-17 at ef5a435)
346
+ + difftool: handle unmerged files in dir-diff mode
347
+ + difftool: initialize variables for readability
348
168
---------------------------------------------------
169
-[Stalled]
349
+ "git difftool" learned to handle unmerged paths correctly in
350
+ dir-diff mode.
351
171
-* es/t1500-modernize (2016-05-10) 7 commits
172
- - t1500: finish preparation upfront
173
- - t1500: be considerate to future potential tests
174
- - t1500: avoid setting environment variables outside of tests
175
- - t1500: avoid setting configuration options outside of tests
176
- - t1500: avoid changing working directory outside of tests
177
- - t1500: reduce dependence upon global state
178
- - t1500: test_rev_parse: facilitate future test enhancements
352
+ Will merge to 'master'.
353
180
- test updates to make it more readable and maintainable.
354
182
- Will be rerolled.
183
- ($gmane/294181)
355
+* jc/attr (2016-05-17) 14 commits
356
+ - SQUASH???
357
+ - attr: retire git_check_attrs() API
358
+ - attr: convert git_check_attrs() callers to use the new API
359
+ - attr: convert git_all_attrs() to use "struct git_attr_check"
360
+ - attr: (re)introduce git_check_attr() and struct git_attr_check
361
+ - attr: rename function and struct related to checking attributes
362
+ - attr.c: tighten constness around "git_attr" structure
363
+ - attr.c: simplify macroexpand_one()
364
+ - attr.c: mark where #if DEBUG ends more clearly
365
+ - attr.c: complete a sentence in a comment
366
+ - attr.c: explain the lack of attr-name syntax check in parse_attr()
367
+ - attr.c: update a stale comment on "struct match_attr"
368
+ - attr.c: use strchrnul() to scan for one line
369
+ - commit.c: use strchrnul() to scan for one line
370
+
371
+ The attributes API has been updated so that it can later be
372
+ optimized using the knowledge of which attributes are queried.
373
+
374
+
375
+* fc/fast-import-broken-marks-file (2016-05-17) 1 commit
376
+ - fast-import: do not truncate exported marks file
377
+
378
+ "git fast-import --export-marks" would overwrite the existing marks
379
+ file even when it makes a dump from its custom die routine.
380
+ Prevent it from doing so when we have an import-marks file but
381
+ haven't finished reading it.
382
383
+--------------------------------------------------
384
+[Stalled]
385
386
* ep/http-curl-trace (2016-05-02) 2 commits
387
. imap-send.c: introduce the GIT_TRACE_CURL environment variable
@@ -409,305 +609,188 @@ of the repositories listed at
609
--------------------------------------------------
610
[Cooking]
611
412
-* ar/diff-args-osx-precompose (2016-05-13) 1 commit
413
- - diff: run arguments through precompose_argv
414
-
415
- Many commands normalize command line arguments from NFD to NFC
416
- variant of UTF-8 on OSX, but commands in the "diff" family did
417
- not, causing "git diff $path" to complain that no such path is
418
- known to Git. They have been taught to do the normalization.
419
-
420
- Will merge to 'next'.
421
-
422
-
423
-* ls/travis-build-doc (2016-05-10) 1 commit
424
- (merged to 'next' on 2016-05-10 at 7f63497)
425
- + travis-ci: build documentation
426
-
427
- CI test was taught to build documentation pages.
428
-
429
- Will merge to 'master'.
430
-
431
-
432
-* js/t3404-typofix (2016-05-10) 1 commit
433
- (merged to 'next' on 2016-05-10 at cbeabc0)
434
- + t3404: fix typo
435
-
436
- Will merge to 'master'.
437
-
438
-
439
-* jk/rebase-interative-eval-fix (2016-05-10) 1 commit
440
- (merged to 'next' on 2016-05-11 at 4fdf387)
441
- + rebase--interactive: avoid empty list in shell for-loop
442
-
443
- Portability enhancement for "rebase -i" to help platforms whose
444
- shell does not like "for i in <empty>" (which is not POSIX-kosher).
445
-
446
- Will merge to 'master'.
447
-
448
-
449
-* jk/test-send-sh-x-trace-elsewhere (2016-05-11) 1 commit
450
- (merged to 'next' on 2016-05-11 at 273a137)
451
- + test-lib: set BASH_XTRACEFD automatically
452
-
453
- Running tests with '-x' option to trace the individual command
454
- executions is a useful way to debug test scripts, but some tests
455
- that capture the standard error stream and check what the command
456
- said can be broken with the trace output mixed in. When running
457
- our tests under "bash", however, we can redirect the trace output
458
- to another file descriptor to keep the standard error of programs
459
- being tested intact.
460
-
461
- Will merge to 'master'.
462
-
463
-
464
-* js/perf-rebase-i (2016-05-13) 3 commits
465
- (merged to 'next' on 2016-05-13 at eb51ddd)
466
- + perf: run "rebase -i" under perf
467
- + perf: make the tests work in worktrees
468
- + perf: let's disable symlinks when they are not available
469
-
470
- Add perf test for "rebase -i"
471
-
472
- Will merge to 'master'.
473
-
474
-
475
-* nd/worktree-cleanup-post-head-protection (2016-05-10) 7 commits
476
- - worktree: simplify prefixing paths
477
- - worktree: avoid 0{40}, too many zeroes, hard to read
478
- - worktree.c: add clear_worktree()
479
- - worktree.c: use is_dot_or_dotdot()
480
- - git-worktree.txt: keep subcommand listing in alphabetical order
481
- - worktree.c: rewrite mark_current_worktree() to avoid strbuf
482
- - completion: support git-worktree
483
- (this branch uses nd/worktree-various-heads.)
484
-
485
- Further preparatory clean-up for "worktree" feature.
486
-
487
- Expecting a reroll.
488
- ($gmane/294136, etc.)
489
-
490
-
491
-* va/mailinfo-doc-typofix (2016-05-11) 1 commit
492
- (merged to 'next' on 2016-05-11 at 7180176)
493
- + Documentation/git-mailinfo: fix typo
494
-
495
- Typofix.
496
-
497
- Will merge to 'master'.
498
-
499
-
500
-* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
501
- (merged to 'next' on 2016-05-10 at 2ada404)
502
- + wt-status.c: set commitable bit if there is a meaningful merge.
503
-
504
- "git commit --dry-run" reported "No, no, you cannot commit." in one
505
- case where "git commit" would have allowed you to commit, and this
506
- improves it a little bit ("git commit --dry-run --short" still does
507
- not give you the correct answer, for example). This is a stop-gap
508
- measure in that "commit --short --dry-run" still gives an incorrect
509
- result.
510
-
511
- Will merge to 'master'.
512
-
513
-
514
-* ak/t4151-ls-files-could-be-empty (2016-05-09) 1 commit
515
- (merged to 'next' on 2016-05-10 at 36ae38c)
516
- + t4151: make sure argument to 'test -z' is given
517
-
518
- Test fix.
519
-
520
- Will merge to 'master'.
521
-
522
-
523
-* es/test-gpg-tags (2016-05-09) 1 commit
524
- (merged to 'next' on 2016-05-10 at 9fcb98b)
525
- + t6302: simplify non-gpg cases
526
-
527
- Test fix.
528
-
529
- Will merge to 'master'.
530
-
531
-
532
-* jc/test-seq (2016-05-09) 2 commits
533
- (merged to 'next' on 2016-05-10 at 1512890)
534
- + test-lib-functions.sh: rewrite test_seq without Perl
535
- + test-lib-functions.sh: remove misleading comment on test_seq
536
-
537
- Test fix.
538
-
539
- Will merge to 'master'.
540
-
541
-
542
-* js/windows-dotgit (2016-05-11) 2 commits
543
- (merged to 'next' on 2016-05-11 at d10caa2)
544
- + mingw: remove unnecessary definition
545
- + mingw: introduce the 'core.hideDotFiles' setting
546
-
547
- On Windows, .git and optionally any files whose name starts with a
548
- dot are now marked as hidden, with a core.hideDotFiles knob to
549
- customize this behaviour.
550
-
551
- Will merge to 'master'.
612
+* es/t1500-modernize (2016-05-17) 5 commits
613
+ - t1500: avoid setting environment variables outside of tests
614
+ - t1500: avoid setting configuration options outside of tests
615
+ - t1500: avoid changing working directory outside of tests
616
+ - t1500: test_rev_parse: facilitate future test enhancements
617
+ - t1500: be considerate to future potential tests
618
619
+ test updates to make it more readable and maintainable.
620
554
-* nd/error-errno (2016-05-09) 41 commits
555
- (merged to 'next' on 2016-05-10 at 1cdeda8)
556
- + wrapper.c: use warning_errno()
557
- + vcs-svn: use error_errno()
558
- + upload-pack.c: use error_errno()
559
- + unpack-trees.c: use error_errno()
560
- + transport-helper.c: use error_errno()
561
- + sha1_file.c: use {error,die,warning}_errno()
562
- + server-info.c: use error_errno()
563
- + sequencer.c: use error_errno()
564
- + run-command.c: use error_errno()
565
- + rerere.c: use error_errno() and warning_errno()
566
- + reachable.c: use error_errno()
567
- + mailmap.c: use error_errno()
568
- + ident.c: use warning_errno()
569
- + http.c: use error_errno() and warning_errno()
570
- + grep.c: use error_errno()
571
- + gpg-interface.c: use error_errno()
572
- + fast-import.c: use error_errno()
573
- + entry.c: use error_errno()
574
- + editor.c: use error_errno()
575
- + diff-no-index.c: use error_errno()
576
- + credential-cache--daemon.c: use warning_errno()
577
- + copy.c: use error_errno()
578
- + connected.c: use error_errno()
579
- + config.c: use error_errno()
580
- + compat/win32/syslog.c: use warning_errno()
581
- + combine-diff.c: use error_errno()
582
- + check-racy.c: use error_errno()
583
- + builtin/worktree.c: use error_errno()
584
- + builtin/upload-archive.c: use error_errno()
585
- + builtin/update-index.c: prefer "err" to "errno" in process_lstat_error
586
- + builtin/rm.c: use warning_errno()
587
- + builtin/pack-objects.c: use die_errno() and warning_errno()
588
- + builtin/merge-file.c: use error_errno()
589
- + builtin/mailsplit.c: use error_errno()
590
- + builtin/help.c: use warning_errno()
591
- + builtin/fetch.c: use error_errno()
592
- + builtin/branch.c: use error_errno()
593
- + builtin/am.c: use error_errno()
594
- + bisect.c: use die_errno() and warning_errno()
595
- + usage.c: add warning_errno() and error_errno()
596
- + usage.c: move format processing out of die_errno()
621
598
- The code for warning_errno/die_errno has been refactored and a new
599
- error_errno() reporting helper is introduced.
622
+* jc/rerere-multi (2016-05-11) 1 commit
623
+ (merged to 'next' on 2016-05-13 at f4d1d82)
624
+ + rerere: plug memory leaks upon "rerere forget" failure
625
626
Will merge to 'master'.
627
628
604
-* nd/remote-plural-ours-plus-theirs (2016-05-06) 1 commit
605
- (merged to 'next' on 2016-05-10 at aea08dc)
606
- + remote.c: specify correct plural form in "commit diverge" message
607
-
608
- Message fix.
609
-
610
- Will merge to 'master'.
611
-
629
+* cc/apply-introduce-state (2016-05-12) 48 commits
630
+ - builtin/apply: rename 'prefix_' parameter to 'prefix'
631
+ - builtin/apply: move applying patches into apply_all_patches()
632
+ - builtin/apply: move 'state' check into check_apply_state()
633
+ - builtin/apply: move 'symlink_changes' global into 'struct apply_state'
634
+ - builtin/apply: move 'fn_table' global into 'struct apply_state'
635
+ - builtin/apply: move 'state_linenr' global into 'struct apply_state'
636
+ - builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
637
+ - builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
638
+ - builtin/apply: move 'ws_error_action' into 'struct apply_state'
639
+ - builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
640
+ - builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
641
+ - builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
642
+ - builtin/apply: move 'whitespace_option' into 'struct apply_state'
643
+ - builtin/apply: move 'whitespace_error' global into 'struct apply_state'
644
+ - builtin/apply: move 'root' global into 'struct apply_state'
645
+ - builtin/apply: move 'p_value_known' global into 'struct apply_state'
646
+ - builtin/apply: move 'p_value' global into 'struct apply_state'
647
+ - builtin/apply: move 'has_include' global into 'struct apply_state'
648
+ - builtin/apply: move 'limit_by_name' global into 'struct apply_state'
649
+ - builtin/apply: move 'patch_input_file' global into 'struct apply_state'
650
+ - builtin/apply: move 'apply' global into 'struct apply_state'
651
+ - builtin/apply: move 'p_context' global into 'struct apply_state'
652
+ - builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
653
+ - builtin/apply: move 'line_termination' global into 'struct apply_state'
654
+ - builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
655
+ - builtin/apply: move 'no_add' global into 'struct apply_state'
656
+ - builtin/apply: move 'threeway' global into 'struct apply_state'
657
+ - builtin/apply: move 'summary' global into 'struct apply_state'
658
+ - builtin/apply: move 'numstat' global into 'struct apply_state'
659
+ - builtin/apply: move 'diffstat' global into 'struct apply_state'
660
+ - builtin/apply: move 'cached' global into 'struct apply_state'
661
+ - builtin/apply: move 'allow_overlap' global into 'struct apply_state'
662
+ - builtin/apply: move 'update_index' global into 'struct apply_state'
663
+ - builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
664
+ - builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
665
+ - builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
666
+ - builtin/apply: move 'check_index' global into 'struct apply_state'
667
+ - builtin/apply: move 'check' global into 'struct apply_state'
668
+ - builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
669
+ - builtin/apply: move 'state' init into init_apply_state()
670
+ - builtin/apply: introduce 'struct apply_state' to start libifying
671
+ - builtin/apply: move 'read_stdin' global into cmd_apply()
672
+ - builtin/apply: move 'options' variable into cmd_apply()
673
+ - builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
674
+ - builtin/apply: avoid local variable shadowing 'len' parameter
675
+ - builtin/apply: avoid parameter shadowing 'linenr' global
676
+ - builtin/apply: avoid parameter shadowing 'p_value' global
677
+ - builtin/apply: make gitdiff_verify_name() return void
678
613
-* nd/test-helpers (2016-05-10) 1 commit
614
- (merged to 'next' on 2016-05-10 at e8ad58d)
615
- + wrap-for-bin.sh: regenerate bin-wrappers when switching branches
679
+ The "git apply" standalone program is being libified; this is the
680
+ first step to move many state variables into a structure that can
681
+ be explicitly (re)initialized to make the machinery callable more
682
+ than once.
683
617
- Switching between 'master' and 'next', between which the paths to
618
- test helper binaries have changed, did not update bin-wrappers/*
619
- scripts used in tests, causing false test failures.
684
+ The next step that moves some remaining state variables into the
685
+ structure and turns die()s into an error return that propagates up
686
+ to the caller is not queued yet but in flight. It would be good to
687
+ review the above first and give the remainder of the series a solid
688
+ base to build on.
689
621
- Will merge to 'master'.
690
+ Will be rerolled.
691
692
624
-* tb/core-eol-fix (2016-04-25) 4 commits
625
- (merged to 'next' on 2016-05-10 at fa8a200)
626
- + convert.c: ident + core.autocrlf didn't work
627
- + t0027: test cases for combined attributes
628
- + convert: allow core.autocrlf=input and core.eol=crlf
629
- + t0027: make commit_chk_wrnNNO() reliable
693
+* jk/test-z-n-unquoted (2016-05-14) 6 commits
694
+ (merged to 'next' on 2016-05-17 at 65372cf)
695
+ + always quote shell arguments to test -z/-n
696
+ + t9103: modernize test style
697
+ + t9107: switch inverted single/double quotes in test
698
+ + t9107: use "return 1" instead of "exit 1"
699
+ + t9100,t3419: enclose all test code in single-quotes
700
+ + t/lib-git-svn: drop $remote_git_svn and $git_svn_id
701
631
- A couple of bugs around core.autocrlf have been fixed.
702
+ t9xxx series has been updated primarily for readability, while
703
+ fixing small bugs in it. A few scripted Porcelains have also been
704
+ updated to fix possible bugs around their use of "test -z" and
705
+ "test -n".
706
707
Will merge to 'master'.
708
709
636
-* tb/t5601-sed-fix (2016-05-09) 1 commit
637
- (merged to 'next' on 2016-05-10 at d3e54e8)
638
- + t5601: Remove trailing space in sed expression
639
-
640
- Test fix.
710
+* pb/bisect (2016-05-13) 4 commits
711
+ - t6030: explicitly test for bisection cleanup
712
+ - bisect--helper: `write_terms` shell function in C
713
+ - bisect: rewrite `check_term_format` shell function in C
714
+ - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
715
642
- Will merge to 'master'.
716
+ Beginning of GSoC "git bisect" project.
717
718
645
-* va/i18n-remote-comment-to-align (2016-05-09) 1 commit
646
- (merged to 'next' on 2016-05-10 at edbacbb)
647
- + i18n: remote: add comment for translators
719
+* sb/pathspec-label (2016-05-14) 5 commits
720
+ . pathspec: record labels
721
+ . pathspec: move prefix check out of the inner loop
722
+ . pathspec: move long magic parsing out of prefix_pathspec
723
+ . Documentation: correct typo in example for querying attributes
724
+ . Documentation: fix a typo
725
649
- Message fix.
726
+ The pathspec mechanism learned ":(label=X)$pattern" pathspec magic
727
+ to limit paths that match $pattern further by labels defined by the
728
+ attributes mechanism for the paths.
729
651
- Will merge to 'master'.
730
+ (RFC/WIP)
731
732
654
-* jc/linkgit-fix (2016-05-09) 1 commit
655
- (merged to 'next' on 2016-05-10 at 0e5ba60)
656
- + Documentation: fix linkgit references
733
+* ar/diff-args-osx-precompose (2016-05-13) 1 commit
734
+ (merged to 'next' on 2016-05-17 at 7b59b79)
735
+ + diff: run arguments through precompose_argv
736
658
- Many 'linkgit:<git documentation page>' references were broken,
659
- which are all fixed with this.
737
+ Many commands normalize command line arguments from NFD to NFC
738
+ variant of UTF-8 on OSX, but commands in the "diff" family did
739
+ not, causing "git diff $path" to complain that no such path is
740
+ known to Git. They have been taught to do the normalization.
741
742
Will merge to 'master'.
743
744
664
-* js/http-custom-headers (2016-05-10) 4 commits
665
- (merged to 'next' on 2016-05-10 at 7cf5cca)
666
- + submodule: ensure that -c http.extraheader is heeded
667
- + Merge branch 'jk/submodule-c-credential' into js/http-custom-headers
668
- + t5551: make the test for extra HTTP headers more robust
669
- + tests: adjust the configuration for Apache 2.2
670
- (this branch uses jk/submodule-c-credential.)
745
+* js/perf-rebase-i (2016-05-13) 3 commits
746
+ (merged to 'next' on 2016-05-13 at eb51ddd)
747
+ + perf: run "rebase -i" under perf
748
+ + perf: make the tests work in worktrees
749
+ + perf: let's disable symlinks when they are not available
750
672
- Update tests for "http.extraHeaders=<header>" to be portable back
673
- to Apache 2.2 (the original depended on <RequireAll/> which is a
674
- more recent feature).
751
+ Add perf test for "rebase -i"
752
753
Will merge to 'master'.
754
755
679
-* sb/submodule-deinit-all (2016-05-05) 1 commit
680
- (merged to 'next' on 2016-05-09 at 0fd4518)
681
- + submodule deinit: require '--all' instead of '.' for all submodules
756
+* nd/worktree-cleanup-post-head-protection (2016-05-10) 7 commits
757
+ - worktree: simplify prefixing paths
758
+ - worktree: avoid 0{40}, too many zeroes, hard to read
759
+ - worktree.c: add clear_worktree()
760
+ - worktree.c: use is_dot_or_dotdot()
761
+ - git-worktree.txt: keep subcommand listing in alphabetical order
762
+ - worktree.c: rewrite mark_current_worktree() to avoid strbuf
763
+ - completion: support git-worktree
764
+ (this branch uses nd/worktree-various-heads.)
765
683
- Correct faulty recommendation to use "git submodule deinit ." when
684
- de-initialising all submodules, which would result in a strange
685
- error message in a pathological corner case.
766
+ Further preparatory clean-up for "worktree" feature.
767
687
- Will merge to 'master'.
768
+ Expecting a reroll.
769
+ ($gmane/294136, etc.)
770
771
690
-* bn/config-doc-tt-varnames (2016-05-05) 1 commit
691
- (merged to 'next' on 2016-05-10 at aa7b834)
692
- + config: consistently format $variables in monospaced font
693
- (this branch uses jc/config-pathname-type.)
772
+* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
773
+ (merged to 'next' on 2016-05-10 at 2ada404)
774
+ + wt-status.c: set commitable bit if there is a meaningful merge.
775
695
- Doc formatting fixes.
776
+ "git commit --dry-run" reported "No, no, you cannot commit." in one
777
+ case where "git commit" would have allowed you to commit, and this
778
+ improves it a little bit ("git commit --dry-run --short" still does
779
+ not give you the correct answer, for example). This is a stop-gap
780
+ measure in that "commit --short --dry-run" still gives an incorrect
781
+ result.
782
783
Will merge to 'master'.
784
785
700
-* lp/typofixes (2016-05-06) 1 commit
701
- (merged to 'next' on 2016-05-09 at 59683be)
702
- + typofix: assorted typofixes in comments, documentation and messages
703
-
704
- Will merge to 'master'.
705
-
786
+* tb/core-eol-fix (2016-04-25) 4 commits
787
+ (merged to 'next' on 2016-05-10 at fa8a200)
788
+ + convert.c: ident + core.autocrlf didn't work
789
+ + t0027: test cases for combined attributes
790
+ + convert: allow core.autocrlf=input and core.eol=crlf
791
+ + t0027: make commit_chk_wrnNNO() reliable
792
707
-* sb/z-is-gnutar-ism (2016-05-09) 2 commits
708
- (merged to 'next' on 2016-05-09 at 51d527d)
709
- + t6041: do not compress backup tar file
710
- + t3513: do not compress backup tar file
793
+ A couple of bugs around core.autocrlf have been fixed.
794
795
Will merge to 'master'.
796
@@ -728,7 +811,8 @@ of the repositories listed at
811
812
813
* jc/doc-lint (2016-05-10) 1 commit
731
- - ci: validate "linkgit:" in documentation
814
+ (merged to 'next' on 2016-05-17 at 9032aa5)
815
+ + ci: validate "linkgit:" in documentation
816
817
Find common mistakes when writing gitlink: in our documentation and
818
drive the check from "make check-docs".
@@ -738,7 +822,7 @@ of the repositories listed at
822
let's move it forward and have the logic improved later when people
823
care about it deeply.
824
741
- Will merge to 'next'.
825
+ Will merge to 'master'.
826
827
828
* jk/push-client-deadlock-fix (2016-05-11) 2 commits
@@ -753,19 +837,6 @@ of the repositories listed at
837
Will merge to 'master'.
838
839
756
-* ab/hooks (2016-05-04) 4 commits
757
- (merged to 'next' on 2016-05-09 at 23cf808)
758
- + hooks: allow customizing where the hook directory is
759
- + githooks.txt: minor improvements to the grammar & phrasing
760
- + githooks.txt: amend dangerous advice about 'update' hook ACL
761
- + githooks.txt: improve the intro section
762
-
763
- A new configuration variable core.hooksPath allows customizing
764
- where the hook directory is.
765
-
766
- Will merge to 'master'.
767
-
768
-
840
* mh/split-under-lock (2016-05-13) 33 commits
841
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
842
- commit_ref_update(): remove the flags parameter
@@ -808,46 +879,6 @@ of the repositories listed at
879
then merge to 'next'.
880
881
811
-* bn/http-cookiefile-config (2016-05-04) 2 commits
812
- (merged to 'next' on 2016-05-09 at d519b13)
813
- + http: expand http.cookieFile as a path
814
- + Documentation: config: improve word ordering for http.cookieFile
815
-
816
- "http.cookieFile" configuration variable clearly wants a pathname,
817
- but we forgot to treat it as such by e.g. applying tilde expansion.
818
-
819
- Will merge to 'master'.
820
-
821
-
822
-* jc/config-pathname-type (2016-05-04) 1 commit
823
- (merged to 'next' on 2016-05-09 at 0876e55)
824
- + config: describe 'pathname' value type
825
- (this branch is used by bn/config-doc-tt-varnames.)
826
-
827
- Consolidate description of tilde-expansion that is done to
828
- configuration variables that take pathname to a single place.
829
-
830
- Will merge to 'master'.
831
-
832
-
833
-* jk/submodule-c-credential (2016-05-06) 6 commits
834
- (merged to 'next' on 2016-05-10 at 4abe871)
835
- + submodule: stop sanitizing config options
836
- + submodule: use prepare_submodule_repo_env consistently
837
- + submodule--helper: move config-sanitizing to submodule.c
838
- + submodule: export sanitized GIT_CONFIG_PARAMETERS
839
- + t5550: break submodule config test into multiple sub-tests
840
- + t5550: fix typo in $HTTPD_URL
841
- (this branch is used by js/http-custom-headers.)
842
-
843
- An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
844
- submodule honor -c credential.* from command line, 2016-02-29)
845
- turned out to be a convoluted no-op; implement what it wanted to do
846
- correctly, and stop filtering settings given via "git -c var=val".
847
-
848
- Will merge to 'master'.
849
-
850
-
882
* mh/connect-leak (2016-04-28) 1 commit
883
- git_connect(): fix memory leak with CONNECT_DIAG_URL
884
@@ -909,49 +940,6 @@ of the repositories listed at
940
Will merge to 'master'.
941
942
912
-* jc/fsck-nul-in-commit (2016-05-10) 2 commits
913
- (merged to 'next' on 2016-05-10 at 3bc3ca3)
914
- + fsck: detect and warn a commit with embedded NUL
915
- + fsck_commit_buffer(): do not special case the last validation
916
-
917
- "git fsck" learned to catch NUL byte in a commit object as
918
- potential error and warn.
919
-
920
- Will merge to 'master'.
921
-
922
-
923
-* jc/ll-merge-internal (2016-05-09) 3 commits
924
- (merged to 'next' on 2016-05-10 at a6bf1d0)
925
- + t6036: remove pointless test that expects failure
926
- + ll-merge: use a longer conflict marker for internal merge
927
- + ll-merge: fix typo in comment
928
-
929
- "git rerere" can get confused by conflict markers deliberately left
930
- by the inner merge step, because they are indistinguishable from
931
- the real conflict markers left by the outermost merge which are
932
- what the end user and "rerere" need to look at. This was fixed by
933
- making the conflict markers left by the inner merges a bit longer.
934
-
935
- Will merge to 'master'.
936
-
937
-
938
-* sb/submodule-init (2016-05-03) 7 commits
939
- (merged to 'next' on 2016-05-03 at 8a5fce4)
940
- + submodule init: redirect stdout to stderr
941
- (merged to 'next' on 2016-04-29 at 3e81ee88)
942
- + submodule--helper update-clone: abort gracefully on missing .gitmodules
943
- + submodule init: fail gracefully with a missing .gitmodules file
944
- (merged to 'next' on 2016-04-27 at afaad81)
945
- + submodule: port init from shell to C
946
- + submodule: port resolve_relative_url from shell to C
947
- + Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init
948
- + Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init
949
-
950
- Update of "git submodule" to move pieces of logic to C continues.
951
-
952
- Will cook for a bit more in 'next'.
953
-
954
-
943
* jc/send-email-skip-backup (2016-04-12) 1 commit
944
- send-email: detect and offer to skip backup files
945
@@ -964,26 +952,7 @@ of the repositories listed at
952
Needs review.
953
954
967
-* va/i18n-misc-updates (2016-05-12) 10 commits
968
- (merged to 'next' on 2016-05-13 at 0361b16)
969
- + i18n: unpack-trees: avoid substituting only a verb in sentences
970
- (merged to 'next' on 2016-05-10 at b5dbd0d)
971
- + i18n: builtin/pull.c: split strings marked for translation
972
- + i18n: builtin/pull.c: mark placeholders for translation
973
- + i18n: git-parse-remote.sh: mark strings for translation
974
- + i18n: branch: move comment for translators
975
- + i18n: branch: unmark string for translation
976
- + i18n: builtin/rm.c: remove a comma ',' from string
977
- + i18n: unpack-trees: mark strings for translation
978
- + i18n: builtin/branch.c: mark option for translation
979
- + i18n: index-pack: use plural string instead of normal one
980
-
981
- Mark several messages for translation.
982
-
983
- Will merge to 'master'.
984
-
985
-
986
-* kn/ref-filter-branch-list (2016-04-25) 17 commits
955
+* kn/ref-filter-branch-list (2016-05-17) 17 commits
956
- branch: implement '--format' option
957
- branch: use ref-filter printing APIs
958
- branch, tag: use porcelain output
@@ -1005,6 +974,7 @@ of the repositories listed at
974
The code to list branches in "git branch" has been consolidated
975
with the more generic ref-filter API.
976
977
+ Rerolled.
978
Needs review.
979
980
@@ -1077,7 +1047,6 @@ of the repositories listed at
1047
which needs to be fixed before this final step can proceed.
1048
($gmane/282594)
1049
1080
-
1050
--------------------------------------------------
1051
[Discarded]
1052
@@ -1085,5 +1054,3 @@ of the repositories listed at
1054
. diff: enable "compaction heuristics" and lose experimentation knob
1055
1056
Superseded by the tip commit on the jk/diff-compact-heuristic topic.
1088
-
1089
-