What's cooking (2016/06 #10)
Junio C Hamano committed
Jun 29, 2016 at 16:21 UTC
b086292834a2b1c1207d2293dc4c66bd50cddcb0
1 file changed
+397
-447
whats-cooking.txt
+397
-447
@@ -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, #09; Mon, 27)
3
+Subject: What's cooking in git.git (Jun 2016, #10; Wed, 29)
4
X-master-at: cf4c2cfe52be5bd973a4838f73a35d3959ce2f43
5
-X-next-at: 760e8615f44f1ce38bfde1e76620c8f8fb1bd5c2
5
+X-next-at: 9717e00580637967d08d52f0b50bbe27721a2120
6
7
-What's cooking in git.git (Jun 2016, #09; Mon, 27)
7
+What's cooking in git.git (Jun 2016, #10; Wed, 29)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +12,8 @@ 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 first batch for this cycle has been merged to 'master', the tip
16
-of 'next' has been rewound and rebuilt, while a few topics got
17
-temporarily ejected from 'next'.
15
+The first few batches for this cycle has been merged to 'master',
16
+and new topics are trickling into 'next'.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -22,311 +21,150 @@ of the repositories listed at
21
http://git-blame.blogspot.com/p/git-public-repositories.html
22
23
--------------------------------------------------
25
-[Graduated to "master"]
26
-
27
-* ap/git-svn-propset-doc (2016-06-15) 1 commit
28
- (merged to 'next' on 2016-06-22 at 5a34f7d)
29
- + git-svn: document the 'git svn propset' command
30
-
31
- "git svn propset" subcommand that was added in 2.3 days is
32
- documented now.
33
-
34
-
35
-* cc/apply-introduce-state (2016-06-06) 50 commits
36
- (merged to 'next' on 2016-06-20 at 4f205b8)
37
- + builtin/apply: remove misleading comment on lock_file field
38
- + builtin/apply: move 'newfd' global into 'struct apply_state'
39
- + builtin/apply: add 'lock_file' pointer into 'struct apply_state'
40
- + builtin/apply: move applying patches into apply_all_patches()
41
- + builtin/apply: move 'state' check into check_apply_state()
42
- + builtin/apply: move 'symlink_changes' global into 'struct apply_state'
43
- + builtin/apply: move 'fn_table' global into 'struct apply_state'
44
- + builtin/apply: move 'state_linenr' global into 'struct apply_state'
45
- + builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
46
- + builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
47
- + builtin/apply: move 'ws_error_action' into 'struct apply_state'
48
- + builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
49
- + builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
50
- + builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
51
- + builtin/apply: move 'whitespace_option' into 'struct apply_state'
52
- + builtin/apply: move 'whitespace_error' global into 'struct apply_state'
53
- + builtin/apply: move 'root' global into 'struct apply_state'
54
- + builtin/apply: move 'p_value_known' global into 'struct apply_state'
55
- + builtin/apply: move 'p_value' global into 'struct apply_state'
56
- + builtin/apply: move 'has_include' global into 'struct apply_state'
57
- + builtin/apply: move 'limit_by_name' global into 'struct apply_state'
58
- + builtin/apply: move 'patch_input_file' global into 'struct apply_state'
59
- + builtin/apply: move 'apply' global into 'struct apply_state'
60
- + builtin/apply: move 'p_context' global into 'struct apply_state'
61
- + builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
62
- + builtin/apply: move 'line_termination' global into 'struct apply_state'
63
- + builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
64
- + builtin/apply: move 'no_add' global into 'struct apply_state'
65
- + builtin/apply: move 'threeway' global into 'struct apply_state'
66
- + builtin/apply: move 'summary' global into 'struct apply_state'
67
- + builtin/apply: move 'numstat' global into 'struct apply_state'
68
- + builtin/apply: move 'diffstat' global into 'struct apply_state'
69
- + builtin/apply: move 'cached' global into 'struct apply_state'
70
- + builtin/apply: move 'allow_overlap' global into 'struct apply_state'
71
- + builtin/apply: move 'update_index' global into 'struct apply_state'
72
- + builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
73
- + builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
74
- + builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
75
- + builtin/apply: move 'check_index' global into 'struct apply_state'
76
- + builtin/apply: move 'check' global into 'struct apply_state'
77
- + builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
78
- + builtin/apply: move 'state' init into init_apply_state()
79
- + builtin/apply: introduce 'struct apply_state' to start libifying
80
- + builtin/apply: move 'read_stdin' global into cmd_apply()
81
- + builtin/apply: move 'options' variable into cmd_apply()
82
- + builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
83
- + builtin/apply: avoid local variable shadowing 'len' parameter
84
- + builtin/apply: avoid parameter shadowing 'linenr' global
85
- + builtin/apply: avoid parameter shadowing 'p_value' global
86
- + builtin/apply: make gitdiff_verify_name() return void
87
-
88
- Originally merged to 'next' on 2016-06-06
89
-
90
- The "git apply" standalone program is being libified; this is the
91
- first step to move many state variables into a structure that can
92
- be explicitly (re)initialized to make the machinery callable more
93
- than once.
94
-
95
- The next step that moves some remaining state variables into the
96
- structure and turns die()s into an error return that propagates up
97
- to the caller is not queued yet but in flight. It would be good to
98
- review the above first and give the remainder of the series a solid
99
- base to build on.
100
-
101
-
102
-* dn/gpg-doc (2016-06-16) 1 commit
103
- (merged to 'next' on 2016-06-22 at f467355)
104
- + Documentation: GPG capitalization
105
-
106
- The documentation tries to consistently spell "GPG"; when
107
- referring to the specific program name, "gpg" is used.
108
-
109
-
110
-* em/newer-freebsd-shells-are-fine-with-returns (2016-06-17) 1 commit
111
- (merged to 'next' on 2016-06-22 at dbee33c)
112
- + rebase: update comment about FreeBSD /bin/sh
113
-
114
- Comments about misbehaving FreeBSD shells have been clarified with
115
- the version number (9.x and before are broken, newer ones are OK).
116
-
117
-
118
-* et/add-chmod-x (2016-06-07) 1 commit
119
- (merged to 'next' on 2016-06-22 at 71d65a0)
120
- + add: add --chmod=+x / --chmod=-x options
121
-
122
- "git update-index --add --chmod=+x file" may be usable as an escape
123
- hatch, but not a friendly thing to force for people who do need to
124
- use it regularly. "git add --chmod=+x file" can be used instead.
125
-
126
-
127
-* jc/deref-tag (2016-06-14) 1 commit
128
- (merged to 'next' on 2016-06-22 at 1075713)
129
- + blame, line-log: do not loop around deref_tag()
130
-
131
- Code clean-up.
132
-
133
-
134
-* jk/avoid-unbounded-alloca (2016-06-07) 1 commit
135
- (merged to 'next' on 2016-06-22 at 93feb23)
136
- + tree-diff: avoid alloca for large allocations
137
-
138
- A codepath that used alloca(3) to place an unbounded amount of data
139
- on the stack has been updated to avoid doing so.
140
-
141
-
142
-* jk/fetch-prune-doc (2016-06-14) 1 commit
143
- (merged to 'next' on 2016-06-22 at 6563376)
144
- + fetch: document that pruning happens before fetching
145
-
146
- Minor doc update.
147
-
148
-
149
-* lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
150
- (merged to 'next' on 2016-06-22 at 92162f5)
151
- + receive-pack: send auto-gc output over sideband 2
152
-
153
- Messages that are generated by auto gc during "git push" on the
154
- receiving end are now passed back to the sending end in such a way
155
- that they are shown with "remote: " prefix to avoid confusing the
156
- users.
157
-
158
-
159
-* lv/status-say-working-tree-not-directory (2016-06-09) 1 commit
160
- (merged to 'next' on 2016-06-22 at c65c7c1)
161
- + Use "working tree" instead of "working directory" for git status
162
-
163
- "git status" used to say "working directory" when it meant "working
164
- tree".
165
-
166
-
167
-* mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
168
- (merged to 'next' on 2016-06-22 at 183295b)
169
- + cherry-pick: allow to pick to unborn branches
170
-
171
- "git cherry-pick A" worked on an unborn branch, but "git
172
- cherry-pick A..B" didn't.
173
-
174
-
175
-* nb/gnome-keyring-build (2016-06-14) 1 commit
176
- (merged to 'next' on 2016-06-22 at 0dfb90c)
177
- + gnome-keyring: Don't hard-code pkg-config executable
178
-
179
- Build improvements for gnome-keyring (in contrib/)
180
-
181
-
182
-* pb/strbuf-read-file-doc (2016-06-14) 1 commit
183
- (merged to 'next' on 2016-06-22 at 10e4b4f)
184
- + strbuf: describe the return value of strbuf_read_file
185
-
186
- Minor doc update.
187
-
188
-
189
-* pc/occurred (2016-06-10) 2 commits
190
- (merged to 'next' on 2016-06-22 at ce0b944)
191
- + config.c: fix misspelt "occurred" in an error message
192
- + refs.h: fix misspelt "occurred" in a comment
193
-
194
- Typofix.
195
-
196
-
197
-* rj/compat-regex-size-max-fix (2016-06-06) 1 commit
198
- (merged to 'next' on 2016-06-22 at 376c5b1)
199
- + regex: fix a SIZE_MAX macro redefinition warning
200
-
201
- A compilation fix.
202
-
203
-
204
-* sg/reflog-past-root (2016-06-06) 1 commit
205
- (merged to 'next' on 2016-06-22 at c5d4e29)
206
- + reflog: continue walking the reflog past root commits
207
-
208
- "git reflog" stopped upon seeing an entry that denotes a branch
209
- creation event (aka "unborn"), which made it appear as if the
210
- reflog was truncated.
211
-
212
-
213
-* tb/complete-status (2016-06-10) 3 commits
214
- (merged to 'next' on 2016-06-22 at 44ae68f)
215
- + completion: add git status
216
- + completion: add __git_get_option_value helper
217
- + completion: factor out untracked file modes into a variable
24
+[New Topics]
25
219
- The completion script (in contrib/) learned to complete "git
220
- status" options.
26
+* cc/apply-am (2016-06-28) 41 commits
27
+ - apply: use error_errno() where possible
28
+ - builtin/am: use apply api in run_apply()
29
+ - apply: change error_routine when be_silent is set
30
+ - usage: add get_error_routine() and get_warn_routine()
31
+ - usage: add set_warn_routine()
32
+ - apply: don't print on stdout when be_silent is set
33
+ - apply: make 'be_silent' incompatible with 'apply_verbosely'
34
+ - apply: add 'be_silent' variable to 'struct apply_state'
35
+ - write_or_die: use warning() instead of fprintf(stderr, ...)
36
+ - environment: add set_index_file()
37
+ - apply: make some parsing functions static again
38
+ - apply: move libified code from builtin/apply.c to apply.{c,h}
39
+ - apply: rename and move opt constants to apply.h
40
+ - builtin/apply: rename option parsing functions
41
+ - builtin/apply: make create_one_file() return -1 on error
42
+ - builtin/apply: make try_create_file() return -1 on error
43
+ - builtin/apply: make write_out_results() return -1 on error
44
+ - builtin/apply: make write_out_one_result() return -1 on error
45
+ - builtin/apply: make create_file() return -1 on error
46
+ - builtin/apply: make add_index_file() return -1 on error
47
+ - builtin/apply: make add_conflicted_stages_file() return -1 on error
48
+ - builtin/apply: make remove_file() return -1 on error
49
+ - builtin/apply: make build_fake_ancestor() return -1 on error
50
+ - builtin/apply: change die_on_unsafe_path() to check_unsafe_path()
51
+ - builtin/apply: make gitdiff_*() return -1 on error
52
+ - builtin/apply: make gitdiff_*() return 1 at end of header
53
+ - builtin/apply: make parse_traditional_patch() return -1 on error
54
+ - builtin/apply: make apply_all_patches() return 128 or 1 on error
55
+ - builtin/apply: move check_apply_state() to apply.c
56
+ - builtin/apply: make check_apply_state() return -1 instead of die()ing
57
+ - apply: make init_apply_state() return -1 instead of exit()ing
58
+ - builtin/apply: move init_apply_state() to apply.c
59
+ - builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ing
60
+ - builtin/apply: make parse_whitespace_option() return -1 instead of die()ing
61
+ - builtin/apply: make parse_single_patch() return -1 on error
62
+ - builtin/apply: make parse_chunk() return a negative integer on error
63
+ - builtin/apply: make find_header() return -128 instead of die()ing
64
+ - builtin/apply: read_patch_file() return -1 instead of die()ing
65
+ - builtin/apply: make apply_patch() return -1 or -128 instead of die()ing
66
+ - apply: move 'struct apply_state' to apply.h
67
+ - apply: make some names more specific
68
+
69
+ "git am" has been taught to make an internal call to "git apply"'s
70
+ innards without spawning the latter as a separate process.
71
72
+ Needs review.
73
223
-* tr/doc-tt (2016-06-08) 4 commits
224
- (merged to 'next' on 2016-06-22 at dc6df3b)
225
- + doc: change configuration variables format
226
- + doc: more consistency in environment variables format
227
- + doc: change environment variables format
228
- + doc: clearer rule about formatting literals
74
230
- The documentation set has been updated so that literal commands,
231
- configuration variables and environment variables are consistently
232
- typeset in fixed-width font and bold in manpages.
75
+* dp/autoconf-curl-ssl (2016-06-28) 1 commit
76
+ - ./configure.ac: detect SSL in libcurl using curl-config
77
78
+ The ./configure script generated from configure.ac was taught how
79
+ to detect support of SSL by libcurl better.
80
235
-* vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
236
- (merged to 'next' on 2016-06-22 at 8bf21d3)
237
- + git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
81
+ Needs review.
82
239
- The git-prompt scriptlet (in contrib/) was not friendly with those
240
- who uses "set -u", which has been fixed.
83
242
---------------------------------------------------
243
-[New Topics]
84
+* js/color-on-windows-comment (2016-06-28) 1 commit
85
+ (merged to 'next' on 2016-06-28 at 38a2ea1)
86
+ + color.h: remove obsolete comment about limitations on Windows
87
245
-* jk/test-match-signal (2016-06-24) 4 commits
246
- - t/lib-git-daemon: use test_match_signal
247
- - test_must_fail: use test_match_signal
248
- - t0005: use test_match_signal as appropriate
249
- - tests: factor portable signal check out of t0005
88
+ For a long time, we carried an in-code comment that said our
89
+ colored output would work only when we use fprintf/fputs on
90
+ Windows, which no longer is the case for the past few years.
91
251
- The test framework learned a new helper test_match_signal to check
252
- an exit code from getting killed by an expected signal.
92
+ Will merge to 'master'.
93
254
- Will merge to 'next'.
94
95
+* js/sign-empty-commit-fix (2016-06-29) 1 commit
96
+ - commit -S: avoid invalid pointer with empty message
97
257
-* ah/unpack-trees-advice-messages (2016-06-27) 1 commit
258
- - unpack-trees: fix English grammar in do-this-before-that messages
98
+ "git commit --amend --allow-empty-message -S" for a commit without
99
+ any message body could have misidentified where the header of the
100
+ commit object ends.
101
102
Will merge to 'next'.
103
104
263
-* ew/gc-auto-pack-limit-fix (2016-06-27) 1 commit
264
- - gc: fix off-by-one error with gc.autoPackLimit
265
-
266
- "gc.autoPackLimit" when set to 1 should not trigger a repacking
267
- when there is only one pack, but the code counted poorly and did
268
- so.
105
+* js/t3404-grammo-fix (2016-06-29) 1 commit
106
+ - t3404: fix a grammo (commands are ran -> commands are run)
107
108
Will merge to 'next'.
109
110
273
-* nd/connect-ssh-command-config (2016-06-27) 1 commit
274
- - connect: read $GIT_SSH_COMMAND from config file
111
+* ls/p4-tmp-refs (2016-06-29) 1 commit
112
+ - git-p4: place temporary refs used for branch import under refs/git-p4-tmp
113
276
- A new configuration variable core.sshCommand to specify what value
277
- for GIT_SSH_COMMAND to use per repository.
114
+ "git p4" used a location outside $GIT_DIR/refs/ to place its
115
+ temporary branches, which has been moved to refs/git-p4-tmp/.
116
117
+ Needs an ack from "git p4" experts.
118
280
-* nd/doc-new-command (2016-06-27) 1 commit
281
- - new-command.txt: correct the command description file
119
283
- Will merge to 'next'.
120
+* jc/pull-rebase-ff (2016-06-29) 1 commit
121
+ - pull: fast-forward "pull --rebase=true"
122
123
+ "git pull --rebase", when there is no new commits on our side since
124
+ we forked from the upstream, should be able to fast-forward without
125
+ invoking "git rebase", but it didn't.
126
286
-* po/range-doc (2016-06-27) 3 commits
287
- - doc: give headings for the two and three dot notations
288
- - doc: show the actual left, right, and boundary marks
289
- - doc: use 'symmetric difference' consistently
127
+ Needs a real log message and a few tests.
128
129
292
-* sb/submodule-parallel-fetch (2016-06-27) 2 commits
293
- - xwrite: poll on non-blocking FDs
294
- - xread: retry after poll on EAGAIN/EWOULDBLOCK
130
+* ps/rebase-i-auto-unstash-upon-abort (2016-06-29) 1 commit
131
+ - rebase -i: restore autostash on abort
132
296
- Fix a recently introduced codepaths that are involved in parallel
297
- submodule operations, which gave up on reading too early, and
298
- could have wasted CPU while attempting to write under a corner case
299
- condition.
133
+ "git rebase -i --autostash" did not restore the auto-stashed change
134
+ when the operation was aborted.
135
136
Will merge to 'next'.
137
138
+--------------------------------------------------
139
+[Stalled]
140
304
-* mm/doc-tt (2016-06-27) 6 commits
305
- - doc: typeset HEAD and variants as litteral
306
- - CodingGuidelines: formatting HEAD in documentation
307
- - doc: typeset long options with argument as litteral
308
- - doc: typeset -- as litteral
309
- - doc: typeset long command-line options as literal
310
- - doc: typeset short command-line options as literal
141
+* jh/clean-smudge-annex (2016-06-22) 10 commits
142
+ - SQUASH???
143
+ - use smudgeToFile filter in recursive merge
144
+ - use smudgeToFile filter in git am
145
+ - better recovery from failure of smudgeToFile filter
146
+ - warn on unusable smudgeToFile/cleanFromFile config
147
+ - use smudgeToFile in git checkout etc
148
+ - use cleanFromFile in git add
149
+ - add smudgeToFile and cleanFromFile filter configs
150
+ - clarify %f documentation
151
+ - Merge branch 'tb/convert-peek-in-index' into jh/clean-smudge-annex
152
+ (this branch uses tb/convert-peek-in-index.)
153
312
- More mark-up updates to typeset strings that are expected to
313
- literally typed by the end user in fixed-width font.
154
+ The interface to "clean/smudge" filters require Git to feed the
155
+ whole contents via pipe, which is suboptimal for some
156
+ applications. "cleanFromFile/smudgeToFile" commands are the moral
157
+ equilvalents for these filters but they interact with the files on
158
+ the filesystem directly.
159
160
316
-* nd/fetch-ref-summary (2016-06-27) 5 commits
317
- - fetch: reduce duplicate in ref update status lines with placeholder
318
- - fetch: align all "remote -> local" output
319
- - fetch: change flag code for displaying tag update and deleted ref
320
- - fetch: refactor ref update status formatting code
321
- - git-fetch.txt: document fetch output
161
+* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
162
+ - blame: require 0 context lines while finding moved lines with -M
163
323
- Improve the look of the way "git fetch" reports what happened to
324
- each ref that was fetched.
164
+ "git blame -M" missed a single line that was moved within the file.
165
326
- Still being discussed.
166
+ We may want to squash a test or two to this commit. Volunteers?
167
328
---------------------------------------------------
329
-[Stalled]
168
169
* tb/convert-peek-in-index (2016-06-07) 3 commits
170
- correct ce_compare_data() in a middle of a merge
@@ -404,14 +242,6 @@ of the repositories listed at
242
Waiting for review.
243
244
407
-* dg/subtree-rebase-test (2016-01-19) 1 commit
408
- - contrib/subtree: Add a test for subtree rebase that loses commits
409
-
410
- Reviewed up to v5.
411
- Will be rerolled.
412
- ($gmane/284426)
413
-
414
-
245
* dk/gc-more-wo-pack (2016-01-13) 4 commits
246
- gc: clean garbage .bitmap files from pack dir
247
- t5304: ensure non-garbage files are not deleted
@@ -443,75 +273,186 @@ of the repositories listed at
273
--------------------------------------------------
274
[Cooking]
275
276
+* dg/subtree-rebase-test (2016-06-28) 1 commit
277
+ - contrib/subtree: Add a test for subtree rebase that loses commits
278
+
279
+ This is just a test to specify the desired behaviour that currently
280
+ is not available.
281
+
282
+ Will merge to 'next'.
283
+
284
+
285
+* jk/test-match-signal (2016-06-24) 4 commits
286
+ - t/lib-git-daemon: use test_match_signal
287
+ - test_must_fail: use test_match_signal
288
+ - t0005: use test_match_signal as appropriate
289
+ - tests: factor portable signal check out of t0005
290
+
291
+ The test framework learned a new helper test_match_signal to check
292
+ an exit code from getting killed by an expected signal.
293
+
294
+ HOLD
295
+ ($gmane/298523)
296
+
297
+
298
+* ah/unpack-trees-advice-messages (2016-06-27) 1 commit
299
+ - unpack-trees: fix English grammar in do-this-before-that messages
300
+
301
+ Will merge to 'next'.
302
+
303
+
304
+* ew/gc-auto-pack-limit-fix (2016-06-27) 1 commit
305
+ - gc: fix off-by-one error with gc.autoPackLimit
306
+
307
+ "gc.autoPackLimit" when set to 1 should not trigger a repacking
308
+ when there is only one pack, but the code counted poorly and did
309
+ so.
310
+
311
+ Will merge to 'next'.
312
+
313
+
314
+* nd/connect-ssh-command-config (2016-06-28) 2 commits
315
+ - SQUASH???
316
+ - connect: read $GIT_SSH_COMMAND from config file
317
+
318
+ A new configuration variable core.sshCommand to specify what value
319
+ for GIT_SSH_COMMAND to use per repository.
320
+
321
+ Is everybody happy with the SQUASH???
322
+ If so will merge to 'next'.
323
+
324
+
325
+* nd/doc-new-command (2016-06-27) 1 commit
326
+ - new-command.txt: correct the command description file
327
+
328
+ Will merge to 'next'.
329
+
330
+
331
+* po/range-doc (2016-06-27) 3 commits
332
+ - doc: give headings for the two and three dot notations
333
+ - doc: show the actual left, right, and boundary marks
334
+ - doc: use 'symmetric difference' consistently
335
+
336
+ Expecting a reroll.
337
+
338
+
339
+* sb/submodule-parallel-fetch (2016-06-27) 2 commits
340
+ - xwrite: poll on non-blocking FDs
341
+ - xread: retry after poll on EAGAIN/EWOULDBLOCK
342
+
343
+ Fix a recently introduced codepaths that are involved in parallel
344
+ submodule operations, which gave up on reading too early, and
345
+ could have wasted CPU while attempting to write under a corner case
346
+ condition.
347
+
348
+ Will merge to 'next'.
349
+
350
+
351
+* mm/doc-tt (2016-06-28) 7 commits
352
+ - doc: typeset HEAD and variants as literal
353
+ - CodingGuidelines: formatting HEAD in documentation
354
+ - doc: typeset long options with argument as literal
355
+ - doc: typeset '--' as literal
356
+ - doc: typeset long command-line options as literal
357
+ - doc: typeset short command-line options as literal
358
+ - Documentation/git-mv.txt: fix whitespace indentation
359
+
360
+ More mark-up updates to typeset strings that are expected to
361
+ literally typed by the end user in fixed-width font.
362
+
363
+ Will merge to 'next'.
364
+
365
+
366
+* nd/fetch-ref-summary (2016-06-27) 5 commits
367
+ - fetch: reduce duplicate in ref update status lines with placeholder
368
+ - fetch: align all "remote -> local" output
369
+ - fetch: change flag code for displaying tag update and deleted ref
370
+ - fetch: refactor ref update status formatting code
371
+ - git-fetch.txt: document fetch output
372
+
373
+ Improve the look of the way "git fetch" reports what happened to
374
+ each ref that was fetched.
375
+
376
+ Still being discussed.
377
+
378
+
379
* ak/t7800-wo-readlink (2016-06-21) 1 commit
447
- - t7800: readlink may not be available
380
+ (merged to 'next' on 2016-06-28 at 403bbbb)
381
+ + t7800: readlink may not be available
382
383
One among four invocations of readlink(1) in our test suite has
384
been rewritten so that the test can run on systems without the
385
command (others are in valgrind test framework and t9802).
386
453
- Will merge to 'next'.
387
+ Will merge to 'master'.
388
389
390
* js/perf-on-apple (2016-06-21) 1 commit
457
- - perf: accommodate for MacOSX
391
+ (merged to 'next' on 2016-06-28 at 83529b9)
392
+ + perf: accommodate for MacOSX
393
394
t/perf needs /usr/bin/time with GNU extension; the invocation of it
395
is updated to "gtime" on Darwin.
396
462
- Will merge to 'next'.
397
+ Will merge to 'master'.
398
399
400
* sb/t5614-modernize (2016-06-21) 1 commit
466
- - t5614: don't use subshells
401
+ (merged to 'next' on 2016-06-28 at ee05326)
402
+ + t5614: don't use subshells
403
(this branch uses sb/clone-shallow-passthru.)
404
405
Test clean-up.
406
471
- Will merge to 'next'.
407
+ Will merge to 'master'.
408
409
410
* ao/p4-has-branch-prefix-fix (2016-06-22) 1 commit
475
- - git-p4: correct hasBranchPrefix verbose output
411
+ (merged to 'next' on 2016-06-28 at 333f90d)
412
+ + git-p4: correct hasBranchPrefix verbose output
413
414
A bug, which caused "git p4" while running under verbose mode to
415
report paths that are omitted due to branch prefix incorrectly, has
416
been fixed; the command said "Ignoring file outside of prefix" for
417
paths that are _inside_.
418
482
- Will merge to 'next'.
419
+ Will merge to 'master'.
420
421
422
* cb/t7810-test-label-fix (2016-06-21) 1 commit
486
- - t7810: fix duplicated test title
423
+ (merged to 'next' on 2016-06-28 at 4d85a00)
424
+ + t7810: fix duplicated test title
425
426
Test clean-up.
427
490
- Will merge to 'next'.
428
+ Will merge to 'master'.
429
430
431
* jc/t2300-setup (2016-06-22) 1 commit
494
- - t2300: "git --exec-path" is not usable in $PATH on Windows as-is
432
+ (merged to 'next' on 2016-06-28 at 62b902a)
433
+ + t2300: "git --exec-path" is not usable in $PATH on Windows as-is
434
435
Portability fix for Windows.
436
498
- Will merge to 'next'.
437
+ Will merge to 'master'.
438
439
440
* jk/perf-any-version (2016-06-22) 2 commits
502
- - p4211: explicitly disable renames in no-rename test
503
- - t/perf: fix regression in testing older versions of git
441
+ (merged to 'next' on 2016-06-28 at 6a41c30)
442
+ + p4211: explicitly disable renames in no-rename test
443
+ + t/perf: fix regression in testing older versions of git
444
445
Allow t/perf framework to use the features from the most recent
446
version of Git even when testing an older installed version.
447
508
- Will merge to 'next'.
448
+ Will merge to 'master'.
449
450
451
* jn/preformatted-doc-url (2016-06-22) 1 commit
512
- - doc: git-htmldocs.googlecode.com is no more
452
+ (merged to 'next' on 2016-06-28 at 60a99eb)
453
+ + doc: git-htmldocs.googlecode.com is no more
454
514
- Will merge to 'next'.
455
+ Will merge to 'master'.
456
457
458
* ex/deprecate-empty-pathspec-as-match-all (2016-06-22) 1 commit
@@ -532,18 +473,19 @@ of the repositories listed at
473
474
475
* jk/ansi-color (2016-06-23) 7 commits
535
- - color: support strike-through attribute
536
- - color: support "italic" attribute
537
- - color: allow "no-" for negating attributes
538
- - color: refactor parse_attr
539
- - add skip_prefix_mem helper
540
- - doc: refactor description of color format
541
- - color: fix max-size comment
476
+ (merged to 'next' on 2016-06-28 at 354989c)
477
+ + color: support strike-through attribute
478
+ + color: support "italic" attribute
479
+ + color: allow "no-" for negating attributes
480
+ + color: refactor parse_attr
481
+ + add skip_prefix_mem helper
482
+ + doc: refactor description of color format
483
+ + color: fix max-size comment
484
485
The output coloring scheme learned two new attributes, italic and
486
strike, in addition to existing bold, reverse, etc.
487
546
- Will merge to 'next'.
488
+ Will merge to 'master'.
489
490
491
* nd/icase (2016-06-27) 13 commits
@@ -568,26 +510,28 @@ of the repositories listed at
510
511
512
* mj/log-show-signature-conf (2016-06-24) 3 commits
571
- - log: add log.showSignature configuration variable
572
- - log: add "--no-show-signature" command line option
573
- - t4202: refactor test
513
+ (merged to 'next' on 2016-06-28 at c8b3347)
514
+ + log: add log.showSignature configuration variable
515
+ + log: add "--no-show-signature" command line option
516
+ + t4202: refactor test
517
518
"git log" learns log.showSignature configuration variable, and a
519
command line option "--no-show-signature" to countermand it.
520
578
- Will merge to 'next'.
521
+ Will merge to 'master'.
522
523
524
* mg/signature-doc (2016-06-17) 4 commits
582
- - Documentation/technical: signed merge tag format
583
- - Documentation/technical: signed commit format
584
- - Documentation/technical: signed tag format
585
- - Documentation/technical: describe signature formats
525
+ (merged to 'next' on 2016-06-28 at 2732a37)
526
+ + Documentation/technical: signed merge tag format
527
+ + Documentation/technical: signed commit format
528
+ + Documentation/technical: signed tag format
529
+ + Documentation/technical: describe signature formats
530
531
Formats of the various data (and how to validate them) where we use
532
GPG signature have been documented.
533
590
- Will merge to 'next'.
534
+ Will merge to 'master'.
535
536
537
* jk/string-list-static-init (2016-06-13) 2 commits
@@ -648,7 +592,8 @@ of the repositories listed at
592
The ref-store abstraction was introduced to the refs API so that we
593
can plug in different backends to store references.
594
651
- Rebased on top of mh/split-under-lock.
595
+ Is everybody happy with this version?
596
+ If so, will merge to 'next'.
597
598
599
* mh/update-ref-errors (2016-06-20) 6 commits
@@ -663,40 +608,23 @@ of the repositories listed at
608
Error handling in the codepaths that updates refs has been
609
improved.
610
666
- Rebased on top of mh/split-under-lock.
667
-
668
-
669
-* jh/clean-smudge-annex (2016-06-22) 10 commits
670
- - SQUASH???
671
- - use smudgeToFile filter in recursive merge
672
- - use smudgeToFile filter in git am
673
- - better recovery from failure of smudgeToFile filter
674
- - warn on unusable smudgeToFile/cleanFromFile config
675
- - use smudgeToFile in git checkout etc
676
- - use cleanFromFile in git add
677
- - add smudgeToFile and cleanFromFile filter configs
678
- - clarify %f documentation
679
- - Merge branch 'tb/convert-peek-in-index' into jh/clean-smudge-annex
680
- (this branch uses tb/convert-peek-in-index.)
681
-
682
- The interface to "clean/smudge" filters require Git to feed the
683
- whole contents via pipe, which is suboptimal for some
684
- applications. "cleanFromFile/smudgeToFile" commands are the moral
685
- equilvalents for these filters but they interact with the files on
686
- the filesystem directly.
611
+ Is everybody happy with this version?
612
+ If so, will merge to 'next'.
613
614
615
* lc/shell-default-value-noexpand (2016-06-19) 1 commit
690
- - sh-setup: enclose setting of ${VAR=default} in double-quotes
616
+ (merged to 'next' on 2016-06-28 at 2dc7727)
617
+ + sh-setup: enclose setting of ${VAR=default} in double-quotes
618
619
Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
620
to set the default value, without enclosing it in double quotes.
621
695
- Will merge to 'next'.
622
+ Will merge to 'master'.
623
624
625
* sb/clone-shallow-passthru (2016-06-20) 1 commit
699
- - clone: do not let --depth imply --shallow-submodules
626
+ (merged to 'next' on 2016-06-28 at d515d7d)
627
+ + clone: do not let --depth imply --shallow-submodules
628
(this branch is used by sb/t5614-modernize.)
629
630
Fix an unintended regression in v2.9 that breaks "clone --depth"
@@ -704,22 +632,28 @@ of the repositories listed at
632
be cloned shallowly, which many server instances that host upstream
633
of the submodules are not prepared for.
634
707
- Will merge to 'next'.
635
+ Will merge to 'master'.
636
637
710
-* js/find-commit-subject-ignore-leading-blanks (2016-06-22) 2 commits
711
- - commit.c: make find_commit_subject() more robust
712
- - pretty: make the skip_blank_lines() function public
638
+* js/find-commit-subject-ignore-leading-blanks (2016-06-29) 5 commits
639
+ (merged to 'next' on 2016-06-29 at 9717e00)
640
+ + reset --hard: skip blank lines when reporting the commit subject
641
+ + sequencer: use skip_blank_lines() to find the commit subject
642
+ + commit -C: skip blank lines at the beginning of the message
643
+ (merged to 'next' on 2016-06-28 at 32bbd94)
644
+ + commit.c: make find_commit_subject() more robust
645
+ + pretty: make the skip_blank_lines() function public
646
647
A helper function that takes the contents of a commit object and
648
finds its subject line did not ignore leading blank lines, as is
649
commonly done by other codepaths. Make it ignore leading blank
650
lines to match.
651
719
- Will merge to 'next'.
652
+ Will merge to 'master'.
653
654
722
-* js/log-to-diffopt-file (2016-06-24) 10 commits
655
+* js/log-to-diffopt-file (2016-06-28) 11 commits
656
+ - diff: do not color output when --color=auto and --output=<file> is given
657
- t4211: ensure that log respects --output=<file>
658
- shortlog: respect the --output=<file> setting
659
- format-patch: use stdout directly
@@ -738,35 +672,44 @@ of the repositories listed at
672
codepaths have been updated to consistently write into that FILE*
673
instead.
674
675
+ Will merge to 'next'.
676
+
677
678
* js/mingw-parameter-less-c-functions (2016-06-20) 1 commit
743
- - mingw: let the build succeed with DEVELOPER=1
679
+ (merged to 'next' on 2016-06-28 at e673c65)
680
+ + mingw: let the build succeed with DEVELOPER=1
681
682
Some platform-specific code had non-ANSI strict declarations of C
683
functions that do not take any parameters, which has been
684
corrected.
685
749
- Will merge to 'next'.
686
+ Will merge to 'master'.
687
688
752
-* bc/cocci (2016-06-20) 8 commits
753
- - merge-recursive: convert merge_recursive_generic to object_id
689
+* bc/cocci (2016-06-28) 11 commits
690
+ - diff: convert prep_temp_blob() to struct object_id
691
+ - merge-recursive: convert merge_recursive_generic() to object_id
692
- merge-recursive: convert leaf functions to use struct object_id
693
- merge-recursive: convert struct merge_file_info to object_id
694
- merge-recursive: convert struct stage_data to use object_id
695
- diff: rename struct diff_filespec's sha1_valid member
696
- diff: convert struct diff_filespec to struct object_id
697
- coccinelle: apply object_id Coccinelle transformations
698
+ - coccinelle: convert hashcpy() with null_sha1 to hashclr()
699
- contrib/coccinelle: add basic Coccinelle transforms
700
+ - hex: add oid_to_hex_r()
701
702
Conversion from unsigned char sha1[20] to struct object_id
703
continues.
704
705
+ Needs review.
706
+
707
708
* jk/tzoffset-fix (2016-06-20) 3 commits
767
- - local_tzoffset: detect errors from tm_to_time_t
768
- - t0006: test various date formats
769
- - t0006: rename test-date's "show" to "relative"
709
+ (merged to 'next' on 2016-06-28 at 08ec8c5)
710
+ + local_tzoffset: detect errors from tm_to_time_t
711
+ + t0006: test various date formats
712
+ + t0006: rename test-date's "show" to "relative"
713
714
The internal code used to show local timezone offset is not
715
prepared to handle timestamps beyond year 2100, and gave a
@@ -774,7 +717,7 @@ of the repositories listed at
717
+0000 instead and let "git log" going in such a case, instead
718
of aborting.
719
777
- Will merge to 'next'.
720
+ Will merge to 'master'.
721
722
723
* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
@@ -801,13 +744,14 @@ of the repositories listed at
744
745
746
* jk/gpg-interface-cleanup (2016-06-17) 7 commits
804
- - gpg-interface: check gpg signature creation status
805
- - sign_buffer: use pipe_command
806
- - verify_signed_buffer: use pipe_command
807
- - run-command: add pipe_command helper
808
- - verify_signed_buffer: use tempfile object
809
- - verify_signed_buffer: drop pbuf variable
810
- - gpg-interface: use child_process.args
747
+ (merged to 'next' on 2016-06-28 at eed3498)
748
+ + gpg-interface: check gpg signature creation status
749
+ + sign_buffer: use pipe_command
750
+ + verify_signed_buffer: use pipe_command
751
+ + run-command: add pipe_command helper
752
+ + verify_signed_buffer: use tempfile object
753
+ + verify_signed_buffer: drop pbuf variable
754
+ + gpg-interface: use child_process.args
755
756
A new run-command API function pipe_command() is introduced to
757
sanely feed data to the standard input while capturing data from
@@ -818,7 +762,7 @@ of the repositories listed at
762
updated to use this API to read from the status-fd to check for
763
errors (instead of relying on GPG's exit status).
764
821
- Will merge to 'next'.
765
+ Will merge to 'master'.
766
767
768
* lf/sideband-returns-void (2016-06-16) 2 commits
@@ -832,8 +776,9 @@ of the repositories listed at
776
777
778
* nd/graph-width-padded (2016-06-16) 2 commits
835
- - pretty.c: support <direction>|(<negative number>) forms
836
- - pretty: pass graph width to pretty formatting for use in '%>|(N)'
779
+ (merged to 'next' on 2016-06-28 at 0f733ef)
780
+ + pretty.c: support <direction>|(<negative number>) forms
781
+ + pretty: pass graph width to pretty formatting for use in '%>|(N)'
782
783
"log --graph --format=" learned that "%>|(N)" specifies the width
784
relative to the terminal's left edge, not relative to the area to
@@ -841,7 +786,7 @@ of the repositories listed at
786
also now accepts negative N that means the column limit is relative
787
to the right border.
788
844
- Will merge to 'next'.
789
+ Will merge to 'master'.
790
791
792
* jk/bisect-show-tree (2016-06-16) 1 commit
@@ -869,26 +814,28 @@ of the repositories listed at
814
815
816
* jk/repack-keep-unreachable (2016-06-14) 3 commits
872
- - repack: extend --keep-unreachable to loose objects
873
- - repack: add --keep-unreachable option
874
- - repack: document --unpack-unreachable option
817
+ (merged to 'next' on 2016-06-28 at 802b849)
818
+ + repack: extend --keep-unreachable to loose objects
819
+ + repack: add --keep-unreachable option
820
+ + repack: document --unpack-unreachable option
821
822
"git repack" learned the "--keep-unreachable" option, which sends
823
loose unreachable objects to a pack instead of leaving them loose.
824
This helps heuristics based on the number of loose objects
825
(e.g. "gc --auto").
826
881
- Will merge to 'next'.
827
+ Will merge to 'master'.
828
829
884
-* lf/recv-sideband-cleanup (2016-06-13) 1 commit
830
+* lf/recv-sideband-cleanup (2016-06-29) 2 commits
831
+ - SQUASH???
832
- sideband.c: refactor recv_sideband()
833
887
- Code simplification. It however loses the atomicity of the output
888
- 9ac13ec9 (atomic write for sideband remote messages, 2006-10-11)
889
- tried to add to an once-much-simpler codebase.
834
+ Code simplification. It however seems to add unnecessary trailing
835
+ output in some cases.
836
891
- Expecting a reroll.
837
+ Queued with fixup from Nico.
838
+ Waiting for response from Lukas.
839
840
841
* nd/test-lib-httpd-show-error-log-in-verbose (2016-06-13) 1 commit
@@ -901,14 +848,15 @@ of the repositories listed at
848
849
850
* sb/submodule-clone-retry (2016-06-13) 2 commits
904
- - submodule update: continue when a clone fails
905
- - submodule--helper: initial clone learns retry logic
851
+ (merged to 'next' on 2016-06-28 at 8a86d54)
852
+ + submodule update: continue when a clone fails
853
+ + submodule--helper: initial clone learns retry logic
854
855
"git submodule update" that drives many "git clone" could
856
eventually hit flaky servers/network conditions on one of the
857
submodules; the command learned to retry the attempt.
858
911
- Will merge to 'next'.
859
+ Will merge to 'master'.
860
861
862
* jc/blame-reverse (2016-06-14) 2 commits
@@ -970,8 +918,9 @@ of the repositories listed at
918
"I am interested only in the recent N months worth of history" and
919
"Give me only the history since that version".
920
973
- Rerolled.
974
- Needs review. What this topic attempts to achieve is worthwhile, I
921
+ Needs review.
922
+
923
+ Rerolled. What this topic attempts to achieve is worthwhile, I
924
would think.
925
926
@@ -1030,19 +979,21 @@ of the repositories listed at
979
The API to iterate over all the refs (i.e. for_each_ref(), etc.)
980
has been revamped.
981
1033
- Rebased on top of mh/split-under-lock.
982
+ Is everybody happy with this version?
983
+ If so, will merge to 'next'.
984
985
986
* ew/mboxrd-format-am (2016-06-06) 3 commits
1037
- - am: support --patch-format=mboxrd
1038
- - mailsplit: support unescaping mboxrd messages
1039
- - pretty: support "mboxrd" output format
987
+ (merged to 'next' on 2016-06-28 at ee0a088)
988
+ + am: support --patch-format=mboxrd
989
+ + mailsplit: support unescaping mboxrd messages
990
+ + pretty: support "mboxrd" output format
991
992
Teach format-patch and mailsplit (hence "am") how a line that
993
happens to begin with "From " in the e-mail message is quoted with
994
">", so that these lines can be restored to their original shape.
995
1045
- Will merge to 'next'.
996
+ Will merge to 'master'.
997
998
999
* mh/connect (2016-06-06) 10 commits
@@ -1060,46 +1011,49 @@ of the repositories listed at
1011
Rewrite Git-URL parsing routine (hopefully) without changing any
1012
behaviour.
1013
1014
+ Comments?
1015
+
1016
1017
* va/i18n-even-more (2016-06-17) 38 commits
1065
- - i18n: branch: mark comment when editing branch description for translation
1066
- - i18n: unmark die messages for translation
1067
- - i18n: submodule: escape shell variables inside eval_gettext
1068
- - i18n: submodule: join strings marked for translation
1069
- - i18n: init-db: join message pieces
1070
- - i18n: remote: allow translations to reorder message
1071
- - i18n: remote: mark URL fallback text for translation
1072
- - i18n: standardise messages
1073
- - i18n: sequencer: add period to error message
1074
- - i18n: merge: change command option help to lowercase
1075
- - i18n: merge: mark messages for translation
1076
- - i18n: notes: mark options for translation
1077
- - i18n: notes: mark strings for translation
1078
- - i18n: transport-helper.c: change N_() call to _()
1079
- - i18n: bisect: mark strings for translation
1080
- - t5523: use test_i18ngrep for negation
1081
- - t4153: fix negated test_i18ngrep call
1082
- - t9003: become resilient to GETTEXT_POISON
1083
- - tests: unpack-trees: update to use test_i18n* functions
1084
- - tests: use test_i18n* functions to suppress false positives
1085
- - i18n: setup: mark strings for translation
1086
- - i18n: rebase-interactive: mark comments of squash for translation
1087
- - i18n: rebase-interactive: mark here-doc strings for translation
1088
- - i18n: rebase-interactive: mark strings for translation
1089
- - i18n: git-sh-setup.sh: mark strings for translation
1090
- - t6030: update to use test_i18ncmp
1091
- - i18n: bisect: simplify error message for i18n
1092
- - i18n: rebase: mark placeholder for translation
1093
- - i18n: rebase: fix marked string to use eval_gettext variant
1094
- - merge-octopus: use die shell function from git-sh-setup.sh
1095
- - i18n: merge-octopus: mark messages for translation
1096
- - i18n: sequencer: mark string for translation
1097
- - i18n: sequencer: mark entire sentences for translation
1098
- - i18n: transport: mark strings for translation
1099
- - i18n: advice: internationalize message for conflicts
1100
- - i18n: advice: mark string about detached head for translation
1101
- - i18n: builtin/remote.c: fix mark for translation
1102
- - Merge branch 'jc/t2300-setup' into HEAD
1018
+ (merged to 'next' on 2016-06-28 at 5919dfa)
1019
+ + i18n: branch: mark comment when editing branch description for translation
1020
+ + i18n: unmark die messages for translation
1021
+ + i18n: submodule: escape shell variables inside eval_gettext
1022
+ + i18n: submodule: join strings marked for translation
1023
+ + i18n: init-db: join message pieces
1024
+ + i18n: remote: allow translations to reorder message
1025
+ + i18n: remote: mark URL fallback text for translation
1026
+ + i18n: standardise messages
1027
+ + i18n: sequencer: add period to error message
1028
+ + i18n: merge: change command option help to lowercase
1029
+ + i18n: merge: mark messages for translation
1030
+ + i18n: notes: mark options for translation
1031
+ + i18n: notes: mark strings for translation
1032
+ + i18n: transport-helper.c: change N_() call to _()
1033
+ + i18n: bisect: mark strings for translation
1034
+ + t5523: use test_i18ngrep for negation
1035
+ + t4153: fix negated test_i18ngrep call
1036
+ + t9003: become resilient to GETTEXT_POISON
1037
+ + tests: unpack-trees: update to use test_i18n* functions
1038
+ + tests: use test_i18n* functions to suppress false positives
1039
+ + i18n: setup: mark strings for translation
1040
+ + i18n: rebase-interactive: mark comments of squash for translation
1041
+ + i18n: rebase-interactive: mark here-doc strings for translation
1042
+ + i18n: rebase-interactive: mark strings for translation
1043
+ + i18n: git-sh-setup.sh: mark strings for translation
1044
+ + t6030: update to use test_i18ncmp
1045
+ + i18n: bisect: simplify error message for i18n
1046
+ + i18n: rebase: mark placeholder for translation
1047
+ + i18n: rebase: fix marked string to use eval_gettext variant
1048
+ + merge-octopus: use die shell function from git-sh-setup.sh
1049
+ + i18n: merge-octopus: mark messages for translation
1050
+ + i18n: sequencer: mark string for translation
1051
+ + i18n: sequencer: mark entire sentences for translation
1052
+ + i18n: transport: mark strings for translation
1053
+ + i18n: advice: internationalize message for conflicts
1054
+ + i18n: advice: mark string about detached head for translation
1055
+ + i18n: builtin/remote.c: fix mark for translation
1056
+ + Merge branch 'jc/t2300-setup' into HEAD
1057
1058
More markings of messages for i18n, with updates to various tests
1059
to pass GETTEXT_POISON tests.
@@ -1107,15 +1061,7 @@ of the repositories listed at
1061
One patch from the original submission dropped due to conflicts
1062
with jk/upload-pack-hook, which is still in flux.
1063
1110
- Will merge to 'next'.
1111
-
1112
-
1113
-* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
1114
- - blame: require 0 context lines while finding moved lines with -M
1115
-
1116
- "git blame -M" missed a single line that was moved within the file.
1117
-
1118
- We may want to squash a test or two to this commit. Volunteers?
1064
+ Will merge to 'master'.
1065
1066
1067
* nd/worktree-lock (2016-06-13) 6 commits
@@ -1137,18 +1083,19 @@ of the repositories listed at
1083
1084
1085
* jk/upload-pack-hook (2016-06-02) 7 commits
1140
- - upload-pack: provide a hook for running pack-objects
1141
- - t1308: do not get fooled by symbolic links to the source tree
1142
- - config: add a notion of "scope"
1143
- - config: return configset value for current_config_ functions
1144
- - config: set up config_source for command-line config
1145
- - git_config_parse_parameter: refactor cleanup code
1146
- - git_config_with_options: drop "found" counting
1086
+ (merged to 'next' on 2016-06-28 at e5e5bb6)
1087
+ + upload-pack: provide a hook for running pack-objects
1088
+ + t1308: do not get fooled by symbolic links to the source tree
1089
+ + config: add a notion of "scope"
1090
+ + config: return configset value for current_config_ functions
1091
+ + config: set up config_source for command-line config
1092
+ + git_config_parse_parameter: refactor cleanup code
1093
+ + git_config_with_options: drop "found" counting
1094
1095
Allow a custom "git upload-pack" replacement to respond to
1096
"fetch/clone" request.
1097
1151
- Will merge to 'next'.
1098
+ Will merge to 'master'.
1099
1100
1101
* sb/submodule-default-paths (2016-06-20) 5 commits
@@ -1236,17 +1183,18 @@ of the repositories listed at
1183
1184
1185
* nd/worktree-cleanup-post-head-protection (2016-05-24) 6 commits
1239
- - worktree: simplify prefixing paths
1240
- - worktree: avoid 0{40}, too many zeroes, hard to read
1241
- - worktree.c: use is_dot_or_dotdot()
1242
- - git-worktree.txt: keep subcommand listing in alphabetical order
1243
- - worktree.c: rewrite mark_current_worktree() to avoid strbuf
1244
- - completion: support git-worktree
1186
+ (merged to 'next' on 2016-06-28 at 55414fa)
1187
+ + worktree: simplify prefixing paths
1188
+ + worktree: avoid 0{40}, too many zeroes, hard to read
1189
+ + worktree.c: use is_dot_or_dotdot()
1190
+ + git-worktree.txt: keep subcommand listing in alphabetical order
1191
+ + worktree.c: rewrite mark_current_worktree() to avoid strbuf
1192
+ + completion: support git-worktree
1193
(this branch is used by nd/worktree-lock.)
1194
1195
Further preparatory clean-up for "worktree" feature.
1196
1249
- Will merge to 'next'.
1197
+ Will merge to 'master'.
1198
1199
1200
* mh/split-under-lock (2016-06-13) 33 commits
@@ -1288,11 +1236,13 @@ of the repositories listed at
1236
Further preparatory work on the refs API before the pluggable
1237
backend series can land.
1238
1291
- Replaced with a rerolled version.
1239
+ Is everybody happy with this version?
1240
+ If so, will merge to 'next'.
1241
1242
1243
* jc/send-email-skip-backup (2016-04-12) 1 commit
1295
- - send-email: detect and offer to skip backup files
1244
+ (merged to 'next' on 2016-06-28 at 67dac59)
1245
+ + send-email: detect and offer to skip backup files
1246
1247
A careless invocation of "git send-email directory/" after editing
1248
0001-change.patch with an editor often ends up sending both
@@ -1300,7 +1250,7 @@ of the repositories listed at
1250
embarrassment and a minor confusion. Detect such an input and
1251
offer to skip the backup files when sending the patches out.
1252
1303
- Will merge to 'next'.
1253
+ Will merge to 'master'.
1254
Perhaps people will enhance it more once it gains more visibility.
1255
1256