What's cooking (2014/06 #02)
Junio C Hamano committed
Jun 6, 2014 at 14:59 UTC
d0b008168371a5f37adae9d9cc854224deed6228
1 file changed
+504
-809
whats-cooking.txt
+504
-809
@@ -1,24 +1,26 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2014, #01; Tue, 3)
4
-X-master-at: 79dcccc503ac228630ecf15dcf8e1d9455daef2d
5
-X-next-at: cc83a7f2654514ddbeb91a63300d3b726f6df536
3
+Subject: What's cooking in git.git (Jun 2014, #02; Fri, 6)
4
+X-master-at: 0953113bb5687f42bcdfc3d20dd3a125784ad383
5
+X-next-at: 41885497b0c577b31af733b8c4b05bcded1912bd
6
7
-What's cooking in git.git (Jun 2014, #01; Tue, 3)
7
+What's cooking in git.git (Jun 2014, #02; Fri, 6)
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 first batch of topics, all of which have been cooking for quite
15
-a while on the 'next' branch, have been merged to 'master'. I'll
14
+The second batch of topics, all of which have been cooking for quite
15
+a while on the 'next' branch, have been merged to 'master'.
16
17
- - merge another batch to 'master', then
18
- - rewind the tip of 'next' in preparation to start accepting new topics
19
-
20
-sometime mid-next week. I'll also update tinyurl.com/gitCal for this
21
-cycle soonish.
17
+I am aware of a handful of multi-patch topics sent to the list the
18
+past week that have not been picked up, and I won't be picking them
19
+up yet, before we have a chance to first have some topics that have
20
+been cooking in 'next' during the previous cycle merged to 'master'
21
+and then rewind the tip of 'next'. At that point, I may have to ask
22
+for them to be rebased on top of the updated 'master' to reduce
23
+conflicts. Thanks for your patience.
24
25
You can find the changes described here in the integration branches
26
of the repositories listed at
@@ -28,508 +30,329 @@ of the repositories listed at
30
--------------------------------------------------
31
[Graduated to "master"]
32
31
-* as/grep-fullname-config (2014-03-20) 1 commit
32
- (merged to 'next' on 2014-03-28 at 810a076)
33
- + grep: add grep.fullName config variable
34
-
35
- Add a configuration variable to force --full-name to be default for
36
- "git grep".
37
-
38
- This may cause regressions on scripted users that do not expect
39
- this new behaviour.
40
-
41
-
42
-* bg/strbuf-trim (2014-05-06) 2 commits
43
- (merged to 'next' on 2014-05-07 at 978f378)
44
- + api-strbuf.txt: add docs for _trim and _ltrim
45
- + strbuf: use _rtrim and _ltrim in strbuf_trim
46
-
47
-
48
-* dt/api-doc-setup-gently (2014-04-30) 1 commit
49
- (merged to 'next' on 2014-05-07 at 6054b08)
50
- + docs: document RUN_SETUP_GENTLY and clarify RUN_SETUP
51
-
52
-
53
-* ef/send-email-absolute-path-to-the-command (2014-04-23) 2 commits
54
- (merged to 'next' on 2014-04-23 at a657e5e)
55
- + send-email: windows drive prefix (e.g. C:) appears only at the beginning
56
- (merged to 'next' on 2014-04-21 at 43bebb5)
57
- + send-email: recognize absolute path on Windows
58
-
59
-
60
-* ep/shell-command-substitution (2014-04-30) 41 commits
61
- (merged to 'next' on 2014-05-07 at e9952c7)
62
- + t5000-tar-tree.sh: use the $( ... ) construct for command substitution
63
- + t4204-patch-id.sh: use the $( ... ) construct for command substitution
64
- + t4119-apply-config.sh: use the $( ... ) construct for command substitution
65
- + t4116-apply-reverse.sh: use the $( ... ) construct for command substitution
66
- + t4057-diff-combined-paths.sh: use the $( ... ) construct for command substitution
67
- + t4038-diff-combined.sh: use the $( ... ) construct for command substitution
68
- + t4036-format-patch-signer-mime.sh: use the $( ... ) construct for command substitution
69
- + t4014-format-patch.sh: use the $( ... ) construct for command substitution
70
- + t4013-diff-various.sh: use the $( ... ) construct for command substitution
71
- + t4012-diff-binary.sh: use the $( ... ) construct for command substitution
72
- + t4010-diff-pathspec.sh: use the $( ... ) construct for command substitution
73
- + t4006-diff-mode.sh: use the $( ... ) construct for command substitution
74
- + t3910-mac-os-precompose.sh: use the $( ... ) construct for command substitution
75
- + t3905-stash-include-untracked.sh: use the $( ... ) construct for command substitution
76
- + t1050-large.sh: use the $( ... ) construct for command substitution
77
- + t1020-subdirectory.sh: use the $( ... ) construct for command substitution
78
- + t1004-read-tree-m-u-wf.sh: use the $( ... ) construct for command substitution
79
- + t1003-read-tree-prefix.sh: use the $( ... ) construct for command substitution
80
- + t1002-read-tree-m-u-2way.sh: use the $( ... ) construct for command substitution
81
- + t1001-read-tree-m-2way.sh: use the $( ... ) construct for command substitution
82
- + t1000-read-tree-m-3way.sh: use the $( ... ) construct for command substitution
83
- + t0300-credentials.sh: use the $( ... ) construct for command substitution
84
- + t0030-stripspace.sh: use the $( ... ) construct for command substitution
85
- + t0026-eol-config.sh: use the $( ... ) construct for command substitution
86
- + t0025-crlf-auto.sh: use the $( ... ) construct for command substitution
87
- + t0020-crlf.sh: use the $( ... ) construct for command substitution
88
- + t0010-racy-git.sh: use the $( ... ) construct for command substitution
89
- + t0001-init.sh: use the $( ... ) construct for command substitution
90
- + p5302-pack-index.sh: use the $( ... ) construct for command substitution
91
- + lib-gpg.sh: use the $( ... ) construct for command substitution
92
- + lib-cvs.sh: use the $( ... ) construct for command substitution
93
- + lib-credential.sh: use the $( ... ) construct for command substitution
94
- + git-web--browse.sh: use the $( ... ) construct for command substitution
95
- + git-stash.sh: use the $( ... ) construct for command substitution
96
- + git-rebase.sh: use the $( ... ) construct for command substitution
97
- + git-rebase--merge.sh: use the $( ... ) construct for command substitution
98
- + git-pull.sh: use the $( ... ) construct for command substitution
99
- + appp.sh: use the $( ... ) construct for command substitution
100
- + t7900-subtree.sh: use the $( ... ) construct for command substitution
101
- + test-gitmw-lib.sh: use the $( ... ) construct for command substitution
102
- + t9365-continuing-queries.sh: use the $( ... ) construct for command substitution
103
-
104
- Adjust shell scripts to use $(cmd) instead of `cmd`.
105
-
106
-
107
-* ew/config-protect-mode (2014-05-06) 1 commit
108
- (merged to 'next' on 2014-05-07 at 8443093)
109
- + config: preserve config file permissions on edits
110
-
111
-
112
-* fc/merge-default-to-upstream (2014-04-22) 1 commit
113
- (merged to 'next' on 2014-04-22 at 4f98483)
114
- + merge: enable defaulttoupstream by default
115
-
116
- "git merge" without argument, even when there is an upstream
117
- defined for the current branch, refused to run until
118
- merge.defaultToUpstream is set to true. Flip the default of that
119
- configuration variable to true.
120
-
121
-
122
-* fc/mergetool-prompt (2014-04-24) 2 commits
123
- (merged to 'next' on 2014-05-02 at a554691)
124
- + mergetool: document the default for --[no-]prompt
125
- (merged to 'next' on 2014-04-22 at dcaec94)
126
- + mergetool: run prompt only if guessed tool
127
-
128
- mergetool.prompt used to default to 'true', always causing a confirmation
129
- "do you really want to run the tool on this path" to be shown.
130
-
131
- Among the two purposes the prompt serves, ignore the use case to
132
- confirm that the user wants to view particular path with the named
133
- tool, and make the prompt only to confirm the choice of the tool
134
- made by autodetection and defaulting. For those who configured the
135
- tool explicitly, the prompt shown for the latter purpose is simply
136
- annoying.
137
-
138
- Strictly speaking, this is a backward incompatible change and the
139
- users need to explicitly set the variable to 'true' if they want to
140
- resurrect the now-ignored use case.
141
-
142
-
143
-* fc/mergetools-vimdiff3 (2014-04-22) 1 commit
144
- (merged to 'next' on 2014-04-22 at d843e75)
145
- + mergetools: add vimdiff3 mode
146
-
147
-
148
-* fc/rerere-conflict-style (2014-04-30) 1 commit
149
- (merged to 'next' on 2014-05-07 at bde7fd0)
150
- + rerere: fix for merge.conflictstyle
151
-
152
- "git rerere forget" did not work well when merge.conflictstyle
153
- was set to a non-default value.
154
-
155
-
156
-* jc/apply-ignore-whitespace (2014-03-26) 1 commit
157
- (merged to 'next' on 2014-04-04 at 53779a7)
158
- + apply --ignore-space-change: lines with and without leading whitespaces do not match
159
-
160
- "--ignore-space-change" option of "git apply" ignored the
161
- spaces at the beginning of line too aggressively, which is
162
- inconsistent with the option of the same name "diff" and "git diff"
163
- have.
164
-
165
-
166
-* jk/commit-date-approxidate (2014-05-02) 4 commits
167
- (merged to 'next' on 2014-05-07 at 7ec8f7d)
168
- + commit: accept more date formats for "--date"
169
- + commit: print "Date" line when the user has set date
170
- + pretty: make show_ident_date public
171
- + commit: use split_ident_line to compare author/committer
172
-
173
- "git commit --date=<date>" option learned to read from more
174
- timestamp formats, including "--date=now".
175
-
176
-
177
-* jk/external-diff-use-argv-array (2014-04-21) 5 commits
178
- (merged to 'next' on 2014-04-22 at e6d92d7)
179
- + run_external_diff: refactor cmdline setup logic
180
- + run_external_diff: hoist common bits out of conditional
181
- + run_external_diff: drop fflush(NULL)
182
- + run_external_diff: clean up error handling
183
- + run_external_diff: use an argv_array for the environment
184
-
185
- Code clean-up (and a bugfix which has been merged for 2.0).
186
-
187
-
188
-* jx/blame-align-relative-time (2014-04-23) 2 commits
189
- (merged to 'next' on 2014-04-23 at 858df39)
190
- + blame: dynamic blame_date_width for different locales
191
- + blame: fix broken time_buf paddings in relative timestamp
192
-
193
- "git blame" miscounted number of columns needed to show localized
194
- timestamps, resulting in jaggy left-side-edge of the source code
195
- lines in its output.
196
-
197
-
198
-* ks/tree-diff-nway (2014-04-09) 20 commits
199
- (merged to 'next' on 2014-04-09 at c17228e)
200
- + mingw: activate alloca
201
- (merged to 'next' on 2014-04-08 at 6b74773)
202
- + combine-diff: speed it up, by using multiparent diff tree-walker directly
203
- + tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
204
- + Portable alloca for Git
205
- (merged to 'next' on 2014-03-31 at 16a7bd4)
206
- + tree-diff: reuse base str(buf) memory on sub-tree recursion
207
- + tree-diff: no need to call "full" diff_tree_sha1 from show_path()
208
- + tree-diff: rework diff_tree interface to be sha1 based
209
- + tree-diff: diff_tree() should now be static
210
- + tree-diff: remove special-case diff-emitting code for empty-tree cases
211
- (merged to 'next' on 2014-03-25 at cfcbdac)
212
- + tree-diff: simplify tree_entry_pathcmp
213
- + tree-diff: show_path prototype is not needed anymore
214
- + tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
215
- + tree-diff: move all action-taking code out of compare_tree_entry()
216
- + tree-diff: don't assume compare_tree_entry() returns -1,0,1
217
- (merged to 'next' on 2014-03-21 at d872679)
218
- + tree-diff: consolidate code for emitting diffs and recursion in one place
219
- + tree-diff: show_tree() is not needed
220
- + tree-diff: no need to pass match to skip_uninteresting()
221
- + tree-diff: no need to manually verify that there is no mode change for a path
222
- + combine-diff: move changed-paths scanning logic into its own function
223
- + combine-diff: move show_log_first logic/action out of paths scanning
224
-
225
- Instead of running N pair-wise diff-trees when inspecting a
226
- N-parent merge, find the set of paths that were touched by walking
227
- N+1 trees in parallel. These set of paths can then be turned into
228
- N pair-wise diff-tree results to be processed through rename
229
- detections and such. And N=2 case nicely degenerates to the usual
230
- 2-way diff-tree, which is very nice.
231
-
232
-
233
-* lr/git-run-setup-gently (2014-04-22) 1 commit
234
- (merged to 'next' on 2014-04-22 at 5c2523f)
235
- + git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive
236
-
237
-
238
-* mh/ref-transaction (2014-04-07) 27 commits
239
- (merged to 'next' on 2014-04-16 at a99f84d)
240
- + ref_transaction_commit(): work with transaction->updates in place
241
- + struct ref_update: add a type field
242
- + struct ref_update: add a lock field
243
- + ref_transaction_commit(): simplify code using temporary variables
244
- + struct ref_update: store refname as a FLEX_ARRAY
245
- + struct ref_update: rename field "ref_name" to "refname"
246
- + refs: remove API function update_refs()
247
- + update-ref --stdin: reimplement using reference transactions
248
- + refs: add a concept of a reference transaction
249
- + update-ref --stdin: harmonize error messages
250
- + update-ref --stdin: improve the error message for unexpected EOF
251
- + t1400: test one mistake at a time
252
- + update-ref --stdin -z: deprecate interpreting the empty string as zeros
253
- + update-ref.c: extract a new function, parse_next_sha1()
254
- + t1400: test that stdin -z update treats empty <newvalue> as zeros
255
- + update-ref --stdin: simplify error messages for missing oldvalues
256
- + update-ref --stdin: make error messages more consistent
257
- + update-ref --stdin: improve error messages for invalid values
258
- + update-ref.c: extract a new function, parse_refname()
259
- + parse_cmd_verify(): copy old_sha1 instead of evaluating <oldvalue> twice
260
- + update-ref --stdin: read the whole input at once
261
- + update_refs(): fix constness
262
- + refs.h: rename the action_on_err constants
263
- + t1400: add some more tests involving quoted arguments
264
- + parse_arg(): really test that argument is properly terminated
265
- + t1400: provide more usual input to the command
266
- + t1400: fix name and expected result of one test
267
-
268
- Update "update-ref --stdin [-z]" and then introduce a transactional
269
- support for (multi-)reference updates.
270
-
271
-
272
-* mm/mediawiki-encoding-fix (2014-04-23) 2 commits
273
- (merged to 'next' on 2014-05-02 at 7744361)
274
- + git-remote-mediawiki: fix encoding issue for UTF-8 media files
275
- + git-remote-mediawiki: allow stop/start-ing the test server
276
-
277
-
278
-* nd/index-pack-one-fd-per-thread (2014-04-16) 1 commit
279
- (merged to 'next' on 2014-04-16 at b38d5a9)
280
- + index-pack: work around thread-unsafe pread()
281
-
282
- Enable threaded index-pack on platforms without thread-safe
283
- pread() emulation.
284
-
285
-
286
-* rs/ref-update-check-errors-early (2014-04-17) 2 commits
287
- (merged to 'next' on 2014-04-21 at acc62aa)
288
- + commit.c: check for lock error and return early
289
- + sequencer.c: check for lock failure and bail early in fast_forward_to
290
-
291
-
292
-* sk/msvc-dynlink-crt (2014-05-06) 1 commit
293
- (merged to 'next' on 2014-05-07 at 20f4839)
294
- + MSVC: link dynamically to the CRT
295
-
296
-
297
-* sk/svn-parse-datestamp (2014-04-17) 1 commit
298
- (merged to 'next' on 2014-04-21 at 5ff519f)
299
- + SVN.pm::parse_svn_date: allow timestamps with a single-digit hour
300
-
301
- "git svn" learned to cope with malformed timestamps with only one
302
- digit in the hour part, e.g. 2014-01-07T5:01:02.048176Z, emitted
303
- by some broken subversion server implementations.
304
-
305
-
306
-* sk/tag-contains-wo-recursion (2014-04-25) 1 commit
307
- (merged to 'next' on 2014-04-25 at f320750)
308
- + git tag --contains: avoid stack overflow
309
-
310
-
311
-* ym/fix-opportunistic-index-update-race (2014-04-10) 2 commits
312
- (merged to 'next' on 2014-04-16 at cb92f4f)
313
- + read-cache.c: verify index file before we opportunistically update it
314
- + wrapper.c: add xpread() similar to xread()
315
-
316
- Read-only operations such as "git status" that internally refreshes
317
- the index write out the refreshed index to the disk to optimize
318
- future accesses to the working tree, but this could race with a
319
- "read-write" operation that modify the index while it is running.
320
- Detect such a race and avoid overwriting the index.
321
-
322
- Duy raised a good point that we may need to do the same for the
323
- normal writeout codepath, not just the "opportunistic" update
324
- codepath. While that is true, nobody sane would be running two
325
- simultaneous operations that are clearly write-oriented competing
326
- with each other against the same index file. So in that sense that
327
- can be done as a less urgent follow-up for this topic.
33
+* bc/blame-crlf-test (2014-05-08) 1 commit
34
+ (merged to 'next' on 2014-05-14 at b819505)
35
+ + blame: correctly handle files regardless of autocrlf
36
329
---------------------------------------------------
330
-[New Topics]
37
+ If a file contained CRLF line endings in a repository with
38
+ core.autocrlf=input, then blame always marked lines as "Not
39
+ Committed Yet", even if they were unmodified.
40
332
-* bg/xcalloc-nmemb-then-size (2014-05-27) 12 commits
333
- - transport-helper.c: rearrange xcalloc arguments
334
- - remote.c: rearrange xcalloc arguments
335
- - reflog-walk.c: rearrange xcalloc arguments
336
- - pack-revindex.c: rearrange xcalloc arguments
337
- - notes.c: rearrange xcalloc arguments
338
- - imap-send.c: rearrange xcalloc arguments
339
- - http-push.c: rearrange xcalloc arguments
340
- - diff.c: rearrange xcalloc arguments
341
- - config.c: rearrange xcalloc arguments
342
- - commit.c: rearrange xcalloc arguments
343
- - builtin/remote.c: rearrange xcalloc arguments
344
- - builtin/ls-remote.c: rearrange xcalloc arguments
41
346
- Like calloc(3), xcalloc() takes nmemb and then size.
42
+* da/imap-send-use-credential-helper (2014-04-29) 1 commit
43
+ (merged to 'next' on 2014-05-12 at b0698a5)
44
+ + imap-send: use git-credential
45
348
- Will merge to 'next'.
46
+ "git imap-send" learned to ask the credential helper for
47
+ authentication material.
48
49
351
-* jk/complete-merge-pull (2014-05-27) 2 commits
352
- - completion: add missing options for git-merge
353
- - completion: add a note that merge options are shared
50
+* dk/blame-reorg (2014-04-28) 1 commit
51
+ (merged to 'next' on 2014-05-14 at 354a0e3)
52
+ + blame: large-scale performance rewrite
53
355
- The completion code did not know about quite a few options that are
356
- common between "git merge" and "git pull", and a couple of options
357
- unique to "git merge".
54
+ "git blame" has been optimized greatly by reorganising the data
55
+ structure that is used to keep track of the work to be done, thanks
56
+ to David Karstrup <dak@gnu.org>.
57
359
- Will merge to 'next'.
58
59
+* dk/raise-core-deltabasecachelimit (2014-05-06) 1 commit
60
+ (merged to 'next' on 2014-05-12 at 97ec92a)
61
+ + Bump core.deltaBaseCacheLimit to 96m
62
362
-* jl/remote-rm-prune (2014-05-27) 3 commits
363
- - remote prune: optimize "dangling symref" check/warning
364
- - remote: repack packed-refs once when deleting multiple refs
365
- - remote rm: delete remote configuration as the last
63
+ The `core.deltabasecachelimit` used to default to 16 MiB, but this
64
+ proved to be too small, and has been bumped to 96 MiB.
65
367
- "git remote rm" and "git remote prune" can involve removing many
368
- refs at once, which is not a very efficient thing to do when very
369
- many refs exist in the packed-refs file.
66
371
- Will merge to 'next'.
67
+* dt/merge-recursive-case-insensitive (2014-05-08) 2 commits
68
+ (merged to 'next' on 2014-05-12 at 820d524)
69
+ + mv: allow renaming to fix case on case insensitive filesystems
70
+ + merge-recursive.c: fix case-changing merge bug
71
72
+ On a case insensitive filesystem, merge-recursive incorrectly
73
+ deleted the file that is to be renamed to a name that is the same
74
+ except for case differences.
75
374
-* jm/instaweb-apache-24 (2014-05-27) 1 commit
375
- - git-instaweb: add support for Apache 2.4
76
377
- Will merge to 'next'.
77
+* ep/shell-assign-and-export-vars (2014-05-23) 2 commits
78
+ (merged to 'next' on 2014-05-23 at 7699c0e)
79
+ + scripts: more "export VAR=VALUE" fixes
80
+ + scripts: "export VAR=VALUE" construct is not portable
81
82
380
-* jm/t9138-style-fix (2014-05-27) 1 commit
381
- - t9138-git-svn-authors-prog.sh fixups
83
+* fc/status-printf-squelch-format-zero-length-warnings (2014-05-07) 1 commit
84
+ (merged to 'next' on 2014-05-12 at 6b04e23)
85
+ + silence a bunch of format-zero-length warnings
86
383
- Will merge to 'next'.
87
88
+* jc/coding-guidelines (2014-05-20) 9 commits
89
+ (merged to 'next' on 2014-05-23 at bb351fc)
90
+ + CodingGuidelines: avoid "test <cond> -a/-o <cond>"
91
+ (merged to 'next' on 2014-05-12 at e1fcf62)
92
+ + CodingGuidelines: on splitting a long line
93
+ + CodingGuidelines: on comparison
94
+ + CodingGuidelines: do not call the conditional statement "if()"
95
+ + CodingGuidelines: give an example for shell function preamble
96
+ + CodingGuidelines: give an example for control statements
97
+ + CodingGuidelines: give an example for redirection
98
+ + CodingGuidelines: give an example for case/esac statement
99
+ + CodingGuidelines: once it is in, it is not worth the code churn
100
386
-* mc/git-p4-pre-are-p4-only (2014-05-27) 1 commit
387
- (merged to 'next' on 2014-05-27 at 71572fe)
388
- + git-p4: Do not include diff in spec file when just preparing p4
101
+ Some people need these things spelled out, unable to follow advices
102
+ given by others when they fail to imitate the surrounding existing
103
+ code.
104
390
- Will merge to 'master'.
105
106
+* jd/subtree (2014-05-13) 6 commits
107
+ (merged to 'next' on 2014-05-14 at 977db74)
108
+ + contrib/subtree: allow adding an annotated tag
109
+ (merged to 'next' on 2014-05-07 at 81b375d)
110
+ + contrib/subtree/Makefile: clean up rule for "clean"
111
+ + contrib/subtree/Makefile: clean up rules to generate documentation
112
+ + contrib/subtree/Makefile: s/libexecdir/gitexecdir/
113
+ + contrib/subtree/Makefile: use GIT-VERSION-FILE
114
+ + contrib/subtree/Makefile: scrap unused $(gitdir)
115
393
-* nd/daemonize-gc (2014-05-27) 1 commit
394
- - gc --auto: do not lock refs in the background
116
+ Clean-up build procedure of subtree in contrib/.
117
396
- Will merge to 'next'.
118
119
+* je/pager-do-not-recurse (2014-04-28) 1 commit
120
+ (merged to 'next' on 2014-05-12 at 32de470)
121
+ + pager: do allow spawning pager recursively
122
399
-* ow/config-mailmap-pathname (2014-05-27) 1 commit
400
- - config: respect '~' and '~user' in mailmap.file
123
+ We used to unconditionally disable the pager in the pager process
124
+ we spawn to feed out output, but that prevented people who want to
125
+ run "less" within "less" from doing so.
126
402
- Will merge to 'next'.
127
128
+* jj/command-line-adjective (2014-05-21) 1 commit
129
+ (merged to 'next' on 2014-05-23 at fe136c8)
130
+ + Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
131
405
-* rh/prompt-tests (2014-05-30) 10 commits
406
- - t9904: new __git_ps1 tests for Zsh
407
- - lib-prompt-tests.sh: add variable for string that encodes percent in PS1
408
- - lib-prompt-tests.sh: put all tests inside a function
409
- - t9903: move prompt tests to a new lib-prompt-tests.sh file
410
- - t9903: move PS1 color code variable definitions to lib-bash.sh
411
- - t9903: include "Bash" in test names via new $shellname var
412
- - t9903: run pc mode tests again with PS1 expansion disabled
413
- - t9903: move test name prefix to a separate variable
414
- - t9903: put the Bash pc mode prompt test cases in a function
415
- - t9903: remove Zsh test from the suite of Bash prompt tests
132
417
- Will merge to 'next'.
133
+* jk/commit-C-pick-empty (2014-04-28) 1 commit
134
+ (merged to 'next' on 2014-05-12 at c187e1e)
135
+ + commit: do not complain of empty messages from -C
136
137
+ "git commit --allow-empty-message -C $commit" did not work when the
138
+ commit did not have any log message.
139
420
-* jm/doc-wording-tweaks (2014-05-28) 1 commit
421
- - Documentation: wording fixes in the user manual and glossary
140
423
- Will merge to 'next'.
141
+* jk/grep-tell-run-command-to-cd-when-running-pager (2014-05-07) 1 commit
142
+ (merged to 'next' on 2014-05-12 at 065cb22)
143
+ + grep: use run-command's "dir" option for --open-files-in-pager
144
145
426
-* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
427
- - gitweb: Harden UTF-8 handling in generated links
146
+* jk/index-pack-report-missing (2014-05-12) 1 commit
147
+ (merged to 'next' on 2014-05-14 at 72d40e1)
148
+ + index-pack: distinguish missing objects from type errors
149
429
- Will merge to 'next'.
150
151
+* jk/squelch-compiler-warning-from-funny-error-macro (2014-05-06) 2 commits
152
+ (merged to 'next' on 2014-05-12 at d9daf8d)
153
+ + let clang use the constant-return error() macro
154
+ + inline constant return from error() function
155
432
-* mn/sideband-no-ansi (2014-06-02) 1 commit
433
- - sideband.c: do not use ANSI control sequence on non-terminal
156
435
- Will merge to 'next'.
157
+* jk/utf8-switch-between-nfd-and-nfc (2014-04-29) 1 commit
158
+ (merged to 'next' on 2014-05-12 at 948823c)
159
+ + t3910: show failure of core.precomposeunicode with decomposed filenames
160
161
+ Document a known breakage with a test.
162
438
-* jc/fetch-push-refmap (2014-06-02) 9 commits
439
- - fetch: allow explicit --refmap to override configuration
440
- - fetch doc: add a section on configured remote-tracking branches
441
- - fetch doc: remove "short-cut" section
442
- - fetch doc: update refspec format description
443
- - fetch doc: on pulling multiple refspecs
444
- - fetch doc: remove notes on outdated "mixed layout"
445
- - fetch doc: update note on '+' in front of the refspec
446
- - fetch doc: move FETCH_HEAD material lower and add an example
447
- - fetch doc: update introductory part for clarity
163
164
+* jn/contrib-remove-diffall (2014-05-09) 1 commit
165
+ (merged to 'next' on 2014-05-12 at 416009e)
166
+ + contrib: remove git-diffall
167
+
168
+ Spring cleaning of contrib/.
169
450
-* jc/shortlog-ref-exclude (2014-05-30) 1 commit
451
- - shortlog: allow --exclude=<glob> to be passed
170
453
- Needs rewording the proposed log message ($gmane/250469, 250475).
171
+* jn/contrib-remove-vim (2014-05-09) 1 commit
172
+ (merged to 'next' on 2014-05-12 at 9e727c8)
173
+ + contrib: remove vim support instructions
174
175
+ Spring cleaning of contrib/.
176
456
-* lt/log-auto-decorate (2014-05-30) 1 commit
457
- - git log: support "auto" decorations
177
459
- Will merge to 'next'.
178
+* jn/test-lint-unmoor (2014-05-23) 1 commit
179
+ (merged to 'next' on 2014-05-23 at aa997bc)
180
+ + test-lint: find unportable sed, echo, test, and export usage after &&
181
182
462
-* lt/request-pull (2014-06-02) 1 commit
463
- - fix brown paper bag breakage in t5150-request-pull.sh
183
+* mc/git-p4-prepare-p4-only (2014-05-27) 1 commit
184
+ (merged to 'next' on 2014-05-27 at 71572fe)
185
+ + git-p4: Do not include diff in spec file when just preparing p4
186
465
- Will merge to 'next'.
187
188
+* mk/show-s-no-extra-blank-line-for-merges (2014-05-15) 1 commit
189
+ (merged to 'next' on 2014-05-21 at 3b98b35)
190
+ + git-show: fix 'git show -s' to not add extra terminator after merge commit
191
468
-* na/no-http-test-in-the-middle (2014-05-30) 1 commit
469
- - t5538: move http push tests out to t5542
192
+ "git show -s" (i.e. show log message only) used to incorrectly emit
193
+ an extra blank line after a merge commit.
194
471
- Will merge to 'next'.
195
196
+* mm/pager-less-sans-S (2014-05-07) 1 commit
197
+ (merged to 'next' on 2014-05-07 at 66ce999)
198
+ + pager: remove 'S' from $LESS by default
199
474
-* pb/trim-trailing-spaces (2014-06-02) 1 commit
475
- - dir.c:trim_trailing_spaces(): fix for " \ " sequence
200
+ Since the very beginning of Git, we gave the LESS environment a
201
+ default value "FRSX" when we spawn "less" as the pager. "S" (chop
202
+ long lines instead of wrapping) has been removed from this default
203
+ set of options, because it is more or less a personal taste thing,
204
+ as opposed to others that have good justifications (i.e. "R" is
205
+ very much justified because many kinds of output we produce are
206
+ colored and "FX" is justified because output we produce is often
207
+ shorter than a page).
208
477
- Will merge to 'next'.
209
210
+* mt/rebase-i-keep-empty-test (2014-05-19) 1 commit
211
+ (merged to 'next' on 2014-05-21 at d87d266)
212
+ + rebase --keep-empty -i: add test
213
480
-* rs/mailinfo-header-cmp (2014-06-02) 1 commit
481
- - mailinfo: use strcmp() for string comparison
214
483
- Will merge to 'next'.
215
+* nd/status-auto-comment-char (2014-05-19) 2 commits
216
+ (merged to 'next' on 2014-05-21 at f762e62)
217
+ + commit: allow core.commentChar=auto for character auto selection
218
+ + config: be strict on core.commentChar
219
220
+ The `core.commentChar` configuration variable is used to specify a
221
+ custom comment character other than the default "#" to be used in
222
+ the commit log editor. This can be set to `auto` to attempt to
223
+ choose a different character that does not conflict with what
224
+ already starts a line in the message being edited for cases like
225
+ "git commit --amend".
226
486
-* rs/pack-objects-no-unnecessary-realloc (2014-06-02) 1 commit
487
- - pack-objects: use free()+xcalloc() instead of xrealloc()+memset()
227
489
- Will merge to 'next'.
228
+* rs/reflog-exists (2014-05-08) 2 commits
229
+ (merged to 'next' on 2014-05-12 at 24a1d01)
230
+ + checkout.c: use ref_exists instead of file_exist
231
+ + refs.c: add new functions reflog_exists and delete_reflog
232
233
492
-* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
493
- - userdiff: support Java try keyword
494
- - userdiff: support C# async methods and correct C# keywords
234
+* sk/spawn-less-case-insensitively-from-grep-O-i (2014-05-15) 1 commit
235
+ (merged to 'next' on 2014-05-21 at eb28305)
236
+ + git grep -O -i: if the pager is 'less', pass the '-I' option
237
238
+ "git grep -O" to show the lines that hit in the pager did not work
239
+ well with case insensitive search. We now spawn "less" with its
240
+ "-I" option when it is used as the pager (which is the default).
241
497
-* jk/error-resolve-conflict-advice (2014-06-03) 2 commits
498
- - error_resolve_conflict: drop quotations around operation
499
- - error_resolve_conflict: rewrap advice message
242
501
- Will merge to 'next'.
243
+* sk/submodules-absolute-path-on-windows (2014-05-08) 1 commit
244
+ (merged to 'next' on 2014-05-14 at 83a05d9)
245
+ + Revert "submodules: fix ambiguous absolute paths under Windows"
246
247
504
-* rs/read-ref-at (2014-06-03) 1 commit
505
- - refs.c: change read_ref_at to use the reflog iterators
248
+* ss/howto-manage-trunk (2014-05-28) 1 commit
249
+ (merged to 'next' on 2014-05-28 at 5318336)
250
+ + How to keep a project's canonical history correct.
251
507
- Will merge to 'next'.
252
253
+* tb/unicode-6.3-zero-width (2014-05-12) 2 commits
254
+ (merged to 'next' on 2014-05-14 at 08e0171)
255
+ + utf8: make it easier to auto-update git_wcwidth()
256
+ + utf8.c: use a table for double_width
257
510
-* sh/enable-preloadindex (2014-06-03) 1 commit
511
- - environment.c: enable core.preloadindex by default
258
+ Update the logic to compute the display width needed for utf8
259
+ strings and allow us to more easily maintain the tables used in
260
+ that logic.
261
513
- Will merge to 'next'.
262
+ We may want to let the users choose if codepoints with ambiguous
263
+ widths are treated as a double or single width in a follow-up patch.
264
265
516
-* ta/string-list-init (2014-06-03) 1 commit
517
- - string-list: Add a value to string_list initializer lists
266
+* tg/tag-state-tag-name-in-editor-hints (2014-05-07) 1 commit
267
+ (merged to 'next' on 2014-05-12 at 0b7db32)
268
+ + builtin/tag.c: show tag name to hint in the message editor
269
519
- Will merge to 'next'.
270
+ "git tag" when editing the tag message shows the name of the tag
271
+ being edited as a comment in the editor.
272
+
273
+
274
+* tl/relax-in-poll-emulation (2014-04-29) 1 commit
275
+ (merged to 'next' on 2014-05-12 at 9369b08)
276
+ + compat/poll: sleep 1 millisecond to avoid busy wait
277
+
278
+
279
+* wg/svn-fe-style-fixes (2014-05-12) 1 commit
280
+ (merged to 'next' on 2014-05-12 at 88c0e0d)
281
+ + svn-fe: conform to pep8
282
+
283
+
284
+* wk/doc-clarify-upstream (2014-05-13) 1 commit
285
+ (merged to 'next' on 2014-05-14 at 6c8fb52)
286
+ + Documentation: mention config sources for @{upstream}
287
288
--------------------------------------------------
522
-[Stalled]
289
+[New Topics]
290
524
-* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
525
- - commit -m: commit staged submodules regardless of ignore config
526
- - status/commit: show staged submodules regardless of ignore config
291
+* jc/rev-parse-argh-dashed-multi-words (2014-06-04) 1 commit
292
+ (merged to 'next' on 2014-06-06 at 8b04440)
293
+ + update-index: fix segfault with missing --cacheinfo argument
294
+
295
+ "update-index --cacheinfo" in 2.0 crashes on a malformed command line.
296
+
297
+ Will merge to 'master'.
298
528
- There also are a few patches Ronald Weiss and Jens are working on
529
- polishing around this topic, and a patch from Jens each for gitk
530
- and git-gui.
299
532
- Waiting for the dust to settle until picking them up all.
300
+* sk/test-cmp-bin (2014-06-04) 1 commit
301
+ (merged to 'next' on 2014-06-06 at 112ae4b)
302
+ + t5000, t5003: do not use test_cmp to compare binary files
303
+
304
+ Will merge to 'master'.
305
+
306
+
307
+* dt/refs-check-refname-component-optim (2014-06-05) 1 commit
308
+ (merged to 'next' on 2014-06-06 at e85fb57)
309
+ + refs.c: optimize check_refname_component()
310
+
311
+ Will merge to 'master'.
312
+
313
+
314
+* jm/dedup-test-config (2014-06-05) 1 commit
315
+ (merged to 'next' on 2014-06-06 at 443f096)
316
+ + t/t7810-grep.sh: remove duplicate test_config()
317
+
318
+ Will merge to 'master'.
319
+
320
+--------------------------------------------------
321
+[Stalled]
322
+
323
+* nd/multiple-work-trees (2014-03-25) 28 commits
324
+ - count-objects: report unused files in $GIT_DIR/repos/...
325
+ - gc: support prune --repos
326
+ - gc: style change -- no SP before closing bracket
327
+ - prune: strategies for linked checkouts
328
+ - checkout: detach if the branch is already checked out elsewhere
329
+ - checkout: clean up half-prepared directories in --to mode
330
+ - checkout: support checking out into a new working directory
331
+ - use new wrapper write_file() for simple file writing
332
+ - wrapper.c: wrapper to open a file, fprintf then close
333
+ - setup.c: support multi-checkout repo setup
334
+ - setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
335
+ - setup.c: convert check_repository_format_gently to use strbuf
336
+ - setup.c: detect $GIT_COMMON_DIR in is_git_directory()
337
+ - setup.c: convert is_git_directory() to use strbuf
338
+ - git-stash: avoid hardcoding $GIT_DIR/logs/....
339
+ - *.sh: avoid hardcoding $GIT_DIR/hooks/...
340
+ - git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
341
+ - $GIT_COMMON_DIR: a new environment variable
342
+ - commit: use SEQ_DIR instead of hardcoding "sequencer"
343
+ - fast-import: use git_path() for accessing .git dir instead of get_git_dir()
344
+ - reflog: avoid constructing .lock path with git_path
345
+ - *.sh: respect $GIT_INDEX_FILE
346
+ - git_path(): be aware of file relocation in $GIT_DIR
347
+ - path.c: group git_path(), git_pathdup() and strbuf_git_path() together
348
+ - path.c: rename vsnpath() to do_git_path()
349
+ - git_snpath(): retire and replace with strbuf_git_path()
350
+ - path.c: make get_pathname() call sites return const char *
351
+ - path.c: make get_pathname() return strbuf instead of static buffer
352
+
353
+ A replacement for contrib/workdir/git-new-workdir that does not
354
+ rely on symbolic links and make sharing of objects and refs safer
355
+ by making the borrowee and borrowers aware of each other.
356
357
358
* mh/lockfile (2014-04-15) 25 commits
@@ -740,353 +563,395 @@ of the repositories listed at
563
--------------------------------------------------
564
[Cooking]
565
743
-* ep/shell-assign-and-export-vars (2014-05-23) 2 commits
744
- (merged to 'next' on 2014-05-23 at 7699c0e)
745
- + scripts: more "export VAR=VALUE" fixes
746
- + scripts: "export VAR=VALUE" construct is not portable
566
+* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
567
+ (merged to 'next' on 2014-06-06 at a2d0105)
568
+ + commit -m: commit staged submodules regardless of ignore config
569
+ + status/commit: show staged submodules regardless of ignore config
570
+
571
+ submodule.*.ignore and diff.ignoresubmodules are used to ignore all
572
+ submodule changes in "diff" output, but it can be confusing to
573
+ apply these configuration values to status and commit.
574
+
575
+ This is a backward-incompatible change, but should be so in a good
576
+ way (aka bugfix).
577
578
Will merge to 'master'.
579
580
751
-* jn/test-lint-unmoor (2014-05-23) 1 commit
752
- (merged to 'next' on 2014-05-23 at aa997bc)
753
- + test-lint: find unportable sed, echo, test, and export usage after &&
581
+* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
582
+ - git-gui: show staged submodules regardless of ignore config
583
755
- Will merge to 'master'.
584
+ Tentatively queued what I expect to receive via Pat Thoyts.
585
586
758
-* jj/command-line-adjective (2014-05-21) 1 commit
759
- (merged to 'next' on 2014-05-23 at fe136c8)
760
- + Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
587
+* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits
588
+ - gitk: show staged submodules regardless of ignore config
589
+ - gitk: Merge branch 'new' of https://github.com/vnwildman/gitk
590
+ - l10n: Init Vietnamese translation
591
762
- Will merge to 'master'.
592
+ Tentatively queued what I expect to receive via Paul Mackerras.
593
594
765
-* jk/daemon-tolower (2014-05-23) 1 commit
766
- (merged to 'next' on 2014-05-23 at 23c796d)
767
- + daemon/config: factor out duplicate xstrdup_tolower
595
+* bg/xcalloc-nmemb-then-size (2014-05-27) 12 commits
596
+ (merged to 'next' on 2014-06-06 at 7058fe5)
597
+ + transport-helper.c: rearrange xcalloc arguments
598
+ + remote.c: rearrange xcalloc arguments
599
+ + reflog-walk.c: rearrange xcalloc arguments
600
+ + pack-revindex.c: rearrange xcalloc arguments
601
+ + notes.c: rearrange xcalloc arguments
602
+ + imap-send.c: rearrange xcalloc arguments
603
+ + http-push.c: rearrange xcalloc arguments
604
+ + diff.c: rearrange xcalloc arguments
605
+ + config.c: rearrange xcalloc arguments
606
+ + commit.c: rearrange xcalloc arguments
607
+ + builtin/remote.c: rearrange xcalloc arguments
608
+ + builtin/ls-remote.c: rearrange xcalloc arguments
609
+
610
+ Like calloc(3), xcalloc() takes nmemb and then size.
611
612
Will merge to 'master'.
613
614
772
-* jk/strbuf-tolower (2014-05-23) 1 commit
773
- (merged to 'next' on 2014-05-23 at b172137)
774
- + strbuf: add strbuf_tolower function
615
+* jk/complete-merge-pull (2014-05-27) 2 commits
616
+ (merged to 'next' on 2014-06-06 at f88b8e3)
617
+ + completion: add missing options for git-merge
618
+ + completion: add a note that merge options are shared
619
+
620
+ The completion code did not know about quite a few options that are
621
+ common between "git merge" and "git pull", and a couple of options
622
+ unique to "git merge".
623
624
Will merge to 'master'.
625
626
779
-* jk/http-errors (2014-05-27) 8 commits
780
- - http: default text charset to iso-8859-1
781
- - remote-curl: reencode http error messages
782
- - strbuf: add strbuf_reencode helper
783
- - http: optionally extract charset parameter from content-type
784
- - http: extract type/subtype portion of content-type
785
- - t5550: test display of remote http error messages
786
- - t/lib-httpd: use write_script to copy CGI scripts
787
- - test-lib: preserve GIT_CURL_VERBOSE from the environment
627
+* jl/remote-rm-prune (2014-05-27) 3 commits
628
+ (merged to 'next' on 2014-06-06 at d3bde27)
629
+ + remote prune: optimize "dangling symref" check/warning
630
+ + remote: repack packed-refs once when deleting multiple refs
631
+ + remote rm: delete remote configuration as the last
632
789
- Will merge to 'next'.
633
+ "git remote rm" and "git remote prune" can involve removing many
634
+ refs at once, which is not a very efficient thing to do when very
635
+ many refs exist in the packed-refs file.
636
637
+ Will merge to 'master'.
638
792
-* jm/format-patch-mail-sig (2014-05-27) 2 commits
793
- - format-patch: add "--signature-file=<file>" option
794
- - format-patch: make newline after signature conditional
639
796
- Will merge to 'next'.
640
+* jm/instaweb-apache-24 (2014-05-27) 1 commit
641
+ (merged to 'next' on 2014-06-06 at ab6e494)
642
+ + git-instaweb: add support for Apache 2.4
643
644
+ Will merge to 'master'.
645
799
-* sk/wincred (2014-05-14) 2 commits
800
- (merged to 'next' on 2014-05-21 at a3b9ca3)
801
- + wincred: avoid overwriting configured variables
802
- + wincred: add install target
646
+
647
+* jm/t9138-style-fix (2014-05-27) 1 commit
648
+ (merged to 'next' on 2014-06-06 at 552098b)
649
+ + t9138-git-svn-authors-prog.sh fixups
650
651
Will merge to 'master'.
652
653
807
-* as/pretty-truncate (2014-05-21) 5 commits
808
- (merged to 'next' on 2014-05-23 at 94d4c51)
809
- + pretty.c: format string with truncate respects logOutputEncoding
810
- + t4205, t6006: add tests that fail with i18n.logOutputEncoding set
811
- + t4205 (log-pretty-format): use `tformat` rather than `format`
812
- + t4041, t4205, t6006, t7102: don't hardcode tested encoding value
813
- + t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
654
+* nd/daemonize-gc (2014-05-27) 1 commit
655
+ (merged to 'next' on 2014-06-06 at 638c6ca)
656
+ + gc --auto: do not lock refs in the background
657
+
658
+ "git gc --auto" was recently changed to run in the background to
659
+ give control back early to the end-user sitting in front of the
660
+ terminal, but it forgot that housekeeping involving reflogs should
661
+ be done without other processes competing for accesses to the refs.
662
663
Will merge to 'master'.
664
665
818
-* cc/replace-graft (2014-05-19) 1 commit
819
- (merged to 'next' on 2014-05-21 at 7d90c4e)
820
- + replace: add --graft option
821
- (this branch uses cc/replace-edit.)
666
+* ow/config-mailmap-pathname (2014-05-27) 1 commit
667
+ (merged to 'next' on 2014-06-06 at a686803)
668
+ + config: respect '~' and '~user' in mailmap.file
669
823
- Will eject from 'next' and replace with a newer reroll.
670
+ mailmap.file configuration names a pathname, hence should honor
671
+ ~/path and ~user/path as its value.
672
673
+ Will merge to 'master'.
674
826
-* jk/argv-array-for-child-process (2014-05-15) 7 commits
827
- (merged to 'next' on 2014-05-21 at 5b2fa64)
828
- + argv-array: drop "detach" code
829
- + get_importer: use run-command's internal argv_array
830
- + get_exporter: use argv_array
831
- + get_helper: use run-command's internal argv_array
832
- + git_connect: use argv_array
833
- + run_column_filter: use argv_array
834
- + run-command: store an optional argv_array
675
836
- Will merge to 'master'.
676
+* rh/prompt-tests (2014-06-05) 11 commits
677
+ - t9904: new __git_ps1 tests for Zsh
678
+ - test-lib: make it possible to override how test code is eval'd
679
+ - lib-prompt-tests.sh: add variable for string that encodes percent in PS1
680
+ - lib-prompt-tests.sh: put all tests inside a function
681
+ - t9903: move prompt tests to a new lib-prompt-tests.sh file
682
+ - t9903: move PS1 color code variable definitions to lib-bash.sh
683
+ - t9903: include "Bash" in test names via new $shellname var
684
+ - t9903: run pc mode tests again with PS1 expansion disabled
685
+ - t9903: move test name prefix to a separate variable
686
+ - t9903: put the Bash pc mode prompt test cases in a function
687
+ - t9903: remove Zsh test from the suite of Bash prompt tests
688
689
+ Maybe a reroll to limit the damage to test_eval_ is coming?
690
839
-* jk/diff-files-assume-unchanged (2014-05-15) 1 commit
840
- (merged to 'next' on 2014-05-21 at 142d2c8)
841
- + run_diff_files: do not look at uninitialized stat data
691
+
692
+* jm/doc-wording-tweaks (2014-05-28) 1 commit
693
+ (merged to 'next' on 2014-06-06 at 4dca23e)
694
+ + Documentation: wording fixes in the user manual and glossary
695
696
Will merge to 'master'.
697
698
846
-* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit
847
- (merged to 'next' on 2014-05-21 at 77c89fe)
848
- + open_sha1_file: report "most interesting" errno
699
+* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
700
+ - gitweb: Harden UTF-8 handling in generated links
701
850
- Will merge to 'master'.
702
+ $gmane/250758?
703
704
853
-* mt/rebase-i-keep-empty-test (2014-05-19) 1 commit
854
- (merged to 'next' on 2014-05-21 at d87d266)
855
- + rebase --keep-empty -i: add test
705
+* mn/sideband-no-ansi (2014-06-02) 1 commit
706
+ (merged to 'next' on 2014-06-06 at f61fc73)
707
+ + sideband.c: do not use ANSI control sequence on non-terminal
708
709
Will merge to 'master'.
710
711
860
-* nd/status-auto-comment-char (2014-05-19) 2 commits
861
- (merged to 'next' on 2014-05-21 at f762e62)
862
- + commit: allow core.commentChar=auto for character auto selection
863
- + config: be strict on core.commentChar
712
+* jc/fetch-push-refmap (2014-06-05) 9 commits
713
+ - fetch: allow explicit --refmap to override configuration
714
+ - fetch doc: add a section on configured remote-tracking branches
715
+ - fetch doc: remove "short-cut" section
716
+ - fetch doc: update refspec format description
717
+ - fetch doc: on pulling multiple refspecs
718
+ - fetch doc: remove notes on outdated "mixed layout"
719
+ - fetch doc: update note on '+' in front of the refspec
720
+ - fetch doc: move FETCH_HEAD material lower and add an example
721
+ - fetch doc: update introductory part for clarity
722
865
- Will merge to 'master'.
723
+ Will merge to 'next'.
724
725
868
-* rr/rebase-autostash-fix (2014-05-20) 2 commits
869
- (merged to 'next' on 2014-05-21 at ca4aa40)
870
- + rebase -i: test "Nothing to do" case with autostash
871
- + rebase -i: handle "Nothing to do" case with autostash
726
+* jc/shortlog-ref-exclude (2014-06-04) 1 commit
727
+ (merged to 'next' on 2014-06-06 at a358cbe)
728
+ + shortlog: allow --exclude=<glob> to be passed
729
730
Will merge to 'master'.
731
732
876
-* sk/spawn-less-case-insensitively-from-grep-O-i (2014-05-15) 1 commit
877
- (merged to 'next' on 2014-05-21 at eb28305)
878
- + git grep -O -i: if the pager is 'less', pass the '-I' option
733
+* lt/log-auto-decorate (2014-05-30) 1 commit
734
+ (merged to 'next' on 2014-06-06 at d451fc1)
735
+ + git log: support "auto" decorations
736
737
Will merge to 'master'.
738
739
883
-* sk/windows-unc-path (2014-05-20) 1 commit
884
- (merged to 'next' on 2014-05-21 at d1f1350)
885
- + Windows: Allow using UNC path for git repository
740
+* lt/request-pull (2014-06-02) 1 commit
741
+ (merged to 'next' on 2014-06-06 at ad4d79d)
742
+ + fix brown paper bag breakage in t5150-request-pull.sh
743
744
Will merge to 'master'.
745
746
890
-* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit
891
- (merged to 'next' on 2014-05-23 at 4653133)
892
- + move "--follow needs one pathspec" rule to diff_setup_done
747
+* na/no-http-test-in-the-middle (2014-05-30) 1 commit
748
+ (merged to 'next' on 2014-06-06 at e195615)
749
+ + t5538: move http push tests out to t5542
750
751
Will merge to 'master'.
752
753
897
-* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
898
- - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
899
- - git-add--interactive: Preserve diff heading when splitting hunks
754
+* pb/trim-trailing-spaces (2014-06-02) 1 commit
755
+ (merged to 'next' on 2014-06-06 at 741efc2)
756
+ + dir.c:trim_trailing_spaces(): fix for " \ " sequence
757
901
- Waiting for a reroll.
758
+ Fix an error in parsing of .gitignore files that use a trailing
759
+ "\ " to mark pathnames that end with a SP.
760
761
+ Will merge to 'master'.
762
904
-* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit
905
- (merged to 'next' on 2014-05-21 at 676392b)
906
- + t/lib-httpd: require SANITY prereq
763
+
764
+* rs/mailinfo-header-cmp (2014-06-02) 1 commit
765
+ (merged to 'next' on 2014-06-06 at 5e856f4)
766
+ + mailinfo: use strcmp() for string comparison
767
+
768
+ Avoid running over the end of header string while parsing an
769
+ incoming e-mail message to extract the patch.
770
771
Will merge to 'master'.
772
773
911
-* jk/index-pack-report-missing (2014-05-12) 1 commit
912
- (merged to 'next' on 2014-05-14 at 72d40e1)
913
- + index-pack: distinguish missing objects from type errors
774
+* rs/pack-objects-no-unnecessary-realloc (2014-06-02) 1 commit
775
+ (merged to 'next' on 2014-06-06 at a39f7ad)
776
+ + pack-objects: use free()+xcalloc() instead of xrealloc()+memset()
777
+
778
+ Avoid unnecessary copy of previous contents when extending the
779
+ hashtable used in pack-objects.
780
781
Will merge to 'master'.
782
783
918
-* tb/unicode-6.3-zero-width (2014-05-12) 2 commits
919
- (merged to 'next' on 2014-05-14 at 08e0171)
920
- + utf8: make it easier to auto-update git_wcwidth()
921
- + utf8.c: use a table for double_width
784
+* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
785
+ - userdiff: support Java try keyword
786
+ - userdiff: support C# async methods and correct C# keywords
787
923
- Update the logic to compute the display width needed for utf8
924
- strings and allow us to more easily maintain the tables used in
925
- that logic.
788
927
- We may want to let the users choose if codepoints with ambiguous
928
- widths are treated as a double or single width in a follow-up patch.
789
+* jk/error-resolve-conflict-advice (2014-06-03) 2 commits
790
+ (merged to 'next' on 2014-06-06 at f2e7bbf)
791
+ + error_resolve_conflict: drop quotations around operation
792
+ + error_resolve_conflict: rewrap advice message
793
794
Will merge to 'master'.
795
796
933
-* mk/show-s-no-extra-blank-line-for-merges (2014-05-15) 1 commit
934
- (merged to 'next' on 2014-05-21 at 3b98b35)
935
- + git-show: fix 'git show -s' to not add extra terminator after merge commit
797
+* rs/read-ref-at (2014-06-03) 1 commit
798
+ (merged to 'next' on 2014-06-06 at 30f9896)
799
+ + refs.c: change read_ref_at to use the reflog iterators
800
801
Will merge to 'master'.
802
803
940
-* wk/doc-clarify-upstream (2014-05-13) 1 commit
941
- (merged to 'next' on 2014-05-14 at 6c8fb52)
942
- + Documentation: mention config sources for @{upstream}
804
+* sh/enable-preloadindex (2014-06-03) 1 commit
805
+ (merged to 'next' on 2014-06-06 at 0f0d7da)
806
+ + environment.c: enable core.preloadindex by default
807
808
Will merge to 'master'.
809
810
947
-* dk/raise-core-deltabasecachelimit (2014-05-06) 1 commit
948
- (merged to 'next' on 2014-05-12 at 97ec92a)
949
- + Bump core.deltaBaseCacheLimit to 96m
950
-
951
- The original 16 MiB limit for the in-core delta-base-cache
952
- introduced in 18bdec11 (Limit the size of the new delta_base_cache,
953
- 2007-03-19) is turning out to be too small.
811
+* ta/string-list-init (2014-06-06) 1 commit
812
+ (merged to 'next' on 2014-06-06 at f0f2abc)
813
+ + string-list: spell all values out that are given to a string_list initializer
814
815
Will merge to 'master'.
816
817
958
-* fc/status-printf-squelch-format-zero-length-warnings (2014-05-07) 1 commit
959
- (merged to 'next' on 2014-05-12 at 6b04e23)
960
- + silence a bunch of format-zero-length warnings
818
+* jk/daemon-tolower (2014-05-23) 1 commit
819
+ (merged to 'next' on 2014-05-23 at 23c796d)
820
+ + daemon/config: factor out duplicate xstrdup_tolower
821
822
Will merge to 'master'.
823
824
965
-* jk/grep-tell-run-command-to-cd-when-running-pager (2014-05-07) 1 commit
966
- (merged to 'next' on 2014-05-12 at 065cb22)
967
- + grep: use run-command's "dir" option for --open-files-in-pager
825
+* jk/strbuf-tolower (2014-05-23) 1 commit
826
+ (merged to 'next' on 2014-05-23 at b172137)
827
+ + strbuf: add strbuf_tolower function
828
829
Will merge to 'master'.
830
831
972
-* jk/squelch-compiler-warning-from-funny-error-macro (2014-05-06) 2 commits
973
- (merged to 'next' on 2014-05-12 at d9daf8d)
974
- + let clang use the constant-return error() macro
975
- + inline constant return from error() function
832
+* jk/http-errors (2014-05-27) 8 commits
833
+ (merged to 'next' on 2014-06-06 at 1004dae)
834
+ + http: default text charset to iso-8859-1
835
+ + remote-curl: reencode http error messages
836
+ + strbuf: add strbuf_reencode helper
837
+ + http: optionally extract charset parameter from content-type
838
+ + http: extract type/subtype portion of content-type
839
+ + t5550: test display of remote http error messages
840
+ + t/lib-httpd: use write_script to copy CGI scripts
841
+ + test-lib: preserve GIT_CURL_VERBOSE from the environment
842
+
843
+ Propagate the error messages from the webserver better to the
844
+ client coming over the HTTP transport.
845
846
Will merge to 'master'.
847
848
980
-* rs/reflog-exists (2014-05-08) 2 commits
981
- (merged to 'next' on 2014-05-12 at 24a1d01)
982
- + checkout.c: use ref_exists instead of file_exist
983
- + refs.c: add new functions reflog_exists and delete_reflog
849
+* jm/format-patch-mail-sig (2014-05-27) 2 commits
850
+ (merged to 'next' on 2014-06-06 at 0c8d703)
851
+ + format-patch: add "--signature-file=<file>" option
852
+ + format-patch: make newline after signature conditional
853
854
Will merge to 'master'.
855
856
988
-* tg/tag-state-tag-name-in-editor-hints (2014-05-07) 1 commit
989
- (merged to 'next' on 2014-05-12 at 0b7db32)
990
- + builtin/tag.c: show tag name to hint in the message editor
857
+* sk/wincred (2014-05-14) 2 commits
858
+ (merged to 'next' on 2014-05-21 at a3b9ca3)
859
+ + wincred: avoid overwriting configured variables
860
+ + wincred: add install target
861
862
Will merge to 'master'.
863
864
995
-* sk/submodules-absolute-path-on-windows (2014-05-08) 1 commit
996
- (merged to 'next' on 2014-05-14 at 83a05d9)
997
- + Revert "submodules: fix ambiguous absolute paths under Windows"
865
+* as/pretty-truncate (2014-05-21) 5 commits
866
+ (merged to 'next' on 2014-05-23 at 94d4c51)
867
+ + pretty.c: format string with truncate respects logOutputEncoding
868
+ + t4205, t6006: add tests that fail with i18n.logOutputEncoding set
869
+ + t4205 (log-pretty-format): use `tformat` rather than `format`
870
+ + t4041, t4205, t6006, t7102: don't hardcode tested encoding value
871
+ + t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
872
873
Will merge to 'master'.
874
875
1002
-* jn/contrib-remove-diffall (2014-05-09) 1 commit
1003
- (merged to 'next' on 2014-05-12 at 416009e)
1004
- + contrib: remove git-diffall
876
+* cc/replace-graft (2014-06-05) 4 commits
877
+ - contrib: add convert-grafts-to-replace-refs.sh
878
+ - Documentation: replace: add --graft option
879
+ - replace: add test for --graft
880
+ - replace: add --graft option
881
+ (this branch uses cc/replace-edit.)
882
1006
- Spring cleaning of contrib/.
883
1008
- Will merge to 'master'.
884
+* jk/argv-array-for-child-process (2014-05-15) 7 commits
885
+ (merged to 'next' on 2014-05-21 at 5b2fa64)
886
+ + argv-array: drop "detach" code
887
+ + get_importer: use run-command's internal argv_array
888
+ + get_exporter: use argv_array
889
+ + get_helper: use run-command's internal argv_array
890
+ + git_connect: use argv_array
891
+ + run_column_filter: use argv_array
892
+ + run-command: store an optional argv_array
893
894
+ Will merge to 'master'.
895
1011
-* jn/contrib-remove-vim (2014-05-09) 1 commit
1012
- (merged to 'next' on 2014-05-12 at 9e727c8)
1013
- + contrib: remove vim support instructions
896
1015
- Spring cleaning of contrib/.
897
+* jk/diff-files-assume-unchanged (2014-05-15) 1 commit
898
+ (merged to 'next' on 2014-05-21 at 142d2c8)
899
+ + run_diff_files: do not look at uninitialized stat data
900
901
Will merge to 'master'.
902
903
1020
-* ss/howto-manage-trunk (2014-05-28) 1 commit
1021
- (merged to 'next' on 2014-05-28 at 5318336)
1022
- + How to keep a project's canonical history correct.
904
+* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit
905
+ (merged to 'next' on 2014-05-21 at 77c89fe)
906
+ + open_sha1_file: report "most interesting" errno
907
908
Will merge to 'master'.
909
910
1027
-* wg/svn-fe-style-fixes (2014-05-12) 1 commit
1028
- (merged to 'next' on 2014-05-12 at 88c0e0d)
1029
- + svn-fe: conform to pep8
911
+* rr/rebase-autostash-fix (2014-05-20) 2 commits
912
+ (merged to 'next' on 2014-05-21 at ca4aa40)
913
+ + rebase -i: test "Nothing to do" case with autostash
914
+ + rebase -i: handle "Nothing to do" case with autostash
915
916
Will merge to 'master'.
917
918
1034
-* cb/byte-order (2014-05-30) 3 commits
1035
- (merged to 'next' on 2014-05-30 at 857617e)
1036
- + compat/bswap.h: fix endianness detection
1037
- (merged to 'next' on 2014-05-07 at f55c040)
1038
- + compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
1039
- + compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
1040
-
1041
- Compatibility enhancement for Solaris.
919
+* sk/windows-unc-path (2014-05-20) 1 commit
920
+ (merged to 'next' on 2014-05-21 at d1f1350)
921
+ + Windows: Allow using UNC path for git repository
922
923
Will merge to 'master'.
924
925
1046
-* dt/merge-recursive-case-insensitive (2014-05-08) 2 commits
1047
- (merged to 'next' on 2014-05-12 at 820d524)
1048
- + mv: allow renaming to fix case on case insensitive filesystems
1049
- + merge-recursive.c: fix case-changing merge bug
1050
-
1051
- On a case insensitive filesystem, merge-recursive incorrectly
1052
- deleted the file that is to be renamed to a name that is the same
1053
- except for case differences.
926
+* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit
927
+ (merged to 'next' on 2014-05-23 at 4653133)
928
+ + move "--follow needs one pathspec" rule to diff_setup_done
929
930
Will merge to 'master'.
931
932
1058
-* jc/coding-guidelines (2014-05-20) 9 commits
1059
- (merged to 'next' on 2014-05-23 at bb351fc)
1060
- + CodingGuidelines: avoid "test <cond> -a/-o <cond>"
1061
- (merged to 'next' on 2014-05-12 at e1fcf62)
1062
- + CodingGuidelines: on splitting a long line
1063
- + CodingGuidelines: on comparison
1064
- + CodingGuidelines: do not call the conditional statement "if()"
1065
- + CodingGuidelines: give an example for shell function preamble
1066
- + CodingGuidelines: give an example for control statements
1067
- + CodingGuidelines: give an example for redirection
1068
- + CodingGuidelines: give an example for case/esac statement
1069
- + CodingGuidelines: once it is in, it is not worth the code churn
933
+* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
934
+ - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
935
+ - git-add--interactive: Preserve diff heading when splitting hunks
936
1071
- Will merge to 'master'.
937
+ Waiting for a reroll.
938
939
1074
-* jd/subtree (2014-05-13) 6 commits
1075
- (merged to 'next' on 2014-05-14 at 977db74)
1076
- + contrib/subtree: allow adding an annotated tag
1077
- (merged to 'next' on 2014-05-07 at 81b375d)
1078
- + contrib/subtree/Makefile: clean up rule for "clean"
1079
- + contrib/subtree/Makefile: clean up rules to generate documentation
1080
- + contrib/subtree/Makefile: s/libexecdir/gitexecdir/
1081
- + contrib/subtree/Makefile: use GIT-VERSION-FILE
1082
- + contrib/subtree/Makefile: scrap unused $(gitdir)
940
+* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit
941
+ (merged to 'next' on 2014-05-21 at 676392b)
942
+ + t/lib-httpd: require SANITY prereq
943
944
Will merge to 'master'.
945
946
1087
-* mm/pager-less-sans-S (2014-05-07) 1 commit
1088
- (merged to 'next' on 2014-05-07 at 66ce999)
1089
- + pager: remove 'S' from $LESS by default
947
+* cb/byte-order (2014-05-30) 3 commits
948
+ (merged to 'next' on 2014-05-30 at 857617e)
949
+ + compat/bswap.h: fix endianness detection
950
+ (merged to 'next' on 2014-05-07 at f55c040)
951
+ + compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
952
+ + compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
953
+
954
+ Compatibility enhancement for Solaris.
955
956
Will merge to 'master'.
957
@@ -1111,54 +976,9 @@ of the repositories listed at
976
Will merge to 'master'.
977
978
1114
-* da/imap-send-use-credential-helper (2014-04-29) 1 commit
1115
- (merged to 'next' on 2014-05-12 at b0698a5)
1116
- + imap-send: use git-credential
1117
-
1118
- "git imap-send" learns to ask the credential helper for
1119
- authentication material.
1120
-
1121
- Will merge to 'master'.
1122
-
1123
-
1124
-* dk/blame-reorg (2014-04-28) 1 commit
1125
- (merged to 'next' on 2014-05-14 at 354a0e3)
1126
- + blame: large-scale performance rewrite
1127
-
1128
- Will merge to 'master'.
1129
-
1130
-
1131
-* je/pager-do-not-recurse (2014-04-28) 1 commit
1132
- (merged to 'next' on 2014-05-12 at 32de470)
1133
- + pager: do allow spawning pager recursively
1134
-
1135
- We used to unconditionally disabled the pager in the pager process
1136
- we spawn to feed out output, but that prevents people who want to
1137
- run less within less from doing so.
1138
-
1139
- Will merge to 'master'.
1140
-
1141
-
1142
-* jk/commit-C-pick-empty (2014-04-28) 1 commit
1143
- (merged to 'next' on 2014-05-12 at c187e1e)
1144
- + commit: do not complain of empty messages from -C
1145
-
1146
- "git commit --allow-empty-message -C $commit" did not work when the
1147
- commit did not have any log message.
1148
-
1149
- Will merge to 'master'.
1150
-
1151
-
1152
-* jk/utf8-switch-between-nfd-and-nfc (2014-04-29) 1 commit
1153
- (merged to 'next' on 2014-05-12 at 948823c)
1154
- + t3910: show failure of core.precomposeunicode with decomposed filenames
1155
-
1156
- Document a known breakage with a test.
1157
-
1158
- Will merge to 'master'.
1159
-
1160
-
1161
-* mt/send-email-cover-to-cc (2014-04-29) 2 commits
979
+* mt/send-email-cover-to-cc (2014-06-04) 3 commits
980
+ (merged to 'next' on 2014-06-06 at 583f5fc)
981
+ + t9001: avoid non-portable '\n' with sed
982
(merged to 'next' on 2014-05-12 at b696006)
983
+ test/send-email: to-cover, cc-cover tests
984
+ git-send-email: two new options: to-cover, cc-cover
@@ -1206,33 +1026,18 @@ of the repositories listed at
1026
I could try to squash them myself, but it is low priority for me.
1027
1028
1209
-* tl/relax-in-poll-emulation (2014-04-29) 1 commit
1210
- (merged to 'next' on 2014-05-12 at 9369b08)
1211
- + compat/poll: sleep 1 millisecond to avoid busy wait
1212
-
1213
- Will merge to 'master'.
1214
-
1215
-
1216
-* bc/blame-crlf-test (2014-05-08) 1 commit
1217
- (merged to 'next' on 2014-05-14 at b819505)
1218
- + blame: correctly handle files regardless of autocrlf
1219
-
1220
- If a file contained CRLF line endings in a repository with
1221
- core.autocrlf=input, then blame always marked lines as "Not
1222
- Committed Yet", even if they were unmodified.
1223
-
1224
- Will merge to 'master'.
1225
-
1226
-
1227
-* ib/test-selectively-run (2014-05-21) 4 commits
1228
- - t0000-*.sh: Fix the GIT_SKIP_TESTS sub-tests
1229
- - test-lib: '--run' to run only specific tests
1230
- - test-lib: tests skipped by GIT_SKIP_TESTS say so
1231
- - test-lib: Document short options in t/README
1029
+* ib/test-selectively-run (2014-06-06) 4 commits
1030
+ (merged to 'next' on 2014-06-06 at d894205)
1031
+ + t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests
1032
+ + test-lib: '--run' to run only specific tests
1033
+ + test-lib: tests skipped by GIT_SKIP_TESTS say so
1034
+ + test-lib: document short options in t/README
1035
1036
Allow specifying only certain individual test pieces to be run
1037
using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
1038
1039
+ Will merge to 'master'.
1040
+
1041
1042
* fc/remote-helper-refmap (2014-04-21) 8 commits
1043
(merged to 'next' on 2014-04-22 at fb5a4c2)
@@ -1249,23 +1054,11 @@ of the repositories listed at
1054
while transferring the history.
1055
1056
1252
-* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
1253
- - git-gui: show staged submodules regardless of ignore config
1254
-
1255
- Tentatively queued what I expect to receive via Pat Thoyts.
1256
-
1257
-
1258
-* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits
1259
- - gitk: show staged submodules regardless of ignore config
1260
- - gitk: Merge branch 'new' of https://github.com/vnwildman/gitk
1261
- - l10n: Init Vietnamese translation
1262
-
1263
- Tentatively queued what I expect to receive via Paul Mackerras.
1264
-
1265
-
1057
* jh/submodule-tests (2014-04-17) 1 commit
1058
- t7410: 210 tests for various 'git submodule update' scenarios
1059
1060
+ What's the status of this one?
1061
+
1062
1063
* mt/patch-id-stable (2014-05-06) 6 commits
1064
(merged to 'next' on 2014-05-07 at 6ade68e)
@@ -1284,43 +1077,6 @@ of the repositories listed at
1077
Will merge to 'master'.
1078
1079
1287
-* nd/multiple-work-trees (2014-03-25) 28 commits
1288
- - count-objects: report unused files in $GIT_DIR/repos/...
1289
- - gc: support prune --repos
1290
- - gc: style change -- no SP before closing bracket
1291
- - prune: strategies for linked checkouts
1292
- - checkout: detach if the branch is already checked out elsewhere
1293
- - checkout: clean up half-prepared directories in --to mode
1294
- - checkout: support checking out into a new working directory
1295
- - use new wrapper write_file() for simple file writing
1296
- - wrapper.c: wrapper to open a file, fprintf then close
1297
- - setup.c: support multi-checkout repo setup
1298
- - setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
1299
- - setup.c: convert check_repository_format_gently to use strbuf
1300
- - setup.c: detect $GIT_COMMON_DIR in is_git_directory()
1301
- - setup.c: convert is_git_directory() to use strbuf
1302
- - git-stash: avoid hardcoding $GIT_DIR/logs/....
1303
- - *.sh: avoid hardcoding $GIT_DIR/hooks/...
1304
- - git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
1305
- - $GIT_COMMON_DIR: a new environment variable
1306
- - commit: use SEQ_DIR instead of hardcoding "sequencer"
1307
- - fast-import: use git_path() for accessing .git dir instead of get_git_dir()
1308
- - reflog: avoid constructing .lock path with git_path
1309
- - *.sh: respect $GIT_INDEX_FILE
1310
- - git_path(): be aware of file relocation in $GIT_DIR
1311
- - path.c: group git_path(), git_pathdup() and strbuf_git_path() together
1312
- - path.c: rename vsnpath() to do_git_path()
1313
- - git_snpath(): retire and replace with strbuf_git_path()
1314
- - path.c: make get_pathname() call sites return const char *
1315
- - path.c: make get_pathname() return strbuf instead of static buffer
1316
-
1317
- A replacement for contrib/workdir/git-new-workdir that does not
1318
- rely on symbolic links and make sharing of objects and refs safer
1319
- by making the borrowee and borrowers aware of each other.
1320
-
1321
- Will hold.
1322
-
1323
-
1080
* cc/interpret-trailers (2014-05-28) 11 commits
1081
- Documentation: add documentation for 'git interpret-trailers'
1082
- trailer: add tests for commands in config file
@@ -1336,64 +1092,3 @@ of the repositories listed at
1092
1093
A new filter to programatically edit the tail end of the commit log
1094
messages.
1339
-
1340
---------------------------------------------------
1341
-[Discarded]
1342
-
1343
-* jc/format-patch (2013-04-22) 2 commits
1344
- . format-patch: --inline-single
1345
- . format-patch: rename "no_inline" field
1346
-
1347
- A new option to send a single patch to the standard output to be
1348
- appended at the bottom of a message. I personally have no need for
1349
- this, but it was easy enough to cobble together. Tests, docs and
1350
- stripping out more MIMEy stuff are left as exercises to interested
1351
- parties.
1352
-
1353
-
1354
-* mt/rebase-i-ack (2014-05-19) 6 commits
1355
- . git-ack: record an ack
1356
- . rebase: test ack
1357
- . git-rebase: document ack
1358
- . rebase -i: add ack action
1359
- + test: add test_write_lines helper
1360
- + patch-id: make it stable against hunk reordering
1361
- (this branch is tangled with mt/patch-id-stable.)
1362
-
1363
- Will be rerolled post 2.0
1364
-
1365
-
1366
-* rs/ref-transaction (2014-04-29) 27 commits
1367
- . refs.c: make lock_ref_sha1 static
1368
- . refs.c: make write_ref_sha1 static
1369
- . walker.c: use ref transaction for ref updates
1370
- . fast-import.c: use a ref transaction when dumping tags
1371
- . receive-pack.c: use a reference transaction for updating the refs
1372
- . fetch.c: use a single ref transaction for all ref updates
1373
- . fetch.c: change s_update_ref to use a ref transaction
1374
- . fetch.c: clear errno before calling functions that might set it
1375
- . refs.c: ref_transaction_commit should not free the transaction
1376
- . refs.c: free the transaction before returning when number of updates is 0
1377
- . refs.c: change update_ref to use a transaction
1378
- . branch.c: use ref transaction for all ref updates
1379
- . fast-import.c: change update_branch to use ref transactions
1380
- . sequencer.c: use ref transactions for all ref updates
1381
- . commit.c: use ref transactions for updates
1382
- . replace.c: use the ref transaction functions for updates
1383
- . tag.c: use ref transactions when doing updates
1384
- . refs.c: ref_transaction_delete to check for error and return status
1385
- . refs.c: change ref_transaction_create to do error checking and return status
1386
- . refs.c: change ref_transaction_update() to do error checking and return status
1387
- . refs.c: remove the onerr argument to ref_transaction_commit
1388
- . refs.c: make update_ref_write update a strbuf on failure
1389
- . update-ref.c: log transaction error from the update_ref
1390
- . refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
1391
- . refs.c: add a strbuf argument to ref_transaction_commit for error logging
1392
- . refs.c: allow passing NULL to ref_transaction_free
1393
- . refs.c: constify the sha arguments for ref_transaction_create|delete|update
1394
- (this branch uses mh/ref-transaction; is tangled with rs/ref-transaction-2.)
1395
-
1396
- Temporarily dropped; there are a lot of conflicts with topics in
1397
- flight, and the topic is still being worked on with frequent
1398
- rerolls. Will pick up a reroll once things settle down a bit after
1399
- the release.