What's cooking (2014/03 #05)
Junio C Hamano committed
Mar 24, 2014 at 13:25 UTC
aeebe323dd1942ea7436863fbec9ab48a68825e7
1 file changed
+312
-350
whats-cooking.txt
+312
-350
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2014, #04; Thu, 20)
4
-X-master-at: 5172cb3bcb2c7e1a609e34cfae64e3b181e0226a
5
-X-next-at: 4443bfdcdf4b1e25b48040987632afd841c9b636
3
+Subject: What's cooking in git.git (Mar 2014, #05; Mon, 24)
4
+X-master-at: 3f09db07b3dc0758756fad73c96abd0e47cbcd1b
5
+X-next-at: f5e1d547771ba4cba473a0195e52a3c9bceeb5f9
6
7
-What's cooking in git.git (Mar 2014, #04; Thu, 20)
7
+What's cooking in git.git (Mar 2014, #05; Mon, 24)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -16,6 +16,11 @@ before the v1.9.0 final release, many of them fallouts from GSoC
16
microprojects. Many topics that have been marked to be discarded
17
are finally discarded.
18
19
+There seems to be a crasher somewhere in the new pack bitmap
20
+codepath that was introduced recently. I am hoping that the root
21
+cause is found and fixed soonish. Other than that, things look more
22
+or less calm on the 'next' and up.
23
+
24
You can find the changes described here in the integration branches
25
of the repositories listed at
26
@@ -24,283 +29,179 @@ of the repositories listed at
29
--------------------------------------------------
30
[Graduated to "master"]
31
27
-* bg/install-branch-config-skip-prefix (2014-03-06) 2 commits
28
- (merged to 'next' on 2014-03-12 at 9d04564)
29
- + branch: use skip_prefix() in install_branch_config()
30
- + t3200-branch: test setting branch as own upstream
31
-
32
-
33
-* dd/find-graft-with-sha1-pos (2014-02-27) 1 commit
34
- (merged to 'next' on 2014-03-12 at 0383d59)
35
- + commit.c: use the generic "sha1_pos" function for lookup
36
-
37
- Replace a hand-rolled binary search with a call to our generic
38
- binary search helper function.
39
-
40
-
41
-* dd/use-alloc-grow (2014-03-03) 14 commits
42
- (merged to 'next' on 2014-03-12 at ed82259)
43
- + sha1_file.c: use ALLOC_GROW() in pretend_sha1_file()
44
- + read-cache.c: use ALLOC_GROW() in add_index_entry()
45
- + builtin/mktree.c: use ALLOC_GROW() in append_to_tree()
46
- + attr.c: use ALLOC_GROW() in handle_attr_line()
47
- + dir.c: use ALLOC_GROW() in create_simplify()
48
- + reflog-walk.c: use ALLOC_GROW()
49
- + replace_object.c: use ALLOC_GROW() in register_replace_object()
50
- + patch-ids.c: use ALLOC_GROW() in add_commit()
51
- + diffcore-rename.c: use ALLOC_GROW()
52
- + diff.c: use ALLOC_GROW()
53
- + commit.c: use ALLOC_GROW() in register_commit_graft()
54
- + cache-tree.c: use ALLOC_GROW() in find_subtree()
55
- + bundle.c: use ALLOC_GROW() in add_to_ref_list()
56
- + builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()
57
-
58
- Replace open-coded reallocation with ALLOC_GROW() macro.
59
-
60
-
61
-* fc/transport-helper-fixes (2014-02-24) 7 commits
62
- (merged to 'next' on 2014-03-12 at 5d7c69a)
63
- + remote-bzr: support the new 'force' option
64
- + test-hg.sh: tests are now expected to pass
65
- + transport-helper.c: do not overwrite forced bit
66
- + transport-helper: check for 'forced update' message
67
- + transport-helper: add 'force' to 'export' helpers
68
- + transport-helper: don't update refs in dry-run
69
- + transport-helper: mismerge fix
70
-
71
- Updates transport-helper, fast-import and fast-export to allow the
72
- ref mapping and ref deletion in a way similar to the natively
73
- supported transports.
74
-
75
-
76
-* jc/no-need-for-env-in-sh-scripts (2014-03-06) 1 commit
77
- (merged to 'next' on 2014-03-12 at dfd3234)
78
- + *.sh: drop useless use of "env"
79
-
80
-
81
-* jc/tag-contains-with (2014-03-07) 1 commit
82
- (merged to 'next' on 2014-03-12 at e120644)
83
- + tag: grok "--with" as synonym to "--contains"
84
-
85
-
86
-* jk/clean-d-pathspec (2014-03-11) 2 commits
87
- (merged to 'next' on 2014-03-12 at aaae6ee)
88
- + clean: simplify dir/not-dir logic
89
- + clean: respect pathspecs with "-d"
90
-
91
- "git clean -d pathspec" did not use the given pathspec correctly
92
- and ended up cleaning too much.
93
-
94
-
95
-* jk/detect-push-typo-early (2014-03-05) 3 commits
96
- (merged to 'next' on 2014-03-12 at da522e7)
97
- + push: detect local refspec errors early
98
- + match_explicit_lhs: allow a "verify only" mode
99
- + match_explicit: hoist refspec lhs checks into their own function
100
-
101
- Catch "git push $there no-such-branch" early.
32
+* dk/skip-prefix-scan-only-once (2014-03-03) 1 commit
33
+ (merged to 'next' on 2014-03-14 at ff375fc)
34
+ + skip_prefix(): scan prefix only once
35
36
+ Update implementation of skip_prefix() to scan only once; given
37
+ that most "prefix" arguments to the inline function are constant
38
+ strings whose strlen() can be determined at the compile time, this
39
+ might actually make things worse with a compiler with sufficient
40
+ intelligence.
41
104
-* jk/diff-filespec-cleanup (2014-02-24) 1 commit
105
- (merged to 'next' on 2014-03-12 at 184c2aa)
106
- + diffcore.h: be explicit about the signedness of is_binary
42
108
- Portability fix to a topic already in v1.9
43
+* es/sh-i18n-envsubst (2014-03-12) 1 commit
44
+ (merged to 'next' on 2014-03-14 at e4d5603)
45
+ + sh-i18n--envsubst: retire unused string_list_member()
46
47
111
-* jk/doc-deprecate-grafts (2014-03-05) 1 commit
112
- (merged to 'next' on 2014-03-12 at 8d34916)
113
- + docs: mark info/grafts as outdated
48
+* jc/stash-pop-not-popped (2014-02-26) 1 commit
49
+ (merged to 'next' on 2014-03-14 at 9ba1de8)
50
+ + stash pop: mention we did not drop the stash upon failing to apply
51
52
+ "stash pop", upon failing to apply the stash, refrains from
53
+ discarding the stash to avoid information loss. Be more explicit
54
+ in the error message.
55
116
-* jk/repack-pack-keep-objects (2014-03-03) 1 commit
117
- (merged to 'next' on 2014-03-12 at 3fd2335)
118
- + repack: add `repack.packKeptObjects` config var
56
+ The wording may want to get a bit more bikeshedding.
57
58
121
-* jn/branch-lift-unnecessary-name-length-limit (2014-03-05) 1 commit
122
- (merged to 'next' on 2014-03-12 at bd0fb0e)
123
- + branch.c: delete size check of newly tracked branch names
59
+* jk/shallow-update-fix (2014-03-17) 3 commits
60
+ (merged to 'next' on 2014-03-17 at 011942e)
61
+ + shallow: verify shallow file after taking lock
62
+ (merged to 'next' on 2014-03-12 at ce5abbf)
63
+ + shallow: automatically clean up shallow tempfiles
64
+ + shallow: use stat_validity to check for up-to-date file
65
66
+ Serving objects from a shallow repository needs to write a new file
67
+ to hold the temporary shallow boundaries but it was not cleaned
68
+ when we exit due to die() or a signal.
69
126
-* mh/simplify-cache-tree-find (2014-03-05) 6 commits
127
- (merged to 'next' on 2014-03-12 at c29aa24)
128
- + cache_tree_find(): use path variable when passing over slashes
129
- + cache_tree_find(): remove early return
130
- + cache_tree_find(): remove redundant check
131
- + cache_tree_find(): fix comment formatting
132
- + cache_tree_find(): find the end of path component using strchrnul()
133
- + cache_tree_find(): remove redundant checks
70
71
+* jn/wt-status (2014-03-12) 4 commits
72
+ (merged to 'next' on 2014-03-14 at 8ac862c)
73
+ + wt-status: lift the artificual "at least 20 columns" floor
74
+ + wt-status: i18n of section labels
75
+ + wt-status: extract the code to compute width for labels
76
+ + wt-status: make full label string to be subject to l10n
77
136
-* nd/sha1-file-delta-stack-leakage-fix (2014-02-24) 1 commit
137
- (merged to 'next' on 2014-03-12 at 9d1a621)
138
- + sha1_file: fix delta_stack memory leak in unpack_entry
78
+ Unify the codepaths that format new/modified/changed sections and
79
+ conflicted paths in the "git status" output and make it possible to
80
+ properly internationalize their output.
81
140
- Fix a small leak in the delta stack used when resolving a long
141
- delta chain at runtime.
82
83
+* lt/request-pull (2014-03-13) 6 commits
84
+ (merged to 'next' on 2014-03-17 at 21a598d)
85
+ + request-pull: documentation updates
86
+ + request-pull: resurrect "pretty refname" feature
87
+ + request-pull: test updates
88
+ + request-pull: pick up tag message as before
89
+ + request-pull: allow "local:remote" to specify names on both ends
90
+ + request-pull: more strictly match local/remote branches
91
144
-* rm/strchrnul-not-strlen (2014-03-10) 1 commit
145
- (merged to 'next' on 2014-03-12 at fad8f12)
146
- + use strchrnul() in place of strchr() and strlen()
92
+ Discard the accumulated "heuristics" to guess from which branch the
93
+ result wants to be pulled from and make sure what the end user
94
+ specified is not second-guessed by "git request-pull", to avoid
95
+ mistakes.
96
97
149
-* rs/grep-h-c (2014-03-11) 2 commits
150
- (merged to 'next' on 2014-03-12 at 0341bd8)
151
- + grep: support -h (no header) with --count
152
- + t7810: add missing variables to tests in loop
98
+* nd/tag-version-sort (2014-02-27) 1 commit
99
+ (merged to 'next' on 2014-03-14 at 4e7f714)
100
+ + tag: support --sort=<spec>
101
154
- "git grep" learns to handle combination of "-h (no header)" and "-c
155
- (counts)".
102
+ Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output.
103
104
158
-* sh/finish-tmp-packfile (2014-03-03) 2 commits
159
- (merged to 'next' on 2014-03-12 at 410d45d)
160
- + finish_tmp_packfile():use strbuf for pathname construction
161
- + Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-packfile
105
+* nd/upload-pack-shallow (2014-03-11) 1 commit
106
+ (merged to 'next' on 2014-03-14 at d40b8c3)
107
+ + upload-pack: send shallow info over stdin to pack-objects
108
109
+ Serving objects from a shallow repository needs to write a
110
+ temporary file to be used, but the serving upload-pack may not have
111
+ write access to the repository which is meant to be read-only.
112
+ Instead feed these temporary shallow bounds from the standard input
113
+ of pack-objects so that we do not have to use a temporary file.
114
164
-* sh/use-hashcpy (2014-03-06) 1 commit
165
- (merged to 'next' on 2014-03-12 at cf2735a)
166
- + Use hashcpy() when copying object names
115
116
+* tc/commit-dry-run-exit-status-tests (2014-02-24) 1 commit
117
+ (merged to 'next' on 2014-03-12 at b839886)
118
+ + demonstrate git-commit --dry-run exit code behaviour
119
120
--------------------------------------------------
121
[New Topics]
122
172
-* jk/lib-terminal-lazy (2014-03-14) 1 commit
173
- (merged to 'next' on 2014-03-20 at 5de832f)
174
- + t/lib-terminal: make TTY a lazy prerequisite
175
-
176
- The test helper lib-terminal always run an actual test_expect_* when
177
- included, which screwed up with the use of skil-all that may have to
178
- be done later.
179
-
180
- Will merge to 'master'.
181
-
182
-
183
-* ah/doc-gitk-config (2014-03-20) 1 commit
184
- (merged to 'next' on 2014-03-20 at d671b60)
185
- + Documentation/gitk: document the location of the configulation file
186
-
187
- Will merge to 'master'.
188
-
123
+* ca/doc-config-third-party (2014-03-21) 1 commit
124
+ - config.txt: third-party tools may and do use their own variables
125
190
-* as/grep-fullname-config (2014-03-20) 1 commit
191
- - grep: add grep.fullName config variable
192
-
193
-
194
-* fr/add-interactive-argv-array (2014-03-18) 1 commit
195
- (merged to 'next' on 2014-03-20 at 9d65f3d)
196
- + add: use struct argv_array in run_add_interactive()
197
-
198
- Will merge to 'master'.
199
-
200
-
201
-* jk/pack-bitmap (2014-03-17) 1 commit
202
- (merged to 'next' on 2014-03-20 at bba6246)
203
- + pack-objects: turn off bitmaps when skipping objects
204
-
205
- Instead of dying when asked to (re)pack with the reachability
206
- bitmap when a bitmap cannot be built, just (re)pack without
207
- producing a bitmap in such a case, with a warning.
208
-
209
- Will merge to 'master', and probably to 'maint' later.
210
-
211
-
212
-* jk/pack-bitmap-progress (2014-03-17) 2 commits
213
- (merged to 'next' on 2014-03-20 at c7a83f9)
214
- + pack-objects: show reused packfile objects in "Counting objects"
215
- + pack-objects: show progress for reused packfiles
216
-
217
- The progress output while repacking and transferring objects showed
218
- an apparent large silence while writing the objects out of existing
219
- packfiles, when the reachability bitmap was in use.
220
-
221
- Will merge to 'master', and probably to 'maint' later.
222
-
223
-
224
-* jk/subtree-prefix (2014-03-17) 1 commit
225
- (merged to 'next' on 2014-03-20 at 81367fa)
226
- + subtree: initialize "prefix" variable
227
-
228
- A stray environment variable $prefix could have leaked into and
229
- affected the behaviour of the "subtree" script.
230
-
231
- Will merge to 'master'.
232
-
233
-
234
-* nd/gc-aggressive (2014-03-17) 4 commits
235
- - gc --aggressive: three phase repacking
236
- - gc --aggressive: make --depth configurable
237
- - pack-objects: support --keep
238
- - environment.c: fix constness for odb_pack_keep()
126
+ Will merge to 'next'.
127
128
241
-* nd/index-pack-error-message (2014-03-17) 1 commit
242
- (merged to 'next' on 2014-03-20 at 4d722ac)
243
- + index-pack: report error using the correct variable
129
+* dw/doc-status-no-longer-shows-pound-prefix (2014-03-21) 1 commit
130
+ - doc: status, remove leftover statement about '#' prefix
131
245
- Will merge to 'master'.
132
+ Will merge to 'next'.
133
134
248
-* rr/doc-merge-strategies (2014-03-17) 1 commit
249
- (merged to 'next' on 2014-03-20 at d31f415)
250
- + Documentation/merge-strategies: avoid hyphenated commands
251
-
252
- Will merge to 'master'.
135
+* js/userdiff-cc (2014-03-21) 10 commits
136
+ - userdiff: have 'cpp' hunk header pattern catch more C++ anchor points
137
+ - t4018: test cases showing that the cpp pattern misses many anchor points
138
+ - t4018: test cases for the built-in cpp pattern
139
+ - t4018: reduce test files for pattern compilation tests
140
+ - t4018: convert custom pattern test to the new infrastructure
141
+ - t4018: convert java pattern test to the new infrastructure
142
+ - t4018: convert perl pattern tests to the new infrastructure
143
+ - t4018: an infrastructure to test hunk headers
144
+ - userdiff: support unsigned and long long suffixes of integer constants
145
+ - userdiff: support C++ ->* and .* operators in the word regexp
146
147
+ Improves the pattern to match the hunk-header for C/C++.
148
255
-* us/printf-not-echo (2014-03-18) 2 commits
256
- (merged to 'next' on 2014-03-20 at 41205c8)
257
- + test-lib.sh: do not "echo" caller-supplied strings
258
- + rebase -i: do not "echo" random user-supplied strings
149
+ Will merge to 'next'.
150
260
- Will merge to 'master'.
151
152
+* dp/makefile-charset-lib-doc (2014-03-23) 1 commit
153
+ - Makefile: describe CHARSET_LIB better
154
263
-* bb/diff-no-index-dotdot (2014-03-19) 2 commits
264
- (merged to 'next' on 2014-03-20 at 352f48c)
265
- + diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()
266
- + diff-no-index: rename read_directory()
155
+ Will merge to 'next'.
156
268
- Will merge to 'master'.
157
158
+* ib/rev-parse-parseopt-argh (2014-03-24) 5 commits
159
+ - parse-options: make sure argh string does not have SP or _
160
+ - update-index: teach --cacheinfo a new syntax "mode,sha1,path"
161
+ - parse-options: multi-word argh should use dash to separate words
162
+ - t1502: protect runs of SPs used in the indentation
163
+ - rev-parse --parseopt: option argument name hints
164
271
-* bg/rebase-off-of-previous-branch (2014-03-19) 1 commit
272
- - rebase: allow "-" short-hand for the previous branch
165
+ Teaches the "rev-parse --parseopt" mechanism used by scripted
166
+ Porcelains to parse command line options and give help text how to
167
+ supply argv-help (the placeholder string for an option parameter,
168
+ e.g. "key-id" in "--gpg-sign=<key-id>").
169
170
Will merge to 'next'.
171
172
277
-* dt/tests-with-env-not-subshell (2014-03-19) 1 commit
278
- - tests: use "env" to run commands with temporary env-var settings
279
-
173
+* rs/pickaxe-i (2014-03-24) 10 commits
174
+ - pickaxe: simplify kwset loop in contains()
175
+ - pickaxe: call strlen only when necessary in diffcore_pickaxe_count()
176
+ - pickaxe: move pickaxe() after pickaxe_match()
177
+ - pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe()
178
+ - pickaxe: honor -i when used with -S and --pickaxe-regex
179
+ - t4209: use helper functions to test --author
180
+ - t4209: use helper functions to test --grep
181
+ - t4209: factor out helper function test_log_icase()
182
+ - t4209: factor out helper function test_log()
183
+ - t4209: set up expectations up front
184
281
-* hs/simplify-bit-setting-in-fsck-tree (2014-03-20) 1 commit
282
- - fsck: use bitwise-or assignment operator to set flag
185
+ Allow the options -i/--regexp-ignore-case, --pickaxe-regex, and -S
186
+ to be used together and work as expected to perform a pickaxe
187
+ search using case-insensitive regular expression matching.
188
284
-
285
-* mm/status-porcelain-format-i18n-fix (2014-03-20) 2 commits
286
- - SQUASH??? fix decl-after-stmt and simplify
287
- - status: disable translation when --porcelain is used
189
+ Will merge to 'next'.
190
191
290
-* ss/test-on-mingw-rsync-path-no-absolute (2014-03-19) 1 commit
291
- (merged to 'next' on 2014-03-20 at 2b7b95d)
292
- + t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync
192
+* an/branch-config-message (2014-03-24) 1 commit
193
+ - branch.c: install_branch_config: simplify if chain
194
294
- Will merge to 'master'.
195
+ Will merge to 'next'.
196
197
+--------------------------------------------------
198
+[Stalled]
199
200
* sz/mingw-index-pack-threaded (2014-03-19) 1 commit
201
- Enable index-pack threading in msysgit.
202
203
Still under discussion among Windows folks
204
302
---------------------------------------------------
303
-[Stalled]
205
206
* bc/blame-crlf-test (2014-02-18) 1 commit
207
- blame: add a failing test for a CRLF issue.
@@ -471,33 +372,149 @@ of the repositories listed at
372
--------------------------------------------------
373
[Cooking]
374
474
-* ap/remote-hg-skip-null-bookmarks (2014-03-19) 1 commit
475
- - remote-hg: do not fail on invalid bookmarks
375
+* jk/lib-terminal-lazy (2014-03-14) 1 commit
376
+ (merged to 'next' on 2014-03-20 at 5de832f)
377
+ + t/lib-terminal: make TTY a lazy prerequisite
378
+
379
+ The test helper lib-terminal always run an actual test_expect_* when
380
+ included, which screwed up with the use of skil-all that may have to
381
+ be done later.
382
+
383
+ Will merge to 'master'.
384
+
385
+
386
+* ah/doc-gitk-config (2014-03-20) 1 commit
387
+ (merged to 'next' on 2014-03-20 at d671b60)
388
+ + Documentation/gitk: document the location of the configulation file
389
+
390
+ Will merge to 'master'.
391
+
392
+
393
+* as/grep-fullname-config (2014-03-20) 1 commit
394
+ - grep: add grep.fullName config variable
395
396
Will merge to 'next'.
397
398
480
-* jn/wt-status (2014-03-12) 4 commits
481
- (merged to 'next' on 2014-03-14 at 8ac862c)
482
- + wt-status: lift the artificual "at least 20 columns" floor
483
- + wt-status: i18n of section labels
484
- + wt-status: extract the code to compute width for labels
485
- + wt-status: make full label string to be subject to l10n
399
+* fr/add-interactive-argv-array (2014-03-18) 1 commit
400
+ (merged to 'next' on 2014-03-20 at 9d65f3d)
401
+ + add: use struct argv_array in run_add_interactive()
402
487
- Unify the codepaths that format new/modified/changed sections and
488
- conflicted paths in the "git status" output and make it possible to
489
- properly internationalize their output.
403
+ Will merge to 'master'.
404
+
405
+
406
+* jk/pack-bitmap (2014-03-17) 1 commit
407
+ (merged to 'next' on 2014-03-20 at bba6246)
408
+ + pack-objects: turn off bitmaps when skipping objects
409
+
410
+ Instead of dying when asked to (re)pack with the reachability
411
+ bitmap when a bitmap cannot be built, just (re)pack without
412
+ producing a bitmap in such a case, with a warning.
413
+
414
+ Will merge to 'master', and probably to 'maint' later.
415
+
416
+
417
+* jk/pack-bitmap-progress (2014-03-17) 2 commits
418
+ (merged to 'next' on 2014-03-20 at c7a83f9)
419
+ + pack-objects: show reused packfile objects in "Counting objects"
420
+ + pack-objects: show progress for reused packfiles
421
+
422
+ The progress output while repacking and transferring objects showed
423
+ an apparent large silence while writing the objects out of existing
424
+ packfiles, when the reachability bitmap was in use.
425
+
426
+ Will merge to 'master', and probably to 'maint' later.
427
+
428
+
429
+* jk/subtree-prefix (2014-03-17) 1 commit
430
+ (merged to 'next' on 2014-03-20 at 81367fa)
431
+ + subtree: initialize "prefix" variable
432
+
433
+ A stray environment variable $prefix could have leaked into and
434
+ affected the behaviour of the "subtree" script.
435
436
Will merge to 'master'.
437
438
494
-* es/sh-i18n-envsubst (2014-03-12) 1 commit
495
- (merged to 'next' on 2014-03-14 at e4d5603)
496
- + sh-i18n--envsubst: retire unused string_list_member()
439
+* nd/gc-aggressive (2014-03-17) 4 commits
440
+ - gc --aggressive: three phase repacking
441
+ - gc --aggressive: make --depth configurable
442
+ - pack-objects: support --keep
443
+ - environment.c: fix constness for odb_pack_keep()
444
+
445
+
446
+* nd/index-pack-error-message (2014-03-17) 1 commit
447
+ (merged to 'next' on 2014-03-20 at 4d722ac)
448
+ + index-pack: report error using the correct variable
449
+
450
+ Will merge to 'master'.
451
+
452
+
453
+* rr/doc-merge-strategies (2014-03-17) 1 commit
454
+ (merged to 'next' on 2014-03-20 at d31f415)
455
+ + Documentation/merge-strategies: avoid hyphenated commands
456
+
457
+ Will merge to 'master'.
458
+
459
+
460
+* us/printf-not-echo (2014-03-18) 2 commits
461
+ (merged to 'next' on 2014-03-20 at 41205c8)
462
+ + test-lib.sh: do not "echo" caller-supplied strings
463
+ + rebase -i: do not "echo" random user-supplied strings
464
+
465
+ Will merge to 'master'.
466
+
467
+
468
+* bb/diff-no-index-dotdot (2014-03-19) 2 commits
469
+ (merged to 'next' on 2014-03-20 at 352f48c)
470
+ + diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()
471
+ + diff-no-index: rename read_directory()
472
+
473
+ Will merge to 'master'.
474
+
475
+
476
+* bg/rebase-off-of-previous-branch (2014-03-19) 1 commit
477
+ (merged to 'next' on 2014-03-21 at 916b759)
478
+ + rebase: allow "-" short-hand for the previous branch
479
+
480
+ Will merge to 'master'.
481
+
482
+
483
+* dt/tests-with-env-not-subshell (2014-03-19) 1 commit
484
+ - tests: use "env" to run commands with temporary env-var settings
485
+ (this branch is used by jk/tests-cleanup.)
486
+
487
+ Will merge to 'next'.
488
+
489
+
490
+* hs/simplify-bit-setting-in-fsck-tree (2014-03-20) 1 commit
491
+ - fsck: use bitwise-or assignment operator to set flag
492
+
493
+ Will merge to 'next'.
494
+
495
+
496
+* mm/status-porcelain-format-i18n-fix (2014-03-20) 2 commits
497
+ - SQUASH??? fix decl-after-stmt and simplify
498
+ - status: disable translation when --porcelain is used
499
+
500
+ Will merge to 'next' after squashing in the fixup.
501
+
502
+
503
+* ss/test-on-mingw-rsync-path-no-absolute (2014-03-19) 1 commit
504
+ (merged to 'next' on 2014-03-20 at 2b7b95d)
505
+ + t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync
506
507
Will merge to 'master'.
508
509
510
+* ap/remote-hg-skip-null-bookmarks (2014-03-21) 2 commits
511
+ - SQUASH???
512
+ - remote-hg: do not fail on invalid bookmarks
513
+
514
+ Will merge to 'next' after squashing in the fix.
515
+ Thanks Torsten for testing.
516
+
517
+
518
* mh/remove-subtree-long-pathname-fix (2014-03-13) 2 commits
519
(merged to 'next' on 2014-03-17 at 68cc994)
520
+ entry.c: fix possible buffer overflow in remove_subtree()
@@ -513,19 +530,12 @@ of the repositories listed at
530
Will merge to 'master'.
531
532
516
-* pw/branch-config-message (2014-03-13) 1 commit
517
- - install_branch_config(): simplify verbose messages logic
518
-
519
- Among the many attempts to microproject #8, this seemed to be the
520
- most "done" among the table based ones; I however tend to think
521
- that the original with minimum refactoring would be easier to read.
522
-
523
-
533
* ys/fsck-commit-parsing (2014-03-19) 2 commits
525
- - fsck.c:fsck_commit(): use skip_prefix() to verify and skip constant
526
- - fsck.c:fsck_ident(): ident points at a const string
534
+ (merged to 'next' on 2014-03-21 at 2728983)
535
+ + fsck.c:fsck_commit(): use skip_prefix() to verify and skip constant
536
+ + fsck.c:fsck_ident(): ident points at a const string
537
528
- Will merge to 'next'.
538
+ Will merge to 'master'.
539
540
541
* jk/warn-on-object-refname-ambiguity (2014-03-13) 4 commits
@@ -538,23 +548,23 @@ of the repositories listed at
548
Will merge to 'master'.
549
550
541
-* jk/diff-funcname-cpp-regex (2014-03-05) 1 commit
542
- - diff: simplify cpp funcname regex
543
-
544
- It appears that Peff and Hannes agreed to base the final version
545
- not on this one, but Hannes's version.
546
-
547
-
551
* bp/commit-p-editor (2014-03-18) 7 commits
549
- - run-command: mark run_hook_with_custom_index as deprecated
550
- - merge hook tests: fix and update tests
551
- - merge: fix GIT_EDITOR override for commit hook
552
- - commit: fix patch hunk editing with "commit -p -m"
553
- - test patch hunk editing with "commit -p -m"
554
- - merge hook tests: use 'test_must_fail' instead of '!'
555
- - merge hook tests: fix missing '&&' in test
552
+ (merged to 'next' on 2014-03-21 at 23b6b06)
553
+ + run-command: mark run_hook_with_custom_index as deprecated
554
+ + merge hook tests: fix and update tests
555
+ + merge: fix GIT_EDITOR override for commit hook
556
+ + commit: fix patch hunk editing with "commit -p -m"
557
+ + test patch hunk editing with "commit -p -m"
558
+ + merge hook tests: use 'test_must_fail' instead of '!'
559
+ + merge hook tests: fix missing '&&' in test
560
+
561
+ When it is not necessary to edit a commit log message (e.g. "git
562
+ commit -m" is given a message without specifying "-e"), we used to
563
+ disable the spawning of the editor by overriding GIT_EDITOR, but
564
+ this means all the uses of the editor, other than to edit the
565
+ commit log message, are also affected.
566
557
- Will merge to 'next'.
567
+ Will merge to 'master'.
568
569
570
* cp/am-patch-format-doc (2014-03-17) 2 commits
@@ -581,75 +591,18 @@ of the repositories listed at
591
Will merge to 'master'.
592
593
584
-* nd/upload-pack-shallow (2014-03-11) 1 commit
585
- (merged to 'next' on 2014-03-14 at d40b8c3)
586
- + upload-pack: send shallow info over stdin to pack-objects
587
-
588
- Will merge to 'master'.
589
-
590
-
591
-* jc/stash-pop-not-popped (2014-02-26) 1 commit
592
- (merged to 'next' on 2014-03-14 at 9ba1de8)
593
- + stash pop: mention we did not drop the stash upon failing to apply
594
-
595
- "stash pop", upon failing to apply the stash, refrains from
596
- discarding the stash to avoid information loss. Be more explicit
597
- in the error message.
598
-
599
- The wording may want to get a bit more bikeshedding.
600
-
601
- Will merge to 'master'.
602
-
603
-
604
-* cn/fetch-prune-overlapping-destination (2014-02-28) 2 commits
594
+* cn/fetch-prune-overlapping-destination (2014-03-24) 3 commits
595
+ - SQUASH??? style and leak fix
596
- fetch: handle overlaping refspecs on --prune
597
- fetch: add a failing test for prunning with overlapping refspecs
598
599
Protect refs in a hierarchy that can come from more than one remote
600
hierarcies from incorrect removal by "git fetch --prune".
601
611
- Comments?
602
+ Since I didn't get any responses to my earlier "Comments?", I ended
603
+ up reading it myself again and found a small leak.
604
613
-
614
-* dk/skip-prefix-scan-only-once (2014-03-03) 1 commit
615
- (merged to 'next' on 2014-03-14 at ff375fc)
616
- + skip_prefix(): scan prefix only once
617
-
618
- Update implementation of skip_prefix() to scan only once; given
619
- that most "prefix" arguments to the inline function are constant
620
- strings whose strlen() can be determined at the compile time, this
621
- might actually make things worse with a compiler with sufficient
622
- intelligence.
623
-
624
- Will merge to 'master'.
625
-
626
-
627
-* jk/shallow-update-fix (2014-03-17) 3 commits
628
- (merged to 'next' on 2014-03-17 at 011942e)
629
- + shallow: verify shallow file after taking lock
630
- (merged to 'next' on 2014-03-12 at ce5abbf)
631
- + shallow: automatically clean up shallow tempfiles
632
- + shallow: use stat_validity to check for up-to-date file
633
-
634
- Serving objects from a shallow repository needs to write a
635
- temporary file to be used, but the serving upload-pack may not have
636
- write access to the repository which is meant to be read-only.
637
-
638
- Will merge to 'master'.
639
-
640
-
641
-* nd/tag-version-sort (2014-02-27) 1 commit
642
- (merged to 'next' on 2014-03-14 at 4e7f714)
643
- + tag: support --sort=<spec>
644
-
645
- Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output.
646
-
647
- Will merge to 'master'.
648
-
649
-
650
-* tc/commit-dry-run-exit-status-tests (2014-02-24) 1 commit
651
- (merged to 'next' on 2014-03-12 at b839886)
652
- + demonstrate git-commit --dry-run exit code behaviour
605
+ Hoping to be able to merge a fix for this issue soonish.
606
607
608
* nd/commit-editor-cleanup (2014-02-25) 3 commits
@@ -660,6 +613,8 @@ of the repositories listed at
613
614
"git commit --cleanup=<mode>" learned a new mode, scissors.
615
616
+ Will merge to 'master'.
617
+
618
619
* nd/multiple-work-trees (2014-03-17) 28 commits
620
- count-objects: report unused files in $GIT_DIR/repos/...
@@ -691,10 +646,15 @@ of the repositories listed at
646
- path.c: make get_pathname() call sites return const char *
647
- path.c: make get_pathname() return strbuf instead of static buffer
648
694
- Replaced with v5 (with minor fixes already squashed in).
649
+ A replacement for contrib/workdir/git-new-workdir that does not
650
+ rely on symbolic links and make sharing of objects and refs safer
651
+ by making the borrowee and borrowers aware of each other.
652
+
653
+ Reported to break on a worktree whose leading path component has a
654
+ symbolic link in it ($gmane/244822).
655
656
697
-* ks/tree-diff-nway (2014-03-04) 19 commits
657
+* ks/tree-diff-nway (2014-03-20) 19 commits
658
- combine-diff: speed it up, by using multiparent diff tree-walker directly
659
- tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
660
- Portable alloca for Git
@@ -708,12 +668,13 @@ of the repositories listed at
668
- tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
669
- tree-diff: move all action-taking code out of compare_tree_entry()
670
- tree-diff: don't assume compare_tree_entry() returns -1,0,1
711
- - tree-diff: consolidate code for emitting diffs and recursion in one place
712
- - tree-diff: show_tree() is not needed
713
- - tree-diff: no need to pass match to skip_uninteresting()
714
- - tree-diff: no need to manually verify that there is no mode change for a path
715
- - combine-diff: move changed-paths scanning logic into its own function
716
- - combine-diff: move show_log_first logic/action out of paths scanning
671
+ (merged to 'next' on 2014-03-21 at d872679)
672
+ + tree-diff: consolidate code for emitting diffs and recursion in one place
673
+ + tree-diff: show_tree() is not needed
674
+ + tree-diff: no need to pass match to skip_uninteresting()
675
+ + tree-diff: no need to manually verify that there is no mode change for a path
676
+ + combine-diff: move changed-paths scanning logic into its own function
677
+ + combine-diff: move show_log_first logic/action out of paths scanning
678
679
Instead of running N pair-wise diff-trees when inspecting a
680
N-parent merge, find the set of paths that were touched by walking
@@ -751,23 +712,6 @@ of the repositories listed at
712
'master'.
713
714
754
-* lt/request-pull (2014-03-13) 6 commits
755
- (merged to 'next' on 2014-03-17 at 21a598d)
756
- + request-pull: documentation updates
757
- + request-pull: resurrect "pretty refname" feature
758
- + request-pull: test updates
759
- + request-pull: pick up tag message as before
760
- + request-pull: allow "local:remote" to specify names on both ends
761
- + request-pull: more strictly match local/remote branches
762
-
763
- Discard the accumulated "heuristics" to guess from which branch the
764
- result wants to be pulled from and make sure what the end user
765
- specified is not second-guessed by "git request-pull", to avoid
766
- mistakes.
767
-
768
- Will merge to 'master'.
769
-
770
-
715
* cc/interpret-trailers (2014-03-07) 11 commits
716
- Documentation: add documentation for 'git interpret-trailers'
717
- trailer: add tests for commands in config file
@@ -792,3 +736,21 @@ of the repositories listed at
736
(this branch is used by tr/remerge-diff.)
737
738
Will hold.
739
+
740
+--------------------------------------------------
741
+[Discarded]
742
+
743
+* jk/diff-funcname-cpp-regex (2014-03-05) 1 commit
744
+ . diff: simplify cpp funcname regex
745
+
746
+ Superceded.
747
+
748
+
749
+* pw/branch-config-message (2014-03-13) 1 commit
750
+ . install_branch_config(): simplify verbose messages logic
751
+
752
+ Among the many attempts to microproject #8, this seemed to be the
753
+ most "done" among the table based ones; I however tend to think
754
+ that the original with minimum refactoring would be easier to read.
755
+
756
+ an/branch-config-message supersedes this topic.