What's cooking (2013/06 #04)
Junio C Hamano committed
Jun 11, 2013 at 15:21 UTC
9c9340387191206e4b1d86cd9044c1321f6ac051
1 file changed
+353
-453
whats-cooking.txt
+353
-453
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2013, #03; Thu, 6)
4
-X-master-at: 882e78c7f9c284408640347a4b1910ea73537a10
5
-X-next-at: 4be48e85aeafa12baca36edf3ee8cb0b7e970a16
3
+Subject: What's cooking in git.git (Jun 2013, #04; Tue, 11)
4
+X-master-at: 4d1c565e1fb4e76c391448cdf85fe7c132bbb390
5
+X-next-at: 3b07823faafc941f5079443779265b5ba32c8407
6
7
-What's cooking in git.git (Jun 2013, #03; Thu, 6)
7
+What's cooking in git.git (Jun 2013, #04; Tue, 11)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -17,185 +17,373 @@ of the repositories listed at
17
http://git-blame.blogspot.com/p/git-public-repositories.html
18
19
--------------------------------------------------
20
-[New Topics]
20
+[Graduated to "master"]
21
22
-* jk/list-objects-sans-blobs (2013-06-06) 4 commits
23
- - archive: ignore blob objects when checking reachability
24
- - list-objects: optimize "revs->blob_objects = 0" case
25
- - upload-archive: restrict remote objects with reachability check
26
- - clear parsed flag when we free tree buffers
22
+* ar/wildmatch-foldcase (2013-06-02) 1 commit
23
+ (merged to 'next' on 2013-06-04 at 3180bcc)
24
+ + wildmatch: properly fold case everywhere
25
28
- Attempt to allow "archive --remote=$there $arbitrary_sha1" while
29
- keeping the reachability safety.
26
+ The wildmatch engine did not honor WM_CASEFOLD option correctly.
27
31
---------------------------------------------------
32
-[Graduated to "master"]
28
34
-* dm/unbash-subtree (2013-05-21) 1 commit
35
- (merged to 'next' on 2013-06-03 at 2c9d2fb)
36
- + contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash
29
+* cb/log-follow-with-combined (2013-05-28) 1 commit
30
+ (merged to 'next' on 2013-06-04 at d5bf4f3)
31
+ + fix segfault with git log -c --follow
32
+
33
+
34
+* cm/gitweb-project-list-persistent-cgi-fix (2013-06-07) 1 commit
35
+ (merged to 'next' on 2013-06-07 at b16ca1f)
36
+ + gitweb: fix problem causing erroneous project list
37
+
38
+ "gitweb" forgot to clear a global variable $search_regexp upon each
39
+ request, mistakenly carrying over the previous search to a new one
40
+ when used as a persistent CGI.
41
+
42
+
43
+* cr/git-work-tree-sans-git-dir (2013-06-03) 1 commit
44
+ (merged to 'next' on 2013-06-04 at bebedca)
45
+ + git.txt: remove stale comment regarding GIT_WORK_TREE
46
+
47
+ These days, "git --work-tree=there cmd" without specifying an
48
+ explicit --git-dir=here will do the usual discovery, but we had a
49
+ description of older behaviour in the documentation.
50
+
51
+
52
+* fc/at-head (2013-05-08) 13 commits
53
+ (merged to 'next' on 2013-06-04 at f334a2a)
54
+ + sha1_name: compare variable with constant, not constant with variable
55
+ + Add new @ shortcut for HEAD
56
+ + sha1_name: refactor reinterpret()
57
+ + sha1_name: check @{-N} errors sooner
58
+ + sha1_name: reorganize get_sha1_basic()
59
+ + sha1_name: don't waste cycles in the @-parsing loop
60
+ + sha1_name: remove unnecessary braces
61
+ + sha1_name: remove no-op
62
+ + tests: at-combinations: @{N} versus HEAD@{N}
63
+ + tests: at-combinations: increase coverage
64
+ + tests: at-combinations: improve nonsense()
65
+ + tests: at-combinations: check ref names directly
66
+ + tests: at-combinations: simplify setup
67
+
68
+ Instead of typing four capital letters "HEAD", you can say "@".
69
+
70
+
71
+* fc/completion-less-ls-remote (2013-06-02) 1 commit
72
+ (merged to 'next' on 2013-06-03 at 6624f0b)
73
+ + completion: avoid ls-remote in certain scenarios
74
+
75
+
76
+* fc/do-not-use-the-index-in-add-to-index (2013-06-03) 2 commits
77
+ (merged to 'next' on 2013-06-04 at 94e7b60)
78
+ + read-cache: trivial style cleanups
79
+ + read-cache: fix wrong 'the_index' usage
80
+
81
+
82
+* fc/remote-bzr (2013-05-28) 8 commits
83
+ (merged to 'next' on 2013-06-04 at a603082)
84
+ + remote-bzr: add fallback check for a partial clone
85
+ + remote-bzr: reorganize the way 'wanted' works
86
+ + remote-bzr: trivial cleanups
87
+ + remote-bzr: change global repo
88
+ + remote-bzr: delay cloning/pulling
89
+ + remote-bzr: simplify get_remote_branch()
90
+ + remote-bzr: fix for files with spaces
91
+ + remote-bzr: recover from failed clones
92
+
93
+
94
+* fc/remote-hg (2013-05-28) 50 commits
95
+ (merged to 'next' on 2013-06-04 at 9ee7dab)
96
+ + remote-hg: add support for --force
97
+ + remote-hg: add support for --dry-run
98
+ + remote-hg: check if a fetch is needed
99
+ + remote-hg: trivial cleanup
100
+ + remote-helpers: improve marks usage
101
+ + remote-hg: add check_push() helper
102
+ + remote-hg: add setup_big_push() helper
103
+ + remote-hg: remove files before modifications
104
+ + remote-hg: improve lightweight tag author
105
+ + remote-hg: use remote 'default' not local one
106
+ + remote-hg: improve branch listing
107
+ + remote-hg: simplify branch_tip()
108
+ + remote-hg: check diverged bookmarks
109
+ + remote-hg: pass around revision refs
110
+ + remote-hg: implement custom checkheads()
111
+ + remote-hg: implement custom push()
112
+ + remote-hg: only update necessary revisions
113
+ + remote-hg: force remote bookmark push selectively
114
+ + remote-hg: reorganize bookmark handling
115
+ + remote-hg: add test for failed double push
116
+ + remote-hg: add test for big push
117
+ + remote-hg: add test for new bookmark special
118
+ + remote-hg: add test for bookmark diverge
119
+ + remote-hg: add test for diverged push
120
+ + remote-hg: add test to push new bookmark
121
+ + remote-hg: add remote tests
122
+ + remote-hg: update bookmarks when using a remote
123
+ + remote-hg: add check_bookmark() test helper
124
+ + remote-bzr: simplify test checks
125
+ + remote-hg: add tests for 'master' bookmark
126
+ + remote-hg: always point HEAD to master
127
+ + remote-hg: improve progress calculation
128
+ + remote-hg: trivial cleanups
129
+ + remote-hg: ensure remote rebasing works
130
+ + remote-hg: upgrade version 1 marks
131
+ + remote-hg: switch from revisions to SHA-1 noteids
132
+ + remote-hg: add version checks to the marks
133
+ + remote-hg: improve node traversing
134
+ + remote-hg: shuffle some code
135
+ + remote-hg: use a shared repository store
136
+ + remote-hg: load all extensions
137
+ + remote-hg: test: simplify previous branch checkout
138
+ + remote-helpers: test: simplify remote URLs
139
+ + remote-helpers: tests: general improvements
140
+ + remote-helpers: test: cleanup style
141
+ + remote-helpers: test: cleanup white-spaces
142
+ + remote-hg: trivial reorganization
143
+ + remote-hg: test: be a little more quiet
144
+ + remote-hg: tests: fix hg merge
145
+ + remote-helpers: tests: use python directly
146
+
147
+
148
+* jk/test-exit-code-by-signal (2013-06-06) 2 commits
149
+ (merged to 'next' on 2013-06-06 at 6fdea1b)
150
+ + t0005: skip signal death exit code test on Windows
151
+ (merged to 'next' on 2013-06-03 at 25af892)
152
+ + t0005: test git exit code from signal death
153
+
154
+
155
+* mm/mediawiki-https-fail-message (2013-05-29) 1 commit
156
+ (merged to 'next' on 2013-06-04 at fb2671c)
157
+ + git-remote-mediawiki: better error message when HTTP(S) access fails
158
+
159
+ Hint users when https:// connection failed to check the
160
+ certificate; it is a good hint if we assumie that it is common
161
+ error for the end users to make.
162
+
163
+
164
+* nd/warn-ambiguous-object-name (2013-05-29) 1 commit
165
+ (merged to 'next' on 2013-06-04 at e87c9d1)
166
+ + get_sha1: warn about full or short object names that look like refs
167
+
168
+ "git cmd <name>", when <name> happens to be a 40-hex string,
169
+ directly uses the 40-hex string as an object name, even if a ref
170
+ "refs/<some hierarchy>/<name>" exists. This disambiguation order
171
+ is unlikely to change, but we should warn about the ambiguity just
172
+ like we warn when more than one refs/ hierachies share the same
173
+ name.
174
+
175
+
176
+* rj/mingw-cygwin (2013-05-08) 2 commits
177
+ (merged to 'next' on 2013-06-04 at 308fdb4)
178
+ + cygwin: Remove the CYGWIN_V15_WIN32API build variable
179
+ + mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
180
38
- It turns out that git-subtree script does not have to be run with
39
- bash.
181
+ Update build for Cygwin 1.[57]. Torsten Bögershausen reports that
182
+ this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it
183
+ ahead.
184
185
42
-* fc/cleanups (2013-05-28) 3 commits
43
- (merged to 'next' on 2013-06-03 at 527cf93)
44
- + test: rebase: fix --interactive test
45
- + test: trivial cleanups
46
- + remote: trivial style cleanup
186
+* rr/die-on-missing-upstream (2013-06-02) 2 commits
187
+ (merged to 'next' on 2013-06-03 at 00847ea)
188
+ + sha1_name: fix error message for @{<N>}, @{<date>}
189
+ + sha1_name: fix error message for @{u}
190
191
+ When a reflog notation is used for implicit "current branch", we
192
+ did not say which branch and worse said "branch ''".
193
49
-* fc/makefile (2013-05-26) 5 commits
50
- (merged to 'next' on 2013-06-03 at d1074e4)
51
- + build: do not install git-remote-testpy
52
- + build: add NO_INSTALL variable
53
- + build: cleanup using $<
54
- + build: cleanup using $^
55
- + build: trivial simplification
56
- (this branch is used by fc/remote-helpers-use-specified-python.)
194
58
- Stop installing the git-remote-testpy script that is only used for
59
- testing. Also use handy magic variables to simplify rules.
195
+* rr/diffcore-pickaxe-doc (2013-06-03) 2 commits
196
+ (merged to 'next' on 2013-06-04 at 67d1fc7)
197
+ + diffcore-pickaxe doc: document -S and -G properly
198
+ + diffcore-pickaxe: make error messages more consistent
199
200
+ Update the low-level diffcore documentation on -S/-G and --pickaxe-all.
201
62
-* fc/send-email-chainreplyto-warning (2013-05-28) 1 commit
63
- (merged to 'next' on 2013-06-03 at e04764f)
64
- + send-email: remove warning about unset chainreplyto
202
66
- An overdue removal of "behaviour changed at 1.7.0; if you were
67
- living in a cave, here is what you can adjust to it" message.
203
+* rr/maint-fetch-tag-doc-asterisks (2013-06-07) 1 commit
204
+ (merged to 'next' on 2013-06-07 at bfa4e7b)
205
+ + fetch-options.txt: prevent a wildcard refspec from getting misformatted
206
207
70
-* fc/show-branch-in-rebase-am (2013-05-29) 1 commit
71
- (merged to 'next' on 2013-06-03 at 176f6b7)
72
- + prompt: fix for simple rebase
208
+* rr/rebase-autostash (2013-05-29) 7 commits
209
+ (merged to 'next' on 2013-06-04 at 16f7c54)
210
+ + rebase: implement --[no-]autostash and rebase.autostash
211
+ + rebase --merge: return control to caller, for housekeeping
212
+ + rebase -i: return control to caller, for housekeeping
213
+ + am: return control to caller, for housekeeping
214
+ + rebase: prepare to do generic housekeeping
215
+ + rebase -i: don't error out if $state_dir already exists
216
+ + am: tighten a conditional that checks for $dotest
217
74
- The bash prompt code (in contrib/) displayed the name of the branch
75
- being rebased when "rebase -i/-m/-p" modes are in use, but not the
76
- plain vanilla "rebase".
218
219
+* rs/unpack-trees-plug-leak (2013-06-02) 7 commits
220
+ (merged to 'next' on 2013-06-03 at 97e7b6d)
221
+ + unpack-trees: free cache_entry array members for merges
222
+ + diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const
223
+ + diff-lib, read-tree, unpack-trees: mark cache_entry pointers const
224
+ + unpack-trees: create working copy of merge entry in merged_entry
225
+ + unpack-trees: factor out dup_entry
226
+ + read-cache: mark cache_entry pointers const
227
+ + cache: mark cache_entry pointers const
228
79
-* fc/transport-helper-no-refspec (2013-05-21) 2 commits
80
- (merged to 'next' on 2013-06-03 at 8763bda)
81
- + transport-helper: check if the dry-run is supported
82
- + transport-helper: barf when user tries old:new
229
84
- With "export" remote-helper protocol, (1) a push that tries to
85
- update a remote ref whose name is different from the pushing side
86
- does not work yet, and (2) the helper may not know how to do
87
- --dry-run, so detect such problematic cases and disable them for
88
- now.
230
+* tr/sha1-file-silence-loose-object-info-under-prune-race (2013-06-03) 1 commit
231
+ (merged to 'next' on 2013-06-04 at e891bb8)
232
+ + sha1_file: silence sha1_loose_object_info
233
234
91
-* jc/core-checkstat (2013-05-06) 1 commit
92
- (merged to 'next' on 2013-06-03 at 2166cb3)
93
- + deprecate core.statinfo at Git 2.0 boundary
94
- (this branch is used by jc/core-checkstat-2.0.)
235
+* tr/test-commit-only-on-orphan (2013-06-02) 1 commit
236
+ (merged to 'next' on 2013-06-03 at b1864fd)
237
+ + Test 'commit --only' after 'checkout --orphan'
238
96
- The configuration variable core.checkstat was advertised in the
97
- documentation but the code expected core.statinfo instead.
239
99
- For now, we accept both core.checkstat and core.statinfo, but the
100
- latter will be removed in the longer term.
240
+* xq/credential-osxkeychain (2013-05-28) 1 commit
241
+ (merged to 'next' on 2013-06-04 at a4ee0e0)
242
+ + credential-osxkeychain: support more protocols
243
244
+--------------------------------------------------
245
+[New Topics]
246
103
-* ks/difftool-dir-diff-copy-fix (2013-05-29) 1 commit
104
- (merged to 'next' on 2013-06-03 at ca0cae0)
105
- + difftool --dir-diff: allow changing any clean working tree file
247
+* jc/topo-author-date-sort (2013-06-11) 4 commits
248
+ - log: --author-date-order
249
+ - sort-in-topological-order: use prio-queue
250
+ - prio-queue: priority queue of pointers to structs
251
+ - toposort: rename "lifo" field
252
+ (this branch uses jk/commit-info-slab; is tangled with jc/show-branch.)
253
107
- "difftool --dir-diff" did not copy back changes made by the
108
- end-user in the diff tool backend to the working tree in some
109
- cases.
254
+ "git log" learned the "--author-date-order" option, with which the
255
+ output is topologically sorted and commits in parallel histories
256
+ are shown intermixed together based on the author timestamp.
257
258
+ Will merge to 'next'.
259
112
-* nd/clone-connectivity-shortcut (2013-05-28) 4 commits
113
- (merged to 'next' on 2013-06-03 at 812bd80)
114
- + clone: open a shortcut for connectivity check
115
- + index-pack: remove dead code (it should never happen)
116
- + fetch-pack: prepare updated shallow file before fetching the pack
117
- + clone: let the user know when check_everything_connected is run
260
119
- "git clone" uses a lighter-weight implementation when making sure
120
- that the history behind refs are complete.
261
+* fc/makefile (2013-06-09) 4 commits
262
+ - Makefile: use $^ to avoid listing prerequisites on the command line
263
+ - build: do not install git-remote-testgit
264
+ - build: generate and clean test scripts
265
+ - Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile
266
267
+ Will merge to 'next'.
268
123
-* nd/prune-packed-dryrun-verbose (2013-05-28) 1 commit
124
- (merged to 'next' on 2013-06-03 at 3445b27)
125
- + prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()
269
270
+* fc/show-non-empty-errors-in-test (2013-06-09) 1 commit
271
+ - test: test_must_be_empty helper
272
128
-* nd/urls-doc-no-file-hyperlink-fix (2013-05-24) 1 commit
129
- (merged to 'next' on 2013-06-03 at 54903b2)
130
- + urls.txt: avoid auto converting to hyperlink
273
+ Will merge to 'next'.
274
132
- An entry for "file://" scheme in the enumeration of URL types Git
133
- can take in the HTML documentation was made into a clickable link
134
- by mistake.
275
276
+* nd/traces (2013-06-09) 2 commits
277
+ - git.txt: document GIT_TRACE_PACKET
278
+ - core: use env variable instead of config var to turn on logging pack access
279
137
-* rj/mingw-compat-st-mode-bits (2013-05-29) 1 commit
138
- (merged to 'next' on 2013-06-03 at 2efe84c)
139
- + path: Fix a sparse warning
280
+ Will merge to 'next'.
281
282
142
-* rr/push-head (2013-05-29) 3 commits
143
- (merged to 'next' on 2013-06-03 at ecd5be7)
144
- + push: make push.default = current use resolved HEAD
145
- + push: fail early with detached HEAD and current
146
- + push: factor out the detached HEAD error message
283
+* rr/complete-difftool-fixup (2013-06-09) 2 commits
284
+ (merged to 'next' on 2013-06-11 at fe91170)
285
+ + completion: show can take both revlist and paths
286
+ + completion: difftool takes both revs and files
287
+ (this branch is tangled with rr/complete-difftool.)
288
148
- "git push $there HEAD:branch" did not resolve HEAD early enough, so
149
- it was easy to flip it around while push is still going on and push
150
- out a branch that the user did not originally intended when the
151
- command was started.
289
+ Replaces rr/complete-difftool.
290
291
+ Will merge to 'master'.
292
154
-* rr/zsh-color-prompt (2013-05-17) 3 commits
155
- (merged to 'next' on 2013-06-03 at d011a76)
156
- + prompt: colorize ZSH prompt
157
- + prompt: factor out gitstring coloring logic
158
- + prompt: introduce GIT_PS1_STATESEPARATOR
293
294
+* rr/triangle-push-fix (2013-06-09) 4 commits
295
+ - t/push-default: test pushdefault with all modes
296
+ - t/push-default: generalize test_push_{success, commit}
297
+ - push: make upstream, simple work with pushdefault
298
+ - t/push-default: remove redundant test_config lines
299
161
-* rs/commit-m-no-edit (2013-05-28) 1 commit
162
- (merged to 'next' on 2013-06-03 at 14329fa)
163
- + commit: don't start editor if empty message is given with -m
300
+ Tries to apply the 'push.default = upstream' semantics to
301
+ triangular workflow where it does not quite apply.
302
165
- "git commit --allow-empty-message -m ''" should not start an
166
- editor.
303
+ Will be worked further.
304
305
169
-* sb/archive-zip-double-assignment-fix (2013-05-29) 1 commit
170
- (merged to 'next' on 2013-06-03 at c316eec)
171
- + archive-zip:write_zip_entry: Remove second reset of size variable to zero.
306
+* rs/discard-index-discard-array (2013-06-09) 2 commits
307
+ - read-cache: free cache in discard_index
308
+ - read-cache: add simple performance test
309
310
+ Will merge to 'next'.
311
174
-* tg/maint-zsh-svn-remote-prompt (2013-05-22) 1 commit
175
- (merged to 'next' on 2013-06-03 at 32a45c0)
176
- + prompt: fix show upstream with svn and zsh
312
178
- zsh prompt script that borrowed from bash prompt script did not
179
- work due to slight differences in array variable notation between
180
- these two shells.
313
+* cm/remote-mediawiki (2013-06-11) 1 commit
314
+ - git-remote-mediawiki: display message when launched directly
315
316
+ Will merge to 'next'.
317
183
-* th/bisect-skip-report-range-fix (2013-05-22) 1 commit
184
- (merged to 'next' on 2013-06-03 at 7bd4656)
185
- + bisect: Fix log output for multi-parent skip ranges
318
187
- Fix for an additional bisect log comments.
319
+* jg/status-config (2013-06-11) 2 commits
320
+ - status:introduce status.branch to enable --branch by default
321
+ - status: introduce status.short to enable --short by default
322
323
+ Will merge to 'next'.
324
190
-* tr/push-no-verify-doc (2013-05-23) 1 commit
191
- (merged to 'next' on 2013-06-03 at 01737d6)
192
- + Document push --no-verify
325
194
- "git push --[no-]verify" was not documented.
326
+* mh/loose-refs-race-with-pack-ref (2013-06-11) 4 commits
327
+ - resolve_ref_unsafe(): close race condition reading loose refs
328
+ - resolve_ref_unsafe(): nest reference-reading code in an infinite loop
329
+ - resolve_ref_unsafe(): handle the case of an SHA-1 within loop
330
+ - resolve_ref_unsafe(): extract function handle_missing_loose_ref()
331
332
--------------------------------------------------
333
[Stalled]
334
335
+* jh/shorten-refname (2013-05-07) 4 commits
336
+ - t1514: refname shortening is done after dereferencing symbolic refs
337
+ - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
338
+ - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
339
+ - t1514: Add tests of shortening refnames in strict/loose mode
340
+
341
+ When remotes/origin/HEAD is not a symbolic ref, "rev-parse
342
+ --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
343
+ "origin/HEAD", which is fixed with this series (if it is a symbolic
344
+ ref that points at remotes/origin/something, then it should show
345
+ "origin/something" and it already does).
346
+
347
+ Expecting a reroll, as an early part of a larger series.
348
+
349
+
350
+* jk/submodule-subdirectory-ok (2013-04-24) 3 commits
351
+ - submodule: fix quoting in relative_path()
352
+ - submodule: drop the top-level requirement
353
+ - rev-parse: add --prefix option
354
+
355
+ Allow various subcommands of "git submodule" to be run not from the
356
+ top of the working tree of the superproject.
357
+
358
+ Waiting for a reroll.
359
+
360
+
361
+* jl/submodule-mv (2013-04-23) 5 commits
362
+ - submodule.c: duplicate real_path's return value
363
+ - rm: delete .gitmodules entry of submodules removed from the work tree
364
+ - Teach mv to update the path entry in .gitmodules for moved submodules
365
+ - Teach mv to move submodules using a gitfile
366
+ - Teach mv to move submodules together with their work trees
367
+
368
+ "git mv A B" when moving a submodule A does "the right thing",
369
+ inclusing relocating its working tree and adjusting the paths in
370
+ the .gitmodules file.
371
+
372
+ Waiting for a reroll.
373
+
374
+
375
+* jk/list-objects-sans-blobs (2013-06-06) 4 commits
376
+ . archive: ignore blob objects when checking reachability
377
+ . list-objects: optimize "revs->blob_objects = 0" case
378
+ . upload-archive: restrict remote objects with reachability check
379
+ . clear parsed flag when we free tree buffers
380
+
381
+ Attempt to allow "archive --remote=$there $arbitrary_sha1" while
382
+ keeping the reachability safety.
383
+
384
+ Seems to break some tests in a trivial and obvious way.
385
+
386
+
387
* fc/remote-helpers-use-specified-python (2013-05-28) 4 commits
388
- remote-helpers: add exec-path links
389
- remote-helpers: allow direct test execution
@@ -209,10 +397,10 @@ of the repositories listed at
397
398
399
* jk/packed-refs-race (2013-05-06) 4 commits
212
- - for_each_ref: load all loose refs before packed refs
213
- - get_packed_refs: reload packed-refs file when it changes
214
- - add a stat_validity struct
215
- - resolve_ref: close race condition for packed refs
400
+ . for_each_ref: load all loose refs before packed refs
401
+ . get_packed_refs: reload packed-refs file when it changes
402
+ . add a stat_validity struct
403
+ . resolve_ref: close race condition for packed refs
404
405
Will be rerolled.
406
@@ -268,55 +456,30 @@ of the repositories listed at
456
$gmane/226216
457
458
271
-* jk/commit-info-slab (2013-04-19) 3 commits
272
- - commit-slab: introduce a macro to define a slab for new type
273
- - commit-slab: avoid large realloc
274
- - commit: allow associating auxiliary info on-demand
275
- (this branch is used by jc/show-branch.)
276
-
277
- Technology demonstration to show a way we could use unbound number
278
- of flag bits on commit objects.
279
-
280
-
281
-* jc/show-branch (2013-05-21) 5 commits
459
+* jc/show-branch (2013-06-07) 5 commits
460
- show-branch: use commit slab to represent bitflags of arbitrary width
461
- show-branch.c: remove "all_mask"
462
- show-branch.c: abstract out "flags" operation
463
- show-branch.c: lift all_mask/all_revs to a global static
464
- show-branch.c: update comment style
287
- (this branch uses jk/commit-info-slab.)
465
+ (this branch uses jk/commit-info-slab; is tangled with jc/topo-author-date-sort.)
466
467
Waiting for the final step to lift the hard-limit before sending it out.
468
469
--------------------------------------------------
470
[Cooking]
471
294
-* ar/wildmatch-foldcase (2013-06-02) 1 commit
295
- (merged to 'next' on 2013-06-04 at 3180bcc)
296
- + wildmatch: properly fold case everywhere
297
-
298
- The wildmatch engine did not honor WM_CASEFOLD option correctly.
299
-
300
- Will merge to 'master'.
301
-
302
-
303
-* cr/git-work-tree-sans-git-dir (2013-06-03) 1 commit
304
- (merged to 'next' on 2013-06-04 at bebedca)
305
- + git.txt: remove stale comment regarding GIT_WORK_TREE
306
-
307
- These days, "git --work-tree=there cmd" without specifying an
308
- explicit --git-dir=here will do the usual discovery, but we had a
309
- description of older behaviour in the documentation.
310
-
311
- Will merge to 'master'.
312
-
472
+* jk/commit-info-slab (2013-06-07) 3 commits
473
+ - commit-slab: introduce a macro to define a slab for new type
474
+ - commit-slab: avoid large realloc
475
+ - commit: allow associating auxiliary info on-demand
476
+ (this branch is used by jc/show-branch and jc/topo-author-date-sort.)
477
314
-* fc/do-not-use-the-index-in-add-to-index (2013-06-03) 2 commits
315
- (merged to 'next' on 2013-06-04 at 94e7b60)
316
- + read-cache: trivial style cleanups
317
- + read-cache: fix wrong 'the_index' usage
478
+ Technology demonstration to show a way we could add custom
479
+ information to represent unbound number of flag bits etc. to commit
480
+ objects.
481
319
- Will merge to 'master'.
482
+ Will be in 'next' with jc/topo-author-date-sort.
483
484
485
* fc/sequencer-skip-quiet (2013-06-06) 5 commits
@@ -330,29 +493,26 @@ of the repositories listed at
493
post-rewrite hook could use a better refactoring from the original
494
code copied from builtin/commit.c, though.
495
496
+ Will discard the top 3, merge the rest to 'next'.
497
334
-* js/test-ln-s-add (2013-06-02) 11 commits
498
+
499
+* js/test-ln-s-add (2013-06-07) 10 commits
500
+ - t4011: remove SYMLINKS prerequisite
501
- t6035: use test_ln_s_add to remove SYMLINKS prerequisite
502
- t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
503
- t3100: use test_ln_s_add to remove SYMLINKS prerequisite
504
- t3030: use test_ln_s_add to remove SYMLINKS prerequisite
339
- - t2100: use test_ln_s_add to remove SYMLINKS prerequisite
505
- t0000: use test_ln_s_add to remove SYMLINKS prerequisite
506
- tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
342
- - tests: introduce test_ln_s and test_ln_s_add
507
+ - tests: introduce test_ln_s_add
508
- t3010: modernize style
344
- - t2100: modernize style and unroll a loop of test cases
509
- test-chmtime: Fix exit code on Windows
510
511
Many tests that check the behaviour of symbolic links stored in the
512
index or the tree objects do not have to be skipped on a filesystem
513
that lack symbolic link support.
514
351
- There seem to be some misconversion, mostly around the use of the
352
- new test_ln_s helper.
353
-
354
- Will be rerolled.
355
- $gmane/226466,226467
515
+ Will merge to 'next'.
516
517
518
* mt/send-email-cc-match-fix (2013-06-05) 7 commits
@@ -374,33 +534,21 @@ of the repositories listed at
534
Will merge to 'master'.
535
536
377
-* rr/complete-difftool (2013-06-03) 2 commits
537
+* rr/complete-difftool (2013-06-09) 4 commits
538
+ (merged to 'next' on 2013-06-09 at 2ee40cb)
539
+ + Revert 77c1305 and 3c3b46b
540
+ (merged to 'next' on 2013-06-07 at 90e5f58)
541
+ + completion: add deprecated __git_complete_file ()
542
(merged to 'next' on 2013-06-04 at 01c7611)
543
+ completion: clarify ls-tree, archive, show completion
544
+ completion: difftool takes both revs and files
545
+ (this branch is tangled with rr/complete-difftool-fixup.)
546
382
- Update command line completion (in contrib/) to use a better named
383
- completion helper function for commands that take revisions and
384
- paths.
385
-
386
- Will merge to 'master'.
387
-
388
-
389
-* rr/diffcore-pickaxe-doc (2013-06-03) 2 commits
390
- (merged to 'next' on 2013-06-04 at 67d1fc7)
391
- + diffcore-pickaxe doc: document -S and -G properly
392
- + diffcore-pickaxe: make error messages more consistent
393
-
394
- Update the low-level diffcore documentation on -S/-G and --pickaxe-all.
395
-
396
- Will merge to 'master'.
397
-
398
-
399
-* tr/sha1-file-silence-loose-object-info-under-prune-race (2013-06-03) 1 commit
400
- (merged to 'next' on 2013-06-04 at e891bb8)
401
- + sha1_file: silence sha1_loose_object_info
547
+ Update command line completion (in contrib/) to use a better named
548
+ completion helper function for commands that take revisions and
549
+ paths.
550
403
- Will merge to 'master'.
551
+ Reverted, to be replaced with rr/complete-difftool-fixup.
552
553
554
* bp/mediawiki-credential (2013-06-05) 1 commit
@@ -414,7 +562,7 @@ of the repositories listed at
562
Will merge to 'master'.
563
564
417
-* mz/rebase-tests (2013-06-03) 7 commits
565
+* mz/rebase-tests (2013-06-07) 7 commits
566
- tests: move test for rebase messages from t3400 to t3406
567
- t3406: modernize style
568
- add tests for rebasing merged history
@@ -423,23 +571,7 @@ of the repositories listed at
571
- add tests for rebasing with patch-equivalence present
572
- add simple tests of consistency across rebase types
573
426
- Will be rerolled.
427
-
428
-
429
-* fc/completion-less-ls-remote (2013-06-02) 1 commit
430
- (merged to 'next' on 2013-06-03 at 6624f0b)
431
- + completion: avoid ls-remote in certain scenarios
432
-
433
- Will merge to 'master'.
434
-
435
-
436
-* jk/test-exit-code-by-signal (2013-06-06) 2 commits
437
- (merged to 'next' on 2013-06-06 at 6fdea1b)
438
- + t0005: skip signal death exit code test on Windows
439
- (merged to 'next' on 2013-06-03 at 25af892)
440
- + t0005: test git exit code from signal death
441
-
442
- Will merge to 'master'.
574
+ Will merge to 'next'.
575
576
577
* nd/make-wildmatch-default (2013-06-02) 1 commit
@@ -454,76 +586,16 @@ of the repositories listed at
586
587
Remove stale contrib/ material.
588
457
-
458
-* rs/unpack-trees-plug-leak (2013-06-02) 7 commits
459
- (merged to 'next' on 2013-06-03 at 97e7b6d)
460
- + unpack-trees: free cache_entry array members for merges
461
- + diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const
462
- + diff-lib, read-tree, unpack-trees: mark cache_entry pointers const
463
- + unpack-trees: create working copy of merge entry in merged_entry
464
- + unpack-trees: factor out dup_entry
465
- + read-cache: mark cache_entry pointers const
466
- + cache: mark cache_entry pointers const
467
-
468
- Will merge to 'master'.
469
-
470
-
471
-* tr/test-commit-only-on-orphan (2013-06-02) 1 commit
472
- (merged to 'next' on 2013-06-03 at b1864fd)
473
- + Test 'commit --only' after 'checkout --orphan'
474
-
589
Will merge to 'master'.
590
591
478
-* ap/diff-ignore-blank-lines (2013-05-29) 1 commit
592
+* ap/diff-ignore-blank-lines (2013-06-10) 1 commit
593
- diff: add --ignore-blank-lines option
594
595
"git diff" learned a mode that ignores hunks whose change consists
596
only of additions and removals of blank lines, which is the same as
597
"diff -B" (ignore blank lines) of GNU diff.
598
485
- Will be rerolled.
486
- $gmane/226394
487
-
488
-
489
-* rj/mingw-cygwin (2013-05-08) 2 commits
490
- (merged to 'next' on 2013-06-04 at 308fdb4)
491
- + cygwin: Remove the CYGWIN_V15_WIN32API build variable
492
- + mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
493
-
494
- Update build for Cygwin 1.[57]. Torsten Bögershausen reports that
495
- this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it
496
- ahead.
497
-
498
- Will merge to 'master'.
499
-
500
-
501
-* rr/rebase-autostash (2013-05-29) 7 commits
502
- (merged to 'next' on 2013-06-04 at 16f7c54)
503
- + rebase: implement --[no-]autostash and rebase.autostash
504
- + rebase --merge: return control to caller, for housekeeping
505
- + rebase -i: return control to caller, for housekeeping
506
- + am: return control to caller, for housekeeping
507
- + rebase: prepare to do generic housekeeping
508
- + rebase -i: don't error out if $state_dir already exists
509
- + am: tighten a conditional that checks for $dotest
510
-
511
- Will merge to 'master'.
512
-
513
-
514
-* cb/log-follow-with-combined (2013-05-28) 1 commit
515
- (merged to 'next' on 2013-06-04 at d5bf4f3)
516
- + fix segfault with git log -c --follow
517
-
518
- Will merge to 'master'.
519
-
520
-
521
-* xq/credential-osxkeychain (2013-05-28) 1 commit
522
- (merged to 'next' on 2013-06-04 at a4ee0e0)
523
- + credential-osxkeychain: support more protocols
524
-
525
- Will merge to 'master'.
526
-
599
600
* mh/reflife (2013-06-02) 25 commits
601
(merged to 'next' on 2013-06-05 at 291d863)
@@ -560,42 +632,6 @@ of the repositories listed at
632
Will merge to 'master'.
633
634
563
-* mm/mediawiki-https-fail-message (2013-05-29) 1 commit
564
- (merged to 'next' on 2013-06-04 at fb2671c)
565
- + git-remote-mediawiki: better error message when HTTP(S) access fails
566
-
567
- Hint users when https:// connection failed to check the
568
- certificate; it is a good hint if we assumie that it is common
569
- error for the end users to make.
570
-
571
- Will merge to 'master'.
572
-
573
-
574
-* rr/die-on-missing-upstream (2013-06-02) 2 commits
575
- (merged to 'next' on 2013-06-03 at 00847ea)
576
- + sha1_name: fix error message for @{<N>}, @{<date>}
577
- + sha1_name: fix error message for @{u}
578
-
579
- When a reflog notation is used for implicit "current branch", we
580
- did not say which branch and worse said "branch ''".
581
-
582
- Will merge to 'master'.
583
-
584
-
585
-* fc/remote-bzr (2013-05-28) 8 commits
586
- (merged to 'next' on 2013-06-04 at a603082)
587
- + remote-bzr: add fallback check for a partial clone
588
- + remote-bzr: reorganize the way 'wanted' works
589
- + remote-bzr: trivial cleanups
590
- + remote-bzr: change global repo
591
- + remote-bzr: delay cloning/pulling
592
- + remote-bzr: simplify get_remote_branch()
593
- + remote-bzr: fix for files with spaces
594
- + remote-bzr: recover from failed clones
595
-
596
- Will merge to 'master'.
597
-
598
-
635
* jx/clean-interactive (2013-06-03) 15 commits
636
- test: add t7301 for git-clean--interactive
637
- git-clean: add documentation for interactive git-clean
@@ -633,70 +669,13 @@ of the repositories listed at
669
Waiting for a reroll.
670
671
636
-* fc/contrib-related (2013-06-03) 4 commits
672
+* fc/contrib-related (2013-06-09) 5 commits
673
+ - contrib: related: print the amount of involvement
674
- contrib: related: parse committish like format-patch
675
- contrib: related: add option to parse from committish
676
- contrib: related: add support for multiple patches
677
- Add new git-related helper to contrib
678
642
- Waiting for the design review to settle.
643
-
644
-
645
-* fc/remote-hg (2013-05-28) 50 commits
646
- (merged to 'next' on 2013-06-04 at 9ee7dab)
647
- + remote-hg: add support for --force
648
- + remote-hg: add support for --dry-run
649
- + remote-hg: check if a fetch is needed
650
- + remote-hg: trivial cleanup
651
- + remote-helpers: improve marks usage
652
- + remote-hg: add check_push() helper
653
- + remote-hg: add setup_big_push() helper
654
- + remote-hg: remove files before modifications
655
- + remote-hg: improve lightweight tag author
656
- + remote-hg: use remote 'default' not local one
657
- + remote-hg: improve branch listing
658
- + remote-hg: simplify branch_tip()
659
- + remote-hg: check diverged bookmarks
660
- + remote-hg: pass around revision refs
661
- + remote-hg: implement custom checkheads()
662
- + remote-hg: implement custom push()
663
- + remote-hg: only update necessary revisions
664
- + remote-hg: force remote bookmark push selectively
665
- + remote-hg: reorganize bookmark handling
666
- + remote-hg: add test for failed double push
667
- + remote-hg: add test for big push
668
- + remote-hg: add test for new bookmark special
669
- + remote-hg: add test for bookmark diverge
670
- + remote-hg: add test for diverged push
671
- + remote-hg: add test to push new bookmark
672
- + remote-hg: add remote tests
673
- + remote-hg: update bookmarks when using a remote
674
- + remote-hg: add check_bookmark() test helper
675
- + remote-bzr: simplify test checks
676
- + remote-hg: add tests for 'master' bookmark
677
- + remote-hg: always point HEAD to master
678
- + remote-hg: improve progress calculation
679
- + remote-hg: trivial cleanups
680
- + remote-hg: ensure remote rebasing works
681
- + remote-hg: upgrade version 1 marks
682
- + remote-hg: switch from revisions to SHA-1 noteids
683
- + remote-hg: add version checks to the marks
684
- + remote-hg: improve node traversing
685
- + remote-hg: shuffle some code
686
- + remote-hg: use a shared repository store
687
- + remote-hg: load all extensions
688
- + remote-hg: test: simplify previous branch checkout
689
- + remote-helpers: test: simplify remote URLs
690
- + remote-helpers: tests: general improvements
691
- + remote-helpers: test: cleanup style
692
- + remote-helpers: test: cleanup white-spaces
693
- + remote-hg: trivial reorganization
694
- + remote-hg: test: be a little more quiet
695
- + remote-hg: tests: fix hg merge
696
- + remote-helpers: tests: use python directly
697
-
698
- Will merge to 'master'.
699
-
679
680
* hv/config-from-blob (2013-05-12) 5 commits
681
- do not die when error in config parsing of buf occurs
@@ -731,96 +710,17 @@ of the repositories listed at
710
improve culling of irrelevant parents while traversing a mergy
711
history.
712
713
+ Will merge to 'master'.
714
+
715
735
-* mm/color-auto-default (2013-05-15) 2 commits
716
+* mm/color-auto-default (2013-06-10) 2 commits
717
- make color.ui default to 'auto'
718
- config: refactor management of color.ui's default value
719
720
Flip the default for color.ui to 'auto', which is what many
740
- tutorials recommend new users to do. The updated code claims the
741
- switch happened at Git 2.0 in the past tense, but we might want to
742
- expedite it, as this change is not all that important to deserve a
743
- major version bump.
744
-
745
- I'd vote for merging this without waiting for 2.0. Comments?
746
-
747
- Waiting for a reroll.
748
-
749
-
750
-* jh/shorten-refname (2013-05-07) 4 commits
751
- - t1514: refname shortening is done after dereferencing symbolic refs
752
- - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
753
- - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
754
- - t1514: Add tests of shortening refnames in strict/loose mode
755
-
756
- When remotes/origin/HEAD is not a symbolic ref, "rev-parse
757
- --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
758
- "origin/HEAD", which is fixed with this series (if it is a symbolic
759
- ref that points at remotes/origin/something, then it should show
760
- "origin/something" and it already does).
761
-
762
- Expecting a reroll, as an early part of a larger series.
763
-
764
-
765
-* nd/warn-ambiguous-object-name (2013-05-29) 1 commit
766
- (merged to 'next' on 2013-06-04 at e87c9d1)
767
- + get_sha1: warn about full or short object names that look like refs
768
-
769
- "git cmd <name>", when <name> happens to be a 40-hex string,
770
- directly uses the 40-hex string as an object name, even if a ref
771
- "refs/<some hierarchy>/<name>" exists. This disambiguation order
772
- is unlikely to change, but we should warn about the ambiguity just
773
- like we warn when more than one refs/ hierachies share the same
774
- name.
775
-
776
- Will merge to 'master'.
777
-
778
-
779
-* fc/at-head (2013-05-08) 13 commits
780
- (merged to 'next' on 2013-06-04 at f334a2a)
781
- + sha1_name: compare variable with constant, not constant with variable
782
- + Add new @ shortcut for HEAD
783
- + sha1_name: refactor reinterpret()
784
- + sha1_name: check @{-N} errors sooner
785
- + sha1_name: reorganize get_sha1_basic()
786
- + sha1_name: don't waste cycles in the @-parsing loop
787
- + sha1_name: remove unnecessary braces
788
- + sha1_name: remove no-op
789
- + tests: at-combinations: @{N} versus HEAD@{N}
790
- + tests: at-combinations: increase coverage
791
- + tests: at-combinations: improve nonsense()
792
- + tests: at-combinations: check ref names directly
793
- + tests: at-combinations: simplify setup
794
-
795
- Instead of typing four capital letters "HEAD", you can say "@"
796
- instead.
797
-
798
- Will merge to 'master'.
799
-
800
-
801
-* jk/submodule-subdirectory-ok (2013-04-24) 3 commits
802
- - submodule: fix quoting in relative_path()
803
- - submodule: drop the top-level requirement
804
- - rev-parse: add --prefix option
805
-
806
- Allow various subcommands of "git submodule" to be run not from the
807
- top of the working tree of the superproject.
721
+ tutorials recommend new users to do.
722
809
- Waiting for a reroll.
810
-
811
-
812
-* jl/submodule-mv (2013-04-23) 5 commits
813
- - submodule.c: duplicate real_path's return value
814
- - rm: delete .gitmodules entry of submodules removed from the work tree
815
- - Teach mv to update the path entry in .gitmodules for moved submodules
816
- - Teach mv to move submodules using a gitfile
817
- - Teach mv to move submodules together with their work trees
818
-
819
- "git mv A B" when moving a submodule A does "the right thing",
820
- inclusing relocating its working tree and adjusting the paths in
821
- the .gitmodules file.
822
-
823
- Waiting for a reroll.
723
+ Will merge to 'next'.
724
725
726
* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit