What's cooking (2017/04 #06)
Junio C Hamano committed
Apr 27, 2017 at 11:46 UTC
8f3c0e7789bee99a10b9aadebe55e8bb62620a03
1 file changed
+349
-475
whats-cooking.txt
+349
-475
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2017, #05; Tue, 25)
4
-X-master-at: e2cb6ab84c94f147f1259260961513b40c36108a
5
-X-next-at: 87b477812d19226f71786936237a1aa4e7df378e
3
+Subject: What's cooking in git.git (Apr 2017, #06; Wed, 26)
4
+X-master-at: 027a3b943b444a3e3a76f9a89803fc10245b858f
5
+X-next-at: 01180b72fb0ab3645b79bab9296e451329296545
6
7
-What's cooking in git.git (Apr 2017, #05; Tue, 25)
7
+What's cooking in git.git (Apr 2017, #06; Wed, 26)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,6 +12,12 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
+2.13-rc1 was tagged and we are now in a pre-release freeze. The
16
+topics marked to be merged to 'next' in the list below may be merged
17
+to 'next' as usual, but the ones marked for 'master' may stay in
18
+'next' until the final release, unless they are small bug/doc fixes
19
+or hotfixes to topics that are already in -rc1 from now on.
20
+
21
You can find the changes described here in the integration branches
22
of the repositories listed at
23
@@ -20,165 +26,314 @@ of the repositories listed at
26
--------------------------------------------------
27
[Graduated to "master"]
28
23
-* jh/verify-index-checksum-only-in-fsck (2017-04-15) 1 commit
24
- (merged to 'next' on 2017-04-19 at a089b97d34)
25
- + read-cache: force_verify_index_checksum
29
+* ab/completion-push-delete-ref (2017-04-23) 1 commit
30
+ (merged to 'next' on 2017-04-23 at e227df80bf)
31
+ + completion: expand "push --delete <remote> <ref>" for refs on that <remote>
32
27
- The index file has a trailing SHA-1 checksum to detect file
28
- corruption, and historically we checked it every time the index
29
- file is used. Omit the validation during normal use, and instead
30
- verify only in "git fsck".
33
+ The completion script (in contrib/) learned to complete "git push
34
+ --delete b<TAB>" to complete branch name to be deleted.
35
32
- There is an update to the test script as a follow-up.
36
37
+* ab/push-cas-doc-n-test (2017-04-19) 1 commit
38
+ (merged to 'next' on 2017-04-23 at 0ef31ab624)
39
+ + push: document & test --force-with-lease with multiple remotes
40
35
-* bw/submodule-with-bs-path (2017-04-16) 1 commit
36
- (merged to 'next' on 2017-04-19 at 692775477b)
37
- + submodule: prevent backslash expantion in submodule names
41
+ Doc update.
42
39
- "git submodule" script does not work well with strange pathnames.
40
- Protect it from a path with slashes in them, at least.
43
44
+* cc/split-index-config (2017-04-20) 1 commit
45
+ (merged to 'next' on 2017-04-23 at 5996ddc3f2)
46
+ + read-cache: avoid using git_path() in freshen_shared_index()
47
43
-* dt/http-postbuffer-can-be-large (2017-04-13) 1 commit
44
- (merged to 'next' on 2017-04-19 at dc9de26fc9)
45
- + http.postbuffer: allow full range of ssize_t values
48
+ The split-index code configuration code used an unsafe git_path()
49
+ function without copying its result out.
50
47
- Allow the http.postbuffer configuration variable to be set to a
48
- size that can be expressed in size_t, which can be larger than
49
- ulong on some platforms.
51
52
+* gb/rebase-signoff (2017-04-18) 3 commits
53
+ (merged to 'next' on 2017-04-19 at c3c04e6a71)
54
+ + rebase: pass --[no-]signoff option to git am
55
+ + builtin/am: fold am_signoff() into am_append_signoff()
56
+ + builtin/am: honor --signoff also when --rebasing
57
52
-* dt/xgethostname-nul-termination (2017-04-18) 2 commits
53
- (merged to 'next' on 2017-04-19 at 4035f442cc)
54
- + xgethostname: handle long hostnames
55
- + use HOST_NAME_MAX to size buffers for gethostname(2)
58
+ "git rebase" learns "--signoff" option.
59
57
- gethostname(2) may not NUL terminate the buffer if hostname does
58
- not fit; unfortunately there is no easy way to see if our buffer
59
- was too small, but at least this will make sure we will not end up
60
- using garbage past the end of the buffer.
60
61
+* jh/add-index-entry-optim (2017-04-19) 5 commits
62
+ (merged to 'next' on 2017-04-23 at 295d4066a8)
63
+ + read-cache: speed up has_dir_name (part 2)
64
+ + read-cache: speed up has_dir_name (part 1)
65
+ + read-cache: speed up add_index_entry during checkout
66
+ + p0006-read-tree-checkout: perf test to time read-tree
67
+ + read-cache: add strcmp_offset function
68
63
-* jh/string-list-micro-optim (2017-04-15) 1 commit
64
- (merged to 'next' on 2017-04-19 at 2a5e339df9)
65
- + string-list: use ALLOC_GROW macro when reallocing string_list
69
+ "git checkout" that handles a lot of paths has been optimized by
70
+ reducing the number of unnecessary checks of paths in the
71
+ has_dir_name() function.
72
67
- The string-list API used a custom reallocation strategy that was
68
- very inefficient, instead of using the usual ALLOC_GROW() macro,
69
- which has been fixed.
73
74
+* jk/update-links-in-docs (2017-04-20) 6 commits
75
+ (merged to 'next' on 2017-04-23 at f64249bbdf)
76
+ + docs/bisect-lk2009: update java code conventions link
77
+ + docs/bisect-lk2009: update nist report link
78
+ + docs/archimport: quote sourcecontrol.net reference
79
+ + gitcore-tutorial: update broken link
80
+ + doc: replace or.cz gitwiki link with git.wiki.kernel.org
81
+ + doc: use https links to avoid http redirect
82
72
-* jh/unpack-trees-micro-optim (2017-04-15) 1 commit
73
- (merged to 'next' on 2017-04-19 at 970c47a2f9)
74
- + unpack-trees: avoid duplicate ODB lookups during checkout
83
+ Many stale HTTP(s) links have been updated in our documentation.
84
76
- In a 2- and 3-way merge of trees, more than one source trees often
77
- end up sharing an identical subtree; optimize by not reading the
78
- same tree multiple times in such a case.
85
86
+* jk/war-on-git-path (2017-04-20) 6 commits
87
+ (merged to 'next' on 2017-04-23 at 212e0a58ff)
88
+ + am: drop "dir" parameter from am_state_init
89
+ + replace strbuf_addstr(git_path()) with git_path_buf()
90
+ + replace xstrdup(git_path(...)) with git_pathdup(...)
91
+ + use git_path_* helper functions
92
+ + branch: add edit_description() helper
93
+ + bisect: add git_path_bisect_terms helper
94
81
-* jk/loose-object-fsck (2017-04-16) 1 commit
82
- (merged to 'next' on 2017-04-19 at 0cc7810018)
83
- + sha1_file: remove an used fd variable
95
+ While handy, "git_path()" is a dangerous function to use as a
96
+ callsite that uses it safely one day can be broken by changes
97
+ to other code that calls it. Reduction of its use continues.
98
85
- Code cleanup.
99
100
+* ls/travis-coccicheck (2017-04-16) 1 commit
101
+ (merged to 'next' on 2017-04-23 at fa42ffe6b2)
102
+ + travis-ci: add static analysis build job to run coccicheck
103
88
-* jk/ls-files-recurse-submodules-fix (2017-04-18) 2 commits
89
- (merged to 'next' on 2017-04-19 at d4682ceaae)
90
- + ls-files: fix path used when recursing into submodules
91
- + ls-files: fix recurse-submodules with nested submodules
104
+ Travis CI learns to run coccicheck.
105
93
- "ls-files --recurse-submodules" did not quite work well in a
94
- project with nested submodules.
106
107
+* mh/separate-ref-cache (2017-04-16) 20 commits
108
+ (merged to 'next' on 2017-04-23 at bd74983456)
109
+ + do_for_each_entry_in_dir(): delete function
110
+ + files_pack_refs(): use reference iteration
111
+ + commit_packed_refs(): use reference iteration
112
+ + cache_ref_iterator_begin(): make function smarter
113
+ + get_loose_ref_cache(): new function
114
+ + get_loose_ref_dir(): function renamed from get_loose_refs()
115
+ + do_for_each_entry_in_dir(): eliminate `offset` argument
116
+ + refs: handle "refs/bisect/" in `loose_fill_ref_dir()`
117
+ + ref-cache: use a callback function to fill the cache
118
+ + refs: record the ref_store in ref_cache, not ref_dir
119
+ + ref-cache: introduce a new type, ref_cache
120
+ + refs: split `ref_cache` code into separate files
121
+ + ref-cache: rename `remove_entry()` to `remove_entry_from_dir()`
122
+ + ref-cache: rename `find_ref()` to `find_ref_entry()`
123
+ + ref-cache: rename `add_ref()` to `add_ref_entry()`
124
+ + refs_verify_refname_available(): use function in more places
125
+ + refs_verify_refname_available(): implement once for all backends
126
+ + refs_ref_iterator_begin(): new function
127
+ + refs_read_raw_ref(): new function
128
+ + get_ref_dir(): don't call read_loose_refs() for "refs/bisect"
129
97
-* jk/quarantine-received-objects (2017-04-16) 3 commits
98
- (merged to 'next' on 2017-04-19 at 2c6fcf1d6d)
99
- + refs: reject ref updates while GIT_QUARANTINE_PATH is set
100
- + receive-pack: document user-visible quarantine effects
101
- + receive-pack: drop tmp_objdir_env from run_update_hook
130
+ The internals of the refs API around the cached refs has been
131
+ streamlined.
132
103
- Add finishing touches to a recent topic.
133
134
+* nd/conditional-config-in-early-config (2017-04-19) 3 commits
135
+ (merged to 'next' on 2017-04-23 at 1803ee72a9)
136
+ + config: correct file reading order in read_early_config()
137
+ + config: handle conditional include when $GIT_DIR is not set up
138
+ + config: prepare to pass more info in git_config_with_options()
139
106
-* jk/snprintf-cleanups (2017-04-17) 1 commit
107
- (merged to 'next' on 2017-04-19 at 4a18ea9971)
108
- + replace: plug a memory leak
140
+ The recently introduced conditional inclusion of configuration did
141
+ not work well when early-config mechanism was involved.
142
110
- Hotfix for a topic that is already in 'master'.
143
144
+* nd/worktree-add-lock (2017-04-20) 1 commit
145
+ (merged to 'next' on 2017-04-23 at 160b955fbb)
146
+ + worktree add: add --lock option
147
113
-* jt/fetch-pack-error-reporting (2017-04-17) 1 commit
114
- (merged to 'next' on 2017-04-19 at 6da61f7236)
115
- + fetch-pack: show clearer error message upon ERR
148
+ Allow to lock a worktree immediately after it's created. This helps
149
+ prevent a race between "git worktree add; git worktree lock" and
150
+ "git worktree prune".
151
117
- "git fetch-pack" was not prepared to accept ERR packet that the
118
- upload-pack can send with a human-readable error message. It
119
- showed the packet contents with ERR prefix, so there was no data
120
- loss, but it was redundant to say "ERR" in an error message.
152
153
+* pc/t2027-git-to-pipe-cleanup (2017-04-14) 1 commit
154
+ (merged to 'next' on 2017-04-23 at b5c28345a9)
155
+ + t2027: avoid using pipes
156
123
-* km/t1400-modernization (2017-04-16) 1 commit
124
- (merged to 'next' on 2017-04-19 at 7490be39bf)
125
- + t1400: use consistent style for test_expect_success calls
157
+ Having a git command on the upstream side of a pipe in a test
158
+ script will hide the exit status from the command, which may cause
159
+ us to fail to notice a breakage; rewrite tests in a script to avoid
160
+ this issue.
161
127
- Code cleanup.
162
163
+* ps/pathspec-empty-prefix-origin (2017-04-14) 1 commit
164
+ (merged to 'next' on 2017-04-23 at b91098d1f7)
165
+ + pathspec: honor `PATHSPEC_PREFIX_ORIGIN` with empty prefix
166
130
-* nd/conditional-config-include (2017-04-14) 2 commits
131
- (merged to 'next' on 2017-04-19 at 2e94c40b46)
132
- + config: resolve symlinks in conditional include's patterns
133
- + path.c: and an option to call real_path() in expand_user_path()
167
+ A recent update broke "git add -p ../foo" from a subdirectory.
168
135
- $GIT_DIR may in some cases be normalized with all symlinks resolved
136
- while "gitdir" path expansion in the pattern does not receive the
137
- same treatment, leading to incorrect mismatch. This has been fixed.
169
170
+* sf/putty-w-args (2017-04-20) 1 commit
171
+ (merged to 'next' on 2017-04-23 at fdafbe6b73)
172
+ + connect.c: fix leak in handle_ssh_variant
173
140
-* rs/misc-cppcheck-fixes (2017-04-17) 3 commits
141
- (merged to 'next' on 2017-04-19 at e8fca7f593)
142
- + server-info: avoid calling fclose(3) twice in update_info_file()
143
- + files_for_each_reflog_ent_reverse(): close stream and free strbuf on error
144
- + am: close stream on error, but not stdin
174
+ Plug a memleak.
175
146
- Various small fixes.
176
177
+* ss/gitmodules-ignore-doc (2017-04-19) 1 commit
178
+ (merged to 'next' on 2017-04-23 at 3963ab5013)
179
+ + gitmodules: clarify the ignore option values
180
149
-* sb/checkout-recurse-submodules (2017-04-17) 1 commit
150
- (merged to 'next' on 2017-04-19 at 414e18fd9b)
151
- + submodule: remove a superfluous second check for the "new" variable
181
+ Doc update.
182
153
- Code cleanup.
183
184
+* ss/submodule-shallow-doc (2017-04-19) 1 commit
185
+ (merged to 'next' on 2017-04-23 at 56a80f913d)
186
+ + gitmodules: clarify what history depth a shallow clone has
187
156
-* sr/http-proxy-configuration-fix (2017-04-13) 2 commits
157
- (merged to 'next' on 2017-04-19 at d8f507e951)
158
- + http: fix the silent ignoring of proxy misconfiguraion
159
- + http: honor empty http.proxy option to bypass proxy
188
+ Doc update.
189
161
- "http.proxy" set to an empty string is used to disable the usage of
162
- proxy. We broke this early last year.
190
+--------------------------------------------------
191
+[New Topics]
192
193
+* jc/repack-threads (2017-04-27) 1 commit
194
+ - repack: accept --threads=<n> and pass it down to pack-objects
195
165
-* tb/doc-eol-normalization (2017-04-13) 1 commit
166
- (merged to 'next' on 2017-04-19 at fe15d04d0a)
167
- + gitattributes.txt: document how to normalize the line endings
196
+ "git repack" learned to accept the --threads=<n> option and pass it
197
+ to pack-objects.
198
169
- Doc update.
199
+
200
+* ls/travis-stricter-linux32-builds (2017-04-27) 1 commit
201
+ - travis-ci: set DEVELOPER knob for Linux32 build
202
+
203
+ 32-bit Linux build on Travis CI uses stricter compilation options.
204
+
205
+ Will merge to 'next'.
206
+
207
+
208
+* ls/travis-win-fix-status (2017-04-26) 1 commit
209
+ - travis-ci: printf $STATUS as string
210
+
211
+ Relaying status from Windows build by Travis CI was done with an
212
+ unsafe invocation of printf.
213
+
214
+ Will merge to 'next'.
215
216
172
-* xy/format-patch-base (2017-04-17) 1 commit
173
- (merged to 'next' on 2017-04-19 at c10723d486)
174
- + doc: trivial typo in git-format-patch.txt
217
+* sh/rebase-i-reread-todo-after-exec (2017-04-27) 1 commit
218
+ - rebase -i: reread the todo list if `exec` touched it
219
176
- Doc cleanup.
220
+ "git rebase -i" failed to re-read the todo list file when the
221
+ command specified with the `exec` instruction updated it.
222
+
223
+ Will merge to 'next'.
224
225
--------------------------------------------------
179
-[New Topics]
226
+[Stalled]
227
181
-* jh/verify-index-checksum-only-in-fsck (2017-04-25) 1 commit
228
+* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
229
+ - clone: respect configured fetch respecs during initial fetch
230
+
231
+ Expecting a reroll.
232
+ cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
233
+ cf. <CAM0VKj=rsAfKvVccOMOoo5==Q1yW1U0zJBbUV=faKppWFm-u+g@mail.gmail.com>
234
+ Some nits but looks ok.
235
+
236
+
237
+* sk/dash-is-previous (2017-03-01) 5 commits
238
+ - revert.c: delegate handling of "-" shorthand to setup_revisions
239
+ - sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
240
+ - revision.c: args starting with "-" might be a revision
241
+ - revision.c: swap if/else blocks
242
+ - revision.c: do not update argv with unknown option
243
+
244
+ A dash "-" can be written to mean "the branch that was previously
245
+ checked out" in more places.
246
+
247
+ Needs review.
248
+ cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
249
+
250
+
251
+* ls/filter-process-delayed (2017-03-06) 1 commit
252
+ - convert: add "status=delayed" to filter process protocol
253
+
254
+ What's the status of this one???
255
+ cf. <xmqq60jmnmef.fsf@junio-linux.mtv.corp.google.com>
256
+
257
+
258
+* pb/bisect (2017-02-18) 28 commits
259
+ . fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C
260
+ . bisect--helper: remove the dequote in bisect_start()
261
+ . bisect--helper: retire `--bisect-auto-next` subcommand
262
+ . bisect--helper: retire `--bisect-autostart` subcommand
263
+ . bisect--helper: retire `--bisect-write` subcommand
264
+ . bisect--helper: `bisect_replay` shell function in C
265
+ . bisect--helper: `bisect_log` shell function in C
266
+ . bisect--helper: retire `--write-terms` subcommand
267
+ . bisect--helper: retire `--check-expected-revs` subcommand
268
+ . bisect--helper: `bisect_state` & `bisect_head` shell function in C
269
+ . bisect--helper: `bisect_autostart` shell function in C
270
+ . bisect--helper: retire `--next-all` subcommand
271
+ . bisect--helper: retire `--bisect-clean-state` subcommand
272
+ . bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C
273
+ . t6030: no cleanup with bad merge base
274
+ . bisect--helper: `bisect_start` shell function partially in C
275
+ . bisect--helper: `get_terms` & `bisect_terms` shell function in C
276
+ . bisect--helper: `bisect_next_check` & bisect_voc shell function in C
277
+ . bisect--helper: `check_and_set_terms` shell function in C
278
+ . bisect--helper: `bisect_write` shell function in C
279
+ . bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
280
+ . bisect--helper: `bisect_reset` shell function in C
281
+ . wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
282
+ . t6030: explicitly test for bisection cleanup
283
+ . bisect--helper: `bisect_clean_state` shell function in C
284
+ . bisect--helper: `write_terms` shell function in C
285
+ . bisect: rewrite `check_term_format` shell function in C
286
+ . bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
287
+
288
+ Move more parts of "git bisect" to C.
289
+
290
+ Ejected from 'pu', as it overlaps and gets in the way of bc/object-id topic.
291
+ Expecting a reroll.
292
+ cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
293
+ cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
294
+ cf. <CAFZEwPNUXcNY9Qdz=_B7q2kQuaecPzJtTMGdv8YMUPEz2vnp8A@mail.gmail.com>
295
+
296
+
297
+* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits
298
+ - grep: use '/' delimiter for paths
299
+ - grep: only add delimiter if there isn't one already
300
+
301
+ "git grep", when fed a tree-ish as an input, shows each hit
302
+ prefixed with "<tree-ish>:<path>:<lineno>:". As <tree-ish> is
303
+ almost always either a commit or a tag that points at a commit, the
304
+ early part of the output "<tree-ish>:<path>" can be used as the
305
+ name of the blob and given to "git show". When <tree-ish> is a
306
+ tree given in the extended SHA-1 syntax (e.g. "<commit>:", or
307
+ "<commit>:<dir>"), however, this results in a string that does not
308
+ name a blob (e.g. "<commit>::<path>" or "<commit>:<dir>:<path>").
309
+ "git grep" has been taught to be a bit more intelligent about these
310
+ cases and omit a colon (in the former case) or use slash (in the
311
+ latter case) to produce "<commit>:<path>" and
312
+ "<commit>:<dir>/<path>" that can be used as the name of a blob.
313
+
314
+ Expecting a reroll? Is this good enough with known limitations?
315
+
316
+
317
+* jc/diff-b-m (2015-02-23) 5 commits
318
+ . WIPWIP
319
+ . WIP: diff-b-m
320
+ - diffcore-rename: allow easier debugging
321
+ - diffcore-rename.c: add locate_rename_src()
322
+ - diffcore-break: allow debugging
323
+
324
+ "git diff -B -M" produced incorrect patch when the postimage of a
325
+ completely rewritten file is similar to the preimage of a removed
326
+ file; such a resulting file must not be expressed as a rename from
327
+ other place.
328
+
329
+ The fix in this patch is broken, unfortunately.
330
+
331
+ Will discard.
332
+
333
+--------------------------------------------------
334
+[Cooking]
335
+
336
+* jh/verify-index-checksum-only-in-fsck (2017-04-27) 1 commit
337
- t1450: avoid use of "sed" on the index, which is a binary file
338
339
Update an unportable constructin a new test.
@@ -187,29 +342,14 @@ of the repositories listed at
342
343
344
* dt/gc-ignore-old-gc-logs (2017-04-24) 3 commits
190
- - test-lib: retire $remove_trash variable
191
- - test-lib.sh: do not barf under --debug at the end of the test
192
- - test-lib: abort when can't remove trash directory
345
+ (merged to 'next' on 2017-04-26 at 4f4cab8368)
346
+ + test-lib: retire $remove_trash variable
347
+ + test-lib.sh: do not barf under --debug at the end of the test
348
+ + test-lib: abort when can't remove trash directory
349
350
An attempt to allow us notice "fishy" situation where we fail to
351
remove the temporary directory used during the test.
352
197
- Will merge to 'next'.
198
-
199
-
200
-* jk/war-on-git-path (2017-04-20) 6 commits
201
- (merged to 'next' on 2017-04-23 at 212e0a58ff)
202
- + am: drop "dir" parameter from am_state_init
203
- + replace strbuf_addstr(git_path()) with git_path_buf()
204
- + replace xstrdup(git_path(...)) with git_pathdup(...)
205
- + use git_path_* helper functions
206
- + branch: add edit_description() helper
207
- + bisect: add git_path_bisect_terms helper
208
-
209
- While handy, "git_path()" is a dangerous function to use as a
210
- callsite that uses it safely one day can be broken by changes
211
- to other code that calls it. Reduction of its use continues.
212
-
353
Will merge to 'master'.
354
355
@@ -244,17 +384,19 @@ of the repositories listed at
384
385
386
* dt/raise-core-packed-git-limit (2017-04-20) 1 commit
247
- - Increase core.packedGitLimit
387
+ (merged to 'next' on 2017-04-26 at c72dd8c62f)
388
+ + Increase core.packedGitLimit
389
390
Raise the default packed-git limit value on larger platforms to
391
avoid "git fetch" from a (recoverable) failure while "gc" is
392
running in parallel.
393
253
- Will merge to 'next'.
394
+ Will merge to 'master'.
395
396
397
* jk/complete-checkout-sans-dwim-remote (2017-04-23) 1 commit
257
- - completion: optionally disable checkout DWIM
398
+ (merged to 'next' on 2017-04-26 at 0c69cff69f)
399
+ + completion: optionally disable checkout DWIM
400
401
Completion for "git checkout <branch>" that auto-creates the branch
402
out of a remote tracking branch can now be disabled, as this
@@ -262,21 +404,7 @@ of the repositories listed at
404
existing local branch that happens to share the same prefix with
405
bunch of remote tracking branches.
406
265
- Will merge to 'next'.
266
-
267
-
268
-* jk/update-links-in-docs (2017-04-20) 6 commits
269
- (merged to 'next' on 2017-04-23 at f64249bbdf)
270
- + docs/bisect-lk2009: update java code conventions link
271
- + docs/bisect-lk2009: update nist report link
272
- + docs/archimport: quote sourcecontrol.net reference
273
- + gitcore-tutorial: update broken link
274
- + doc: replace or.cz gitwiki link with git.wiki.kernel.org
275
- + doc: use https links to avoid http redirect
276
-
277
- Many stale HTTP(s) links have been updated in our documentation.
278
-
279
- Will merge to 'next'.
407
+ Will merge to 'master'.
408
409
410
* js/larger-timestamps (2017-04-24) 8 commits
@@ -297,28 +425,20 @@ of the repositories listed at
425
move), and then declare uintmax_t is the type to be used as the
426
timestamp_t
427
300
- At v5.
301
- cf. <cover.1493042239.git.johannes.schindelin@gmx.de>
302
-
303
-
304
-* sf/putty-w-args (2017-04-20) 1 commit
305
- (merged to 'next' on 2017-04-23 at fdafbe6b73)
306
- + connect.c: fix leak in handle_ssh_variant
307
-
308
- Plug a memleak.
309
-
428
Will merge to 'next'.
429
430
431
* ab/align-perf-descriptions (2017-04-23) 1 commit
314
- - t/perf: correctly align non-ASCII descriptions in output
432
+ (merged to 'next' on 2017-04-26 at 7d66e7019e)
433
+ + t/perf: correctly align non-ASCII descriptions in output
434
435
Output from perf tests have been updated to align their titles.
436
318
- Will merge to 'next'.
437
+ Will merge to 'master'.
438
439
321
-* ab/grep-pcre-v2 (2017-04-25) 19 commits
440
+* ab/grep-pcre-v2 (2017-04-25) 20 commits
441
+ - SQUASH???
442
- Makefile & configure: make PCRE v2 the default PCRE implementation
443
- grep: remove support for concurrent use of both PCRE v1 & v2
444
- grep: add support for PCRE v2
@@ -400,13 +520,18 @@ of the repositories listed at
520
521
Conversion from uchar[20] to struct object_id continues.
522
523
+ Needs review.
524
+
525
526
* jk/no-null-sha1-in-cache-tree (2017-04-23) 1 commit
405
- - cache-tree: reject entries with null sha1
527
+ (merged to 'next' on 2017-04-26 at 45fbe9d57d)
528
+ + cache-tree: reject entries with null sha1
529
530
Tighten code to update cache-tree so that we won't accidentally
531
write out any 0{40} entry in the tree object.
532
533
+ Will merge to 'master'.
534
+
535
536
* rg/a-the-typo (2017-04-23) 1 commit
537
- NEEDSSIGNOFF: fix minor typing mistakes
@@ -417,176 +542,71 @@ of the repositories listed at
542
543
544
* jk/prio-queue-avoid-swap-with-self (2017-04-24) 1 commit
420
- - prio_queue_reverse: don't swap elements with themselves
545
+ (merged to 'next' on 2017-04-26 at 6a55996734)
546
+ + prio_queue_reverse: don't swap elements with themselves
547
548
Code clean-up.
549
424
- Will merge to 'next'.
550
+ Will merge to 'master'.
551
552
553
* jk/submodule-init-segv-fix (2017-04-24) 1 commit
428
- - submodule_init: die cleanly on submodules without url defined
429
-
430
- Fix a segv in 'submodule init' when url is not given for a submodule.
431
-
432
- Will merge to 'next'.
433
-
434
-
435
-* rs/large-zip (2017-04-24) 5 commits
436
- - archive-zip: support files bigger than 4GB
437
- - archive-zip: support archives bigger than 4GB
438
- - archive-zip: write ZIP dir entry directly to strbuf
439
- - archive-zip: use strbuf for ZIP directory
440
- - archive-zip: add tests for big ZIP archives
441
-
442
- "git archive --format=zip" learned to use zip64 extension when
443
- necessary to go beyond the 4GB limit.
444
-
445
- Will merge to 'next'.
446
-
447
-
448
-* jc/checkout-working-tree-only (2017-04-25) 1 commit
449
- - checkout: add --working-tree-only option
450
-
451
- "git checkout <tree-ish> <pathspec>" learned a variant that does
452
- not update the index when doing its thing.
453
-
454
-
455
-* js/rebase-i-final (2017-04-25) 9 commits
456
- - rebase -i: rearrange fixup/squash lines using the rebase--helper
457
- - t3415: test fixup with wrapped oneline
458
- - rebase -i: skip unnecessary picks using the rebase--helper
459
- - rebase -i: check for missing commits in the rebase--helper
460
- - t3404: relax rebase.missingCommitsCheck tests
461
- - rebase -i: also expand/collapse the SHA-1s via the rebase--helper
462
- - rebase -i: do not invent onelines when expanding/collapsing SHA-1s
463
- - rebase -i: remove useless indentation
464
- - rebase -i: generate the script via rebase--helper
465
-
466
- The final batch to "git rebase -i" updates to move more code from
467
- the shell script to C.
468
-
469
-
470
-* jt/use-trailer-api-in-commands (2017-04-25) 2 commits
471
- - SQUASH??? suggested by jrnieder
472
- - sequencer: require trailing NL in footers
473
-
474
- "git cherry-pick" and other uses of the sequencer machinery
475
- mishandled a trailer block whose last line is an incomplete line.
476
- This has been fixed so that an additional sign-off etc. are added
477
- after completing the existing incomplete line.
478
-
479
-
480
---------------------------------------------------
481
-[Stalled]
482
-
483
-* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
484
- - clone: respect configured fetch respecs during initial fetch
485
-
486
- Expecting a reroll.
487
- cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
488
- cf. <CAM0VKj=rsAfKvVccOMOoo5==Q1yW1U0zJBbUV=faKppWFm-u+g@mail.gmail.com>
489
- Some nits but looks ok.
490
-
491
-
492
-* sk/dash-is-previous (2017-03-01) 5 commits
493
- - revert.c: delegate handling of "-" shorthand to setup_revisions
494
- - sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
495
- - revision.c: args starting with "-" might be a revision
496
- - revision.c: swap if/else blocks
497
- - revision.c: do not update argv with unknown option
498
-
499
- A dash "-" can be written to mean "the branch that was previously
500
- checked out" in more places.
501
-
502
- Needs review.
503
- cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
554
+ (merged to 'next' on 2017-04-26 at 9a6eaaff89)
555
+ + submodule_init: die cleanly on submodules without url defined
556
557
+ Fix a segv in 'submodule init' when url is not given for a submodule.
558
506
-* ls/filter-process-delayed (2017-03-06) 1 commit
507
- - convert: add "status=delayed" to filter process protocol
559
+ Will merge to 'master'.
560
509
- What's the status of this one???
510
- cf. <xmqq60jmnmef.fsf@junio-linux.mtv.corp.google.com>
561
562
+* rs/large-zip (2017-04-24) 5 commits
563
+ (merged to 'next' on 2017-04-26 at a6beab60f2)
564
+ + archive-zip: support files bigger than 4GB
565
+ + archive-zip: support archives bigger than 4GB
566
+ + archive-zip: write ZIP dir entry directly to strbuf
567
+ + archive-zip: use strbuf for ZIP directory
568
+ + archive-zip: add tests for big ZIP archives
569
513
-* pb/bisect (2017-02-18) 28 commits
514
- . fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C
515
- . bisect--helper: remove the dequote in bisect_start()
516
- . bisect--helper: retire `--bisect-auto-next` subcommand
517
- . bisect--helper: retire `--bisect-autostart` subcommand
518
- . bisect--helper: retire `--bisect-write` subcommand
519
- . bisect--helper: `bisect_replay` shell function in C
520
- . bisect--helper: `bisect_log` shell function in C
521
- . bisect--helper: retire `--write-terms` subcommand
522
- . bisect--helper: retire `--check-expected-revs` subcommand
523
- . bisect--helper: `bisect_state` & `bisect_head` shell function in C
524
- . bisect--helper: `bisect_autostart` shell function in C
525
- . bisect--helper: retire `--next-all` subcommand
526
- . bisect--helper: retire `--bisect-clean-state` subcommand
527
- . bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C
528
- . t6030: no cleanup with bad merge base
529
- . bisect--helper: `bisect_start` shell function partially in C
530
- . bisect--helper: `get_terms` & `bisect_terms` shell function in C
531
- . bisect--helper: `bisect_next_check` & bisect_voc shell function in C
532
- . bisect--helper: `check_and_set_terms` shell function in C
533
- . bisect--helper: `bisect_write` shell function in C
534
- . bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
535
- . bisect--helper: `bisect_reset` shell function in C
536
- . wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
537
- . t6030: explicitly test for bisection cleanup
538
- . bisect--helper: `bisect_clean_state` shell function in C
539
- . bisect--helper: `write_terms` shell function in C
540
- . bisect: rewrite `check_term_format` shell function in C
541
- . bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
570
+ "git archive --format=zip" learned to use zip64 extension when
571
+ necessary to go beyond the 4GB limit.
572
543
- Move more parts of "git bisect" to C.
573
+ Will merge to 'master'.
574
545
- Ejected from 'pu', as it overlaps and gets in the way of bc/object-id topic.
546
- Expecting a reroll.
547
- cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
548
- cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
549
- cf. <CAFZEwPNUXcNY9Qdz=_B7q2kQuaecPzJtTMGdv8YMUPEz2vnp8A@mail.gmail.com>
575
576
+* jc/checkout-working-tree-only (2017-04-27) 1 commit
577
+ - checkout: add --working-tree-only option
578
552
-* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits
553
- - grep: use '/' delimiter for paths
554
- - grep: only add delimiter if there isn't one already
579
+ "git checkout <tree-ish> <pathspec>" learned a variant that does
580
+ not update the index when doing its thing.
581
556
- "git grep", when fed a tree-ish as an input, shows each hit
557
- prefixed with "<tree-ish>:<path>:<lineno>:". As <tree-ish> is
558
- almost always either a commit or a tag that points at a commit, the
559
- early part of the output "<tree-ish>:<path>" can be used as the
560
- name of the blob and given to "git show". When <tree-ish> is a
561
- tree given in the extended SHA-1 syntax (e.g. "<commit>:", or
562
- "<commit>:<dir>"), however, this results in a string that does not
563
- name a blob (e.g. "<commit>::<path>" or "<commit>:<dir>:<path>").
564
- "git grep" has been taught to be a bit more intelligent about these
565
- cases and omit a colon (in the former case) or use slash (in the
566
- latter case) to produce "<commit>:<path>" and
567
- "<commit>:<dir>/<path>" that can be used as the name of a blob.
582
569
- Expecting a reroll? Is this good enough with known limitations?
583
+* js/rebase-i-final (2017-04-27) 9 commits
584
+ - rebase -i: rearrange fixup/squash lines using the rebase--helper
585
+ - t3415: test fixup with wrapped oneline
586
+ - rebase -i: skip unnecessary picks using the rebase--helper
587
+ - rebase -i: check for missing commits in the rebase--helper
588
+ - t3404: relax rebase.missingCommitsCheck tests
589
+ - rebase -i: also expand/collapse the SHA-1s via the rebase--helper
590
+ - rebase -i: do not invent onelines when expanding/collapsing SHA-1s
591
+ - rebase -i: remove useless indentation
592
+ - rebase -i: generate the script via rebase--helper
593
594
+ The final batch to "git rebase -i" updates to move more code from
595
+ the shell script to C.
596
572
-* jc/diff-b-m (2015-02-23) 5 commits
573
- . WIPWIP
574
- . WIP: diff-b-m
575
- - diffcore-rename: allow easier debugging
576
- - diffcore-rename.c: add locate_rename_src()
577
- - diffcore-break: allow debugging
597
+ Needs review.
598
579
- "git diff -B -M" produced incorrect patch when the postimage of a
580
- completely rewritten file is similar to the preimage of a removed
581
- file; such a resulting file must not be expressed as a rename from
582
- other place.
599
584
- The fix in this patch is broken, unfortunately.
600
+* jt/use-trailer-api-in-commands (2017-04-26) 1 commit
601
+ - sequencer: add newline before adding footers
602
586
- Will discard.
603
+ "git cherry-pick" and other uses of the sequencer machinery
604
+ mishandled a trailer block whose last line is an incomplete line.
605
+ This has been fixed so that an additional sign-off etc. are added
606
+ after completing the existing incomplete line.
607
+
608
+ Will merge to 'next'.
609
588
---------------------------------------------------
589
-[Cooking]
610
611
* nd/worktree-move (2017-04-20) 6 commits
612
- worktree remove: new command
@@ -598,21 +618,13 @@ of the repositories listed at
618
619
"git worktree" learned move and remove subcommands.
620
621
+ Expecting a reroll.
622
cf. <20170420101024.7593-1-pclouds@gmail.com>
623
cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
624
cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>
625
626
606
-* ab/push-cas-doc-n-test (2017-04-19) 1 commit
607
- (merged to 'next' on 2017-04-23 at 0ef31ab624)
608
- + push: document & test --force-with-lease with multiple remotes
609
-
610
- Doc update.
611
-
612
- Will merge to 'master'.
613
-
614
-
615
-* jk/parse-options-no-no-no (2017-04-19) 2 commits
627
+* jk/parse-options-no-no-no (2017-04-25) 2 commits
628
- SQUASH???
629
- parse-options: disallow double-negations of options starting with no-
630
@@ -627,24 +639,6 @@ of the repositories listed at
639
use it". Perhaps we can drop it?
640
641
630
-* ss/gitmodules-ignore-doc (2017-04-19) 1 commit
631
- (merged to 'next' on 2017-04-23 at 3963ab5013)
632
- + gitmodules: clarify the ignore option values
633
-
634
- Doc update.
635
-
636
- Will merge to 'master'.
637
-
638
-
639
-* ss/submodule-shallow-doc (2017-04-19) 1 commit
640
- (merged to 'next' on 2017-04-23 at 56a80f913d)
641
- + gitmodules: clarify what history depth a shallow clone has
642
-
643
- Doc update.
644
-
645
- Will merge to 'master'.
646
-
647
-
642
* df/dir-iter-remove-subtree (2017-04-19) 5 commits
643
- remove_subtree(): reimplement using iterators
644
- dir_iterator: rewrite state machine model
@@ -655,22 +649,12 @@ of the repositories listed at
649
Update the dir-iterator API and use it to reimplement
650
remove_subtree().
651
658
- Almost there except for a minor nit.
652
+ A reroll exists that is based on the updated 'master', but I ran
653
+ out of time trying to get it to work with other topics in flight
654
+ in 'pu'.
655
GSoC microproject.
656
657
662
-* nd/conditional-config-in-early-config (2017-04-19) 3 commits
663
- (merged to 'next' on 2017-04-23 at 1803ee72a9)
664
- + config: correct file reading order in read_early_config()
665
- + config: handle conditional include when $GIT_DIR is not set up
666
- + config: prepare to pass more info in git_config_with_options()
667
-
668
- The recently introduced conditional inclusion of configuration did
669
- not work well when early-config mechanism was involved.
670
-
671
- Will merge to 'master'.
672
-
673
-
658
* ab/clone-no-tags (2017-04-19) 1 commit
659
(merged to 'next' on 2017-04-23 at c6329b0f7c)
660
+ clone: add a --no-tags option to clone without tags
@@ -682,19 +666,10 @@ of the repositories listed at
666
Will merge to 'master'.
667
668
685
-* ab/completion-push-delete-ref (2017-04-23) 1 commit
686
- (merged to 'next' on 2017-04-23 at e227df80bf)
687
- + completion: expand "push --delete <remote> <ref>" for refs on that <remote>
688
-
689
- The completion script (in contrib/) learned to complete "git push
690
- --delete b<TAB>" to complete branch name to be deleted.
691
-
692
- Will merge to 'master'.
693
-
694
-
669
* bw/forking-and-threading (2017-04-25) 13 commits
696
- - run-command: restrict PATH search to executable files
697
- - run-command: expose is_executable function
670
+ (merged to 'next' on 2017-04-26 at 89c495e37f)
671
+ + run-command: restrict PATH search to executable files
672
+ + run-command: expose is_executable function
673
(merged to 'next' on 2017-04-23 at 7754b5ebc3)
674
+ run-command: block signals between fork and execve
675
+ run-command: add note about forking and threading
@@ -708,10 +683,10 @@ of the repositories listed at
683
+ t0061: run_command executes scripts without a #! line
684
+ t5550: use write_script to generate post-update hook
685
711
- The "run-command" APIimplementation has been made more robust
686
+ The "run-command" API implementation has been made more robust
687
against dead-locking in a threaded environment.
688
714
- Will merge to 'next'.
689
+ Will merge to 'master'.
690
691
692
* sb/reset-recurse-submodules (2017-04-23) 4 commits
@@ -723,7 +698,8 @@ of the repositories listed at
698
"git reset" learned "--recurse-submodules" option.
699
700
726
-* ls/travis-doc-asciidoctor (2017-04-16) 3 commits
701
+* ls/travis-doc-asciidoctor (2017-04-26) 4 commits
702
+ - travis-ci: check AsciiDoc/AsciiDoctor stderr output
703
(merged to 'next' on 2017-04-19 at 359c32953b)
704
+ travis-ci: unset compiler for jobs that do not need one
705
+ travis-ci: parallelize documentation build
@@ -732,8 +708,7 @@ of the repositories listed at
708
Have Travis CI format the documentation with both AsciiDoc and
709
AsciiDoctor.
710
735
- Will hold in 'next' waiting for a small update.
736
- cf. <25191991-F4EA-4D91-B291-854F46A34DC2@gmail.com>
711
+ Will merge to 'next' after a few CI run in 'pu'.
712
713
714
* mg/status-in-progress-info (2017-04-14) 1 commit
@@ -746,52 +721,6 @@ of the repositories listed at
721
cf. <xmqqwpajikd2.fsf@gitster.mtv.corp.google.com>
722
723
749
-* nd/worktree-add-lock (2017-04-20) 1 commit
750
- (merged to 'next' on 2017-04-23 at 160b955fbb)
751
- + worktree add: add --lock option
752
-
753
- Allow to lock a worktree immediately after it's created. This helps
754
- prevent a race between "git worktree add; git worktree lock" and
755
- "git worktree prune".
756
-
757
- Will merge to 'master'.
758
-
759
-
760
-* ps/pathspec-empty-prefix-origin (2017-04-14) 1 commit
761
- (merged to 'next' on 2017-04-23 at b91098d1f7)
762
- + pathspec: honor `PATHSPEC_PREFIX_ORIGIN` with empty prefix
763
-
764
- A recent update broke "git add -p ../foo" from a subdirectory.
765
-
766
- Will merge to 'master'.
767
-
768
-
769
-* gb/rebase-signoff (2017-04-18) 3 commits
770
- (merged to 'next' on 2017-04-19 at c3c04e6a71)
771
- + rebase: pass --[no-]signoff option to git am
772
- + builtin/am: fold am_signoff() into am_append_signoff()
773
- + builtin/am: honor --signoff also when --rebasing
774
-
775
- "git rebase" learns "--signoff" option.
776
-
777
- Will merge to 'master'.
778
-
779
-
780
-* jh/add-index-entry-optim (2017-04-19) 5 commits
781
- (merged to 'next' on 2017-04-23 at 295d4066a8)
782
- + read-cache: speed up has_dir_name (part 2)
783
- + read-cache: speed up has_dir_name (part 1)
784
- + read-cache: speed up add_index_entry during checkout
785
- + p0006-read-tree-checkout: perf test to time read-tree
786
- + read-cache: add strcmp_offset function
787
-
788
- "git checkout" that handles a lot of paths has been optimized by
789
- reducing the number of unnecessary checks of paths in the
790
- has_dir_name() function.
791
-
792
- Will merge to 'master'.
793
-
794
-
724
* ab/grep-threading-cleanup (2017-04-16) 8 commits
725
- grep: given --threads with NO_PTHREADS=YesPlease, warn
726
- pack-objects: fix buggy warning about threads under NO_PTHREADS=YesPlease
@@ -802,26 +731,9 @@ of the repositories listed at
731
- grep: add tests for --threads=N and grep.threads
732
- grep: assert that threading is enabled when calling grep_{lock,unlock}
733
734
+ Code cleanup.
735
806
-* ls/travis-coccicheck (2017-04-16) 1 commit
807
- (merged to 'next' on 2017-04-23 at fa42ffe6b2)
808
- + travis-ci: add static analysis build job to run coccicheck
809
-
810
- Travis CI learns to run coccicheck.
811
-
812
- Will merge to 'master'.
813
-
814
-
815
-* pc/t2027-git-to-pipe-cleanup (2017-04-14) 1 commit
816
- (merged to 'next' on 2017-04-23 at b5c28345a9)
817
- + t2027: avoid using pipes
818
-
819
- Having a git command on the upstream side of a pipe in a test
820
- script will hide the exit status from the command, which may cause
821
- us to fail to notice a breakage; rewrite tests in a script to avoid
822
- this issue.
823
-
824
- Will merge to 'master'.
736
+ Needs review.
737
738
739
* bp/sub-process-convert-filter (2017-04-23) 8 commits
@@ -837,20 +749,10 @@ of the repositories listed at
749
Code from "conversion using external process" codepath has been
750
extracted to a separate sub-process.[ch] module.
751
840
- Reroll exists but needs more work.
752
+ Reroll exists but needs a bit more work.
753
cf. <20170407120354.17736-1-benpeart@microsoft.com>
754
755
844
-* cc/split-index-config (2017-04-20) 1 commit
845
- (merged to 'next' on 2017-04-23 at 5996ddc3f2)
846
- + read-cache: avoid using git_path() in freshen_shared_index()
847
-
848
- The split-index code configuration code used an unsafe git_path()
849
- function without copying its result out.
850
-
851
- Will merge to 'master'.
852
-
853
-
756
* mg/name-rev-debug (2017-03-31) 4 commits
757
- describe: pass --debug down to name-rev
758
- name-rev: provide debug output
@@ -864,35 +766,6 @@ of the repositories listed at
766
cf. <xmqqshltxnwt.fsf@gitster.mtv.corp.google.com>
767
768
867
-* mh/separate-ref-cache (2017-04-16) 20 commits
868
- (merged to 'next' on 2017-04-23 at bd74983456)
869
- + do_for_each_entry_in_dir(): delete function
870
- + files_pack_refs(): use reference iteration
871
- + commit_packed_refs(): use reference iteration
872
- + cache_ref_iterator_begin(): make function smarter
873
- + get_loose_ref_cache(): new function
874
- + get_loose_ref_dir(): function renamed from get_loose_refs()
875
- + do_for_each_entry_in_dir(): eliminate `offset` argument
876
- + refs: handle "refs/bisect/" in `loose_fill_ref_dir()`
877
- + ref-cache: use a callback function to fill the cache
878
- + refs: record the ref_store in ref_cache, not ref_dir
879
- + ref-cache: introduce a new type, ref_cache
880
- + refs: split `ref_cache` code into separate files
881
- + ref-cache: rename `remove_entry()` to `remove_entry_from_dir()`
882
- + ref-cache: rename `find_ref()` to `find_ref_entry()`
883
- + ref-cache: rename `add_ref()` to `add_ref_entry()`
884
- + refs_verify_refname_available(): use function in more places
885
- + refs_verify_refname_available(): implement once for all backends
886
- + refs_ref_iterator_begin(): new function
887
- + refs_read_raw_ref(): new function
888
- + get_ref_dir(): don't call read_loose_refs() for "refs/bisect"
889
-
890
- The internals of the refs API around the cached refs has been
891
- streamlined.
892
-
893
- Will merge to 'master'.
894
-
895
-
769
* ja/doc-l10n (2017-03-20) 3 commits
770
- SQUASH???
771
- l10n: add git-add.txt to localized man pages
@@ -928,18 +801,19 @@ of the repositories listed at
801
802
803
* nd/worktree-kill-parse-ref (2017-04-24) 6 commits
931
- - refs: kill set_worktree_head_symref()
932
- - worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()
933
- - refs: introduce get_worktree_ref_store()
934
- - refs: add REFS_STORE_ALL_CAPS
935
- - refs.c: make submodule ref store hashmap generic
936
- - environment.c: fix potential segfault by get_git_common_dir()
804
+ (merged to 'next' on 2017-04-26 at b8e40da709)
805
+ + refs: kill set_worktree_head_symref()
806
+ + worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()
807
+ + refs: introduce get_worktree_ref_store()
808
+ + refs: add REFS_STORE_ALL_CAPS
809
+ + refs.c: make submodule ref store hashmap generic
810
+ + environment.c: fix potential segfault by get_git_common_dir()
811
(this branch is used by nd/prune-in-worktree.)
812
813
"git gc" did not interact well with "git worktree"-managed
814
per-worktree refs.
815
942
- Will merge to 'next'.
816
+ Will merge to 'master'.
817
818
819
* jc/bundle (2016-03-03) 6 commits