What's cooking (2014/12 #03)
Junio C Hamano committed
Dec 15, 2014 at 12:38 UTC
92d6a7876afe47c632fc9e7d1b16a8f2f40fbbaa
1 file changed
+483
-381
whats-cooking.txt
+483
-381
@@ -1,16 +1,20 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2014, #02; Wed, 10)
4
-X-master-at: c18b86734113ee2aeb0e140c922c8fbd4accc860
5
-X-next-at: 802437b789eb05ee52be21d578fe4cfed918b276
3
+Subject: What's cooking in git.git (Dec 2014, #03; Mon, 15)
4
+X-master-at: 9abc44b681a669c67d071d858c8aad21f65a0956
5
+X-next-at: d6426a0ea3bc6be707b25a6817328703d4883659
6
7
-What's cooking in git.git (Dec 2014, #02; Wed, 10)
7
+What's cooking in git.git (Dec 2014, #03; Mon, 15)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
+The 'next' branch has been rewound and rebuilt on top of 2.2; I
15
+expect this to be a short and light cycle that would not add too
16
+many new things.
17
+
18
You can find the changes described here in the integration branches
19
of the repositories listed at
20
@@ -19,239 +23,222 @@ of the repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
22
-* jh/empty-notes (2014-11-14) 9 commits
23
- (merged to 'next' on 2014-11-18 at 9eeb338)
24
- + t3301: modernize style
25
- + notes: empty notes should be shown by 'git log'
26
- + builtin/notes: add --allow-empty, to allow storing empty notes
27
- + builtin/notes: split create_note() to clarify add vs. remove logic
28
- + builtin/notes: simplify early exit code in add()
29
- + builtin/notes: refactor note file path into struct note_data
30
- + builtin/notes: improve naming
31
- + t3301: verify that 'git notes' removes empty notes by default
32
- + builtin/notes: fix premature failure when trying to add the empty blob
33
-
34
- A request to store an empty note via "git notes" meant to remove
35
- note from the object but with --allow-empty we will store a (surprise!)
36
- note that is empty. In the longer run, we might want to deprecate
37
- the somewhat unintuitive "emptying means deletion" behaviour.
38
-
39
-
40
-* jk/checkout-from-tree (2014-11-13) 1 commit
41
- (merged to 'next' on 2014-11-14 at ddbffb0)
42
- + checkout $tree: do not throw away unchanged index entries
43
-
44
- "git checkout $treeish $path", when $path in the index and the
45
- working tree already matched what is in $treeish at the $path,
46
- still overwrote the $path unnecessarily.
26
+* da/difftool-mergetool-simplify-reporting-status (2014-11-21) 5 commits
27
+ (merged to 'next' on 2014-12-04 at c3c329f)
28
+ + mergetools: stop setting $status in merge_cmd()
29
+ + mergetool: simplify conditionals
30
+ + difftool--helper: add explicit exit statement
31
+ + mergetool--lib: remove use of $status global
32
+ + mergetool--lib: remove no-op assignment to $status from setup_user_tool
33
34
+ Code simplification.
35
49
-* jk/gitweb-with-newer-cgi-multi-param (2014-11-18) 1 commit
50
- (merged to 'next' on 2014-11-18 at 6ac61fe)
51
- + gitweb: hack around CGI's list-context param() handling
36
53
- "gitweb" used to depend on a behaviour recent CGI.pm deprecated.
37
+* jc/unpack-trees-plug-leak (2014-11-17) 1 commit
38
+ (merged to 'next' on 2014-12-04 at 9f1df30)
39
+ + unpack_trees: plug leakage of o->result
40
41
56
-* js/windows-open-eisdir-error (2014-11-17) 1 commit
57
- (merged to 'next' on 2014-11-18 at 57b0d49)
58
- + Windows: correct detection of EISDIR in mingw_open()
42
+* jk/colors-fix (2014-11-20) 3 commits
43
+ (merged to 'next' on 2014-12-04 at 0d97d69)
44
+ + t4026: test "normal" color
45
+ + config: fix parsing of "git config --get-color some.key -1"
46
+ + docs: describe ANSI 256-color mode
47
+ (this branch is used by jk/colors.)
48
60
- open() emulated on Windows platforms did not give EISDIR upon an
61
- attempt to open a directory for writing.
49
50
+* jk/no-perl-tests (2014-11-18) 2 commits
51
+ (merged to 'next' on 2014-12-04 at f166620)
52
+ + t960[34]: mark cvsimport tests as requiring perl
53
+ + t0090: mark add-interactive test with PERL prerequisite
54
64
-* mh/config-flip-xbit-back-after-checking (2014-11-18) 1 commit
65
- (merged to 'next' on 2014-11-18 at 45f7d71)
66
- + create_default_files(): don't set u+x bit on $GIT_DIR/config
67
- (this branch is used by tb/config-core-filemode-check-on-broken-fs.)
55
+ Some tests that depend on perl lacked PERL prerequisite to protect
56
+ them, breaking build with NO_PERL configuration.
57
69
- "git init" (hence "git clone") initialized the per-repository
70
- configuration file .git/config with x-bit by mistake.
58
59
+* jk/pack-bitmap (2014-11-30) 1 commit
60
+ (merged to 'next' on 2014-12-04 at eb457ad)
61
+ + pack-bitmap: do not use gcc packed attribute
62
73
-* rs/env-array-in-child-process (2014-11-10) 1 commit
74
- (merged to 'next' on 2014-11-14 at 3f6ba07)
75
- + use args member of struct child_process
63
77
- Code cleanup.
64
+* jk/push-simple (2014-11-30) 1 commit
65
+ (merged to 'next' on 2014-12-04 at 00785c7)
66
+ + push: truly use "simple" as default, not "upstream"
67
68
+ Git 2.0 was supposed to make the "simple" mode for the default of
69
+ "git push", but it didn't.
70
80
-* rs/maint-config-use-labs (2014-11-17) 1 commit
81
- (merged to 'next' on 2014-11-18 at 53c2404)
82
- + use labs() for variables of type long instead of abs()
71
84
- A few code paths used abs() when they should have used labs() on
85
- long integers.
72
+* jk/rebuild-perl-scripts-with-no-perl-seting-change (2014-11-18) 3 commits
73
+ (merged to 'next' on 2014-12-04 at 27382d3)
74
+ + Makefile: have python scripts depend on NO_PYTHON setting
75
+ + Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macros
76
+ + Makefile: have perl scripts depend on NO_PERL setting
77
78
+ The build procedure did not bother fixing perl and python scripts
79
+ when NO_PERL and NO_PYTHON build-time configuration changed.
80
88
-* rs/receive-pack-use-labs (2014-11-17) 1 commit
89
- (merged to 'next' on 2014-11-18 at c6d2d94)
90
- + use labs() for variables of type long instead of abs()
81
92
- A few code paths used abs() when they should have used labs() on
93
- long integers.
82
+* mh/config-copy-string-from-git-path (2014-11-17) 1 commit
83
+ (merged to 'next' on 2014-12-04 at 9c9518b)
84
+ + cmd_config(): make a copy of path obtained from git_path()
85
86
96
-* sv/get-builtin (2014-11-13) 1 commit
97
- (merged to 'next' on 2014-11-14 at 9497e17)
98
- + builtin: move builtin retrieval to get_builtin()
87
+* po/everyday-doc (2014-11-17) 1 commit
88
+ (merged to 'next' on 2014-12-04 at 39d31fb)
89
+ + Documentation: change "gitlink" typo in git-push
90
100
- Small code consolidation.
91
92
+* rt/push-recurse-submodule-usage-string (2014-11-18) 1 commit
93
+ (merged to 'next' on 2014-12-04 at c43e23c)
94
+ + builtin/push.c: fix description of --recurse-submodules option
95
103
-* tq/git-ssh-command (2014-11-10) 1 commit
104
- (merged to 'next' on 2014-11-14 at 83f5dae)
105
- + git_connect: set ssh shell command in GIT_SSH_COMMAND
96
107
- Allow passing extra set of arguments when ssh is invoked to create
108
- an encrypted & authenticated connection, which is not possible with
109
- existing GIT_SSH mechanism, which was designed more to match what
110
- other programs with similar variables did, not necessarily to be
111
- more useful.
97
+* sv/typofix-apply-error-message (2014-11-17) 1 commit
98
+ (merged to 'next' on 2014-12-04 at de7547a)
99
+ + apply: fix typo in an error message
100
101
--------------------------------------------------
102
[New Topics]
103
116
-* dm/compat-s-ifmt-for-zos (2014-12-04) 1 commit
117
- - compat: convert modes to use portable file type values
104
+* jk/test-asan (2014-12-11) 1 commit
105
+ (merged to 'next' on 2014-12-15 at d24cb92)
106
+ + t: support clang/gcc AddressSanitizer
107
119
- Long overdue departure from the assumption that S_IFMT is shared by
120
- everybody made in 2005.
108
+ Will merge to 'master'.
109
110
123
-* jk/credential-quit (2014-12-04) 2 commits
124
- - prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts
125
- - credential: let helpers tell us to quit
111
+* nd/split-index (2014-12-11) 1 commit
112
+ (merged to 'next' on 2014-12-15 at ed6490c)
113
+ + index-format.txt: add a missing closing quote
114
127
- Credential helpers are asked in turn until one of them give
128
- positive response, which is cumbersome to turn off when you need to
129
- run Git in an automated setting. The credential helper interface
130
- learned to allow a helper to say "stop, don't ask other helpers."
131
- Also GIT_TERMINAL_PROMPT environment can be set to false to disable
132
- our built-in prompt mechanism for passwords.
115
+ A typofix to the documentation of a feature already in the release.
116
134
- Will merge to 'next'.
117
+ Will merge to 'master'.
118
119
137
-* mg/branch-d-m-f (2014-12-09) 2 commits
138
- - branch: allow -f with -m and -d
139
- - t3200-branch: test -M
120
+* ch/new-gpg-drops-rfc-1991 (2014-12-12) 4 commits
121
+ (merged to 'next' on 2014-12-15 at 32d7d50)
122
+ + tests: squelch noise from GPG machinery set-up
123
+ + tests: replace binary GPG keyrings with ASCII-armored keys
124
+ + tests: skip RFC1991 tests for gnupg 2.1
125
+ + tests: create gpg homedir on the fly
126
141
- "git branch -d" (delete) and "git branch -m" (move) learned to
142
- honor "-f" (force) flag; unlike many other subcommands, the way to
143
- force these have been with separate "-D/-M" options, which was
144
- inconsistent.
127
+ Recent GPG changes the keyring format and drops support for RFC1991
128
+ formatted signatures, breaking our existing tests.
129
146
- Will merge to 'next'.
130
+ Will merge to 'master'.
131
132
149
-* mg/doc-check-ignore-tracked-are-not-ignored (2014-12-04) 1 commit
150
- - check-ignore: clarify treatment of tracked files
133
+* jg/prompt-localize-temporary (2014-12-12) 1 commit
134
+ (merged to 'next' on 2014-12-15 at bb9cac9)
135
+ + git-prompt.sh: make $f local to __git_eread()
136
152
- Will merge to 'next'.
137
+ "git-prompt" (in contrib/) used a variable from the global scope,
138
+ possibly contaminating end-user's namespace.
139
140
+ Will merge to 'master'.
141
155
-* rt/completion-tag (2014-12-04) 1 commit
156
- - completion: add git-tag options
157
-
158
- Will merge to 'next'.
142
143
+* jk/strbuf-doc-to-header (2014-12-12) 4 commits
144
+ - strbuf.h: reorganize api function grouping headers
145
+ - strbuf.h: format asciidoc code blocks as 4-space indent
146
+ - strbuf.h: drop asciidoc list formatting from API docs
147
+ - strbuf: migrate api-strbuf.txt documentation to strbuf.h
148
+
149
+ Resolve the "doc vs header" to favor the latter.
150
+
151
+ Expecting to be rerolled.
152
+
153
+
154
+* mh/reflog-expire (2014-12-12) 24 commits
155
+ - refs.c: let fprintf handle the formatting
156
+ - refs.c: don't expose the internal struct ref_lock in the header file
157
+ - lock_any_ref_for_update(): inline function
158
+ - refs.c: remove unlock_ref/close_ref/commit_ref from the refs api
159
+ - reflog_expire(): new function in the reference API
160
+ - expire_reflog(): treat the policy callback data as opaque
161
+ - Move newlog and last_kept_sha1 to "struct expire_reflog_cb"
162
+ - expire_reflog(): move rewrite to flags argument
163
+ - expire_reflog(): move verbose to flags argument
164
+ - expire_reflog(): pass flags through to expire_reflog_ent()
165
+ - struct expire_reflog_cb: a new callback data type
166
+ - Rename expire_reflog_cb to expire_reflog_policy_cb
167
+ - expire_reflog(): move updateref to flags argument
168
+ - expire_reflog(): move dry_run to flags argument
169
+ - expire_reflog(): add a "flags" argument
170
+ - expire_reflog(): extract two policy-related functions
171
+ - Extract function should_expire_reflog_ent()
172
+ - expire_reflog(): use a lock_file for rewriting the reflog file
173
+ - expire_reflog(): return early if the reference has no reflog
174
+ - expire_reflog(): rename "ref" parameter to "refname"
175
+ - expire_reflog(): it's not an each_ref_fn anymore
176
+ - refs.c: add a function to append a reflog entry to a fd
177
+ - refs.c: make ref_transaction_delete a wrapper for ref_transaction_update
178
+ - refs.c: make ref_transaction_create a wrapper for ref_transaction_update
179
161
-* jk/for-each-reflog-ent-reverse (2014-12-05) 2 commits
162
- - for_each_reflog_ent_reverse: turn leftover check into assertion
163
- - for_each_reflog_ent_reverse: fix newlines on block boundaries
180
+ Restructure "reflog expire" to fit the reflogs better with the
181
+ recently updated ref API.
182
165
- Will merge to 'next'.
183
+ Looked reasonable (except that ome shortlog entries stood out like
184
+ a sore thumb).
185
186
168
-* po/doc-assume-unchanged (2014-12-09) 2 commits
169
- - gitignore.txt: do not suggest assume-unchanged
170
- - doc: make clear --assume-unchanged's user contract
187
+* po/doc-core-ignorestat (2014-12-12) 1 commit
188
+ - doc: core.ignoreStat clarify the --assume-unchanged effect
189
172
- Fixes long-standing misunderstanding of what assume-unchanged is
173
- about. Some text near what is removed by the bottom patch may also
174
- have to be removed.
190
+ Expecting a reroll.
191
176
- Will merge to 'next'.
192
193
+* rs/use-strbuf-complete-line (2014-12-12) 1 commit
194
+ (merged to 'next' on 2014-12-15 at d6426a0)
195
+ + use strbuf_complete_line() for adding a newline if needed
196
179
-* tb/t0027-eol-conversion (2014-12-05) 1 commit
180
- - t0027: check the eol conversion warnings
197
+ Will merge to 'master'.
198
182
- Will merge to 'next'.
199
200
+* jk/add-i-read-error (2014-12-15) 1 commit
201
+ - add--interactive: leave main loop on read error
202
185
-* jk/always-allow-large-packets (2014-12-10) 1 commit
186
- - pkt-line: allow writing of LARGE_PACKET_MAX buffers
203
+ "git add -i" did not notice when the interactive command input
204
+ stream went away and kept asking.
205
206
Will merge to 'next'.
207
208
191
-* jk/commit-date-approxidate (2014-12-10) 2 commits
192
- - commit: always populate GIT_AUTHOR_* variables
193
- - commit: loosen ident checks when generating template
194
-
195
- Will merge to 'next'.
209
+* pd/completion-filenames-fix (2014-12-15) 1 commit
210
+ - Update documentation occurrences of filename .sh
211
197
-
198
-* jk/read-packed-refs-without-path-max (2014-12-10) 3 commits
199
- - read_packed_refs: use skip_prefix instead of static array
200
- - read_packed_refs: pass strbuf to parse_ref_line
201
- - read_packed_refs: use a strbuf for reading lines
212
+ The top-of-the-file instruction for completion scripts (in contrib/)
213
+ did not name the files correctly.
214
215
Will merge to 'next'.
216
217
206
-* jn/dedup-doc-header (2014-12-09) 2 commits
207
- - put string-list API documentation in one place
208
- - put strbuf API documentation in one place
209
-
210
- We would want to have an easy way for developers to learn about
211
- APIs, and also a way to encourage them to keep the API
212
- documentation up to date when they make changes. Having header
213
- comments and API documentation duplicated in two different places
214
- risked them going out of sync.
215
-
216
- This removes the duplicates by dropping comments from the header;
217
- it is just for discussion at this moment.
218
-
218
+* rd/send-email-2047-fix (2014-12-15) 2 commits
219
+ - send-email: handle adjacent RFC 2047-encoded words properly
220
+ - send-email: align RFC 2047 decoding more closely with the spec
221
220
-* jn/doc-api-errors (2014-12-04) 1 commit
221
- - doc: document error handling functions and conventions
222
-
223
- For discussion.
224
-
225
-
226
-* js/fsck-tag-validation (2014-12-09) 2 commits
227
- - index-pack: terminate object buffers with NUL
228
- - fsck: properly bound "invalid tag name" error message
229
-
230
- Follow-up to tag object format validation added in 2.2.
231
-
232
- Will merge to 'next'.
233
-
234
-
235
-* js/test-hashmap-squelch-gcc (2014-12-09) 1 commit
236
- - test-hashmap: squelch gcc compiler warning
222
+ "git send-email" did not handle RFC 2047 encoded headers quite
223
+ right.
224
225
Will merge to 'next'.
226
227
+--------------------------------------------------
228
+[Stalled]
229
241
-* ok/rebase-i-count-todo (2014-12-10) 1 commit
242
- - Show number of TODO items for interactive rebase
243
-
244
- Will merge to 'next'.
230
+* pw/remote-set-url-fetch (2014-11-26) 1 commit
231
+ - remote: add --fetch and --both options to set-url
232
233
+ Expecting a reroll.
234
247
-* rw/apply-does-not-take-ignore-date (2014-12-09) 1 commit
248
- - git-am.txt: --ignore-date flag is not passed to git-apply
235
236
+* ye/http-accept-language (2014-12-03) 2 commits
237
+ . SQUASH???
238
+ . http: send Accept-Language header if possible
239
251
- Will merge to 'next'.
240
+ Breaks various people ($gmane/260903).
241
253
---------------------------------------------------
254
-[Stalled]
242
243
* ms/submodule-update-config-doc (2014-11-03) 1 commit
244
- submodule: clarify documentation for update subcommand
@@ -397,17 +384,172 @@ of the repositories listed at
384
--------------------------------------------------
385
[Cooking]
386
387
+* dm/compat-s-ifmt-for-zos (2014-12-04) 1 commit
388
+ (merged to 'next' on 2014-12-15 at 0eb2fe6)
389
+ + compat: convert modes to use portable file type values
390
+
391
+ Long overdue departure from the assumption that S_IFMT is shared by
392
+ everybody made in 2005.
393
+
394
+ Will merge to 'master'.
395
+
396
+
397
+* jk/credential-quit (2014-12-04) 2 commits
398
+ (merged to 'next' on 2014-12-15 at 4cfd999)
399
+ + prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts
400
+ + credential: let helpers tell us to quit
401
+
402
+ Credential helpers are asked in turn until one of them give
403
+ positive response, which is cumbersome to turn off when you need to
404
+ run Git in an automated setting. The credential helper interface
405
+ learned to allow a helper to say "stop, don't ask other helpers."
406
+ Also GIT_TERMINAL_PROMPT environment can be set to false to disable
407
+ our built-in prompt mechanism for passwords.
408
+
409
+ Will merge to 'master'.
410
+
411
+
412
+* mg/branch-d-m-f (2014-12-09) 2 commits
413
+ (merged to 'next' on 2014-12-15 at 8366f2c)
414
+ + branch: allow -f with -m and -d
415
+ + t3200-branch: test -M
416
+
417
+ "git branch -d" (delete) and "git branch -m" (move) learned to
418
+ honor "-f" (force) flag; unlike many other subcommands, the way to
419
+ force these have been with separate "-D/-M" options, which was
420
+ inconsistent.
421
+
422
+ Will merge to 'master'.
423
+
424
+
425
+* mg/doc-check-ignore-tracked-are-not-ignored (2014-12-04) 1 commit
426
+ (merged to 'next' on 2014-12-15 at c50f748)
427
+ + check-ignore: clarify treatment of tracked files
428
+
429
+ Will merge to 'master'.
430
+
431
+
432
+* rt/completion-tag (2014-12-04) 1 commit
433
+ (merged to 'next' on 2014-12-15 at b03ee39)
434
+ + completion: add git-tag options
435
+
436
+ Will merge to 'master'.
437
+
438
+
439
+* jk/for-each-reflog-ent-reverse (2014-12-05) 2 commits
440
+ (merged to 'next' on 2014-12-15 at de71f08)
441
+ + for_each_reflog_ent_reverse: turn leftover check into assertion
442
+ + for_each_reflog_ent_reverse: fix newlines on block boundaries
443
+
444
+ The code that reads the reflog from the newer to the older entries
445
+ did not handle an entry that crosses a boundary of block it uses to
446
+ read them correctly.
447
+
448
+ Will merge to 'master'.
449
+
450
+
451
+* po/doc-assume-unchanged (2014-12-09) 2 commits
452
+ (merged to 'next' on 2014-12-15 at 646e77e)
453
+ + gitignore.txt: do not suggest assume-unchanged
454
+ + doc: make clear --assume-unchanged's user contract
455
+
456
+ Fixes long-standing misunderstanding of what assume-unchanged is
457
+ about. Some text near what is removed by the bottom patch may also
458
+ have to be removed.
459
+
460
+ Will merge to 'master'.
461
+
462
+
463
+* tb/t0027-eol-conversion (2014-12-05) 1 commit
464
+ (merged to 'next' on 2014-12-15 at ba24e75)
465
+ + t0027: check the eol conversion warnings
466
+
467
+ Will merge to 'master'.
468
+
469
+
470
+* jk/always-allow-large-packets (2014-12-10) 1 commit
471
+ (merged to 'next' on 2014-12-15 at c3fb2c8)
472
+ + pkt-line: allow writing of LARGE_PACKET_MAX buffers
473
+
474
+ "git push" and "git fetch" did not communicate an overlong refname
475
+ correctly.
476
+
477
+ Will merge to 'master'.
478
+
479
+
480
+* jk/commit-date-approxidate (2014-12-11) 2 commits
481
+ (merged to 'next' on 2014-12-15 at 047530e)
482
+ + commit: always populate GIT_AUTHOR_* variables
483
+ + commit: loosen ident checks when generating template
484
+
485
+ Recent update to "git commit" broke amending an existing commit
486
+ with bogus author/committer lines without a valid e-mail address.
487
+
488
+ Will merge to 'master'.
489
+
490
+
491
+* jk/read-packed-refs-without-path-max (2014-12-10) 3 commits
492
+ (merged to 'next' on 2014-12-15 at c6d6f56)
493
+ + read_packed_refs: use skip_prefix instead of static array
494
+ + read_packed_refs: pass strbuf to parse_ref_line
495
+ + read_packed_refs: use a strbuf for reading lines
496
+
497
+ Git did not correctly read an overlong refname from a packed refs
498
+ file.
499
+
500
+ Will merge to 'master'.
501
+
502
+
503
+* jn/doc-api-errors (2014-12-04) 1 commit
504
+ - doc: document error handling functions and conventions
505
+
506
+ For discussion.
507
+
508
+
509
+* js/fsck-tag-validation (2014-12-09) 2 commits
510
+ (merged to 'next' on 2014-12-15 at 455f26c)
511
+ + index-pack: terminate object buffers with NUL
512
+ + fsck: properly bound "invalid tag name" error message
513
+
514
+ New tag object format validation added in 2.2 showed garbage
515
+ after a tagname it reported in its error message.
516
+
517
+ Will merge to 'master'.
518
+
519
+
520
+* js/test-hashmap-squelch-gcc (2014-12-09) 1 commit
521
+ (merged to 'next' on 2014-12-15 at a8da691)
522
+ + test-hashmap: squelch gcc compiler warning
523
+
524
+ Will merge to 'master'.
525
+
526
+
527
+* ok/rebase-i-count-todo (2014-12-10) 1 commit
528
+ (merged to 'next' on 2014-12-15 at 4a1f7ed)
529
+ + Show number of TODO items for interactive rebase
530
+
531
+ Will merge to 'master'.
532
+
533
+
534
+* rw/apply-does-not-take-ignore-date (2014-12-09) 1 commit
535
+ (merged to 'next' on 2014-12-15 at ded2f99)
536
+ + git-am.txt: --ignore-date flag is not passed to git-apply
537
+
538
+ Will merge to 'master'.
539
+
540
+
541
* jc/exec-cmd-system-path-leak-fix (2014-11-30) 1 commit
401
- - system_path(): always return free'able memory to the caller
542
+ (merged to 'next' on 2014-12-15 at f926ee5)
543
+ + system_path(): always return free'able memory to the caller
544
545
The function sometimes returned a non-freeable memory and some
546
other times returned a piece of memory that must be freed.
547
406
- Will merge to 'next'.
548
+ Will merge to 'master'.
549
550
551
* jc/hook-cleanup (2014-12-01) 1 commit
410
- (merged to 'next' on 2014-12-04 at 17059f5)
552
+ (merged to 'next' on 2014-12-15 at f5759d0)
553
+ run-command.c: retire unused run_hook_with_custom_index()
554
555
Remove unused code.
@@ -415,16 +557,6 @@ of the repositories listed at
557
Will merge to 'master'.
558
559
418
-* jk/push-simple (2014-11-30) 1 commit
419
- (merged to 'next' on 2014-12-04 at 00785c7)
420
- + push: truly use "simple" as default, not "upstream"
421
-
422
- Git 2.0 was supposed to make the "simple" mode for the default of
423
- "git push", but it didn't.
424
-
425
- Will merge to 'master'.
426
-
427
-
560
* jn/rerere-fail-on-auto-update-failure (2014-12-03) 2 commits
561
- SQUASH???
562
- rerere: error out on autoupdate failure
@@ -433,8 +565,9 @@ of the repositories listed at
565
566
567
* js/push-to-deploy (2014-11-30) 2 commits
436
- - t5516: more tests for receive.denyCurrentBranch=updateInstead
437
- - receive-pack: add another option for receive.denyCurrentBranch
568
+ (merged to 'next' on 2014-12-15 at ef8c99f)
569
+ + t5516: more tests for receive.denyCurrentBranch=updateInstead
570
+ + receive-pack: add another option for receive.denyCurrentBranch
571
(this branch is used by jc/push-to-checkout.)
572
573
"git push" into a repository with a working tree normally refuses
@@ -443,7 +576,7 @@ of the repositories listed at
576
is no change to the working tree and the index instead, which would
577
be useful to "deploy" by pushing into a repository.
578
446
- Will merge to 'next'.
579
+ Will merge to 'master'.
580
581
582
* jc/push-to-checkout (2014-12-01) 2 commits
@@ -458,7 +591,7 @@ of the repositories listed at
591
Needs docs.
592
593
461
-* lh/send-email-hide-x-mailer (2014-12-04) 4 commits
594
+* lh/send-email-hide-x-mailer (2014-12-11) 4 commits
595
- SQUASH???
596
- test/send-email: --[no-]xmailer tests
597
- SQUASH???
@@ -468,6 +601,8 @@ of the repositories listed at
601
in the message it sends out. A new command line flag allows the
602
header to be squelched.
603
604
+ Will merge to 'next' after squashing the fixups.
605
+
606
607
* nd/list-files (2014-12-01) 19 commits
608
- list-files: -M aka diff-cached
@@ -495,52 +630,41 @@ of the repositories listed at
630
631
632
* nd/ls-tree-pathspec (2014-12-01) 5 commits
498
- - t3102: style modernization
499
- - t3102: document that ls-tree does not yet support negated pathspec
500
- - ls-tree: disable negative pathspec because it's not supported
501
- - ls-tree: remove path filtering logic in show_tree
502
- - tree.c: update read_tree_recursive callback to pass strbuf as base
633
+ (merged to 'next' on 2014-12-15 at 8da6e09)
634
+ + t3102: style modernization
635
+ + t3102: document that ls-tree does not yet support negated pathspec
636
+ + ls-tree: disable negative pathspec because it's not supported
637
+ + ls-tree: remove path filtering logic in show_tree
638
+ + tree.c: update read_tree_recursive callback to pass strbuf as base
639
640
"git ls-tree" does not support path selection based on negative
641
pathspecs, but did not error out when negative pathspecs are given.
642
507
- Will merge to 'next'.
643
+ Will merge to 'master'.
644
645
646
* rj/t0050-passes (2014-11-30) 1 commit
511
- - t0050-*.sh: mark the rename (case change) test as passing
647
+ (merged to 'next' on 2014-12-15 at f56c339)
648
+ + t0050-*.sh: mark the rename (case change) test as passing
649
513
- Will merge to 'next'.
650
+ Will merge to 'master'.
651
652
653
* rt/for-each-ref-spell-tcl-as-Tcl (2014-11-30) 1 commit
517
- - for-each-ref: correct spelling of Tcl in option description
654
+ (merged to 'next' on 2014-12-15 at c0fcefb)
655
+ + for-each-ref: correct spelling of Tcl in option description
656
519
- Will merge to 'next'.
657
+ Will merge to 'master'.
658
659
660
* sb/ref-transaction-reflog (2014-12-03) 2 commits
523
- - refs.c: rename transaction.updates to transaction.ref_updates
524
- - refs.c: rename the transaction functions
661
+ . refs.c: rename transaction.updates to transaction.ref_updates
662
+ . refs.c: rename the transaction functions
663
(this branch uses sb/ref-transaction-unify-to-update.)
664
665
Will be rerolled as a part of a larger series.
666
667
530
-* ye/http-accept-language (2014-12-03) 2 commits
531
- - SQUASH???
532
- - http: send Accept-Language header if possible
533
-
534
- Breaks various people ($gmane/260903).
535
-
536
-
537
-* jk/pack-bitmap (2014-11-30) 1 commit
538
- (merged to 'next' on 2014-12-04 at eb457ad)
539
- + pack-bitmap: do not use gcc packed attribute
540
-
541
- Will merge to 'master'.
542
-
543
-
668
* nd/multiple-work-trees (2014-12-01) 34 commits
669
- git-common-dir: make "modules/" per-working-directory directory
670
- checkout: do not fail if target is an empty directory
@@ -582,23 +706,14 @@ of the repositories listed at
706
by making the borrowee and borrowers aware of each other.
707
708
585
-* jc/unpack-trees-plug-leak (2014-11-17) 1 commit
586
- (merged to 'next' on 2014-12-04 at 9f1df30)
587
- + unpack_trees: plug leakage of o->result
588
-
589
- Will merge to 'master'.
590
-
591
-
709
* jk/colors (2014-12-09) 6 commits
593
- (merged to 'next' on 2014-12-09 at 802437b)
710
+ (merged to 'next' on 2014-12-15 at 20b045f)
711
+ parse_color: drop COLOR_BACKGROUND macro
595
- (merged to 'next' on 2014-12-04 at 8d2e37b)
712
+ diff-highlight: allow configurable colors
713
+ parse_color: recognize "no$foo" to clear the $foo attribute
714
+ parse_color: support 24-bit RGB values
715
+ parse_color: refactor color storage
716
+ Merge branch 'jn/parse-config-slot' into jk/colors
601
- (this branch uses jk/colors-fix.)
717
718
"diff-highlight" filter (in contrib/) allows its color output
719
to be customized via configuration variables.
@@ -606,68 +721,21 @@ of the repositories listed at
721
Will merge to 'master'.
722
723
609
-* jk/colors-fix (2014-11-20) 3 commits
610
- (merged to 'next' on 2014-12-04 at 0d97d69)
611
- + t4026: test "normal" color
612
- + config: fix parsing of "git config --get-color some.key -1"
613
- + docs: describe ANSI 256-color mode
614
- (this branch is used by jk/colors.)
615
-
616
- Will merge to 'master'.
617
-
618
-
724
* jk/lock-ref-sha1-basic-return-errors (2014-11-20) 1 commit
620
- - lock_ref_sha1_basic: do not die on locking errors
621
-
622
- Will merge to 'next'.
623
-
725
+ (merged to 'next' on 2014-12-15 at c48b110)
726
+ + lock_ref_sha1_basic: do not die on locking errors
727
625
-* jk/no-perl-tests (2014-11-18) 2 commits
626
- (merged to 'next' on 2014-12-04 at f166620)
627
- + t960[34]: mark cvsimport tests as requiring perl
628
- + t0090: mark add-interactive test with PERL prerequisite
629
-
630
- Some tests that depend on perl lacked PERL prerequisite to protect
631
- them, breaking build with NO_PERL configuration.
632
-
633
- Will merge to 'master'.
634
-
635
-
636
-* jk/rebuild-perl-scripts-with-no-perl-seting-change (2014-11-18) 3 commits
637
- (merged to 'next' on 2014-12-04 at 27382d3)
638
- + Makefile: have python scripts depend on NO_PYTHON setting
639
- + Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macros
640
- + Makefile: have perl scripts depend on NO_PERL setting
641
-
642
- The build procedure did not bother fixing perl and python scripts
643
- when NO_PERL and NO_PYTHON build-time configuration changed.
644
-
645
- Will merge to 'master'.
646
-
647
-
648
-* mh/config-copy-string-from-git-path (2014-11-17) 1 commit
649
- (merged to 'next' on 2014-12-04 at 9c9518b)
650
- + cmd_config(): make a copy of path obtained from git_path()
651
-
652
- Will merge to 'master'.
653
-
654
-
655
-* po/everyday-doc (2014-11-17) 1 commit
656
- (merged to 'next' on 2014-12-04 at 39d31fb)
657
- + Documentation: change "gitlink" typo in git-push
728
+ Correct an API anomaly.
729
730
Will merge to 'master'.
731
732
733
* ps/new-workdir-into-empty-directory (2014-12-03) 1 commit
663
- - git-new-workdir: don't fail if the target directory is empty
664
-
665
- Will merge to 'next'.
734
+ (merged to 'next' on 2014-12-15 at 0787b56)
735
+ + git-new-workdir: don't fail if the target directory is empty
736
667
-
668
-* rt/push-recurse-submodule-usage-string (2014-11-18) 1 commit
669
- (merged to 'next' on 2014-12-04 at c43e23c)
670
- + builtin/push.c: fix description of --recurse-submodules option
737
+ "git new-workdir" (in contrib/) can be used to populate an empty
738
+ and existing directory now.
739
740
Will merge to 'master'.
741
@@ -678,60 +746,26 @@ of the repositories listed at
746
Will be rerolled as a part of a larger series.
747
748
681
-* sb/log-ref-write-fd (2014-11-20) 1 commit
682
- - refs.c: add a function to append a reflog entry to a fd
683
-
684
- Will be rerolled as a part of a larger series.
685
-
686
-
687
-* sb/ref-transaction-unify-to-update (2014-11-20) 2 commits
688
- - refs.c: make ref_transaction_delete a wrapper for ref_transaction_update
689
- - refs.c: make ref_transaction_create a wrapper for ref_transaction_update
690
- (this branch is used by sb/ref-transaction-reflog.)
691
-
692
- Code simplification.
693
-
694
- Will be rerolled as a part of a larger series.
695
-
696
-
749
* sv/doc-stripspace (2014-12-04) 1 commit
698
- (merged to 'next' on 2014-12-04 at 32fd559)
750
+ (merged to 'next' on 2014-12-15 at e86f8ba)
751
+ Documentation/git-stripspace: add synopsis for --comment-lines
752
753
Will merge to 'master'.
754
755
704
-* sv/typofix-apply-error-message (2014-11-17) 1 commit
705
- (merged to 'next' on 2014-12-04 at de7547a)
706
- + apply: fix typo in an error message
707
-
708
- Will merge to 'master'.
709
-
710
-
711
-* da/difftool-mergetool-simplify-reporting-status (2014-11-21) 5 commits
712
- (merged to 'next' on 2014-12-04 at c3c329f)
713
- + mergetools: stop setting $status in merge_cmd()
714
- + mergetool: simplify conditionals
715
- + difftool--helper: add explicit exit statement
716
- + mergetool--lib: remove use of $status global
717
- + mergetool--lib: remove no-op assignment to $status from setup_user_tool
718
-
719
- Code simplification.
720
-
721
- Will merge to 'master'.
722
-
723
-
756
* dw/shell-basename-dashdash-before-stripping-leading-dash-from-login (2014-11-25) 1 commit
725
- - git-sh-setup.sh: use dashdash with basename call
757
+ (merged to 'next' on 2014-12-15 at 42937b7)
758
+ + git-sh-setup.sh: use dashdash with basename call
759
727
- Will merge to 'next'.
760
+ Will merge to 'master'.
761
762
763
* jc/refer-to-t-readme-from-submitting-patches (2014-11-24) 2 commits
731
- - t/README: justify why "! grep foo" is sufficient
732
- - SubmittingPatches: refer to t/README for tests
764
+ (merged to 'next' on 2014-12-15 at 0e88699)
765
+ + t/README: justify why "! grep foo" is sufficient
766
+ + SubmittingPatches: refer to t/README for tests
767
734
- Will merge to 'next'.
768
+ Will merge to 'master'.
769
770
771
* jc/t9001-modernise (2014-11-25) 5 commits
@@ -744,85 +778,110 @@ of the repositories listed at
778
779
780
* js/t5000-dont-copy-bin-sh (2014-11-24) 1 commit
747
- - t5000 on Windows: do not mistake "sh.exe" as "sh"
781
+ (merged to 'next' on 2014-12-15 at 65ffd05)
782
+ + t5000 on Windows: do not mistake "sh.exe" as "sh"
783
749
- Will merge to 'next'.
784
+ Will merge to 'master'.
785
786
787
* mg/add-ignore-errors (2014-11-21) 1 commit
753
- - add: ignore only ignored files
788
+ (merged to 'next' on 2014-12-15 at 3834789)
789
+ + add: ignore only ignored files
790
755
- Will merge to 'next'.
791
+ "git add --ignore-errors ..." did not ignore an error to
792
+ give a file that did not exist.
793
+
794
+ Will merge to 'master'.
795
796
797
* mh/find-uniq-abbrev (2014-11-26) 1 commit
759
- - sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev
798
+ (merged to 'next' on 2014-12-15 at e3b2b62)
799
+ + sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev
800
761
- Will merge to 'next'.
801
+ The code to abbreviate an object name to its short unique prefix
802
+ has been optimized when no abbreviation was requested.
803
+
804
+ Will merge to 'master'.
805
806
807
* mh/simplify-repack-without-refs (2014-11-25) 7 commits
765
- - sort_string_list(): rename to string_list_sort()
766
- - prune_remote(): iterate using for_each_string_list_item()
767
- - prune_remote(): rename local variable
768
- - repack_without_refs(): make the refnames argument a string_list
769
- - prune_remote(): sort delete_refs_list references en masse
770
- - prune_remote(): initialize both delete_refs lists in a single loop
771
- - prune_remote(): exit early if there are no stale references
808
+ (merged to 'next' on 2014-12-15 at 351e03e)
809
+ + sort_string_list(): rename to string_list_sort()
810
+ + prune_remote(): iterate using for_each_string_list_item()
811
+ + prune_remote(): rename local variable
812
+ + repack_without_refs(): make the refnames argument a string_list
813
+ + prune_remote(): sort delete_refs_list references en masse
814
+ + prune_remote(): initialize both delete_refs lists in a single loop
815
+ + prune_remote(): exit early if there are no stale references
816
773
- Will merge to 'next'.
817
+ "git remote update --prune" to drop many refs has been optimized.
818
+
819
+ Will merge to 'master'.
820
821
822
* pb/am-message-id-footer (2014-11-25) 2 commits
777
- - git-am: add --message-id/--no-message-id
778
- - git-mailinfo: add --message-id
823
+ (merged to 'next' on 2014-12-15 at b44b6bd)
824
+ + git-am: add --message-id/--no-message-id
825
+ + git-mailinfo: add --message-id
826
780
- Will merge to 'next'.
827
+ "git am" learned "--message-id" option to copy the message ID of
828
+ the incoming e-mail to the log message of resulting commit.
829
+
830
+ Will merge to 'master'.
831
832
833
* pb/send-email-te (2014-11-25) 2 commits
784
- - git-send-email: add --transfer-encoding option
785
- - git-send-email: delay creation of MIME headers
834
+ (merged to 'next' on 2014-12-15 at 38c2810)
835
+ + git-send-email: add --transfer-encoding option
836
+ + git-send-email: delay creation of MIME headers
837
(this branch is used by jc/t9001-modernise.)
838
788
- Will merge to 'next'.
789
-
839
+ "git send-email" learned "--transfer-encoding" option to force
840
+ a non-fault Content-Transfer-Encoding header (e.g. base64).
841
791
-* pw/remote-set-url-fetch (2014-11-26) 1 commit
792
- - remote: add --fetch and --both options to set-url
793
-
794
- Still under discussion.
842
+ Will merge to 'master'.
843
844
845
* rj/no-xopen-source-for-cygwin (2014-11-24) 1 commit
798
- - git-compat-util.h: don't define _XOPEN_SOURCE on cygwin
846
+ (merged to 'next' on 2014-12-15 at 6e8e9ff)
847
+ + git-compat-util.h: don't define _XOPEN_SOURCE on cygwin
848
800
- Will merge to 'next'.
849
+ Avoid compilation warnings on recent gcc toolchain on Cygwin.
850
+
851
+ Will merge to 'master'.
852
853
854
* sb/string-list (2014-12-04) 3 commits
804
- - string_list: remove string_list_insert_at_index() from its API
805
- - mailmap: use higher level string list functions
806
- - string_list: document string_list_(insert,lookup)
855
+ (merged to 'next' on 2014-12-15 at 8bb8ddd)
856
+ + string_list: remove string_list_insert_at_index() from its API
857
+ + mailmap: use higher level string list functions
858
+ + string_list: document string_list_(insert,lookup)
859
808
- Will merge to 'next'.
860
+ API simplification.
861
+
862
+ Will merge to 'master'.
863
864
865
* sb/write-sha1-update-reflog (2014-11-24) 1 commit
812
- - refs.c: move reflog updates into its own function
866
+ . refs.c: move reflog updates into its own function
867
868
Moves a part of function around to add a helper that still only has
869
one caller. Need to see how this helps in a bigger picture.
870
871
872
* tb/config-core-filemode-check-on-broken-fs (2014-11-21) 1 commit
819
- - init-db: improve the filemode trustability check
873
+ (merged to 'next' on 2014-12-15 at 3e5490b)
874
+ + init-db: improve the filemode trustability check
875
821
- Will merge to 'next'.
876
+ Some filesystems assign filemodes in a strange way, fooling then
877
+ automatic "filemode trustability" check done during a new
878
+ repository creation.
879
+
880
+ Will merge to 'master'.
881
882
883
* jk/approxidate-avoid-y-d-m-over-future-dates (2014-11-13) 2 commits
825
- (merged to 'next' on 2014-11-14 at 3c11a1b)
884
+ (merged to 'next' on 2014-12-15 at 397e986)
885
+ approxidate: allow ISO-like dates far in the future
886
+ pass TIME_DATE_NOW to approxidate future-check
887
@@ -839,15 +898,8 @@ of the repositories listed at
898
Will cook in 'next'.
899
900
842
-* mb/enable-lib-terminal-test-on-newer-darwin (2014-11-14) 1 commit
843
- (merged to 'next' on 2014-11-14 at b2aae27)
844
- + t/lib-terminal: allow TTY tests to run under recent Mac OS
845
-
846
- We probably should drop this ($gmane/259609).
847
-
848
-
901
* br/imap-send-verbosity (2014-11-05) 1 commit
850
- (merged to 'next' on 2014-11-12 at d9e58ec)
902
+ (merged to 'next' on 2014-12-15 at 504af0b)
903
+ imap-send: use parse options API to determine verbosity
904
(this branch is used by br/imap-send-via-libcurl.)
905
@@ -855,25 +907,32 @@ of the repositories listed at
907
908
909
* br/imap-send-via-libcurl (2014-11-10) 1 commit
858
- (merged to 'next' on 2014-11-12 at 5327ab4)
910
+ (merged to 'next' on 2014-12-15 at 90db637)
911
+ git-imap-send: use libcurl for implementation
912
(this branch uses br/imap-send-verbosity.)
913
914
+ Newer libCurl knows how to talk IMAP; "git imap-send" has been
915
+ updated to use this instead of a hand-rolled OpenSSL calls.
916
+
917
Will cook in 'next'.
918
919
920
* cc/interpret-trailers-more (2014-11-10) 4 commits
866
- - trailer: add test with an old style conflict block
867
- - trailer: reuse ignore_non_trailer() to ignore conflict lines
868
- - commit: make ignore_non_trailer() non static
869
- - Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
921
+ (merged to 'next' on 2014-12-15 at 77f6c6a)
922
+ + trailer: add test with an old style conflict block
923
+ + trailer: reuse ignore_non_trailer() to ignore conflict lines
924
+ + commit: make ignore_non_trailer() non static
925
+ + Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
926
(this branch uses jc/conflict-hint.)
927
872
- Will merge to 'next'.
928
+ "git interpret-trailers" learned to properly handle the
929
+ "Conflicts:" block at the end.
930
+
931
+ Will merge to 'master'.
932
933
934
* nd/lockfile-absolute (2014-11-03) 1 commit
876
- (merged to 'next' on 2014-11-06 at 68722a9)
935
+ (merged to 'next' on 2014-12-15 at 34db9af)
936
+ lockfile.c: store absolute path
937
938
The lockfile API can get confused which file to clean up when the
@@ -883,15 +942,19 @@ of the repositories listed at
942
943
944
* jc/merge-bases (2014-10-30) 2 commits
886
- (merged to 'next' on 2014-11-06 at 491e576)
945
+ (merged to 'next' on 2014-12-15 at cac279e)
946
+ get_merge_bases(): always clean-up object flags
947
+ bisect: clean flags after checking merge bases
948
949
+ The get_merge_bases*() API was easy to misuse by careless
950
+ copy&paste coders, leaving object flags tainted in the commits that
951
+ needed to be traversed.
952
+
953
Will cook in 'next'.
954
955
956
* jc/strbuf-add-lines-avoid-sp-ht-sequence (2014-10-27) 1 commit
894
- (merged to 'next' on 2014-10-29 at 9167582)
957
+ (merged to 'next' on 2014-12-15 at b499889)
958
+ strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines
959
960
The commented output used to blindly add a SP before the payload
@@ -901,11 +964,15 @@ of the repositories listed at
964
Will cook in 'next'.
965
966
904
-* nd/untracked-cache (2014-10-27) 19 commits
967
+* nd/untracked-cache (2014-12-15) 24 commits
968
+ - SQUASH???
969
+ - untracked cache: guard and disable on system changes
970
+ - mingw32: add uname()
971
- t7063: tests for untracked cache
972
- update-index: test the system before enabling untracked cache
973
- update-index: manually enable or disable untracked cache
974
- status: enable untracked cache
975
+ - untracked-cache: temporarily disable with $GIT_DISABLE_UNTRACKED_CACHE
976
- untracked cache: mark index dirty if untracked cache is updated
977
- untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATS
978
- untracked cache: avoid racy timestamps
@@ -913,6 +980,7 @@ of the repositories listed at
980
- untracked cache: invalidate at index addition or removal
981
- untracked cache: load from UNTR index extension
982
- untracked cache: save to an index extension
983
+ - ewah: add convenient wrapper ewah_serialize_strbuf()
984
- untracked cache: don't open non-existent .gitignore
985
- untracked cache: mark what dirs should be recursed/saved
986
- untracked cache: record/validate dir mtime and reuse cached output
@@ -925,19 +993,8 @@ of the repositories listed at
993
Comments?
994
995
928
-* zk/grep-color-words (2014-10-27) 2 commits
929
- (merged to 'next' on 2014-10-28 at 4d0457c)
930
- + Revert "grep: fix match highlighting for combined patterns with context lines"
931
- (merged to 'next' on 2014-10-24 at 2d2f8f8)
932
- + grep: fix match highlighting for combined patterns with context lines
933
-
934
- rs/grep-color-words topic solves it in a different way.
935
-
936
- Will discard.
937
-
938
-
996
* jc/conflict-hint (2014-10-28) 4 commits
940
- (merged to 'next' on 2014-10-29 at 693250f)
997
+ (merged to 'next' on 2014-12-15 at b72475f)
998
+ merge & sequencer: turn "Conflicts:" hint into a comment
999
+ builtin/commit.c: extract ignore_non_trailer() helper function
1000
+ merge & sequencer: unify codepaths that write "Conflicts:" hint
@@ -951,7 +1008,7 @@ of the repositories listed at
1008
1009
1010
* jc/diff-b-m (2014-10-23) 1 commit
954
- (merged to 'next' on 2014-10-28 at 4daedb1)
1011
+ (merged to 'next' on 2014-12-15 at 59c6636)
1012
+ diff -B -M: fix output for "copy and then rewrite" case
1013
1014
Fix long-standing bug in "diff -B -M" output.
@@ -960,7 +1017,7 @@ of the repositories listed at
1017
1018
1019
* jc/checkout-local-track-report (2014-10-14) 1 commit
963
- (merged to 'next' on 2014-10-21 at f636a00)
1020
+ (merged to 'next' on 2014-12-15 at e91a7df)
1021
+ checkout: report upstream correctly even with loosely defined branch.*.merge
1022
1023
The report from "git checkout" on a branch that builds on another
@@ -971,7 +1028,7 @@ of the repositories listed at
1028
1029
1030
* jc/clone-borrow (2014-10-15) 1 commit
974
- (merged to 'next' on 2014-10-21 at b76ea34)
1031
+ (merged to 'next' on 2014-12-15 at 08fdf77)
1032
+ clone: --dissociate option to mark that reference is only temporary
1033
1034
Allow "git clone --reference" to be used more safely.
@@ -981,6 +1038,35 @@ of the repositories listed at
1038
--------------------------------------------------
1039
[Discarded]
1040
1041
+* mb/enable-lib-terminal-test-on-newer-darwin (2014-11-14) 1 commit
1042
+ . t/lib-terminal: allow TTY tests to run under recent Mac OS
1043
+
1044
+ We probably should drop this ($gmane/259609).
1045
+
1046
+
1047
+* zk/grep-color-words (2014-10-27) 2 commits
1048
+ . Revert "grep: fix match highlighting for combined patterns with context lines"
1049
+ . grep: fix match highlighting for combined patterns with context lines
1050
+
1051
+ rs/grep-color-words topic solves it in a different way.
1052
+
1053
+ Will discard.
1054
+
1055
+
1056
+* jn/dedup-doc-header (2014-12-10) 2 commits
1057
+ . put string-list API documentation in one place
1058
+ . put strbuf API documentation in one place
1059
+
1060
+ We would want to have an easy way for developers to learn about
1061
+ APIs, and also a way to encourage them to keep the API
1062
+ documentation up to date when they make changes. Having header
1063
+ comments and API documentation duplicated in two different places
1064
+ risked them going out of sync.
1065
+
1066
+ The approach taken by jk/strbuf-doc-to-header is the other way
1067
+ around, which people seem to prefer, so this is discarded.
1068
+
1069
+
1070
* jt/timer-settime (2014-08-29) 6 commits
1071
. use timer_settime() for new platforms
1072
. autoconf: check for timer_settime()
@@ -1053,3 +1139,19 @@ of the repositories listed at
1139
1140
* sb/simplify-repack-without-refs (2014-11-20) 1 commit
1141
. refs.c: use a string_list for repack_without_refs
1142
+
1143
+
1144
+* sb/log-ref-write-fd (2014-11-20) 1 commit
1145
+ . refs.c: add a function to append a reflog entry to a fd
1146
+
1147
+ Will be rerolled as a part of a larger series.
1148
+
1149
+
1150
+* sb/ref-transaction-unify-to-update (2014-11-20) 2 commits
1151
+ . refs.c: make ref_transaction_delete a wrapper for ref_transaction_update
1152
+ . refs.c: make ref_transaction_create a wrapper for ref_transaction_update
1153
+ (this branch is used by sb/ref-transaction-reflog.)
1154
+
1155
+ Code simplification.
1156
+
1157
+ Will be rerolled as a part of a larger series.