What's cooking (2017/03 #12)
Junio C Hamano committed
Mar 29, 2017 at 14:58 UTC
2b0014bdcafa292319e50e31512100bb7788d560
1 file changed
+276
-273
whats-cooking.txt
+276
-273
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2017, #11; Mon, 27)
4
-X-master-at: e0ef7fe78c46e6919d249b9547948a3bb7321dea
5
-X-next-at: f7d0c115f90496503bfc6438d37aefdbb8a4e9f5
3
+Subject: What's cooking in git.git (Mar 2017, #12; Wed, 29)
4
+X-master-at: e1104a5ee539408b81566066aaa6963cb87d5cd6
5
+X-next-at: c2a70e75825ac7c7f54f8cb0fff83ac7cf042a3a
6
7
-What's cooking in git.git (Mar 2017, #11; Mon, 27)
7
+What's cooking in git.git (Mar 2017, #12; Wed, 29)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -20,168 +20,211 @@ of the repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
23
-* jc/lint-runaway-here-doc (2017-03-23) 1 commit
24
- (merged to 'next' on 2017-03-24 at c1f1ca1bd7)
25
- + tests: lint for run-away here-doc
23
+* ab/branch-list-doc (2017-03-24) 2 commits
24
+ (merged to 'next' on 2017-03-27 at 4bb47907ee)
25
+ + branch doc: update description for `--list`
26
+ + branch doc: change `git branch <pattern>` to use `<branchname>`
27
27
- The test framework learned to detect unterminated here documents.
28
+ Doc update.
29
30
30
-* jk/prefix-filename (2017-03-21) 6 commits
31
- (merged to 'next' on 2017-03-22 at 6d180ed430)
32
- + bundle: use prefix_filename with bundle path
33
- + prefix_filename: simplify windows #ifdef
34
- + prefix_filename: return newly allocated string
35
- + prefix_filename: drop length parameter
36
- + prefix_filename: move docstring to header file
37
- + hash-object: fix buffer reuse with --path in a subdirectory
31
+* bw/grep-recurse-submodules (2017-03-18) 2 commits
32
+ (merged to 'next' on 2017-03-21 at a57e2f0129)
33
+ + grep: fix builds with with no thread support
34
+ + grep: set default output method
35
39
- Code clean-up with minor bugfixes.
36
+ Build fix for NO_PTHREADS build.
37
38
42
-* jk/quote-env-path-list-component (2017-03-22) 1 commit
43
- (merged to 'next' on 2017-03-24 at 78843c4f9d)
44
- + t5615: fix a here-doc syntax error
39
+* jh/memihash-opt (2017-03-24) 8 commits
40
+ (merged to 'next' on 2017-03-24 at f1aa0c4d37)
41
+ + name-hash: add test-lazy-init-name-hash to .gitignore
42
+ + name-hash: add perf test for lazy_init_name_hash
43
+ + name-hash: add test-lazy-init-name-hash
44
+ + name-hash: perf improvement for lazy_init_name_hash
45
+ + hashmap: document memihash_cont, hashmap_disallow_rehash api
46
+ + hashmap: add disallow_rehash setting
47
+ + hashmap: allow memihash computation to be continued
48
+ + name-hash: specify initial size for istate.dir_hash table
49
46
- A test fix.
50
+ The name-hash used for detecting paths that are different only in
51
+ cases (which matter on case insensitive filesystems) has been
52
+ optimized to take advantage of multi-threading when it makes sense.
53
54
49
-* km/config-grammofix (2017-03-23) 1 commit
50
- (merged to 'next' on 2017-03-24 at 75ddbbc6f9)
51
- + doc/config: grammar fixes for core.{editor,commentChar}
55
+* jk/fast-import-cleanup (2017-03-24) 4 commits
56
+ (merged to 'next' on 2017-03-27 at 9f6058007f)
57
+ + pack.h: define largest possible encoded object size
58
+ + encode_in_pack_object_header: respect output buffer length
59
+ + fast-import: use xsnprintf for formatting headers
60
+ + fast-import: use xsnprintf for writing sha1s
61
53
- Doc update.
62
+ Code clean-up.
63
64
56
-* km/t1400-modernization (2017-03-21) 5 commits
57
- (merged to 'next' on 2017-03-22 at e9c3154ca4)
58
- + t1400: use test_when_finished for cleanup
59
- + t1400: remove a set of unused output files
60
- + t1400: use test_path_is_* helpers
61
- + t1400: set core.logAllRefUpdates in "logged by touch" tests
62
- + t1400: rename test descriptions to be unique
65
+* jk/pager-in-use (2017-03-24) 1 commit
66
+ (merged to 'next' on 2017-03-27 at 513f007025)
67
+ + pager_in_use: use git_env_bool()
68
69
Code clean-up.
70
71
67
-* sb/describe-broken (2017-03-22) 1 commit
68
- (merged to 'next' on 2017-03-24 at 2262cbf415)
69
- + builtin/describe: introduce --broken flag
72
+* jk/sha1dc (2017-03-26) 1 commit
73
+ (merged to 'next' on 2017-03-27 at 91bf9f06b4)
74
+ + sha1dc: avoid CPP macro collisions
75
71
- "git describe --dirty" dies when it cannot be determined if the
72
- state in the working tree matches that of HEAD (e.g. broken
73
- repository or broken submodule). The command learned a new option
74
- "git describe --broken" to give "$name-broken" (where $name is the
75
- description of HEAD) in such a case.
76
+ sha1dc/sha1.c wanted to check the endianness of the target platform
77
+ at compilation time and used a CPP macro with a rather overly
78
+ generic name, "BIGENDIAN", to pass the result of the check around
79
+ in the file. It wasn't prepared for the same macro set to 0
80
+ (false) by the platform to signal that the target is _not_ a big
81
+ endian box, and assumed that the endianness detection logic it has
82
+ alone would be the one that is setting the macro, resulting in a
83
+ breakage on Windows. This has been fixed by using a bit less
84
+ generic name for the same purpose.
85
86
78
-* sb/push-options-via-transport (2017-03-22) 2 commits
79
- (merged to 'next' on 2017-03-24 at c5535bec3b)
80
- + remote-curl: allow push options
81
- + send-pack: send push options correctly in stateless-rpc case
87
+* sb/checkout-recurse-submodules (2017-03-16) 19 commits
88
+ (merged to 'next' on 2017-03-22 at 48b49d572c)
89
+ + builtin/read-tree: add --recurse-submodules switch
90
+ + builtin/checkout: add --recurse-submodules switch
91
+ + entry.c: create submodules when interesting
92
+ + unpack-trees: check if we can perform the operation for submodules
93
+ + unpack-trees: pass old oid to verify_clean_submodule
94
+ + update submodules: add submodule_move_head
95
+ + submodule.c: get_super_prefix_or_empty
96
+ + update submodules: move up prepare_submodule_repo_env
97
+ + submodules: introduce check to see whether to touch a submodule
98
+ + update submodules: add a config option to determine if submodules are updated
99
+ + update submodules: add submodule config parsing
100
+ + make is_submodule_populated gently
101
+ + lib-submodule-update.sh: define tests for recursing into submodules
102
+ + lib-submodule-update.sh: replace sha1 by hash
103
+ + lib-submodule-update: teach test_submodule_content the -C <dir> flag
104
+ + lib-submodule-update.sh: do not use ./. as submodule remote
105
+ + lib-submodule-update.sh: reorder create_lib_submodule_repo
106
+ + submodule--helper.c: remove duplicate code
107
+ + connect_work_tree_and_git_dir: safely create leading directories
108
83
- Recently we started passing the "--push-options" through the
84
- external remote helper interface; now the "smart HTTP" remote
85
- helper understands what to do with the passed information.
109
+ "git checkout" is taught the "--recurse-submodules" option.
110
111
88
-* sb/submodule-update-initial-runs-custom-script (2017-03-22) 1 commit
89
- (merged to 'next' on 2017-03-24 at 628200c3b1)
90
- + t7406: correct test case for submodule-update initial population
112
+* sg/skip-prefix-in-prettify-refname (2017-03-23) 1 commit
113
+ (merged to 'next' on 2017-03-27 at f7d0c115f9)
114
+ + refs.c: use skip_prefix() in prettify_refname()
115
92
- A test fix.
116
+ Code cleanup.
117
118
95
-* sb/t3600-rephrase (2017-03-22) 1 commit
96
- (merged to 'next' on 2017-03-24 at 5ec1eee490)
97
- + t3600: rename test to describe its functionality
119
+* tg/stash-push-fixup (2017-03-22) 3 commits
120
+ (merged to 'next' on 2017-03-24 at e6b9e04213)
121
+ + stash: keep untracked files intact in stash -k
122
+ + stash: pass the pathspec argument to git reset
123
+ + stash: don't show internal implementation details
124
99
- A test retitling.
125
+ Recent enhancement to "git stash push" command to support pathspec
126
+ to allow only a subset of working tree changes to be stashed away
127
+ was found to be too chatty and exposed the internal implementation
128
+ detail (e.g. when it uses reset to match the index to HEAD before
129
+ doing other things, output from reset seeped out). These, and
130
+ other chattyness has been fixed.
131
132
+--------------------------------------------------
133
+[New Topics]
134
102
-* st/verify-tag (2017-03-24) 1 commit
103
- (merged to 'next' on 2017-03-24 at d26313d4ab)
104
- + t7004, t7030: fix here-doc syntax errors
135
+* bc/push-cert-receive-fix (2017-03-28) 1 commit
136
+ - builtin/receive-pack: fix incorrect pointer arithmetic
137
106
- A few unterminated here documents in tests were fixed, which in
107
- turn revealed incorrect expectations the tests make. These tests
108
- have been updated.
138
+ "git receive-pack" could have been forced to die by attempting
139
+ allocate an unreasonably large amount of memory with a crafted push
140
+ certificate; this has been fixed.
141
110
---------------------------------------------------
111
-[New Topics]
142
+ Will merge to 'next'.
143
113
-* ab/case-insensitive-upstream-and-push-marker (2017-03-27) 1 commit
114
- - rev-parse: match @{upstream}, @{u} and @{push} case-insensitively
144
116
- On many keyboards, typing "@{" involves holding down SHIFT key and
117
- one can easily end up with "@{Up..." when typing "@{upstream}". As
118
- the upstream/push keywords do not appear anywhere else in the syntax,
119
- we can safely accept them case insensitively without introducing
120
- ambiguity or confusion to solve this.
145
+* mh/notes-tree-consolidate-fix (2017-03-27) 1 commit
146
+ - notes: do not break note_tree structure in note_tree_consolidate()
147
+
148
+ Removing an entry from a notes tree and then looking another note
149
+ entry from the resulting tree using the internal notes API
150
+ functions did not work as expected. No in-tree users of the API
151
+ has such access pattern, but it still is worth fixing.
152
153
Will merge to 'next'.
154
155
125
-* bc/object-id (2017-03-26) 21 commits
126
- - Documentation: update and rename api-sha1-array.txt
127
- - Rename sha1_array to oid_array
128
- - Convert sha1_array_for_each_unique and for_each_abbrev to object_id
129
- - Convert sha1_array_lookup to take struct object_id
130
- - Convert remaining callers of sha1_array_lookup to object_id
131
- - Make sha1_array_append take a struct object_id *
132
- - sha1-array: convert internal storage for struct sha1_array to object_id
133
- - builtin/pull: convert to struct object_id
134
- - submodule: convert check_for_new_submodule_commits to object_id
135
- - sha1_name: convert disambiguate_hint_fn to take object_id
136
- - sha1_name: convert struct disambiguate_state to object_id
137
- - test-sha1-array: convert most code to struct object_id
138
- - parse-options-cb: convert sha1_array_append caller to struct object_id
139
- - fsck: convert init_skiplist to struct object_id
140
- - builtin/receive-pack: convert portions to struct object_id
141
- - builtin/receive-pack: fix incorrect pointer arithmetic
142
- - builtin/pull: convert portions to struct object_id
143
- - builtin/diff: convert to struct object_id
144
- - Convert GIT_SHA1_RAWSZ used for allocation to GIT_MAX_RAWSZ
145
- - Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ
146
- - Define new hash-size constants for allocating memory
156
+* ls/travis-relays-for-windows-ci (2017-03-28) 1 commit
157
+ - travis-ci: build and test Git on Windows
158
148
- Conversion from unsigned char [40] to struct object_id continues.
159
+ Define a new task in .travis.yml that triggers a test session on
160
+ Windows run elsewhere.
161
162
151
-* rs/freebsd-getcwd-workaround (2017-03-26) 1 commit
152
- - strbuf: support long paths w/o read rights in strbuf_getcwd() on FreeBSD
163
+* bp/sub-process-convert-filter (2017-03-29) 8 commits
164
+ - convert: update subprocess_read_status to not die on EOF
165
+ - sub-process: move sub-process functions into separate files
166
+ - convert: rename reusable sub-process functions
167
+ - convert: update generic functions to only use generic data structures
168
+ - convert: separate generic structures and variables from the filter specific ones
169
+ - convert: split start_multi_file_filter into two separate functions
170
+ - convert: update convert to use new packet_writel() function
171
+ - pkt-line: add packet_writel() and packet_read_line_gently()
172
154
- FreeBSD implementation of getcwd(3) behaved differently when an
155
- intermediate directory is unreadable/unsearchable depending on the
156
- length of the buffer provided, which our strbuf_getcwd() was not
157
- aware of. strbuf_getcwd() has been taught to cope with it better.
173
+ Code from "conversion using external process" codepath has been
174
+ extracted to a separate sub-process.[ch] module.
175
+
176
+
177
+* cc/split-index-config (2017-03-29) 1 commit
178
+ - read-cache: avoid git_path() race in freshen_shared_index()
179
+
180
+ The split-index code configuration code used an unsafe git_path()
181
+ function without copying its result out.
182
+
183
+ Needs to be explained better.
184
+ The code looked OK, though.
185
+
186
+
187
+* jk/make-coccicheck-detect-errors (2017-03-29) 1 commit
188
+ - Makefile: detect errors in running spatch
189
+
190
+ Build fix.
191
192
Will merge to 'next'.
193
194
162
-* jk/sha1dc (2017-03-26) 1 commit
163
- (merged to 'next' on 2017-03-27 at 91bf9f06b4)
164
- + sha1dc: avoid CPP macro collisions
195
+* jk/snprintf-cleanups (2017-03-28) 18 commits
196
+ - daemon: use an argv_array to exec children
197
+ - gc: replace local buffer with git_path
198
+ - transport-helper: replace checked snprintf with xsnprintf
199
+ - convert unchecked snprintf into xsnprintf
200
+ - combine-diff: replace malloc/snprintf with xstrfmt
201
+ - replace unchecked snprintf calls with heap buffers
202
+ - receive-pack: print --pack-header directly into argv array
203
+ - name-rev: replace static buffer with strbuf
204
+ - create_branch: use xstrfmt for reflog message
205
+ - create_branch: move msg setup closer to point of use
206
+ - avoid using mksnpath for refs
207
+ - avoid using fixed PATH_MAX buffers for refs
208
+ - fetch: use heap buffer to format reflog
209
+ - tag: use strbuf to format tag header
210
+ - diff: avoid fixed-size buffer for patch-ids
211
+ - odb_mkstemp: use git_path_buf
212
+ - odb_mkstemp: write filename into strbuf
213
+ - do not check odb_mkstemp return value for errors
214
166
- sha1dc/sha1.c wanted to check the endianness of the target platform
167
- at compilation time and used a CPP macro with a rather overly
168
- generic name, "BIGENDIAN", to pass the result of the check around
169
- in the file. It wasn't prepared for the same macro set to 0
170
- (false) by the platform to signal that the target is _not_ a big
171
- endian box, and assumed that the endianness detection logic it has
172
- alone would be the one that is setting the macro, resulting in a
173
- breakage on Windows. This has been fixed by using a bit less
174
- generic name for the same purpose.
215
+ Code clean-up.
216
176
- Will merge to 'master'.
217
+ Will merge to 'next'.
218
219
179
-* mg/describe-debug-l10n (2017-03-27) 2 commits
180
- - l10n: de: translate describe debug terms
181
- - describe: localize debug output fully
220
+* mg/name-rev-debug (2017-03-29) 3 commits
221
+ - name-rev: provide debug output
222
+ - name-rev: favor describing with tags and use committer date to tiebreak
223
+ - name-rev: refactor logic to see if a new candidate is a better name
224
+ (this branch uses mg/describe-debug-l10n.)
225
183
- Some debugging output from "git describe" were marked for l10n,
184
- but some weren't. Mark missing ones for l10n.
226
+ "git describe --debug --contains" did not add any meaningful
227
+ information, even though without "--contains" it did.
228
229
Will merge to 'next'.
230
@@ -309,33 +352,89 @@ of the repositories listed at
352
--------------------------------------------------
353
[Cooking]
354
312
-* ab/test-readme-updates (2017-03-26) 3 commits
313
- - t/README: clarify the test_have_prereq documentation
314
- - t/README: change "Inside <X> part" to "Inside the <X> part"
315
- - t/README: link to metacpan.org, not search.cpan.org
355
+* ab/case-insensitive-upstream-and-push-marker (2017-03-27) 1 commit
356
+ (merged to 'next' on 2017-03-28 at 166654719e)
357
+ + rev-parse: match @{upstream}, @{u} and @{push} case-insensitively
358
317
- Doc updates.
359
+ On many keyboards, typing "@{" involves holding down SHIFT key and
360
+ one can easily end up with "@{Up..." when typing "@{upstream}". As
361
+ the upstream/push keywords do not appear anywhere else in the syntax,
362
+ we can safely accept them case insensitively without introducing
363
+ ambiguity or confusion to solve this.
364
319
- Will merge to 'next'.
365
+ Will merge to 'master'.
366
367
322
-* js/rebase-i-reword-to-run-hooks (2017-03-27) 3 commits
323
- - sequencer: allow the commit-msg hooks to run during a `reword`
324
- - sequencer: make commit options more extensible
325
- - t7504: document regression: reword no longer calls commit-msg
368
+* bc/object-id (2017-03-28) 20 commits
369
+ - Documentation: update and rename api-sha1-array.txt
370
+ - Rename sha1_array to oid_array
371
+ - Convert sha1_array_for_each_unique and for_each_abbrev to object_id
372
+ - Convert sha1_array_lookup to take struct object_id
373
+ - Convert remaining callers of sha1_array_lookup to object_id
374
+ - Make sha1_array_append take a struct object_id *
375
+ - sha1-array: convert internal storage for struct sha1_array to object_id
376
+ - builtin/pull: convert to struct object_id
377
+ - submodule: convert check_for_new_submodule_commits to object_id
378
+ - sha1_name: convert disambiguate_hint_fn to take object_id
379
+ - sha1_name: convert struct disambiguate_state to object_id
380
+ - test-sha1-array: convert most code to struct object_id
381
+ - parse-options-cb: convert sha1_array_append caller to struct object_id
382
+ - fsck: convert init_skiplist to struct object_id
383
+ - builtin/receive-pack: convert portions to struct object_id
384
+ - builtin/pull: convert portions to struct object_id
385
+ - builtin/diff: convert to struct object_id
386
+ - Convert GIT_SHA1_RAWSZ used for allocation to GIT_MAX_RAWSZ
387
+ - Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ
388
+ - Define new hash-size constants for allocating memory
389
327
- A recent update to "rebase -i" stopped running hooks for the "git
328
- commit" command during "reword" action, which has been fixed.
390
+ Conversion from unsigned char [40] to struct object_id continues.
391
392
Will merge to 'next'.
393
394
333
-* ab/branch-list-doc (2017-03-24) 2 commits
334
- (merged to 'next' on 2017-03-27 at 4bb47907ee)
335
- + branch doc: update description for `--list`
336
- + branch doc: change `git branch <pattern>` to use `<branchname>`
395
+* rs/freebsd-getcwd-workaround (2017-03-26) 1 commit
396
+ (merged to 'next' on 2017-03-28 at 3f3c1553a7)
397
+ + strbuf: support long paths w/o read rights in strbuf_getcwd() on FreeBSD
398
338
- Doc update.
399
+ FreeBSD implementation of getcwd(3) behaved differently when an
400
+ intermediate directory is unreadable/unsearchable depending on the
401
+ length of the buffer provided, which our strbuf_getcwd() was not
402
+ aware of. strbuf_getcwd() has been taught to cope with it better.
403
+
404
+ Will merge to 'master'.
405
+
406
+
407
+* mg/describe-debug-l10n (2017-03-27) 2 commits
408
+ (merged to 'next' on 2017-03-28 at 16ad604828)
409
+ + l10n: de: translate describe debug terms
410
+ + describe: localize debug output fully
411
+ (this branch is used by mg/name-rev-debug.)
412
+
413
+ Some debugging output from "git describe" were marked for l10n,
414
+ but some weren't. Mark missing ones for l10n.
415
+
416
+ Will merge to 'master'.
417
+
418
+
419
+* ab/test-readme-updates (2017-03-26) 3 commits
420
+ (merged to 'next' on 2017-03-28 at abdc7b3b15)
421
+ + t/README: clarify the test_have_prereq documentation
422
+ + t/README: change "Inside <X> part" to "Inside the <X> part"
423
+ + t/README: link to metacpan.org, not search.cpan.org
424
+
425
+ Doc updates.
426
+
427
+ Will merge to 'master'.
428
+
429
+
430
+* js/rebase-i-reword-to-run-hooks (2017-03-27) 3 commits
431
+ (merged to 'next' on 2017-03-28 at d23d60f63d)
432
+ + sequencer: allow the commit-msg hooks to run during a `reword`
433
+ + sequencer: make commit options more extensible
434
+ + t7504: document regression: reword no longer calls commit-msg
435
+
436
+ A recent update to "rebase -i" stopped running hooks for the "git
437
+ commit" command during "reword" action, which has been fixed.
438
439
Will merge to 'master'.
440
@@ -352,15 +451,6 @@ of the repositories listed at
451
Will merge to 'master'.
452
453
355
-* sg/skip-prefix-in-prettify-refname (2017-03-23) 1 commit
356
- (merged to 'next' on 2017-03-27 at f7d0c115f9)
357
- + refs.c: use skip_prefix() in prettify_refname()
358
-
359
- Code cleanup.
360
-
361
- Will merge to 'master'.
362
-
363
-
454
* sb/submodule-short-status (2017-03-27) 7 commits
455
- submodule.c: correctly handle nested submodules in is_submodule_modified
456
- short status: improve reporting for submodule changes
@@ -380,45 +470,6 @@ of the repositories listed at
470
The endgame looked mostly OK.
471
472
383
-* jk/fast-import-cleanup (2017-03-24) 4 commits
384
- (merged to 'next' on 2017-03-27 at 9f6058007f)
385
- + pack.h: define largest possible encoded object size
386
- + encode_in_pack_object_header: respect output buffer length
387
- + fast-import: use xsnprintf for formatting headers
388
- + fast-import: use xsnprintf for writing sha1s
389
-
390
- Code clean-up.
391
-
392
- Will merge to 'master'.
393
-
394
-
395
-* jk/pager-in-use (2017-03-24) 1 commit
396
- (merged to 'next' on 2017-03-27 at 513f007025)
397
- + pager_in_use: use git_env_bool()
398
-
399
- Code clean-up.
400
-
401
- Will merge to 'master'.
402
-
403
-
404
-* jh/memihash-opt (2017-03-24) 8 commits
405
- (merged to 'next' on 2017-03-24 at f1aa0c4d37)
406
- + name-hash: add test-lazy-init-name-hash to .gitignore
407
- + name-hash: add perf test for lazy_init_name_hash
408
- + name-hash: add test-lazy-init-name-hash
409
- + name-hash: perf improvement for lazy_init_name_hash
410
- + hashmap: document memihash_cont, hashmap_disallow_rehash api
411
- + hashmap: add disallow_rehash setting
412
- + hashmap: allow memihash computation to be continued
413
- + name-hash: specify initial size for istate.dir_hash table
414
-
415
- The name-hash used for detecting paths that are different only in
416
- cases (which matter on case insensitive filesystems) has been
417
- optimized to take advantage of multi-threading when it makes sense.
418
-
419
- Will merge to 'master'.
420
-
421
-
473
* sg/completion-refs-speedup (2017-03-23) 14 commits
474
(merged to 'next' on 2017-03-27 at 6bb275710d)
475
+ completion: speed up branch and tag completion
@@ -485,21 +536,12 @@ of the repositories listed at
536
537
538
* ab/doc-submitting (2017-03-26) 2 commits
488
- - doc/SubmittingPatches: show how to get a CLI commit summary
489
- - doc/SubmittingPatches: clarify the casing convention for "area: change..."
539
+ (merged to 'next' on 2017-03-28 at 49e23678df)
540
+ + doc/SubmittingPatches: show how to get a CLI commit summary
541
+ + doc/SubmittingPatches: clarify the casing convention for "area: change..."
542
543
Doc update.
544
493
- Will merge to 'next'.
494
-
495
-
496
-* bw/grep-recurse-submodules (2017-03-18) 2 commits
497
- (merged to 'next' on 2017-03-21 at a57e2f0129)
498
- + grep: fix builds with with no thread support
499
- + grep: set default output method
500
-
501
- Build fix for NO_PTHREADS build.
502
-
545
Will merge to 'master'.
546
547
@@ -511,22 +553,6 @@ of the repositories listed at
553
A proposal to use po4a to localize our manual pages.
554
555
514
-* tg/stash-push-fixup (2017-03-22) 3 commits
515
- (merged to 'next' on 2017-03-24 at e6b9e04213)
516
- + stash: keep untracked files intact in stash -k
517
- + stash: pass the pathspec argument to git reset
518
- + stash: don't show internal implementation details
519
-
520
- Recent enhancement to "git stash push" command to support pathspec
521
- to allow only a subset of working tree changes to be stashed away
522
- was found to be too chatty and exposed the internal implementation
523
- detail (e.g. when it uses reset to match the index to HEAD before
524
- doing other things, output from reset seeped out). These, and
525
- other chattyness has been fixed.
526
-
527
- Will merge to 'master'.
528
-
529
-
556
* nd/prune-in-worktree (2017-03-27) 12 commits
557
- rev-list: expose and document --single-worktree
558
- revision.c: --reflog add HEAD reflog from all worktrees
@@ -605,22 +631,23 @@ of the repositories listed at
631
632
633
* ab/ref-filter-no-contains (2017-03-24) 16 commits
608
- - tag: add tests for --with and --without
609
- - ref-filter: reflow recently changed branch/tag/for-each-ref docs
610
- - ref-filter: add --no-contains option to tag/branch/for-each-ref
611
- - tag: change --point-at to default to HEAD
612
- - tag: implicitly supply --list given another list-like option
613
- - tag: change misleading --list <pattern> documentation
614
- - parse-options: add OPT_NONEG to the "contains" option
615
- - tag: add more incompatibles mode tests
616
- - for-each-ref: partly change <object> to <commit> in help
617
- - tag tests: fix a typo in a test description
618
- - tag: remove a TODO item from the test suite
619
- - ref-filter: add test for --contains on a non-commit
620
- - ref-filter: make combining --merged & --no-merged an error
621
- - tag doc: reword --[no-]merged to talk about commits, not tips
622
- - tag doc: split up the --[no-]merged documentation
623
- - tag doc: move the description of --[no-]merged earlier
634
+ (merged to 'next' on 2017-03-28 at bdce986928)
635
+ + tag: add tests for --with and --without
636
+ + ref-filter: reflow recently changed branch/tag/for-each-ref docs
637
+ + ref-filter: add --no-contains option to tag/branch/for-each-ref
638
+ + tag: change --point-at to default to HEAD
639
+ + tag: implicitly supply --list given another list-like option
640
+ + tag: change misleading --list <pattern> documentation
641
+ + parse-options: add OPT_NONEG to the "contains" option
642
+ + tag: add more incompatibles mode tests
643
+ + for-each-ref: partly change <object> to <commit> in help
644
+ + tag tests: fix a typo in a test description
645
+ + tag: remove a TODO item from the test suite
646
+ + ref-filter: add test for --contains on a non-commit
647
+ + ref-filter: make combining --merged & --no-merged an error
648
+ + tag doc: reword --[no-]merged to talk about commits, not tips
649
+ + tag doc: split up the --[no-]merged documentation
650
+ + tag doc: move the description of --[no-]merged earlier
651
652
"git tag/branch/for-each-ref" family of commands long allowed to
653
filter the refs by "--contains X" (show only the refs that are
@@ -630,33 +657,22 @@ of the repositories listed at
657
only the refs that are not descendants of X) has been added to
658
them.
659
633
- Will merge to 'next'.
634
-
635
-
636
-* jc/name-rev (2017-03-16) 2 commits
637
- - name-rev: favor describing with tags and use committer date to tiebreak
638
- - name-rev: refactor logic to see if a new candidate is a better name
639
-
640
- "git name-rev" penalized lightweight tags too much, making them
641
- almost useless especially when the command is run with "--tags".
642
- Give the same precedence to lightweight tags as annotated tags as
643
- the base for naming a commit.
644
-
645
- Waiting for jc/p4-current-branch-fix to settle.
660
+ Will merge to 'master'.
661
662
663
* bw/recurse-submodules-relative-fix (2017-03-17) 5 commits
649
- - ls-files: fix bug when recursing with relative pathspec
650
- - ls-files: fix typo in variable name
651
- - grep: fix bug when recursing with relative pathspec
652
- - setup: allow for prefix to be passed to git commands
653
- - grep: fix help text typo
664
+ (merged to 'next' on 2017-03-28 at d0cef6234e)
665
+ + ls-files: fix bug when recursing with relative pathspec
666
+ + ls-files: fix typo in variable name
667
+ + grep: fix bug when recursing with relative pathspec
668
+ + setup: allow for prefix to be passed to git commands
669
+ + grep: fix help text typo
670
671
A few commands that recently learned the "--recurse-submodule"
672
option misbehaved when started from a subdirectory of the
673
superproject.
674
659
- Will merge to 'next'.
675
+ Will merge to 'master'.
676
677
678
* jc/p4-current-branch-fix (2017-03-27) 2 commits
@@ -693,33 +709,6 @@ of the repositories listed at
709
Will merge to 'master'.
710
711
696
-* sb/checkout-recurse-submodules (2017-03-16) 19 commits
697
- (merged to 'next' on 2017-03-22 at 48b49d572c)
698
- + builtin/read-tree: add --recurse-submodules switch
699
- + builtin/checkout: add --recurse-submodules switch
700
- + entry.c: create submodules when interesting
701
- + unpack-trees: check if we can perform the operation for submodules
702
- + unpack-trees: pass old oid to verify_clean_submodule
703
- + update submodules: add submodule_move_head
704
- + submodule.c: get_super_prefix_or_empty
705
- + update submodules: move up prepare_submodule_repo_env
706
- + submodules: introduce check to see whether to touch a submodule
707
- + update submodules: add a config option to determine if submodules are updated
708
- + update submodules: add submodule config parsing
709
- + make is_submodule_populated gently
710
- + lib-submodule-update.sh: define tests for recursing into submodules
711
- + lib-submodule-update.sh: replace sha1 by hash
712
- + lib-submodule-update: teach test_submodule_content the -C <dir> flag
713
- + lib-submodule-update.sh: do not use ./. as submodule remote
714
- + lib-submodule-update.sh: reorder create_lib_submodule_repo
715
- + submodule--helper.c: remove duplicate code
716
- + connect_work_tree_and_git_dir: safely create leading directories
717
-
718
- "git checkout" is taught the "--recurse-submodules" option.
719
-
720
- Will merge to 'master'.
721
-
722
-
712
* jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
713
(merged to 'next' on 2017-02-27 at 7373a1b73d)
714
+ setup_git_env: avoid blind fall-back to ".git"
@@ -740,7 +729,7 @@ of the repositories listed at
729
been deprecated since October 2007, and issues a deprecation
730
warning message since v2.5.0.
731
743
- Will cook in 'next'.
732
+ Will merge to 'master'.
733
734
735
* jc/bundle (2016-03-03) 6 commits
@@ -754,3 +743,17 @@ of the repositories listed at
743
The beginning of "split bundle", which could be one of the
744
ingredients to allow "git clone" traffic off of the core server
745
network to CDN.
746
+
747
+--------------------------------------------------
748
+[Discarded]
749
+
750
+* jc/name-rev (2017-03-16) 2 commits
751
+ . name-rev: favor describing with tags and use committer date to tiebreak
752
+ . name-rev: refactor logic to see if a new candidate is a better name
753
+
754
+ "git name-rev" penalized lightweight tags too much, making them
755
+ almost useless especially when the command is run with "--tags".
756
+ Give the same precedence to lightweight tags as annotated tags as
757
+ the base for naming a commit.
758
+
759
+ Now part of mg/name-rev-debug topic.