What's cooking (2013/04 #01)
Junio C Hamano committed
Apr 1, 2013 at 13:51 UTC
5f3c2eaeab02da832953128ae3af52c6ec54d9a1
1 file changed
+350
-451
whats-cooking.txt
+350
-451
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2013, #08; Fri, 29)
4
-X-master-at: 631bc94e67383b66da190550866566f09d32f299
5
-X-next-at: 26eb6e9fce877ff55db93fee605b878939872a5a
3
+Subject: What's cooking in git.git (Apr 2013, #01; Mon, 1)
4
+X-master-at: cc3e4eba723570bf77902c017611ee02bb86c8b3
5
+X-next-at: 5a7d8b8c6ff8c59f4ad782e539b1d511ca6f2e63
6
7
-What's cooking in git.git (Mar 2013, #08; Fri, 29)
7
+What's cooking in git.git (Apr 2013, #01; Mon, 1)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -24,127 +24,308 @@ of the repositories listed at
24
--------------------------------------------------
25
[Graduated to "master"]
26
27
-* ap/combine-diff-ignore-whitespace (2013-03-14) 1 commit
28
- (merged to 'next' on 2013-03-19 at dfb2c98)
29
- + Allow combined diff to ignore white-spaces
30
- (this branch is used by ap/combine-diff-coalesce-lost.)
27
+* bc/append-signed-off-by (2013-02-23) 13 commits
28
+ (merged to 'next' on 2013-03-26 at 0e3c79b)
29
+ + git-commit: populate the edit buffer with 2 blank lines before s-o-b
30
+ + Unify appending signoff in format-patch, commit and sequencer
31
+ + format-patch: update append_signoff prototype
32
+ + t4014: more tests about appending s-o-b lines
33
+ + sequencer.c: teach append_signoff to avoid adding a duplicate newline
34
+ + sequencer.c: teach append_signoff how to detect duplicate s-o-b
35
+ + sequencer.c: always separate "(cherry picked from" from commit body
36
+ + sequencer.c: require a conforming footer to be preceded by a blank line
37
+ + sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer
38
+ + t/t3511: add some tests of 'cherry-pick -s' functionality
39
+ + t/test-lib-functions.sh: allow to specify the tag name to test_commit
40
+ + commit, cherry-pick -s: remove broken support for multiline rfc2822 fields
41
+ + sequencer.c: rework search for start of footer to improve clarity
42
32
- Originally merged to 'next' on 2013-03-18
43
+ Consolidates codepaths that inspect log-message-to-be and decide to
44
+ add a new Signed-off-by line in various commands. I think there is
45
+ no negative behaviour change in this series, but please report any
46
+ iffy behaviour change immediately if you notice one.
47
34
- Teach "diff --cc" output to honor options to ignore various forms
35
- of whitespace changes.
48
49
+* jc/nobody-sets-src-peer-ref (2013-03-04) 1 commit
50
+ (merged to 'next' on 2013-03-26 at 9d13c02)
51
+ + match_push_refs(): nobody sets src->peer_ref anymore
52
38
-* jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit
39
- (merged to 'next' on 2013-03-26 at 7999dbe)
40
- + simplify-merges: drop merge from irrelevant side branch
53
+ Dead code removal.
54
42
- The --simplify-merges logic did not cull irrelevant parents from a
43
- merge that is otherwise not interesting with respect to the paths
44
- we are following.
55
+ Even though I think this change is correct, please report
56
+ immediately if you find any unintended side effect.
57
46
- This touches a fairly core part of the revision traversal
47
- infrastructure; even though I think this change is correct, please
48
- report immediately if you find any unintended side effect.
58
59
+* jc/remove-export-from-config-mak-in (2013-03-05) 3 commits
60
+ (merged to 'next' on 2013-03-26 at a789220)
61
+ + Fix `make install` when configured with autoconf
62
+ + Makefile: do not export mandir/htmldir/infodir
63
+ + config.mak.in: remove unused definitions
64
51
-* jk/checkout-attribute-lookup (2013-03-20) 3 commits
52
- (merged to 'next' on 2013-03-20 at 43a89e8)
53
- + t2003: work around path mangling issue on Windows
54
- (merged to 'next' on 2013-03-19 at b063a55)
55
- + entry: fix filter lookup
56
- + t2003: modernize style
65
+ config.mak.in template had an "export" line to cause a few
66
+ common makefile variables to be exported; if they need to be
67
+ expoted for autoconf/configure users, they should also be exported
68
+ for people who write config.mak the same way. Move the "export" to
69
+ the main Makefile. Also, stop exporting mandir that used to be
70
+ exported (only) when config.mak.autogen was used. It would have
71
+ broken installation of manpages (but not other documentation
72
+ formats).
73
58
- Codepath to stream blob object contents directly from the object
59
- store to filesystem did not use the correct path to find conversion
60
- filters when writing to temporary files.
74
+ Even though I think this change is correct, please report
75
+ immediately if you find any unintended side effect.
76
77
63
-* jk/difftool-dir-diff-edit-fix (2013-03-14) 3 commits
64
- (merged to 'next' on 2013-03-19 at e68014a)
65
- + difftool --dir-diff: symlink all files matching the working tree
66
- + difftool: avoid double slashes in symlink targets
67
- + git-difftool(1): fix formatting of --symlink description
78
+* jk/common-make-variables-export-safety (2013-02-25) 1 commit
79
+ (merged to 'next' on 2013-03-26 at 8b7bb16)
80
+ + Makefile: make mandir, htmldir and infodir absolute
81
69
- Originally merged to 'next' on 2013-03-15
82
+ Make the three variables safer to be exported to submakes by
83
+ ensuring that they are full paths so that they can be used as
84
+ installation location.
85
71
- "git difftool --dir-diff" made symlinks to working tree files when
72
- preparing a temporary directory structure, so that accidental edits
73
- of these files in the difftool are reflected back to the working
74
- tree, but the logic to decide when to do so was not quite right.
86
+ Even though I think this change is correct, please report
87
+ immediately if you find any unintended side effect.
88
89
77
-* kk/revwalk-slop-too-many-commit-within-a-second (2013-03-22) 1 commit
78
- (merged to 'next' on 2013-03-26 at ea90e75)
79
- + Fix revision walk for commits with the same dates
90
+* jk/index-pack-correct-depth-fix (2013-03-20) 1 commit
91
+ (merged to 'next' on 2013-03-26 at c56e839)
92
+ + index-pack: always zero-initialize object_entry list
93
81
- Allow the revision "slop" code to look deeper while commits with
82
- exactly the same timestamps come next to each other (which can
83
- often happen after a large "am" and "rebase" session).
94
+ "index-pack --fix-thin" used uninitialize value to compute delta
95
+ depths of objects it appends to the resulting pack.
96
97
86
-* rr/tests-dedup-test-config (2013-03-19) 1 commit
87
- (merged to 'next' on 2013-03-26 at d314299)
88
- + t4018,7810,7811: remove test_config() redefinition
98
+* jk/pkt-line-cleanup (2013-03-21) 20 commits
99
+ (merged to 'next' on 2013-03-26 at 2bb3b75)
100
+ + do not use GIT_TRACE_PACKET=3 in tests
101
+ + remote-curl: always parse incoming refs
102
+ + remote-curl: move ref-parsing code up in file
103
+ + remote-curl: pass buffer straight to get_remote_heads
104
+ + teach get_remote_heads to read from a memory buffer
105
+ + pkt-line: share buffer/descriptor reading implementation
106
+ + pkt-line: provide a LARGE_PACKET_MAX static buffer
107
+ + pkt-line: move LARGE_PACKET_MAX definition from sideband
108
+ + pkt-line: teach packet_read_line to chomp newlines
109
+ + pkt-line: provide a generic reading function with options
110
+ + pkt-line: drop safe_write function
111
+ + pkt-line: move a misplaced comment
112
+ + write_or_die: raise SIGPIPE when we get EPIPE
113
+ + upload-archive: use argv_array to store client arguments
114
+ + upload-archive: do not copy repo name
115
+ + send-pack: prefer prefixcmp over memcmp in receive_status
116
+ + fetch-pack: fix out-of-bounds buffer offset in get_ack
117
+ + upload-pack: remove packet debugging harness
118
+ + upload-pack: do not add duplicate objects to shallow list
119
+ + upload-pack: use get_sha1_hex to parse "shallow" lines
120
121
+ Cleans up pkt-line API, implementation and its callers to make them
122
+ more robust. Even though I think this change is correct, please
123
+ report immediately if you find any unintended side effect.
124
91
-* rs/archive-zip-raw-compression (2013-03-16) 1 commit
92
- (merged to 'next' on 2013-03-19 at 8cc1cb3)
93
- + archive-zip: use deflateInit2() to ask for raw compressed data
125
95
- Originally merged to 'next' on 2013-03-18
126
+* jn/push-tests (2013-03-19) 3 commits
127
+ (merged to 'next' on 2013-03-26 at da891db)
128
+ + push test: rely on &&-chaining instead of 'if bad; then echo Oops; fi'
129
+ + push test: simplify check of push result
130
+ + push test: use test_config when appropriate
131
132
+ Update t5516 with style fixes.
133
98
-* yd/doc-is-in-asciidoc (2013-03-21) 1 commit
99
- (merged to 'next' on 2013-03-26 at a980af2)
100
- + CodingGuidelines: our documents are in AsciiDoc
134
135
+* kb/name-hash (2013-02-27) 1 commit
136
+ (merged to 'next' on 2013-03-26 at 750490a)
137
+ + name-hash.c: fix endless loop with core.ignorecase=true
138
103
-* yd/doc-merge-annotated-tag (2013-03-21) 1 commit
104
- (merged to 'next' on 2013-03-26 at a11162f)
105
- + Documentation: merging a tag is a special case
139
+ The code to keep track of what directory names are known to Git on
140
+ platforms with case insensitive filesystems can get confused upon
141
+ a hash collision between these pathnames and looped forever.
142
107
- Document the 1.7.9 feature to merge a signed tag and keep that in
108
- the mergetag header in the resulting commit better.
143
+ Even though I think this change is correct, please report
144
+ immediately if you find any unintended side effect.
145
146
111
-* yd/use-test-config-unconfig (2013-03-25) 12 commits
112
- (merged to 'next' on 2013-03-26 at 55b69a9)
113
- + t7600: use test_config to set/unset git config variables
114
- + t7502: remove clear_config
115
- + t7502: use test_config to set/unset git config variables
116
- + t9500: use test_config to set/unset git config variables
117
- + t7508: use test_config to set/unset git config variables
118
- + t7500: use test_config to set/unset git config variables
119
- + t5541: use test_config to set/unset git config variables
120
- + t5520: use test_config to set/unset git config variables
121
- + t4202: use test_config/test_unconfig to set/unset git config variables
122
- + t4034: use test_config/test_unconfig to set/unset git config variables
123
- + t4304: use test_config to set/unset git config variables
124
- + t3400: use test_config to set/unset git config variables
147
+* nd/branch-show-rebase-bisect-state (2013-03-23) 7 commits
148
+ (merged to 'next' on 2013-03-26 at cd666f6)
149
+ + status, branch: fix the misleading "bisecting" message
150
+ + branch: show more information when HEAD is detached
151
+ + status: show more info than "currently not on any branch"
152
+ + wt-status: move wt_status_get_state() out to wt_status_print()
153
+ + wt-status: split wt_status_state parsing function out
154
+ + wt-status: move strbuf into read_and_strip_branch()
155
+ + Merge branch 'jc/reflog-reverse-walk' into nd/branch-show-rebase-bisect-state
156
126
- Bulk-update of the test suite.
157
+ "git status" shows a bit more info during a bisect/rebase session.
158
+
159
+
160
+* nd/index-pack-threaded-fixes (2013-03-19) 2 commits
161
+ (merged to 'next' on 2013-03-26 at e508c77)
162
+ + index-pack: guard nr_resolved_deltas reads by lock
163
+ + index-pack: protect deepest_delta in multithread code
164
+
165
+ "index-pack --verify-stat" used a few counters outside protection
166
+ of mutex, possibly showing incorrect numbers.
167
+
168
+
169
+* rr/test-3200-style (2013-03-20) 1 commit
170
+ (merged to 'next' on 2013-03-26 at 1214287)
171
+ + t3200 (branch): modernize style
172
+
173
+ Churns.
174
+
175
+
176
+* sr/am-show-final-message-in-applying-indicator (2013-03-21) 1 commit
177
+ (merged to 'next' on 2013-03-26 at 9ecb143)
178
+ + git-am: show the final log message on "Applying:" indicator
179
+
180
+ In addition to the case where the user edits the log message with
181
+ the "e)dit" option of "am -i", replace the "Applying: this patch"
182
+ message with the final log message contents after applymsg hook
183
+ munges it.
184
185
--------------------------------------------------
186
[New Topics]
187
188
+* jc/sha1-name-object-peeler (2013-03-31) 2 commits
189
+ (merged to 'next' on 2013-04-01 at cdb4a18)
190
+ + peel_onion(): teach $foo^{object} peeler
191
+ + peel_onion: disambiguate to favor tree-ish when we know we want a tree-ish
192
+ (this branch is used by mh/rev-parse-verify-doc.)
193
+
194
+ There was no good way to ask "I have a random string that came from
195
+ outside world. I want to turn it into a 40-hex object name while
196
+ making sure such an object exists". A new peeling suffix ^{object}
197
+ can be used for that purpose, together with "rev-parse --verify".
198
+
199
+
200
+* jm/branch-rename-nothing-error (2013-03-31) 1 commit
201
+ (merged to 'next' on 2013-04-01 at 5e5cdaf)
202
+ + branch: give better message when no names specified for rename
203
+
204
+ "git branch -m" without any argument noticed an error, but with an
205
+ incorrect error message.
206
+
207
+ Will merge to 'master'.
208
+
209
+
210
+* rr/prompt-revert-head (2013-03-31) 1 commit
211
+ (merged to 'next' on 2013-04-01 at 1fc21eb)
212
+ + bash: teach __git_ps1 about REVERT_HEAD
213
+
214
+ The prompt string generator did not notice when we are in a middle
215
+ of a "git revert" session.
216
+
217
+ Will merge to 'master'.
218
+
219
+
220
+* rr/send-email-perl-critique (2013-03-31) 3 commits
221
+ - send-email: use the three-arg form of open in recipients_cmd
222
+ - send-email: drop misleading function prototype
223
+ - send-email: use "return;" not "return undef;" on error codepaths
224
+
225
+ Broken down from an earlier discussion to pick up reasonable bits
226
+ with explanation, to demonstrate how it should be done.
227
+
228
+ Will merge to 'next'.
229
+
230
+
231
+* tr/valgrind (2013-04-01) 4 commits
232
+ (merged to 'next' on 2013-04-01 at a973c52)
233
+ + tests: notice valgrind error in test_must_fail
234
+ + tests --valgrind: provide a mode without --track-origins
235
+ + tests: parameterize --valgrind option
236
+ + t/README: --valgrind already implies -v
237
+
238
+ Let us use not just memgrind but other *grind debuggers.
239
+
240
+ Will merge to 'master'.
241
+
242
+
243
+* mh/rev-parse-verify-doc (2013-04-01) 2 commits
244
+ - SQUASH???
245
+ - rev-parse: clarify documentation for the --verify option
246
+ (this branch uses jc/sha1-name-object-peeler.)
247
+
248
+ "rev-parse --verify" was documented in a misleading way.
249
+
250
+
251
+* rs/submodule-summary-limit (2013-04-01) 1 commit
252
+ (merged to 'next' on 2013-04-01 at 3c18cfe)
253
+ + submodule summary: support --summary-limit=<n>
254
+
255
+ "submodule summary --summary-limit" option did not support
256
+ "--option=value" form.
257
+
258
+ Will merge to 'master'.
259
+
260
+
261
+* tb/shared-perm (2013-04-01) 2 commits
262
+ - path.c: optimize adjust_shared_perm()
263
+ - optimize set_shared_perm() in path.c:
264
+ (this branch uses tb/cygwin-shared-repository.)
265
+
266
+ Simplifies adjust_shared_perm() implementation.
267
+
268
+
269
+* nd/pretty-formats (2013-04-01) 12 commits
270
+ - pretty: support %>> that steal trailing spaces
271
+ - pretty: support truncating in %>, %< and %><
272
+ - pretty: support padding placeholders, %< %> and %><
273
+ - pretty: add %C(auto) for auto-coloring on the next placeholder
274
+ - pretty: two phase conversion for non utf-8 commits
275
+ - utf8: keep NULs in reencode_string()
276
+ - pretty: get the correct encoding for --pretty:format=%e
277
+ - pretty: save commit encoding from logmsg_reencode if the caller needs it
278
+ - utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences
279
+ - utf8.c: move display_mode_esc_sequence_len() for use by other functions
280
+ - pretty: share code between format_decoration and show_decorations
281
+ - pretty-formats.txt: wrap long lines
282
+
283
+ A mixed bag of a bugfix and two fun enhancements on pretty formats
284
+ placeholder.
285
+
286
+
287
+* jl/submodule-deinit (2013-04-01) 1 commit
288
+ - submodule deinit: clarify work tree removal message
289
+
290
+ A finishing touch to the new topic in 1.8.3.
291
+
292
+ Will merge to 'next'.
293
+
294
+--------------------------------------------------
295
+[Stalled]
296
+
297
+* jc/format-patch (2013-02-21) 2 commits
298
+ - format-patch: --inline-single
299
+ - format-patch: rename "no_inline" field
300
+
301
+ A new option to send a single patch to the standard output to be
302
+ appended at the bottom of a message. I personally have no need for
303
+ this, but it was easy enough to cobble together. Tests, docs and
304
+ stripping out more MIMEy stuff are left as exercises to interested
305
+ parties.
306
+
307
+ Not ready for inclusion.
308
+
309
+--------------------------------------------------
310
+[Cooking]
311
+
312
* js/log-gpg (2013-03-27) 1 commit
132
- - log: read gpg settings for signed commit verification
313
+ (merged to 'next' on 2013-03-29 at 9a1b2d3)
314
+ + log: read gpg settings for signed commit verification
315
316
Teach "show/log" honor gpg.program configuration just like other
317
parts of the code that use GnuPG.
318
137
- Will merge to 'next'.
319
+ Will merge to 'master'.
320
321
322
* jc/t5516-pushInsteadOf-vs-pushURL (2013-03-28) 1 commit
141
- - t5516: test interaction between pushURL and pushInsteadOf correctly
323
+ (merged to 'next' on 2013-04-01 at bed2879)
324
+ + t5516: test interaction between pushURL and pushInsteadOf correctly
325
326
Update a test to match the documented interaction between pushURL
327
and pushInsteadOf.
328
146
- Will merge to 'next'.
147
-
329
330
* jk/merge-tree-added-identically (2013-03-27) 1 commit
331
- merge-tree: fix "same file added in subdir"
@@ -164,71 +345,57 @@ of the repositories listed at
345
better by introducing remote.pushdefault (overrides the "origin"
346
thing) and branch.*.pushremote (overrides the branch.*.remote).
347
348
+ Expecting a reroll.
349
168
-* sg/gpg-sig (2013-03-29) 5 commits
350
+
351
+* sg/gpg-sig (2013-03-31) 5 commits
352
- pretty printing: extend %G? to include 'N' and 'U'
353
- merge/pull Check for untrusted good GPG signatures
354
- merge/pull: verify GPG signatures of commits being merged
172
- - commit.c: also look at the first GPG status line
355
+ - commit.c/GPG signature verification: Also look at the first GPG status line
356
- Move commit GPG signature verification to commit.c
357
358
Teach "merge/pull" to optionally verify and reject commits that are
359
not signed properly.
360
178
- Will merge to 'next'.
179
-
361
362
* tr/log-tree-optim (2013-03-28) 1 commit
182
- - Avoid loading commits twice in log with diffs
363
+ (merged to 'next' on 2013-03-29 at 5a6795d)
364
+ + Avoid loading commits twice in log with diffs
365
366
Optimize "log" that shows the difference between the parent and the
367
child.
368
187
- Will merge to 'next'.
369
+ Will merge to 'master'.
370
371
372
* jk/config-with-empty-section (2013-03-29) 1 commit
191
- - t1300: document some aesthetic failures of the config editor
373
+ (merged to 'next' on 2013-04-01 at 7972aa9)
374
+ + t1300: document some aesthetic failures of the config editor
375
376
Document that "git config --unset" does not remove an empty section
377
head after removing the last variable in a section, and adding a
378
new variable does not try to reuse a leftover empty section head.
379
197
- Will merge to 'next'.
380
+ Will merge to 'master'.
381
382
383
* jk/difftool-no-overwrite-on-copyback (2013-03-29) 5 commits
201
- - t7800: run --dir-diff tests with and without symlinks
202
- - t7800: fix tests when difftool uses --no-symlinks
203
- - t7800: don't hide grep output
204
- - difftool: don't overwrite modified files
205
- - t7800: move '--symlinks' specific test to the end
384
+ (merged to 'next' on 2013-03-29 at 9f42d34)
385
+ + t7800: run --dir-diff tests with and without symlinks
386
+ + t7800: fix tests when difftool uses --no-symlinks
387
+ + t7800: don't hide grep output
388
+ + difftool: don't overwrite modified files
389
+ + t7800: move '--symlinks' specific test to the end
390
391
Try to be careful when difftool backend allows the user to write
392
into the temporary files being shown *and* the user makes changes
393
to the working tree at the same time. One of the changes has to be
394
lost in such a case, but at least tell the user what he did.
395
396
+ Will merge to 'master'.
397
398
214
---------------------------------------------------
215
-[Stalled]
216
-
217
-* jc/format-patch (2013-02-21) 2 commits
218
- - format-patch: --inline-single
219
- - format-patch: rename "no_inline" field
220
-
221
- A new option to send a single patch to the standard output to be
222
- appended at the bottom of a message. I personally have no need for
223
- this, but it was easy enough to cobble together. Tests, docs and
224
- stripping out more MIMEy stuff are left as exercises to interested
225
- parties.
226
-
227
- Not ready for inclusion.
228
-
229
---------------------------------------------------
230
-[Cooking]
231
-
399
* jc/apply-ws-fix-tab-in-indent (2013-03-29) 2 commits
400
(merged to 'next' on 2013-03-29 at 26eb6e9)
401
+ test: resurrect q_to_tab
@@ -255,13 +422,14 @@ of the repositories listed at
422
423
424
* ap/combine-diff-coalesce-lost (2013-03-25) 1 commit
258
- - combine-diff: coalesce lost lines optimally
425
+ (merged to 'next' on 2013-03-29 at f6a05ca)
426
+ + combine-diff: coalesce lost lines optimally
427
428
Attempts to minimize "diff -c/--cc" output by coalescing the same
429
lines removed from the parents better, but with an O(n^2)
430
complexity.
431
264
- Will merge to 'next' to see if people with real-world usage scream.
432
+ Will cook in 'next' to see if people with real-world usage scream.
433
434
435
* bk/document-commit-tree-S (2013-03-25) 1 commit
@@ -271,71 +439,80 @@ of the repositories listed at
439
Will merge to 'master'.
440
441
274
-* jk/check-corrupt-objects-carefully (2013-03-27) 10 commits
275
- - clone: leave repo in place after checkout errors
276
- - clone: run check_everything_connected
277
- - clone: die on errors from unpack_trees
278
- - add tests for cloning corrupted repositories
279
- - streaming_write_entry: propagate streaming errors
280
- - add test for streaming corrupt blobs
281
- - avoid infinite loop in read_istream_loose
282
- - read_istream_filtered: propagate read error from upstream
283
- - check_sha1_signature: check return value from read_istream
284
- - stream_blob_to_fd: detect errors reading from stream
442
+* jk/check-corrupt-objects-carefully (2013-03-29) 10 commits
443
+ (merged to 'next' on 2013-03-29 at b6a04a7)
444
+ + clone: leave repo in place after checkout errors
445
+ + clone: run check_everything_connected
446
+ + clone: die on errors from unpack_trees
447
+ + add tests for cloning corrupted repositories
448
+ + streaming_write_entry: propagate streaming errors
449
+ + add test for streaming corrupt blobs
450
+ + avoid infinite loop in read_istream_loose
451
+ + read_istream_filtered: propagate read error from upstream
452
+ + check_sha1_signature: check return value from read_istream
453
+ + stream_blob_to_fd: detect errors reading from stream
454
455
Have the streaming interface and other codepaths more carefully
456
examine for corrupt objects.
457
289
- The message in the last one may want to be updated.
290
- $gmane/219229
458
+ Will merge to 'master'.
459
460
293
-* js/iterm-is-on-osx (2013-03-25) 1 commit
294
- - git-web--browse: recognize iTerm as a GUI terminal on OS X
461
+* js/iterm-is-on-osx (2013-03-29) 1 commit
462
+ (merged to 'next' on 2013-04-01 at 201fed2)
463
+ + git-web--browse: recognize any TERM_PROGRAM as a GUI terminal on OS X
464
296
- Add more logic to detect graphic environment of OS X.
465
+ Add more logic to detect graphic environment of OS X by simply
466
+ checking TERM_PROGRAM has some value, not Apple_Terminal, to detect
467
+ iTerm.app and any other.
468
298
- We may want to simplify it down to just "is there TERM_PROGRAM?",
299
- but I am not an OS X user.
469
+ Will merge to 'master'.
470
471
472
* tb/cygwin-shared-repository (2013-03-25) 1 commit
303
- - Make core.sharedRepository work under cygwin 1.7
473
+ (merged to 'next' on 2013-03-29 at dbeb068)
474
+ + Make core.sharedRepository work under cygwin 1.7
475
+ (this branch is used by tb/shared-perm.)
476
477
Cygwin port has a faster-but-lying lstat(2) emulation whose
478
incorrectness does not matter in practice except for a few
479
codepaths, and setting permission bits to directories is a codepath
480
that needs to use a more correct one.
481
310
- Will merge to 'next'.
482
+ Will merge to 'master'.
483
484
485
* jc/directory-attrs-regression-fix (2013-03-28) 6 commits
314
- - t: check that a pattern without trailing slash matches a directory
315
- - dir.c::match_pathname(): pay attention to the length of string parameters
316
- - dir.c::match_pathname(): adjust patternlen when shifting pattern
317
- - dir.c::match_basename(): pay attention to the length of string parameters
318
- - attr.c::path_matches(): special case paths that end with a slash
319
- - attr.c::path_matches(): the basename is part of the pathname
486
+ (merged to 'next' on 2013-03-29 at a3dce2b)
487
+ + t: check that a pattern without trailing slash matches a directory
488
+ + dir.c::match_pathname(): pay attention to the length of string parameters
489
+ + dir.c::match_pathname(): adjust patternlen when shifting pattern
490
+ + dir.c::match_basename(): pay attention to the length of string parameters
491
+ + attr.c::path_matches(): special case paths that end with a slash
492
+ + attr.c::path_matches(): the basename is part of the pathname
493
494
Fix 1.8.1.x regression that stopped matching "dir" (without
495
trailing slash) to a directory "dir".
496
324
- Will merge to 'next'.
497
+ Will merge to 'master'.
498
499
500
* nd/checkout-paths-reduce-match-pathspec-calls (2013-03-27) 1 commit
328
- - checkout: avoid unnecessary match_pathspec calls
501
+ (merged to 'next' on 2013-03-29 at fbcc004)
502
+ + checkout: avoid unnecessary match_pathspec calls
503
504
Consolidate repeated pathspec matches on the same paths, while
505
fixing a bug in "git checkout dir/" code started from an unmerged
506
index.
507
334
- Will merge to 'next'.
508
+ Will merge to 'master'.
509
510
337
-* jc/merge-tag-object (2013-03-19) 1 commit
338
- - merge: a random object may not necssarily be a commit
511
+* jc/merge-tag-object (2013-04-01) 3 commits
512
+ - t6200: test message for merging of an annotated tag
513
+ - t6200: use test_config/test_unconfig
514
+ (merged to 'next' on 2013-03-29 at aeec39c)
515
+ + merge: a random object may not necssarily be a commit
516
517
"git merge $(git rev-parse v1.8.2)" behaved quite differently from
518
"git merge v1.8.2" as if v1.8.2 were written as v1.8.2^0 and did
@@ -346,66 +523,33 @@ of the repositories listed at
523
(i.e. the name appears in refs/tags/) to decide when to special
524
case merging of tags.
525
349
- We may actually want to call the current behaviour a feature,
350
- though. After all, the user went to great length to feed something
351
- different from the normal "v1.8.2" to the command.
352
-
526
Will merge to 'next'.
527
528
356
-* jk/index-pack-correct-depth-fix (2013-03-20) 1 commit
357
- (merged to 'next' on 2013-03-26 at c56e839)
358
- + index-pack: always zero-initialize object_entry list
359
-
360
- "index-pack --fix-thin" used uninitialize value to compute delta
361
- depths of objects it appends to the resulting pack.
362
-
363
- Will merge to 'master'.
364
-
365
-
366
-* jn/push-tests (2013-03-19) 3 commits
367
- (merged to 'next' on 2013-03-26 at da891db)
368
- + push test: rely on &&-chaining instead of 'if bad; then echo Oops; fi'
369
- + push test: simplify check of push result
370
- + push test: use test_config when appropriate
371
-
372
- Update t5516 with style fixes.
373
-
374
- Will merge to 'master'.
375
-
376
-
377
-* nd/index-pack-threaded-fixes (2013-03-19) 2 commits
378
- (merged to 'next' on 2013-03-26 at e508c77)
379
- + index-pack: guard nr_resolved_deltas reads by lock
380
- + index-pack: protect deepest_delta in multithread code
381
-
382
- "index-pack --verify-stat" used a few counters outside protection
383
- of mutex, possibly showing incorrect numbers.
384
-
385
- Will merge to 'master'.
386
-
387
-
529
* kb/status-ignored-optim (2013-03-19) 8 commits
389
- - dir.c: git-status: avoid is_excluded checks for tracked files
390
- - dir.c: replace is_path_excluded with now equivalent is_excluded API
391
- - dir.c: unify is_excluded and is_path_excluded APIs
392
- - dir.c: move prep_exclude and factor out parts of last_exclude_matching
393
- - dir.c: git-status --ignored: don't list empty directories as ignored
394
- - dir.c: git-status --ignored: don't list empty ignored directories
395
- - dir.c: git-status --ignored: don't list files in ignored directories
396
- - dir.c: git-status --ignored: don't drop ignored directories
530
+ (merged to 'next' on 2013-04-01 at 0c12ed9)
531
+ + dir.c: git-status: avoid is_excluded checks for tracked files
532
+ + dir.c: replace is_path_excluded with now equivalent is_excluded API
533
+ + dir.c: unify is_excluded and is_path_excluded APIs
534
+ + dir.c: move prep_exclude and factor out parts of last_exclude_matching
535
+ + dir.c: git-status --ignored: don't list empty directories as ignored
536
+ + dir.c: git-status --ignored: don't list empty ignored directories
537
+ + dir.c: git-status --ignored: don't list files in ignored directories
538
+ + dir.c: git-status --ignored: don't drop ignored directories
539
540
"git status --ignored" had many corner case bugs. Also the command
541
has been optimized by taking advantage of the fact that paths that
542
are already known to the index do not have to be checked against
543
the .gitignore mechanism most of the time.
544
403
- Expecting a review from others; this codepath is used not only by
404
- status but also in add and clean, so a bug in it can result in lost
405
- data.
545
+ Will cook in 'next'.
546
547
+ This codepath is used not only by status but also in add and clean,
548
+ so a bug in it can result in lost data. Extra sets of eyeballs are
549
+ very much appreciated.
550
408
-* jn/add-2.0-u-A-sans-pathspec (2013-03-20) 5 commits
551
+
552
+* jn/add-2.0-u-A-sans-pathspec (2013-04-01) 5 commits
553
- git add: -u/-A now affects the entire working tree
554
- add -A: only show pathless 'add -A' warning when changes exist outside cwd
555
- add -u: only show pathless 'add -u' warning when changes exist outside cwd
@@ -420,39 +564,19 @@ of the repositories listed at
564
$gmane/219342
565
566
423
-* rr/test-3200-style (2013-03-20) 1 commit
424
- (merged to 'next' on 2013-03-26 at 1214287)
425
- + t3200 (branch): modernize style
426
-
427
- Churns.
428
-
429
- Will merge to 'master'.
430
-
431
-
567
* tr/packed-object-info-wo-recursion (2013-03-27) 3 commits
433
- - sha1_file: remove recursion in unpack_entry
434
- - Refactor parts of in_delta_base_cache/cache_or_unpack_entry
435
- - sha1_file: remove recursion in packed_object_info
568
+ (merged to 'next' on 2013-03-29 at b1c3858)
569
+ + sha1_file: remove recursion in unpack_entry
570
+ + Refactor parts of in_delta_base_cache/cache_or_unpack_entry
571
+ + sha1_file: remove recursion in packed_object_info
572
573
Attempts to reduce the stack footprint of sha1_object_info()
574
and unpack_entry() codepaths.
575
440
- Will merge to 'next'.
441
-
576
+ Will cook in 'next'.
577
443
-* sr/am-show-final-message-in-applying-indicator (2013-03-21) 1 commit
444
- (merged to 'next' on 2013-03-26 at 9ecb143)
445
- + git-am: show the final log message on "Applying:" indicator
578
447
- In addition to the case where the user edits the log message with
448
- the "e)dit" option of "am -i", replace the "Applying: this patch"
449
- message with the final log message contents after applymsg hook
450
- munges it.
451
-
452
- Will merge to 'master'.
453
-
454
-
455
-* nd/magic-pathspecs (2013-03-23) 45 commits
579
+* nd/magic-pathspecs (2013-03-31) 45 commits
580
- Rename field "raw" to "_raw" in struct pathspec
581
- pathspec: support :(glob) syntax
582
- pathspec: make --literal-pathspecs disable pathspec magic
@@ -511,19 +635,6 @@ of the repositories listed at
635
Will merge to 'master'.
636
637
514
-* nd/branch-show-rebase-bisect-state (2013-03-23) 7 commits
515
- (merged to 'next' on 2013-03-26 at cd666f6)
516
- + status, branch: fix the misleading "bisecting" message
517
- + branch: show more information when HEAD is detached
518
- + status: show more info than "currently not on any branch"
519
- + wt-status: move wt_status_get_state() out to wt_status_print()
520
- + wt-status: split wt_status_state parsing function out
521
- + wt-status: move strbuf into read_and_strip_branch()
522
- + Merge branch 'jc/reflog-reverse-walk' into nd/branch-show-rebase-bisect-state
523
-
524
- Will merge to 'master'.
525
-
526
-
638
* jc/add-2.0-delete-default (2013-03-08) 3 commits
639
- git add <pathspec>... defaults to "-A"
640
- git add: start preparing for "git add <pathspec>..." to default to "-A"
@@ -540,107 +651,16 @@ of the repositories listed at
651
Will cook in 'next' until Git 2.0.
652
653
543
-* jc/nobody-sets-src-peer-ref (2013-03-04) 1 commit
544
- (merged to 'next' on 2013-03-26 at 9d13c02)
545
- + match_push_refs(): nobody sets src->peer_ref anymore
546
-
547
- Dead code removal.
548
-
549
- Even though I think this change is correct, please report
550
- immediately if you find any unintended side effect.
551
-
552
- Will merge to 'master' in the 4th batch (Risky).
553
-
554
-
555
-* kb/name-hash (2013-02-27) 1 commit
556
- (merged to 'next' on 2013-03-26 at 750490a)
557
- + name-hash.c: fix endless loop with core.ignorecase=true
558
-
559
- The code to keep track of what directory names are known to Git on
560
- platforms with case insensitive filesystems can get confused upon
561
- a hash collision between these pathnames and looped forever.
562
-
563
- Even though I think this change is correct, please report
564
- immediately if you find any unintended side effect.
565
-
566
- Will merge to 'master' in the 4th batch (Risky).
567
-
568
-
654
* tr/line-log (2013-03-28) 5 commits
570
- - Speed up log -L... -M
571
- - log -L: :pattern:file syntax to find by funcname
572
- - Implement line-history search (git log -L)
573
- - Export rewrite_parents() for 'log -L'
574
- - Refactor parse_loc
575
-
576
- Rerolled.
655
+ (merged to 'next' on 2013-04-01 at 5be920c)
656
+ + Speed up log -L... -M
657
+ + log -L: :pattern:file syntax to find by funcname
658
+ + Implement line-history search (git log -L)
659
+ + Export rewrite_parents() for 'log -L'
660
+ + Refactor parse_loc
661
578
- Will merge to 'next'.
579
-
580
-
581
-* jk/common-make-variables-export-safety (2013-02-25) 1 commit
582
- (merged to 'next' on 2013-03-26 at 8b7bb16)
583
- + Makefile: make mandir, htmldir and infodir absolute
584
-
585
- Make the three variables safer to be exported to submakes by
586
- ensuring that they are full paths so that they can be used as
587
- installation location.
588
-
589
- Even though I think this change is correct, please report
590
- immediately if you find any unintended side effect.
591
-
592
- Will merge to 'master' in the 4th batch (Risky).
593
-
594
-
595
-* jk/pkt-line-cleanup (2013-03-21) 20 commits
596
- (merged to 'next' on 2013-03-26 at 2bb3b75)
597
- + do not use GIT_TRACE_PACKET=3 in tests
598
- + remote-curl: always parse incoming refs
599
- + remote-curl: move ref-parsing code up in file
600
- + remote-curl: pass buffer straight to get_remote_heads
601
- + teach get_remote_heads to read from a memory buffer
602
- + pkt-line: share buffer/descriptor reading implementation
603
- + pkt-line: provide a LARGE_PACKET_MAX static buffer
604
- + pkt-line: move LARGE_PACKET_MAX definition from sideband
605
- + pkt-line: teach packet_read_line to chomp newlines
606
- + pkt-line: provide a generic reading function with options
607
- + pkt-line: drop safe_write function
608
- + pkt-line: move a misplaced comment
609
- + write_or_die: raise SIGPIPE when we get EPIPE
610
- + upload-archive: use argv_array to store client arguments
611
- + upload-archive: do not copy repo name
612
- + send-pack: prefer prefixcmp over memcmp in receive_status
613
- + fetch-pack: fix out-of-bounds buffer offset in get_ack
614
- + upload-pack: remove packet debugging harness
615
- + upload-pack: do not add duplicate objects to shallow list
616
- + upload-pack: use get_sha1_hex to parse "shallow" lines
617
-
618
- Cleans up pkt-line API, implementation and its callers to make them
619
- more robust. Even though I think this change is correct, please
620
- report immediately if you find any unintended side effect.
621
-
622
- Will merge to 'master' in the 3rd batch (Risky).
623
-
624
-
625
-* jc/remove-export-from-config-mak-in (2013-03-05) 3 commits
626
- (merged to 'next' on 2013-03-26 at a789220)
627
- + Fix `make install` when configured with autoconf
628
- + Makefile: do not export mandir/htmldir/infodir
629
- + config.mak.in: remove unused definitions
630
-
631
- config.mak.in template had an "export" line to cause a few
632
- common makefile variables to be exported; if they need to be
633
- expoted for autoconf/configure users, they should also be exported
634
- for people who write config.mak the same way. Move the "export" to
635
- the main Makefile. Also, stop exporting mandir that used to be
636
- exported (only) when config.mak.autogen was used. It would have
637
- broken installation of manpages (but not other documentation
638
- formats).
639
-
640
- Even though I think this change is correct, please report
641
- immediately if you find any unintended side effect.
642
-
643
- Will merge to 'master' in the 4th batch (Risky).
662
+ Will merge down to 'master' with warts and all, hoping they get
663
+ fixed eventually in-tree.
664
665
666
* jc/push-2.0-default-to-simple (2013-03-18) 15 commits
@@ -661,124 +681,3 @@ of the repositories listed at
681
- t5404: do not assume the "matching" push is the default
682
683
Will cook in 'next' until Git 2.0.
664
-
665
-
666
-* bc/append-signed-off-by (2013-02-23) 13 commits
667
- (merged to 'next' on 2013-03-26 at 0e3c79b)
668
- + git-commit: populate the edit buffer with 2 blank lines before s-o-b
669
- + Unify appending signoff in format-patch, commit and sequencer
670
- + format-patch: update append_signoff prototype
671
- + t4014: more tests about appending s-o-b lines
672
- + sequencer.c: teach append_signoff to avoid adding a duplicate newline
673
- + sequencer.c: teach append_signoff how to detect duplicate s-o-b
674
- + sequencer.c: always separate "(cherry picked from" from commit body
675
- + sequencer.c: require a conforming footer to be preceded by a blank line
676
- + sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer
677
- + t/t3511: add some tests of 'cherry-pick -s' functionality
678
- + t/test-lib-functions.sh: allow to specify the tag name to test_commit
679
- + commit, cherry-pick -s: remove broken support for multiline rfc2822 fields
680
- + sequencer.c: rework search for start of footer to improve clarity
681
-
682
- Consolidates codepaths that inspect log-message-to-be and decide to
683
- add a new Signed-off-by line in various commands. I think there is
684
- no negative behaviour change in this series, but please report any
685
- iffy behaviour change immediately if you notice one.
686
-
687
- Will merge to 'master' in the 3rd batch (Risky).
688
-
689
---------------------------------------------------
690
-[Discarded]
691
-
692
-* nd/read-directory-recursive-optim (2013-02-17) 1 commit
693
- . read_directory: avoid invoking exclude machinery on tracked files
694
-
695
- "git status" has been optimized by taking advantage of the fact
696
- that paths that are already known to the index do not have to be
697
- checked against the .gitignore mechanism under some conditions.
698
- Even though I think this change is correct, please report
699
- immediately if you find any unintended side effect.
700
-
701
- kb/status-ignored-optim supersedes this.
702
-
703
-
704
-* jc/add-2.0-u-A-sans-pathspec (2013-03-14) 1 commit
705
- . git add: -u/-A now affects the entire working tree
706
-
707
- "git add -u/-A" without pathspec has traditonally limited its
708
- operation to the current directory and its subdirectories, but in
709
- Git 1.8.2 we started encouraging users to be more explicit to
710
- specify "." when they mean it (and use ":/" to make it affect the
711
- entire working tree). With this, we finally change the behaviour
712
- and make it affect the entire working tree in Git 2.0.
713
-
714
- jn/add-2.0-u-A-sans-pathspec supersedes this.
715
-
716
-
717
-* ja/directory-attrs (2013-03-20) 1 commit
718
- . trailing slash required in .gitattributes
719
-
720
- Now part of jc/directory-attrs-regression-fix.
721
-
722
-
723
-* hv/config-from-strbuf (2013-03-10) 4 commits
724
- . teach config parsing to read from strbuf
725
- . config: make parsing stack struct independent from actual data source
726
- . config: drop file pointer validity check in get_next_char()
727
- . config: factor out config file stack management
728
-
729
- Was expecting a reroll.
730
- $gmane/217811
731
-
732
-
733
-* mb/gitweb-highlight-link-target (2012-12-20) 1 commit
734
- . Highlight the link target line in Gitweb using CSS
735
-
736
- Was expecting a reroll.
737
- $gmane/211935
738
-
739
-
740
-* mb/remote-default-nn-origin (2012-07-11) 6 commits
741
- . Teach get_default_remote to respect remote.default.
742
- . Test that plain "git fetch" uses remote.default when on a detached HEAD.
743
- . Teach clone to set remote.default.
744
- . Teach "git remote" about remote.default.
745
- . Teach remote.c about the remote.default configuration setting.
746
- . Rename remote.c's default_remote_name static variables.
747
-
748
- When the user does not specify what remote to interact with, we
749
- often attempt to use 'origin'. This can now be customized via a
750
- configuration variable.
751
-
752
- Was expecting a reroll.
753
- $gmane/210151
754
-
755
- "The first remote becomes the default" bit is better done as a
756
- separate step.
757
-
758
-
759
-* mg/qnx6 (2013-02-25) 1 commit
760
- . QNX: newer QNX 6.x.x is not so crippled
761
-
762
- Not ready for inclusion.
763
-
764
-
765
-* po/help-guides (2013-03-03) 5 commits
766
- . help doc: include --guide option description
767
- . help.c: add list_common_guides_help() function
768
- . help.c: add --guide option
769
- . help.c: use OPT_COUNTUP
770
- . show 'git help <guide>' usage, with examples
771
-
772
- Give more visibility to "concept guides" to help "git help" users.
773
-
774
- Was (and still is) expecting a reroll.
775
- $gmane/217384
776
-
777
-
778
-* jk/t7800-modernize (2013-03-23) 3 commits
779
- . t7800: run --dir-diff tests with and without symlinks
780
- . t7800: fix tests when difftool uses --no-symlinks
781
- . t7800: don't hide grep output
782
-
783
- Superseded by jk/difftool-no-overwrite-on-copyback.
784
-