What's cooking (2015/06 #01)
Junio C Hamano committed
Jun 2, 2015 at 16:43 UTC
5bc79aaa3c247da77df16e5c6e2c90280291146e
1 file changed
+423
-259
whats-cooking.txt
+423
-259
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2015, #08; Fri, 29)
4
-X-master-at: 77bd3ea9f54f1584147b594abc04c26ca516d987
5
-X-next-at: 5f4350e90f9ad5b056aa42fe83b9262c702a5306
3
+Subject: What's cooking in git.git (Jun 2015, #01; Tue, 2)
4
+X-master-at: f86f31ab33c3406adebbb9f9f61be550dcc5a472
5
+X-next-at: b4379f4514b71bf690061de15eb494cafb09b9b1
6
7
-What's cooking in git.git (May 2015, #08; Fri, 29)
7
+What's cooking in git.git (Jun 2015, #01; Tue, 2)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -17,101 +17,319 @@ of the repositories listed at
17
http://git-blame.blogspot.com/p/git-public-repositories.html
18
19
--------------------------------------------------
20
-[New Topics]
20
+[Graduated to "master"]
21
22
-* jc/diff-ws-error-highlight (2015-05-26) 4 commits
23
- - diff.c: --ws-error-highlight=<kind> option
24
- - diff.c: add emit_del_line() and emit_context_line()
25
- - t4015: separate common setup and per-test expectation
26
- - t4015: modernise style
22
+* ah/usage-strings (2015-05-03) 1 commit
23
+ (merged to 'next' on 2015-05-28 at 5f4350e)
24
+ + blame, log: format usage strings similarly to those in documentation
25
28
- Allow whitespace breakages in deleted and context lines to be also
29
- painted in the output.
26
+ A few usage string updates.
27
31
- Will merge to 'next'.
28
29
+* da/mergetool-winmerge (2015-05-20) 2 commits
30
+ (merged to 'next' on 2015-05-26 at d6333e9)
31
+ + mergetools: add winmerge as a builtin tool
32
+ + mergetool--lib: set IFS for difftool and mergetool
33
+
34
+ "git mergetool" learned to drive WinMerge as a backend.
35
34
-* jk/clone-dissociate (2015-05-27) 2 commits
35
- - clone: reorder --dissociate and --reference options
36
- - clone: use OPT_STRING_LIST for --reference
36
+
37
+* dt/cat-file-follow-symlinks (2015-05-20) 3 commits
38
+ (merged to 'next' on 2015-05-26 at 7ae52d4)
39
+ + cat-file: add --follow-symlinks to --batch
40
+ + sha1_name: get_sha1_with_context learns to follow symlinks
41
+ + tree-walk: learn get_tree_entry_follow_symlinks
42
+
43
+ "git cat-file --batch(-check)" learned the "--follow-symlinks"
44
+ option that follows an in-tree symbolic link when asked about an
45
+ object via extended SHA-1 syntax, e.g. HEAD:RelNotes that points at
46
+ Documentation/RelNotes/2.5.0.txt. With the new option, the command
47
+ behaves as if HEAD:Documentation/RelNotes/2.5.0.txt was given as
48
+ input instead.
49
+
50
+
51
+* dt/clean-pathspec-filter-then-lstat (2015-05-18) 1 commit
52
+ (merged to 'next' on 2015-05-26 at 9b24d71)
53
+ + clean: only lstat files in pathspec
54
+
55
+ "git clean pathspec..." tried to lstat(2) and complain even for
56
+ paths outside the given pathspec.
57
+
58
+
59
+* fm/fetch-raw-sha1 (2015-05-22) 3 commits
60
+ (merged to 'next' on 2015-05-26 at dc3f1b3)
61
+ + upload-pack: optionally allow fetching reachable sha1
62
+ + upload-pack: prepare to extend allow-tip-sha1-in-want
63
+ + config.txt: clarify allowTipSHA1InWant with camelCase
64
+
65
+ "git upload-pack" that serves "git fetch" can be told to serve
66
+ commits that are not at the tip of any ref, as long as they are
67
+ reachable from a ref, with uploadpack.allowReachableSHA1InWant
68
+ configuration variable.
69
+
70
+
71
+* jh/filter-empty-contents (2015-05-18) 1 commit
72
+ (merged to 'next' on 2015-05-26 at 9cad398)
73
+ + sha1_file: pass empty buffer to index empty file
74
+
75
+ The clean/smudge interface did not work well when filtering an
76
+ empty contents (failed and then passed the empty input through).
77
+ It can be argued that a filter that produces anything but empty for
78
+ an empty input is nonsense, but if the user wants to do strange
79
+ things, then why not?
80
+
81
+
82
+* jk/http-backend-deadlock (2015-05-25) 1 commit
83
+ (merged to 'next' on 2015-05-26 at 9f3bd8a)
84
+ + Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlock
85
+ (this branch uses jk/http-backend-deadlock-2.2 and jk/http-backend-deadlock-2.3.)
86
+
87
+ Communication between the HTTP server and http_backend process can
88
+ lead to a dead-lock when relaying a large ref negotiation request.
89
+ Diagnose the situation better, and mitigate it by reading such a
90
+ request first into core (to a reasonable limit).
91
+
92
+
93
+* jk/http-backend-deadlock-2.2 (2015-05-25) 3 commits
94
+ + http-backend: spool ref negotiation requests to buffer
95
+ + t5551: factor out tag creation
96
+ + http-backend: fix die recursion with custom handler
97
+ (this branch is used by jk/http-backend-deadlock and jk/http-backend-deadlock-2.3.)
98
+
99
+ Communication between the HTTP server and http_backend process can
100
+ lead to a dead-lock when relaying a large ref negotiation request.
101
+ Diagnose the situation better, and mitigate it by reading such a
102
+ request first into core (to a reasonable limit).
103
+
104
+ This was wiggled back to apply to the 2.2 maintenance track
105
+ (original was for 2.4).
106
+
107
+
108
+* jk/http-backend-deadlock-2.3 (2015-05-25) 1 commit
109
+ + Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3
110
+ (this branch is used by jk/http-backend-deadlock; uses jk/http-backend-deadlock-2.2.)
111
+
112
+ Same for 2.3 maintenance track.
113
+
114
+
115
+* jk/stash-options (2015-05-20) 2 commits
116
+ (merged to 'next' on 2015-05-26 at 5dcb026)
117
+ + stash: recognize "--help" for subcommands
118
+ + stash: complain about unknown flags
119
+
120
+ Make "git stash something --help" error out, so that users can
121
+ safely say "git stash drop --help".
122
+
123
+
124
+* mc/commit-doc-grammofix (2015-05-19) 1 commit
125
+ (merged to 'next' on 2015-05-26 at 9d76e3b)
126
+ + Documentation/git-commit: grammofix
127
+
128
+ Doc grammar fix.
129
+
130
+
131
+* mm/log-format-raw-doc (2015-05-20) 2 commits
132
+ (merged to 'next' on 2015-05-26 at 97e2c9d)
133
+ + Documentation/log: clarify sha1 non-abbreviation in log --raw
134
+ + Documentation/log: clarify what --raw means
135
+
136
+ Clarify that "log --raw" and "log --format=raw" are unrelated
137
+ concepts.
138
+
139
+
140
+* mm/rebase-i-post-rewrite-exec (2015-05-22) 3 commits
141
+ (merged to 'next' on 2015-05-26 at 8ddaab1)
142
+ + t5407: use <<- to align the expected output
143
+ + rebase -i: fix post-rewrite hook with failed exec command
144
+ + rebase -i: demonstrate incorrect behavior of post-rewrite
145
+
146
+ "git rebase -i" fired post-rewrite hook when it shouldn't (namely,
147
+ when it was told to stop sequencing with 'exec' insn).
148
+
149
+
150
+* rs/janitorial (2015-05-20) 3 commits
151
+ (merged to 'next' on 2015-05-26 at 9d5aee4)
152
+ + dir: remove unused variable sb
153
+ + clean: remove unused variable buf
154
+ + use file_exists() to check if a file exists in the worktree
155
156
Code clean-up.
157
40
- Will merge to 'next'.
158
159
+* sb/test-bitmap-free-at-end (2015-05-22) 1 commit
160
+ (merged to 'next' on 2015-05-26 at 1014ebf)
161
+ + test_bitmap_walk: free bitmap with bitmap_free
162
43
-* jk/color-diff-plain-is-context (2015-05-27) 2 commits
44
- - diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT
45
- - diff: accept color.diff.context as a synonym for "plain"
163
+ An earlier leakfix to bitmap testing code was incomplete.
164
47
- "color.diff.plain" was a misnomer; give it 'color.diff.context' as
48
- a more logical synonym.
165
50
- Will merge to 'next'.
166
+* sg/help-group (2015-05-21) 5 commits
167
+ (merged to 'next' on 2015-05-26 at 2749912)
168
+ + help: respect new common command grouping
169
+ + command-list.txt: drop the "common" tag
170
+ + generate-cmdlist: parse common group commands
171
+ + command-list.txt: add the common groups block
172
+ + command-list: prepare machinery for upcoming "common groups" section
173
174
+ Group list of commands shown by "git help" along the workflow
175
+ elements to help early learners.
176
53
-* jk/diagnose-config-mmap-failure (2015-05-28) 5 commits
54
- - xmmap(): drop "Out of memory?"
55
- - config.c: rewrite ENODEV into EISDIR when mmap fails
56
- - config.c: avoid xmmap error messages
57
- - config.c: fix mmap leak when writing config
58
- - read-cache.c: drop PROT_WRITE from mmap of index
177
+--------------------------------------------------
178
+[New Topics]
179
60
- The configuration reader/writer uses mmap(2) interface to access
61
- the files; when we find a directory, it barfed with "Out of memory?".
180
+* gr/rebase-i-drop-warn (2015-06-01) 2 commits
181
+ - git rebase -i: warn about removed commits
182
+ - git-rebase -i: add command "drop" to remove a commit
183
+
184
+ Add "drop commit-object-name subject" command as another way to
185
+ skip replaying of a commit in "rebase -i", and then punish those
186
+ who do not use it (and instead just remove the lines) by throwing
187
+ a warning.
188
+
189
+ Expecting a reroll.
190
+
191
+
192
+* jh/strbuf-read-use-read-in-full (2015-06-01) 1 commit
193
+ - strbuf_read(): skip unnecessary strbuf_grow() at eof
194
+
195
+ Avoid one extra iteration and strbuf_grow() of 8kB in
196
+ strbuf_read().
197
+
198
+ Looked reasonable; perhaps a log message clarification is coming?
199
+
200
+
201
+* jk/squelch-missing-link-warning-for-unreachable (2015-06-01) 3 commits
202
+ (merged to 'next' on 2015-06-01 at 9ddc5d1)
203
+ + suppress errors on missing UNINTERESTING links
204
+ + silence broken link warnings with revs->ignore_missing_links
205
+ + add quieter versions of parse_{tree,commit}
206
+
207
+ Recent "git prune" traverses young unreachable objects to safekeep
208
+ old objects in the reachability chain from them, which causes
209
+ error messages that are unnecessarily alarming.
210
+
211
+ Will merge to 'master'.
212
+
213
+
214
+* mh/reporting-broken-refs-from-for-each-ref (2015-06-02) 3 commits
215
+ - read_loose_refs(): treat NULL_SHA1 loose references as broken
216
+ - for-each-ref: report broken references correctly
217
+ - t6301: new tests of for-each-ref error handling
218
+
219
+ "git for-each-ref" reported "missing object" for 0{40} when it
220
+ encounters a broken ref. The lack of object whose name is 0{40} is
221
+ not the problem; the ref being broken is.
222
+
223
+ A reroll for the tip one coming to pick final minor nits?
224
+ Otherwise looked ready for 'next'.
225
+
226
+
227
+* tb/complete-sequencing (2015-06-01) 1 commit
228
+ (merged to 'next' on 2015-06-01 at b7604e8)
229
+ + completion: suggest sequencer commands for revert
230
+
231
+ The bash completion script (in contrib/) learned a few options that
232
+ "git revert" takes.
233
+
234
+ Will merge to 'master'.
235
+
236
+
237
+* jc/apply-reject-noop-hunk (2015-06-01) 1 commit
238
+ - apply: reject a hunk that does not do anything
239
+
240
+ "git apply" cannot diagnose a patch corruption when the breakage is
241
+ to mark the length of the hunk shorter than it really is on the
242
+ hunk header line "@@ -l,k +m,n @@"; one special case it could is
243
+ when the hunk becomes no-op (e.g. k == n == 2 for two-line context
244
+ patch output), and it learned how to do so.
245
246
Will merge to 'next'.
247
+
248
249
+* es/configure-getdelim (2015-06-02) 2 commits
250
+ - configure: add getdelim() check
251
+ - config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases
252
66
-* mh/verify-lock-error-report (2015-05-27) 5 commits
67
- - ref_transaction_commit(): do not capitalize error messages
68
- - verify_lock(): do not capitalize error messages
69
- - verify_lock(): report errors via a strbuf
70
- - verify_lock(): on errors, let the caller unlock the lock
71
- - verify_lock(): return 0/-1 rather than struct ref_lock *
253
+ Auto-detect availability of getdelim() that helps optimized version
254
+ of strbuf_getwholeline().
255
73
- Bring consistency to error reporting mechanism used in "refs" API.
256
+ Will merge to 'next'.
257
+
258
+
259
+* es/osx-header-pollutes-mask-macro (2015-06-02) 1 commit
260
+ - ewah/bitmap: silence warning about MASK macro redefinition
261
262
Will merge to 'next'.
263
264
78
-* mt/p4-depotFile-at-version (2015-05-27) 1 commit
79
- - p4: retrieve the right revision of the file in UTF-16 codepath
265
+* es/send-email-sendmail-alias (2015-06-01) 10 commits
266
+ - send-email: further warn about unsupported sendmail aliases features
267
+ - t9001: add sendmail aliases line continuation tests
268
+ - t9001: refactor sendmail aliases test infrastructure
269
+ - send-email: implement sendmail aliases line continuation support
270
+ - send-email: simplify sendmail aliases comment and blank line recognizer
271
+ - send-email: refactor sendmail aliases parser
272
+ - send-email: fix style: cuddle 'elsif' and 'else' with closing brace
273
+ - send-email: drop noise comments which merely repeat what code says
274
+ - send-email: visually distinguish sendmail aliases parser warnings
275
+ - send-email: further document missing sendmail aliases functionality
276
+ (this branch uses ah/send-email-sendmail-alias.)
277
+
278
+ "git send-email" learned to handle more forms of sendmail style
279
+ aliases file.
280
281
Will merge to 'next'.
282
283
84
-* sb/glossary-submodule (2015-05-29) 1 commit
85
- - glossary: add "remote", "submodule", "superproject"
284
+* jc/do-not-feed-tags-to-clear-commit-marks (2015-06-01) 1 commit
285
+ - format-patch: do not feed tags to clear_commit_marks()
286
+
287
+ "git format-patch --ignore-if-upstream A..B" did not like to be fed
288
+ tags as boundary commits.
289
+
290
+
291
+* mg/index-read-error-messages (2015-06-01) 2 commits
292
+ - messages: uniform error messages for index write
293
+ - show-index: uniform error messages for index read
294
+
295
+ The tip was RFC.
296
+
297
+
298
+* pt/pull-optparse (2015-06-02) 3 commits
299
+ - pull: use git-rev-parse --parseopt for option parsing
300
+ - pull: handle git-fetch's options as well
301
+ - Merge branch 'pt/pull-tests' into pt/pull-optparse
302
+ (this branch uses pt/pull-tests.)
303
+
304
+ "git pull" has become more aware of the options meant for
305
+ underlying "git fetch" and then learned to use parse-options
306
+ parser.
307
308
Will merge to 'next'.
309
310
90
-* sg/config-name-only (2015-05-28) 3 commits
91
- - completion: use new 'git config' options to reliably list variable names
92
- - SQUASH
93
- - config: add options to list only variable names
311
+* qn/blame-show-email (2015-06-01) 1 commit
312
+ - blame: add blame.showEmail configuration
313
95
- "git config --list" output was hard to parse when values consist of
96
- multiple lines. Introduce a way to show only the keys.
314
+ "git blame" learned blame.showEmail configuration variable.
315
316
+ Will merge to 'next'.
317
99
-* sg/merge-summary-config (2015-05-28) 1 commit
100
- - Documentation: include 'merge.branchdesc' for merge and config as well
318
319
+* rl/am-3way-config (2015-06-02) 3 commits
320
+ - t4150-am: refactor am -3 tests
321
+ - git-am.txt: add configuration section in git am documentation
322
+ - git-am.sh: fix initialization of the threeway variable
323
103
-* jc/push-tags-also (2015-05-29) 1 commit
104
- - push --tags: push tags *in addition to* other stuff
324
+ "git am" learned am.threeWay configuration variable.
325
326
107
-* jk/die-on-bogus-worktree-late (2015-05-29) 1 commit
108
- - setup_git_directory: delay core.bare/core.worktree errors
327
+* sb/pack-protocol-mention-smart-http (2015-06-02) 1 commit
328
+ - Documentation/technical/pack-protocol: mention http as possible protocol
329
330
+ Doc updates.
331
111
-* jk/make-fix-dependencies (2015-05-29) 3 commits
112
- - Makefile: silence perl/PM.stamp recipe
113
- - Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS
114
- - Makefile: drop dependency between git-instaweb and gitweb
332
+ Will merge to 'next'.
333
334
--------------------------------------------------
335
[Stalled]
@@ -298,15 +516,6 @@ of the repositories listed at
516
Waiting for a reroll ($gmane/256591).
517
518
301
-* hv/submodule-config (2014-11-11) 4 commits
302
- - do not die on error of parsing fetchrecursesubmodules option
303
- - use new config API for worktree configurations of submodules
304
- - extract functions for submodule config set and lookup
305
- - implement submodule config cache for lookup of submodule names
306
-
307
- Kicked back to 'pu' per request ($gmane/255610).
308
-
309
-
519
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
520
- perf-lib: add test_perf_cleanup target
521
- perf-lib: split starting the test from the execution
@@ -329,9 +538,143 @@ of the repositories listed at
538
--------------------------------------------------
539
[Cooking]
540
541
+* hv/submodule-config (2015-06-02) 4 commits
542
+ - do not die on error of parsing fetchrecursesubmodules option
543
+ - use new config API for worktree configurations of submodules
544
+ - extract functions for submodule config set and lookup
545
+ - implement submodule config cache for lookup of submodule names
546
+
547
+ The gitmodules API accessed from the C code learned to cache stuff
548
+ lazily.
549
+
550
+
551
+* jc/diff-ws-error-highlight (2015-05-26) 4 commits
552
+ (merged to 'next' on 2015-06-01 at 6046560)
553
+ + diff.c: --ws-error-highlight=<kind> option
554
+ + diff.c: add emit_del_line() and emit_context_line()
555
+ + t4015: separate common setup and per-test expectation
556
+ + t4015: modernise style
557
+
558
+ Allow whitespace breakages in deleted and context lines to be also
559
+ painted in the output.
560
+
561
+ Will merge to 'master'.
562
+
563
+
564
+* jk/clone-dissociate (2015-05-27) 2 commits
565
+ (merged to 'next' on 2015-06-01 at 19e3ec3)
566
+ + clone: reorder --dissociate and --reference options
567
+ + clone: use OPT_STRING_LIST for --reference
568
+
569
+ Code clean-up.
570
+
571
+ Will merge to 'master'.
572
+
573
+
574
+* jk/color-diff-plain-is-context (2015-05-27) 2 commits
575
+ (merged to 'next' on 2015-06-01 at bcd8f1d)
576
+ + diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT
577
+ + diff: accept color.diff.context as a synonym for "plain"
578
+
579
+ "color.diff.plain" was a misnomer; give it 'color.diff.context' as
580
+ a more logical synonym.
581
+
582
+ Will merge to 'master'.
583
+
584
+
585
+* jk/diagnose-config-mmap-failure (2015-05-28) 5 commits
586
+ (merged to 'next' on 2015-06-01 at ca750d5)
587
+ + xmmap(): drop "Out of memory?"
588
+ + config.c: rewrite ENODEV into EISDIR when mmap fails
589
+ + config.c: avoid xmmap error messages
590
+ + config.c: fix mmap leak when writing config
591
+ + read-cache.c: drop PROT_WRITE from mmap of index
592
+
593
+ The configuration reader/writer uses mmap(2) interface to access
594
+ the files; when we find a directory, it barfed with "Out of memory?".
595
+
596
+ Will merge to 'master'.
597
+
598
+
599
+* mh/verify-lock-error-report (2015-05-27) 5 commits
600
+ (merged to 'next' on 2015-06-01 at 7b450a7)
601
+ + ref_transaction_commit(): do not capitalize error messages
602
+ + verify_lock(): do not capitalize error messages
603
+ + verify_lock(): report errors via a strbuf
604
+ + verify_lock(): on errors, let the caller unlock the lock
605
+ + verify_lock(): return 0/-1 rather than struct ref_lock *
606
+
607
+ Bring consistency to error reporting mechanism used in "refs" API.
608
+
609
+ Will merge to 'master'.
610
+
611
+
612
+* mt/p4-depotFile-at-version (2015-05-27) 1 commit
613
+ (merged to 'next' on 2015-06-01 at 33e8622)
614
+ + p4: retrieve the right revision of the file in UTF-16 codepath
615
+
616
+ Will merge to 'master'.
617
+
618
+
619
+* sb/glossary-submodule (2015-05-29) 1 commit
620
+ (merged to 'next' on 2015-06-01 at 84de87b)
621
+ + glossary: add "remote", "submodule", "superproject"
622
+
623
+ Will merge to 'master'.
624
+
625
+
626
+* sg/config-name-only (2015-05-28) 3 commits
627
+ - completion: use new 'git config' options to reliably list variable names
628
+ - SQUASH
629
+ - config: add options to list only variable names
630
+
631
+ "git config --list" output was hard to parse when values consist of
632
+ multiple lines. Introduce a way to show only the keys.
633
+
634
+ Adding a single --name-only option may be a better way to go than
635
+ adding two new options.
636
+
637
+ Expecting reroll.
638
+
639
+
640
+* sg/merge-summary-config (2015-05-28) 1 commit
641
+ - Documentation: include 'merge.branchdesc' for merge and config as well
642
+
643
+ Doc updates.
644
+
645
+ Will merge to 'next'.
646
+
647
+
648
+* jc/push-tags-also (2015-05-29) 1 commit
649
+ - push --tags: push tags *in addition to* other stuff
650
+
651
+ "git fetch --tags" learned to fetch tags in addition to other stuff
652
+ a few years ago, but "git push --tags" didn't. Now it does.
653
+
654
+
655
+* jk/die-on-bogus-worktree-late (2015-05-29) 1 commit
656
+ - setup_git_directory: delay core.bare/core.worktree errors
657
+
658
+ The setup code used to die when core.bare and core.worktree are set
659
+ inconsistently, even for commands that do not need working tree.
660
+
661
+ Will merge to 'next'.
662
+
663
+
664
+* jk/make-fix-dependencies (2015-05-29) 3 commits
665
+ - Makefile: silence perl/PM.stamp recipe
666
+ - Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS
667
+ - Makefile: drop dependency between git-instaweb and gitweb
668
+
669
+ Build clean-up.
670
+
671
+ Will merge to 'next'.
672
+
673
+
674
* ah/send-email-sendmail-alias (2015-05-27) 2 commits
675
- t9001: write $HOME/, not ~/, to help shells without tilde expansion
676
- send-email: add sendmail email aliases format
677
+ (this branch is used by es/send-email-sendmail-alias.)
678
679
"git send-email" learned the alias file format used by the sendmail
680
program (in an abbreviated form).
@@ -404,83 +747,6 @@ of the repositories listed at
747
Will merge to 'master'.
748
749
407
-* da/mergetool-winmerge (2015-05-20) 2 commits
408
- (merged to 'next' on 2015-05-26 at d6333e9)
409
- + mergetools: add winmerge as a builtin tool
410
- + mergetool--lib: set IFS for difftool and mergetool
411
-
412
- "git mergetool" learned to drive WinMerge as a backend.
413
-
414
- Will merge to 'master'.
415
-
416
-
417
-* jk/http-backend-deadlock-2.2 (2015-05-25) 3 commits
418
- + http-backend: spool ref negotiation requests to buffer
419
- + t5551: factor out tag creation
420
- + http-backend: fix die recursion with custom handler
421
- (this branch is used by jk/http-backend-deadlock and jk/http-backend-deadlock-2.3.)
422
-
423
- Communication between the HTTP server and http_backend process can
424
- lead to a dead-lock when relaying a large ref negotiation request.
425
- Diagnose the situation better, and mitigate it by reading such a
426
- request first into core (to a reasonable limit).
427
-
428
- This was wiggled back to apply to the 2.2 maintenance track
429
- (original was for 2.4).
430
-
431
- Will merge to 'master'.
432
-
433
-
434
-* jk/http-backend-deadlock-2.3 (2015-05-25) 1 commit
435
- + Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3
436
- (this branch is used by jk/http-backend-deadlock; uses jk/http-backend-deadlock-2.2.)
437
-
438
- Same for 2.3 maintenance track.
439
-
440
- Will merge to 'master'.
441
-
442
-
443
-* jk/stash-options (2015-05-20) 2 commits
444
- (merged to 'next' on 2015-05-26 at 5dcb026)
445
- + stash: recognize "--help" for subcommands
446
- + stash: complain about unknown flags
447
-
448
- Make "git stash something --help" error out, so that users can
449
- safely say "git stash drop --help".
450
-
451
- Will merge to 'master'.
452
-
453
-
454
-* mc/commit-doc-grammofix (2015-05-19) 1 commit
455
- (merged to 'next' on 2015-05-26 at 9d76e3b)
456
- + Documentation/git-commit: grammofix
457
-
458
- Will merge to 'master'.
459
-
460
-
461
-* rs/janitorial (2015-05-20) 3 commits
462
- (merged to 'next' on 2015-05-26 at 9d5aee4)
463
- + dir: remove unused variable sb
464
- + clean: remove unused variable buf
465
- + use file_exists() to check if a file exists in the worktree
466
-
467
- Will merge to 'master'.
468
-
469
-
470
-* fm/fetch-raw-sha1 (2015-05-22) 3 commits
471
- (merged to 'next' on 2015-05-26 at dc3f1b3)
472
- + upload-pack: optionally allow fetching reachable sha1
473
- + upload-pack: prepare to extend allow-tip-sha1-in-want
474
- + config.txt: clarify allowTipSHA1InWant with camelCase
475
-
476
- "git upload-pack" that serves "git fetch" can be told to serve
477
- commits that are not at the tip of any ref as long as they are
478
- reachable from a ref with uploadpack.allowReachableSHA1InWant
479
- configuration variable.
480
-
481
- Will merge to 'master'.
482
-
483
-
750
* jc/commit-slab (2015-05-22) 1 commit
751
- commit-slab: introduce slabname##_peek() function
752
@@ -488,104 +754,9 @@ of the repositories listed at
754
sparsely (which is not recommended in the first place).
755
756
491
-* mm/rebase-i-post-rewrite-exec (2015-05-22) 3 commits
492
- (merged to 'next' on 2015-05-26 at 8ddaab1)
493
- + t5407: use <<- to align the expected output
494
- + rebase -i: fix post-rewrite hook with failed exec command
495
- + rebase -i: demonstrate incorrect behavior of post-rewrite
496
-
497
- "git rebase -i" fired post-rewrite hook when it shouldn't (namely,
498
- when it was told to stop sequencing with 'exec' insn).
499
-
500
- Will merge to 'master'.
501
-
502
-
757
* sb/submodule-doc-intro (2015-05-28) 1 commit
504
- - submodule doc: reorder introductory paragraphs
505
-
506
- Will merge to 'next'.
507
-
508
-
509
-* sb/test-bitmap-free-at-end (2015-05-22) 1 commit
510
- (merged to 'next' on 2015-05-26 at 1014ebf)
511
- + test_bitmap_walk: free bitmap with bitmap_free
512
-
513
- Will merge to 'master'.
514
-
515
-
516
-* dt/cat-file-follow-symlinks (2015-05-20) 3 commits
517
- (merged to 'next' on 2015-05-26 at 7ae52d4)
518
- + cat-file: add --follow-symlinks to --batch
519
- + sha1_name: get_sha1_with_context learns to follow symlinks
520
- + tree-walk: learn get_tree_entry_follow_symlinks
521
-
522
- "git cat-file --batch(-check)" learned the "--follow-symlinks"
523
- option that follows an in-tree symbolic links when asked about an
524
- object via extended SHA-1 syntax, e.g. HEAD:RelNotes that points at
525
- Documentation/RelNotes/2.5.0.txt. With the new option, the command
526
- behaves as if HEAD:Documentation/RelNotes/2.5.0.txt was given as
527
- input instead.
528
-
529
- Will merge to 'master'.
530
-
531
-
532
-* dt/clean-pathspec-filter-then-lstat (2015-05-18) 1 commit
533
- (merged to 'next' on 2015-05-26 at 9b24d71)
534
- + clean: only lstat files in pathspec
535
-
536
- "git clean pathspec..." tried to lstat(2) and complain even for
537
- paths outside the given pathspec.
538
-
539
- Will merge to 'master'.
540
-
541
-
542
-* jh/filter-empty-contents (2015-05-18) 1 commit
543
- (merged to 'next' on 2015-05-26 at 9cad398)
544
- + sha1_file: pass empty buffer to index empty file
545
-
546
- The clean/smudge interface did not work well when filtering an
547
- empty contents (failed and then passed the empty input through).
548
- It can be argued that a filter that produces anything but empty for
549
- an empty input is nonsense, but if the user wants to do strange
550
- things, then why not?
551
-
552
- Will merge to 'master'.
553
-
554
-
555
-* jk/http-backend-deadlock (2015-05-25) 1 commit
556
- (merged to 'next' on 2015-05-26 at 9f3bd8a)
557
- + Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlock
558
- (this branch uses jk/http-backend-deadlock-2.2 and jk/http-backend-deadlock-2.3.)
559
-
560
- Communication between the HTTP server and http_backend process can
561
- lead to a dead-lock when relaying a large ref negotiation request.
562
- Diagnose the situation better, and mitigate it by reading such a
563
- request first into core (to a reasonable limit).
564
-
565
- Will merge to 'master'.
566
-
567
-
568
-* mm/log-format-raw-doc (2015-05-20) 2 commits
569
- (merged to 'next' on 2015-05-26 at 97e2c9d)
570
- + Documentation/log: clarify sha1 non-abbreviation in log --raw
571
- + Documentation/log: clarify what --raw means
572
-
573
- Clarify that "log --raw" and "log --format=raw" are unrelated
574
- concepts.
575
-
576
- Will merge to 'master'.
577
-
578
-
579
-* sg/help-group (2015-05-21) 5 commits
580
- (merged to 'next' on 2015-05-26 at 2749912)
581
- + help: respect new common command grouping
582
- + command-list.txt: drop the "common" tag
583
- + generate-cmdlist: parse common group commands
584
- + command-list.txt: add the common groups block
585
- + command-list: prepare machinery for upcoming "common groups" section
586
-
587
- Group list of commands shown by "git help" along the workflow
588
- elements to help early learners.
758
+ (merged to 'next' on 2015-06-01 at b6798de)
759
+ + submodule doc: reorder introductory paragraphs
760
761
Will merge to 'master'.
762
@@ -606,18 +777,20 @@ of the repositories listed at
777
778
779
* pt/pull-tests (2015-05-29) 8 commits
609
- - t5520: check reflog action in fast-forward merge
610
- - t5521: test --dry-run does not make any changes
611
- - t5520: test --rebase failure on unborn branch with index
612
- - t5520: test --rebase with multiple branches
613
- - t5520: test work tree fast-forward when fetch updates head
614
- - t5520: test for failure if index has unresolved entries
615
- - t5520: test no merge candidates cases
616
- - t5520: prevent field splitting in content comparisons
780
+ (merged to 'next' on 2015-06-01 at c98370b)
781
+ + t5520: check reflog action in fast-forward merge
782
+ + t5521: test --dry-run does not make any changes
783
+ + t5520: test --rebase failure on unborn branch with index
784
+ + t5520: test --rebase with multiple branches
785
+ + t5520: test work tree fast-forward when fetch updates head
786
+ + t5520: test for failure if index has unresolved entries
787
+ + t5520: test no merge candidates cases
788
+ + t5520: prevent field splitting in content comparisons
789
+ (this branch is used by pt/pull-optparse.)
790
791
Add more test coverage to "git pull".
792
620
- Will merge to 'next'.
793
+ Will merge to 'master'.
794
795
796
* jc/clone-bundle (2015-04-30) 1 commit
@@ -674,12 +847,3 @@ of the repositories listed at
847
has been deprecated since October 2007.
848
849
Will keep in 'next' during the 2.5 cycle.
677
-
678
-
679
-* ah/usage-strings (2015-05-03) 1 commit
680
- (merged to 'next' on 2015-05-28 at 5f4350e)
681
- + blame, log: format usage strings similarly to those in documentation
682
-
683
- A few usage string updates.
684
-
685
- Will merge to 'master'.