What's cooking (2014/10 #03)
Junio C Hamano committed
Oct 14, 2014 at 15:21 UTC
fa532631b64824282a516aadc481d64e6102c267
1 file changed
+232
-229
whats-cooking.txt
+232
-229
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Oct 2014, #01; Thu, 9)
4
-X-master-at: 63a45136a329bab550425c3142db6071434d935e
5
-X-next-at: 2852361b1a5901b41556bbe4a1bcd5e386b17e5d
3
+Subject: What's cooking in git.git (Oct 2014, #03; Tue, 14)
4
+X-master-at: 670a3c1d5a27bfb1cc6b526559c6f5874f00042f
5
+X-next-at: 1f81b4665aea1209bb138fc973dd7b28b6696920
6
7
-What's cooking in git.git (Oct 2014, #02; Thu, 9)
7
+What's cooking in git.git (Oct 2014, #03; Tue, 14)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -19,69 +19,75 @@ of the repositories listed at
19
--------------------------------------------------
20
[Graduated to "master"]
21
22
-* bw/use-write-script-in-tests (2014-09-29) 1 commit
23
- (merged to 'next' on 2014-09-29 at be4056e)
24
- + t/lib-credential: use write_script
25
-
26
-
27
-* jc/push-cert (2014-09-25) 24 commits
28
- (merged to 'next' on 2014-09-25 at 3eb1d69)
29
- + receive-pack::hmac_sha1(): copy the entire SHA-1 hash out
30
- (merged to 'next' on 2014-09-24 at a99f5d8)
31
- + signed push: allow stale nonce in stateless mode
32
- + signed push: teach smart-HTTP to pass "git push --signed" around
33
- + signed push: fortify against replay attacks
34
- + signed push: add "pushee" header to push certificate
35
- + signed push: remove duplicated protocol info
36
- + send-pack: send feature request on push-cert packet
37
- + receive-pack: GPG-validate push certificates
38
- + push: the beginning of "git push --signed"
39
- + pack-protocol doc: typofix for PKT-LINE
40
- + gpg-interface: move parse_signature() to where it should be
41
- + gpg-interface: move parse_gpg_output() to where it should be
42
- + send-pack: clarify that cmds_sent is a boolean
43
- + send-pack: refactor inspecting and resetting status and sending commands
44
- + send-pack: rename "new_refs" to "need_pack_data"
45
- + receive-pack: factor out capability string generation
46
- + send-pack: factor out capability string generation
47
- + send-pack: always send capabilities
48
- + send-pack: refactor decision to send update per ref
49
- + send-pack: move REF_STATUS_REJECT_NODELETE logic a bit higher
50
- + receive-pack: factor out queueing of command
51
- + receive-pack: do not reuse old_sha1[] for other things
52
- + receive-pack: parse feature request a bit earlier
53
- + receive-pack: do not overallocate command structure
54
- (this branch is used by jc/push-cert-hmac-optim.)
55
-
56
- Allow "git push" request to be signed, so that it can be verified and
57
- audited, using the GPG signature of the person who pushed, that the
58
- tips of branches at a public repository really point the commits
59
- the pusher wanted to, without having to "trust" the server.
60
-
61
-
62
-* nd/archive-pathspec (2014-09-22) 1 commit
63
- (merged to 'next' on 2014-09-25 at 8806f93)
64
- + archive: support filtering paths with glob
65
-
66
- "git archive" learned to filter what gets archived with pathspec.
67
-
68
-
69
-* sp/stream-clean-filter (2014-09-22) 7 commits
70
- (merged to 'next' on 2014-09-29 at 47fc36d)
71
- + sha1_file: don't convert off_t to size_t too early to avoid potential die()
72
- + convert: stream from fd to required clean filter to reduce used address space
73
- + copy_fd(): do not close the input file descriptor
74
- + mmap_limit: introduce GIT_MMAP_LIMIT to allow testing expected mmap size
75
- + memory_limit: use git_env_ulong() to parse GIT_ALLOC_LIMIT
76
- + config.c: add git_env_ulong() to parse environment variable
77
- + convert: drop arguments other than 'path' from would_convert_to_git()
78
-
79
- When running a required clean filter, we do not have to mmap the
80
- original before feeding the filter. Instead, stream the file
81
- contents directly to the filter and process its output.
22
+* bc/asciidoc-pretty-formats-fix (2014-10-08) 1 commit
23
+ (merged to 'next' on 2014-10-13 at 8208335)
24
+ + Documentation: fix misrender of pretty-formats in Asciidoctor
25
+
26
+
27
+* da/completion-show-signature (2014-10-07) 1 commit
28
+ (merged to 'next' on 2014-10-07 at 2467c19)
29
+ + completion: add --show-signature for log and show
30
+
31
+
32
+* da/include-compat-util-first-in-c (2014-09-15) 1 commit
33
+ (merged to 'next' on 2014-10-07 at ea5bcb4)
34
+ + cleanups: ensure that git-compat-util.h is included first
35
+
36
+ Code clean-up.
37
+
38
+
39
+* dt/cache-tree-repair (2014-09-30) 1 commit
40
+ (merged to 'next' on 2014-10-07 at 923bd93)
41
+ + t0090: avoid passing empty string to printf %d
42
+ (this branch is used by jk/prune-mtime.)
43
+
44
+ This fixes a topic that has graduated to 'master'.
45
+
46
+
47
+* mh/lockfile (2014-10-01) 38 commits
48
+ (merged to 'next' on 2014-10-08 at 39cb6da)
49
+ + lockfile.h: extract new header file for the functions in lockfile.c
50
+ + hold_locked_index(): move from lockfile.c to read-cache.c
51
+ + hold_lock_file_for_append(): restore errno before returning
52
+ + get_locked_file_path(): new function
53
+ + lockfile.c: rename static functions
54
+ + lockfile: rename LOCK_NODEREF to LOCK_NO_DEREF
55
+ + commit_lock_file_to(): refactor a helper out of commit_lock_file()
56
+ + trim_last_path_component(): replace last_path_elm()
57
+ + resolve_symlink(): take a strbuf parameter
58
+ + resolve_symlink(): use a strbuf for internal scratch space
59
+ + lockfile: change lock_file::filename into a strbuf
60
+ + commit_lock_file(): use a strbuf to manage temporary space
61
+ + try_merge_strategy(): use a statically-allocated lock_file object
62
+ + try_merge_strategy(): remove redundant lock_file allocation
63
+ + struct lock_file: declare some fields volatile
64
+ + lockfile: avoid transitory invalid states
65
+ + git_config_set_multivar_in_file(): avoid call to rollback_lock_file()
66
+ + dump_marks(): remove a redundant call to rollback_lock_file()
67
+ + api-lockfile: document edge cases
68
+ + commit_lock_file(): rollback lock file on failure to rename
69
+ + close_lock_file(): if close fails, roll back
70
+ + commit_lock_file(): die() if called for unlocked lockfile object
71
+ + commit_lock_file(): inline temporary variable
72
+ + remove_lock_file(): call rollback_lock_file()
73
+ + lock_file(): exit early if lockfile cannot be opened
74
+ + prepare_index(): declare return value to be (const char *)
75
+ + delete_ref_loose(): don't muck around in the lock_file's filename
76
+ + cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN
77
+ + lockfile.c: document the various states of lock_file objects
78
+ + lock_file(): always initialize and register lock_file object
79
+ + hold_lock_file_for_append(): release lock on errors
80
+ + lockfile: unlock file if lockfile permissions cannot be adjusted
81
+ + rollback_lock_file(): set fd to -1
82
+ + rollback_lock_file(): exit early if lock is not active
83
+ + rollback_lock_file(): do not clear filename redundantly
84
+ + close_lock_file(): exit (successfully) if file is already closed
85
+ + api-lockfile: revise and expand the documentation
86
+ + unable_to_lock_die(): rename function from unable_to_lock_index_die()
87
+ (this branch is used by mh/lockfile-stdio.)
88
+
89
+ The lockfile API and its users have been cleaned up.
90
83
---------------------------------------------------
84
-[New Topics]
91
92
* mh/lockfile-stdio (2014-10-01) 3 commits
93
(merged to 'next' on 2014-10-08 at e56cebc)
@@ -90,8 +96,6 @@ of the repositories listed at
96
+ fdopen_lock_file(): access a lockfile using stdio
97
(this branch uses mh/lockfile.)
98
93
- Will merge to 'master'.
94
-
99
100
* rs/daemon-fixes (2014-10-01) 3 commits
101
(merged to 'next' on 2014-10-07 at 4171e10)
@@ -103,7 +107,20 @@ of the repositories listed at
107
use the hostname even when gethostbyname() reported that the given
108
hostname is not found.
109
106
- Will merge to 'master'.
110
+
111
+* rs/mailsplit (2014-10-07) 1 commit
112
+ (merged to 'next' on 2014-10-08 at 58b053e)
113
+ + mailsplit: remove unnecessary unlink(2) call
114
+
115
+
116
+* rs/more-uses-of-skip-prefix (2014-10-07) 1 commit
117
+ (merged to 'next' on 2014-10-08 at cd153c0)
118
+ + use skip_prefix() to avoid more magic numbers
119
+
120
+
121
+* rs/plug-leak-in-bundle (2014-10-07) 1 commit
122
+ (merged to 'next' on 2014-10-08 at 5539cd7)
123
+ + bundle: plug minor memory leak in is_tag_in_date_range()
124
125
126
* rs/sha1-array-test (2014-10-01) 2 commits
@@ -111,85 +128,97 @@ of the repositories listed at
128
+ sha1-lookup: handle duplicates in sha1_pos()
129
+ sha1-array: add test-sha1-array and basic tests
130
114
- Will merge to 'master'.
131
+
132
+* sk/tag-contains-wo-recursion (2014-09-23) 1 commit
133
+ (merged to 'next' on 2014-10-08 at e425f54)
134
+ + t7004: give the test a bit more stack space
135
136
117
-* da/completion-show-signature (2014-10-07) 1 commit
118
- (merged to 'next' on 2014-10-07 at 2467c19)
119
- + completion: add --show-signature for log and show
137
+* so/rebase-doc-fork-point (2014-09-29) 1 commit
138
+ (merged to 'next' on 2014-10-07 at 03d8ed6)
139
+ + Documentation/git-rebase.txt: document when --fork-point is auto-enabled
140
+
141
+--------------------------------------------------
142
+[New Topics]
143
+
144
+* bc/asciidoc (2014-10-13) 2 commits
145
+ (merged to 'next' on 2014-10-14 at d9ff206)
146
+ + Documentation: fix mismatched delimiters in git-imap-send
147
+ + Documentation: adjust document title underlining
148
+
149
+ Formatting nitpicks to help a (pickier) reimplementation of
150
+ AsciiDoc to grok our documentation.
151
152
Will merge to 'master'.
153
154
124
-* jk/prune-mtime (2014-10-04) 18 commits
125
- - write_sha1_file: freshen existing objects
126
- - pack-objects: match prune logic for discarding objects
127
- - pack-objects: refactor unpack-unreachable expiration check
128
- - prune: keep objects reachable from recent objects
129
- - sha1_file: add for_each iterators for loose and packed objects
130
- - count-objects: use for_each_loose_file_in_objdir
131
- - count-objects: do not use xsize_t when counting object size
132
- - prune: factor out loose-object directory traversal
133
- - t5304: use helper to report failure of "test foo = bar"
134
- - t5304: use test_path_is_* instead of "test -f"
135
- - reachable: clear pending array after walking it
136
- - clean up name allocation in prepare_revision_walk
137
- - object_array: add a "clear" function
138
- - object_array: factor out slopbuf-freeing logic
139
- - isxdigit: cast input to unsigned char
140
- - foreach_alt_odb: propagate return value from callback
141
- - Merge branch 'dt/cache-tree-repair' into jk/prune-mtime
142
- - Merge branch 'jc/reopen-lock-file' into jk/prune-mtime
143
- (this branch uses dt/cache-tree-repair.)
155
+* da/mergetool-tool-help (2014-10-13) 4 commits
156
+ - difftool: don't assume that default sh is sane
157
+ - mergetool: don't require a work tree for --tool-help
158
+ - git-sh-setup: move GIT_DIR initialization into a function
159
+ - mergetool: use more conservative temporary filenames
160
+ (this branch is tangled with da/mergetool-temporary-filename.)
161
145
- Expecting a reroll.
162
+ Allow "git mergetool --help" to run outside a Git repository.
163
164
+ May want some tests before merging down.
165
148
-* jn/parse-config-slot (2014-10-07) 2 commits
149
- - color_parse: do not mention variable name in error message
150
- - pass config slots as pointers instead of offsets
166
152
- Expecting an Ack/Sign-off or update from Jonathan on the bottom one.
167
+* eb/no-pthreads (2014-10-13) 2 commits
168
+ - pack-objects: set number of threads before checking and warning
169
+ - index-pack: fix compilation with NO_PTHREADS
170
171
+ Allow us build with NO_PTHREADS=NoThanks compilation option. The
172
+ last change (not queued) needs a bit more explanation in its log
173
+ message.
174
155
-* rs/mailsplit (2014-10-07) 1 commit
156
- (merged to 'next' on 2014-10-08 at 58b053e)
157
- + mailsplit: remove unnecessary unlink(2) call
175
+
176
+* jk/test-shell-trace (2014-10-13) 3 commits
177
+ (merged to 'next' on 2014-10-14 at 9118506)
178
+ + test-lib.sh: support -x option for shell-tracing
179
+ + t5304: use helper to report failure of "test foo = bar"
180
+ + t5304: use test_path_is_* instead of "test -f"
181
+
182
+ Test scripts were taught to notice "-x" option to show shell trace,
183
+ as if the tests were run under "sh -x".
184
185
Will merge to 'master'.
186
187
162
-* rs/more-uses-of-skip-prefix (2014-10-07) 1 commit
163
- (merged to 'next' on 2014-10-08 at cd153c0)
164
- + use skip_prefix() to avoid more magic numbers
188
+* rs/receive-pack-argv-leak-fix (2014-10-13) 1 commit
189
+ (merged to 'next' on 2014-10-14 at e64654d)
190
+ + receive-pack: plug minor memory leak in unpack()
191
192
Will merge to 'master'.
193
194
169
-* rs/plug-leak-in-bundle (2014-10-07) 1 commit
170
- (merged to 'next' on 2014-10-08 at 5539cd7)
171
- + bundle: plug minor memory leak in is_tag_in_date_range()
195
+* ta/config-set (2014-10-13) 1 commit
196
+ (merged to 'next' on 2014-10-14 at ed660e4)
197
+ + t1308: fix broken here document in test script
198
199
Will merge to 'master'.
200
201
176
-* bc/asciidoc-pretty-formats-fix (2014-10-08) 1 commit
177
- - Documentation: fix misrender of pretty-formats in Asciidoctor
202
+* jc/checkout-local-track-report (2014-10-14) 1 commit
203
+ - checkout: report upstream correctly even with loosely defined branch.*.merge
204
179
- Will merge to 'next'.
205
+ The report from "git checkout" on a branch that builds on another
206
+ local branch by setting its branch.*.merge to branch name (not a
207
+ full refname) incorrectly said that the upstream is gone.
208
209
182
-* da/mergetool-temporary-filename (2014-10-09) 1 commit
183
- - mergetool: use more conservative temporary filenames
210
+* jc/clone-borrow (2014-10-14) 1 commit
211
+ - clone: --dissociate option to mark that reference is only temporary
212
213
+ Allow "git clone --reference" to be used more safely.
214
215
187
-* jc/completion-no-chdir (2014-10-09) 1 commit
188
- - completion: use "git -C $there" instead of (cd $there && git ...)
216
+* js/completion-hide-not-a-repo (2014-10-14) 1 commit
217
+ - completion: silence "fatal: Not a git repository" error
218
190
- Seems to break t9902; we may want to use $gmane/258099 or something
191
- like that in the meantime, but on the other hand the topic itself
192
- is not that urgent.
219
+ Some internal error messages leaked out of the bash completion when
220
+ typing "git cmd <TAB>" and the machinery tried to complete
221
+ refnames.
222
223
--------------------------------------------------
224
[Stalled]
@@ -262,16 +291,6 @@ of the repositories listed at
291
Hold, waiting for Karsten's replacement.
292
293
265
-* cb/mergetool-difftool (2014-07-21) 2 commits
266
- - difftool: don't assume that default sh is sane
267
- - mergetool: don't require a work tree for --tool-help
268
-
269
- Update the way the "difftool --help" shows the help message that is
270
- shared with the "mergetool" to reduce one shell dependency.
271
-
272
- Will be rerolled.
273
-
274
-
294
* jk/tag-contains (2014-06-30) 8 commits
295
. perf: add tests for tag --contains
296
. tag: use commit_contains
@@ -298,23 +317,6 @@ of the repositories listed at
317
$gmane/250758?
318
319
301
-* rh/prompt-tests (2014-06-05) 11 commits
302
- - t9904: new __git_ps1 tests for Zsh
303
- - test-lib: make it possible to override how test code is eval'd
304
- - lib-prompt-tests.sh: add variable for string that encodes percent in PS1
305
- - lib-prompt-tests.sh: put all tests inside a function
306
- - t9903: move prompt tests to a new lib-prompt-tests.sh file
307
- - t9903: move PS1 color code variable definitions to lib-bash.sh
308
- - t9903: include "Bash" in test names via new $shellname var
309
- - t9903: run pc mode tests again with PS1 expansion disabled
310
- - t9903: move test name prefix to a separate variable
311
- - t9903: put the Bash pc mode prompt test cases in a function
312
- - t9903: remove Zsh test from the suite of Bash prompt tests
313
-
314
- Expecting a reroll to limit the damage to test_eval_; also reported
315
- to be broken with older zsh that are still in the field ($gmane/251231).
316
-
317
-
320
* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
321
- userdiff: support Java try keyword
322
- userdiff: support C# async methods and correct C# keywords
@@ -401,28 +403,77 @@ of the repositories listed at
403
--------------------------------------------------
404
[Cooking]
405
404
-* dt/cache-tree-repair (2014-09-30) 1 commit
405
- (merged to 'next' on 2014-10-07 at 923bd93)
406
- + t0090: avoid passing empty string to printf %d
407
- (this branch is used by jk/prune-mtime.)
406
+* jk/prune-mtime (2014-10-04) 18 commits
407
+ . write_sha1_file: freshen existing objects
408
+ . pack-objects: match prune logic for discarding objects
409
+ . pack-objects: refactor unpack-unreachable expiration check
410
+ . prune: keep objects reachable from recent objects
411
+ . sha1_file: add for_each iterators for loose and packed objects
412
+ . count-objects: use for_each_loose_file_in_objdir
413
+ . count-objects: do not use xsize_t when counting object size
414
+ . prune: factor out loose-object directory traversal
415
+ . t5304: use helper to report failure of "test foo = bar"
416
+ . t5304: use test_path_is_* instead of "test -f"
417
+ . reachable: clear pending array after walking it
418
+ . clean up name allocation in prepare_revision_walk
419
+ . object_array: add a "clear" function
420
+ . object_array: factor out slopbuf-freeing logic
421
+ . isxdigit: cast input to unsigned char
422
+ . foreach_alt_odb: propagate return value from callback
423
+ . Merge branch 'dt/cache-tree-repair' into jk/prune-mtime
424
+ . Merge branch 'jc/reopen-lock-file' into jk/prune-mtime
425
409
- This fixes a topic that has graduated to 'master'.
426
+ Expecting a reroll.
427
+
428
+
429
+* jn/parse-config-slot (2014-10-14) 2 commits
430
+ (merged to 'next' on 2014-10-14 at 7f0a3ad)
431
+ + color_parse: do not mention variable name in error message
432
+ + pass config slots as pointers instead of offsets
433
+
434
+ Code cleanup.
435
+
436
+ Will merge to 'master'.
437
+
438
+
439
+* da/mergetool-temporary-filename (2014-10-13) 2 commits
440
+ - mergetool: add an option for writing to a temporary directory
441
+ - mergetool: use more conservative temporary filenames
442
+ (this branch is tangled with da/mergetool-tool-help.)
443
+
444
+ Tweak the names of the three throw-away files "git mergetool" comes
445
+ up with to feed the merge tool backend, so that a file with a
446
+ single dot in its name in the original (e.g. "hello.c") will have
447
+ only one dot in these variants (e.g. "hello_BASE_4321.c").
448
+
449
+ Will merge to 'next'.
450
+
451
+
452
+* jc/completion-no-chdir (2014-10-09) 1 commit
453
+ (merged to 'next' on 2014-10-14 at 1cf12e1)
454
+ + completion: use "git -C $there" instead of (cd $there && git ...)
455
456
Will merge to 'master'.
457
458
459
* bw/trace-no-inline-getnanotime (2014-09-29) 1 commit
415
- - trace.c: do not mark getnanotime() as "inline"
460
+ (merged to 'next' on 2014-10-14 at 19facbb)
461
+ + trace.c: do not mark getnanotime() as "inline"
462
463
No file-scope static variables in an inlined function, please.
464
465
+ Will merge to 'master'.
466
420
-* po/everyday-doc (2014-09-29) 3 commits
421
- - Make 'git help everyday' work
422
- - doc: Makefile regularise OBSOLETE_HTML list building
423
- - doc: modernise everyday.txt wording and format in man page style
467
425
- Looks ready for 'next' except for minor nits.
468
+* po/everyday-doc (2014-10-10) 3 commits
469
+ (merged to 'next' on 2014-10-13 at daf1d03)
470
+ + doc: add 'everyday' to 'git help'
471
+ + doc: Makefile regularise OBSOLETE_HTML list building
472
+ + doc: modernise everyday.txt wording and format in man page style
473
+
474
+ "git help everyday" to show the Everyday Git document.
475
+
476
+ Will merge to 'master'.
477
478
479
* jc/push-cert-hmac-optim (2014-09-25) 2 commits
@@ -448,76 +499,6 @@ of the repositories listed at
499
Waiting for an Ack.
500
501
451
-* so/rebase-doc-fork-point (2014-09-29) 1 commit
452
- (merged to 'next' on 2014-10-07 at 03d8ed6)
453
- + Documentation/git-rebase.txt: document when --fork-point is auto-enabled
454
-
455
- Will merge to 'master'.
456
-
457
-
458
-* sk/tag-contains-wo-recursion (2014-09-23) 1 commit
459
- (merged to 'next' on 2014-10-08 at e425f54)
460
- + t7004: give the test a bit more stack space
461
-
462
- Will merge to 'master'.
463
-
464
-
465
-* da/include-compat-util-first-in-c (2014-09-15) 1 commit
466
- (merged to 'next' on 2014-10-07 at ea5bcb4)
467
- + cleanups: ensure that git-compat-util.h is included first
468
-
469
- Code clean-up.
470
-
471
- Will merge to 'master'.
472
-
473
-
474
-* mh/lockfile (2014-10-01) 38 commits
475
- (merged to 'next' on 2014-10-08 at 39cb6da)
476
- + lockfile.h: extract new header file for the functions in lockfile.c
477
- + hold_locked_index(): move from lockfile.c to read-cache.c
478
- + hold_lock_file_for_append(): restore errno before returning
479
- + get_locked_file_path(): new function
480
- + lockfile.c: rename static functions
481
- + lockfile: rename LOCK_NODEREF to LOCK_NO_DEREF
482
- + commit_lock_file_to(): refactor a helper out of commit_lock_file()
483
- + trim_last_path_component(): replace last_path_elm()
484
- + resolve_symlink(): take a strbuf parameter
485
- + resolve_symlink(): use a strbuf for internal scratch space
486
- + lockfile: change lock_file::filename into a strbuf
487
- + commit_lock_file(): use a strbuf to manage temporary space
488
- + try_merge_strategy(): use a statically-allocated lock_file object
489
- + try_merge_strategy(): remove redundant lock_file allocation
490
- + struct lock_file: declare some fields volatile
491
- + lockfile: avoid transitory invalid states
492
- + git_config_set_multivar_in_file(): avoid call to rollback_lock_file()
493
- + dump_marks(): remove a redundant call to rollback_lock_file()
494
- + api-lockfile: document edge cases
495
- + commit_lock_file(): rollback lock file on failure to rename
496
- + close_lock_file(): if close fails, roll back
497
- + commit_lock_file(): die() if called for unlocked lockfile object
498
- + commit_lock_file(): inline temporary variable
499
- + remove_lock_file(): call rollback_lock_file()
500
- + lock_file(): exit early if lockfile cannot be opened
501
- + prepare_index(): declare return value to be (const char *)
502
- + delete_ref_loose(): don't muck around in the lock_file's filename
503
- + cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN
504
- + lockfile.c: document the various states of lock_file objects
505
- + lock_file(): always initialize and register lock_file object
506
- + hold_lock_file_for_append(): release lock on errors
507
- + lockfile: unlock file if lockfile permissions cannot be adjusted
508
- + rollback_lock_file(): set fd to -1
509
- + rollback_lock_file(): exit early if lock is not active
510
- + rollback_lock_file(): do not clear filename redundantly
511
- + close_lock_file(): exit (successfully) if file is already closed
512
- + api-lockfile: revise and expand the documentation
513
- + unable_to_lock_die(): rename function from unable_to_lock_index_die()
514
- (this branch is used by mh/lockfile-stdio.)
515
-
516
- The lockfile API and its users have been cleaned up.
517
-
518
- Will merge to 'master'.
519
-
520
-
502
* nd/multiple-work-trees (2014-09-27) 32 commits
503
- t2025: add a test to make sure grafts is working from a linked checkout
504
- checkout: don't require a work tree when checking out into a new one
@@ -559,7 +540,7 @@ of the repositories listed at
540
A few tests need some tweaks for MinGW ($gmane/{257756,257757}).
541
542
562
-* cc/interpret-trailers (2014-09-22) 11 commits
543
+* cc/interpret-trailers (2014-10-13) 11 commits
544
- Documentation: add documentation for 'git interpret-trailers'
545
- trailer: add tests for commands in config file
546
- trailer: execute command from 'trailer.<name>.command'
@@ -575,9 +556,7 @@ of the repositories listed at
556
A new filter to programatically edit the tail end of the commit log
557
messages.
558
578
- Discussion on the topic with Michael Tsirkin who wants to utilize
579
- this machinery is going on. Finally a real functionality review
580
- that is very much welcomed.
559
+ Is this ready for 'next' now?
560
561
562
* mt/patch-id-stable (2014-06-10) 1 commit
@@ -601,3 +580,27 @@ of the repositories listed at
580
Needed rerolling (new paragraph in doc seems to be in a wrong place)
581
for quite some time but without any activity.
582
583
+
584
+* cb/mergetool-difftool (2014-07-21) 2 commits
585
+ . difftool: don't assume that default sh is sane
586
+ . mergetool: don't require a work tree for --tool-help
587
+
588
+ Rerolled as da/mergetool-tool-help topic.
589
+
590
+
591
+* rh/prompt-tests (2014-06-05) 11 commits
592
+ . t9904: new __git_ps1 tests for Zsh
593
+ . test-lib: make it possible to override how test code is eval'd
594
+ . lib-prompt-tests.sh: add variable for string that encodes percent in PS1
595
+ . lib-prompt-tests.sh: put all tests inside a function
596
+ . t9903: move prompt tests to a new lib-prompt-tests.sh file
597
+ . t9903: move PS1 color code variable definitions to lib-bash.sh
598
+ . t9903: include "Bash" in test names via new $shellname var
599
+ . t9903: run pc mode tests again with PS1 expansion disabled
600
+ . t9903: move test name prefix to a separate variable
601
+ . t9903: put the Bash pc mode prompt test cases in a function
602
+ . t9903: remove Zsh test from the suite of Bash prompt tests
603
+
604
+ Was expecting a reroll to limit the damage to test_eval_; also
605
+ reported to be broken with older zsh that are still in the field
606
+ ($gmane/251231).