What's cooking (2013/09 #04)
Junio C Hamano committed
Sep 13, 2013 at 14:55 UTC
d2f2d50265654b310b0e21438634e64549416985
1 file changed
+234
-314
whats-cooking.txt
+234
-314
@@ -1,17 +1,17 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2013, #03; Wed, 11)
4
-X-master-at: a194eaddca201163aa756faccd519f056bd3c35e
5
-X-next-at: 424cb083fbc33c0ccd89e8d591920f438eab564d
3
+Subject: What's cooking in git.git (Sep 2013, #04; Fri, 13)
4
+X-master-at: b3e7d24ca19d841eb2c5c7fce7919ebb5d370a6f
5
+X-next-at: 7b94f8e7d8c83ea87e9d80f00dc6cfd2dc245329
6
7
-What's cooking in git.git (Sep 2013, #03; Wed, 11)
7
+What's cooking in git.git (Sep 2013, #04; Fri, 13)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-The second batch of topics are now in 'master'.
14
+The third batch of topics are now in 'master'.
15
16
You can find the changes described here in the integration branches
17
of the repositories listed at
@@ -21,189 +21,100 @@ of the repositories listed at
21
--------------------------------------------------
22
[Graduated to "master"]
23
24
-* es/rebase-i-no-abbrev (2013-08-25) 3 commits
25
- (merged to 'next' on 2013-09-04 at 6027805)
26
- + rebase -i: fix short SHA-1 collision
27
- + t3404: rebase -i: demonstrate short SHA-1 collision
28
- + t3404: make tests more self-contained
29
-
30
- Originally merged to 'next' on 2013-08-26
31
-
32
- The commit object names in the insn sheet that was prepared at the
33
- beginning of "rebase -i" session can become ambiguous as the
34
- rebasing progresses and the repository gains more commits. Make
35
- sure the internal record is kept with full 40-hex object names.
36
-
37
-
38
-* es/rebase-i-respect-core-commentchar (2013-08-18) 1 commit
39
- (merged to 'next' on 2013-09-04 at 8c1ce68)
40
- + rebase -i: fix cases ignoring core.commentchar
41
-
42
- Originally merged to 'next' on 2013-08-20
43
-
44
- "rebase -i" forgot that the comment character can be configurable
45
- while reading its insn sheet.
46
-
47
-
48
-* jc/ls-files-killed-optim (2013-08-23) 4 commits
49
- (merged to 'next' on 2013-09-04 at 20c2304)
50
- + dir.c::test_one_path(): work around directory_exists_in_index_icase() breakage
51
- + t3010: update to demonstrate "ls-files -k" optimization pitfalls
52
- + ls-files -k: a directory only can be killed if the index has a non-directory
53
- + dir.c: use the cache_* macro to access the current index
54
-
55
- Originally merged to 'next' on 2013-08-27
56
-
57
- "git ls-files -k" needs to crawl only the part of the working tree
58
- that may overlap the paths in the index to find killed files, but
59
- shared code with the logic to find all the untracked files, which
60
- made it unnecessarily inefficient.
61
-
62
-
63
-* jn/post-receive-utf8 (2013-08-05) 3 commits
64
- (merged to 'next' on 2013-09-04 at 3a3f480)
65
- + hooks/post-receive-email: set declared encoding to utf-8
66
- + hooks/post-receive-email: force log messages in UTF-8
67
- + hooks/post-receive-email: use plumbing instead of git log/show
68
-
69
- Originally merged to 'next' on 2013-08-20
70
-
71
- Update post-receive-email script to make sure the message contents
72
- and pathnames are encoded consistently in UTF-8.
73
-
74
-
75
-* js/xread-in-full (2013-08-20) 1 commit
76
- (merged to 'next' on 2013-09-04 at 5bfb049)
77
- + stream_to_pack: xread does not guarantee to read all requested bytes
78
-
79
- Originally merged to 'next' on 2013-08-20
80
-
81
- A call to xread() was used without a loop around to cope with short
82
- read in the codepath to stream new contents to a pack.
83
-
84
-
85
-* nd/push-no-thin (2013-08-13) 1 commit
86
- (merged to 'next' on 2013-09-04 at faa8c02)
87
- + push: respect --no-thin
88
-
89
- Originally merged to 'next' on 2013-08-14
90
-
91
- "git push --no-thin" was a no-op by mistake.
92
-
24
+* jc/commit-is-spelled-with-two-ems (2013-09-05) 2 commits
25
+ (merged to 'next' on 2013-09-05 at 982aef2)
26
+ + typofix: cherry is spelled with two ars
27
+ + typofix: commit is spelled with two ems
28
94
-* rt/rebase-p-no-merge-summary (2013-08-21) 1 commit
95
- (merged to 'next' on 2013-09-04 at d8d89ee)
96
- + rebase --preserve-merges: ignore "merge.log" config
29
98
- Originally merged to 'next' on 2013-08-22
30
+* jc/pager-configuration-doc (2013-08-29) 1 commit
31
+ (merged to 'next' on 2013-09-05 at 3169083)
32
+ + config: rewrite core.pager documentation
33
100
- "git rebase -p" internally used the merge machinery, but when
101
- rebasing, there should not be a need for merge summary.
34
+ It was unclear in the documentation how various configurations and
35
+ environment variables determine which pager is eventually used.
36
37
104
-* sb/mailmap-freeing-NULL-is-ok (2013-08-20) 1 commit
105
- (merged to 'next' on 2013-09-04 at c831015)
106
- + mailmap: remove redundant check for freeing memory
38
+* jk/config-int-range-check (2013-09-09) 5 commits
39
+ (merged to 'next' on 2013-09-09 at 9ab779d)
40
+ + git-config: always treat --int as 64-bit internally
41
+ + config: make numeric parsing errors more clear
42
+ + config: set errno in numeric git_parse_* functions
43
+ + config: properly range-check integer values
44
+ + config: factor out integer parsing from range checks
45
108
- Originally merged to 'next' on 2013-08-20
46
+ "git config" did not provide a way to set or access numbers larger
47
+ than a native "int" on the platform; it now provides 64-bit signed
48
+ integers on all platforms.
49
50
111
-* sh/pull-rebase-preserve (2013-09-04) 1 commit
112
- (merged to 'next' on 2013-09-04 at 32a93bb)
113
- + pull: allow pull to preserve merges when rebasing
51
+* mm/fast-import-feature-doc (2013-08-25) 1 commit
52
+ (merged to 'next' on 2013-09-05 at 83802e2)
53
+ + Documentation/fast-import: clarify summary for `feature` command
54
115
- Originally merged to 'next' on 2013-08-14
55
117
- "git pull --rebase" always flattened the history; pull.rebase can
118
- now be set to "preserve" to invoke "rebase --preserve-merges".
56
+* mm/mediawiki-dumb-push-fix (2013-09-03) 4 commits
57
+ (merged to 'next' on 2013-09-05 at f8313f4)
58
+ + git-remote-mediawiki: no need to update private ref in non-dumb push
59
+ + git-remote-mediawiki: use no-private-update capability on dumb push
60
+ + transport-helper: add no-private-update capability
61
+ + git-remote-mediawiki: add test and check Makefile targets
62
63
121
-* tf/gitweb-ss-tweak (2013-08-20) 4 commits
122
- (merged to 'next' on 2013-09-04 at 774bfbe)
123
- + gitweb: make search help link less ugly
124
- + gitweb: omit the repository owner when it is unset
125
- + gitweb: vertically centre contents of page footer
126
- + gitweb: ensure OPML text fits inside its box
64
+* mm/remote-helpers-doc (2013-08-26) 1 commit
65
+ (merged to 'next' on 2013-09-05 at c181b35)
66
+ + Documentation/remote-helpers: document common use-case for private ref
67
128
- Originally merged to 'next' on 2013-08-22
68
130
- Tweak Gitweb CSS to layout some elements better.
69
+* mn/doc-pack-heu-remove-dead-pastebin (2013-08-23) 1 commit
70
+ (merged to 'next' on 2013-09-05 at 5caecec)
71
+ + remove dead pastebin link from pack-heuristics document
72
73
--------------------------------------------------
74
[New Topics]
75
135
-* bc/send-email-ssl-die-message-fix (2013-09-10) 1 commit
136
- - send-email: don't call methods on undefined values
137
-
138
- When send-email comes up with an error message to die with upon
139
- failure to start an SSL session, it tried to read the error string
140
- from a wrong place.
141
-
142
- Will merge to 'next'.
76
+* jc/url-match (2013-09-12) 1 commit
77
+ (merged to 'next' on 2013-09-13 at 7b94f8e)
78
+ + urlmatch.c: recompute pointer after append_normalized_escapes
79
80
+ While normalizing a URL, we forgot that the buffer that holds it
81
+ could be relocated when it grows, which was a brown-paper-bag bug
82
+ that can lead to a crash introduced on 'master' post 1.8.4 release.
83
145
-* jc/checkout-detach-doc (2013-09-11) 1 commit
146
- - checkout: update synopsys and documentation on detaching HEAD
147
-
148
- "git checkout [--detach] <commit>" was listed poorly in the
149
- synopsis section of its documentation.
150
-
151
-
152
-* jc/cvsserver-perm-bit-fix (2013-09-11) 1 commit
153
- - cvsserver: pick up the right mode bits
154
-
155
- "git cvsserver" computed the permission mode bits incorrectly for
156
- executable files.
157
-
158
- Will merge to 'next'.
159
-
160
-
161
-* jk/trailing-slash-in-pathspec (2013-09-10) 2 commits
162
- - rm: re-use parse_pathspec's trailing-slash removal
163
- - reset: handle submodule with trailing slash
164
-
165
- Needs a reroll?
166
-
167
-
168
-* kb/msvc-compile (2013-09-11) 5 commits
169
- - Windows: do not redefine _WIN32_WINNT
170
- - MinGW: Fix stat definitions to work with MinGW runtime version 4.0
171
- - MSVC: fix stat definition hell
172
- - MSVC: fix compile errors due to macro redefinitions
173
- - MSVC: fix compile errors due to missing libintl.h
84
+ Will merge to 'master' in the fourth batch.
85
175
- Build updates for Windows port.
86
87
+* jx/relative-path-regression-fix (2013-09-13) 3 commits
88
+ - Use simpler relative_path when set_git_dir
89
+ - relative_path should honor dos_drive_prefix
90
+ - test: use unambigous leading path (/foo) for mingw
91
+ (this branch uses jx/clean-interactive.)
92
178
-* lc/filter-branch-too-many-refs (2013-09-11) 2 commits
179
- - ### DONOTMERGE - missing sign-off
180
- - Allow git-filter-branch to process large repositories with lots of branches.
93
182
- "git filter-branch" in a repository with many refs blew limit of
183
- command line length.
184
-
185
- Needs a sign-off.
94
+* nd/unpack-entry-optim-in-pack-objects (2013-09-13) 1 commit
95
+ - pack-objects: no crc check when the cached version is used
96
187
-
188
-* mm/commit-template-squelch-advice-messages (2013-09-11) 2 commits
189
- - commit: disable status hints when writing to COMMIT_EDITMSG
190
- - wt-status: turn advice_status_hints into a field of wt_status
191
-
192
- From the commit log template, remove irrelevant "advice" messages
193
- that are shared with "git status" output.
97
+ The codepath to use data from packfiles that is only exercised in
98
+ pack-objects unnecessarily checked crc checksum of the pack data,
99
+ even when it ends up using in-core copy that it got by reading from
100
+ the pack (at which point the checksum was validated).
101
102
Will merge to 'next'.
103
104
+--------------------------------------------------
105
+[Stalled]
106
198
-* np/lookup-object-hashing (2013-09-11) 1 commit
199
- - lookup_object: remove hashtable_index() and optimize hash_obj()
107
+* jc/ref-excludes (2013-09-03) 2 commits
108
+ - document --exclude option
109
+ - revision: introduce --exclude=<glob> to tame wildcards
110
201
- Micro optimize hash function used in the object hash table.
111
+ People often wished a way to tell "git log --branches" (and "git
112
+ log --remotes --not --branches") to exclude some local branches
113
+ from the expansion of "--branches" (similarly for "--tags", "--all"
114
+ and "--glob=<pattern>"). Now they have one.
115
203
- Will merge to 'next'.
116
+ Needs a matching change to rev-parse.
117
205
---------------------------------------------------
206
-[Stalled]
118
119
* rv/send-email-cache-generated-mid (2013-08-21) 2 commits
120
- git-send-email: Cache generated message-ids, use them when prompting
@@ -294,6 +205,85 @@ of the repositories listed at
205
--------------------------------------------------
206
[Cooking]
207
208
+* bc/send-email-ssl-die-message-fix (2013-09-10) 1 commit
209
+ (merged to 'next' on 2013-09-13 at c6fcdf4)
210
+ + send-email: don't call methods on undefined values
211
+
212
+ When send-email comes up with an error message to die with upon
213
+ failure to start an SSL session, it tried to read the error string
214
+ from a wrong place.
215
+
216
+ Will merge to 'master' in the fourth batch.
217
+
218
+
219
+* jc/checkout-detach-doc (2013-09-11) 1 commit
220
+ - checkout: update synopsys and documentation on detaching HEAD
221
+
222
+ "git checkout [--detach] <commit>" was listed poorly in the
223
+ synopsis section of its documentation.
224
+
225
+
226
+* jc/cvsserver-perm-bit-fix (2013-09-11) 1 commit
227
+ (merged to 'next' on 2013-09-13 at 56db105)
228
+ + cvsserver: pick up the right mode bits
229
+
230
+ "git cvsserver" computed the permission mode bits incorrectly for
231
+ executable files.
232
+
233
+ Will merge to 'master' in the fourth batch.
234
+
235
+
236
+* jk/trailing-slash-in-pathspec (2013-09-13) 2 commits
237
+ - reset: handle submodule with trailing slash
238
+ - rm: re-use parse_pathspec's trailing-slash removal
239
+
240
+ Code refactoring.
241
+
242
+ Will merge to 'next'.
243
+
244
+
245
+* kb/msvc-compile (2013-09-11) 5 commits
246
+ - Windows: do not redefine _WIN32_WINNT
247
+ - MinGW: Fix stat definitions to work with MinGW runtime version 4.0
248
+ - MSVC: fix stat definition hell
249
+ - MSVC: fix compile errors due to macro redefinitions
250
+ - MSVC: fix compile errors due to missing libintl.h
251
+
252
+ Build updates for Windows port.
253
+
254
+ Will merge to 'next'.
255
+
256
+
257
+* lc/filter-branch-too-many-refs (2013-09-12) 1 commit
258
+ - Allow git-filter-branch to process large repositories with lots of branches.
259
+
260
+ "git filter-branch" in a repository with many refs blew limit of
261
+ command line length.
262
+
263
+ Will merge to 'next'.
264
+
265
+
266
+* mm/commit-template-squelch-advice-messages (2013-09-12) 3 commits
267
+ (merged to 'next' on 2013-09-13 at 410d207)
268
+ + commit: disable status hints when writing to COMMIT_EDITMSG
269
+ + wt-status: turn advice_status_hints into a field of wt_status
270
+ + commit: factor status configuration is a helper function
271
+
272
+ From the commit log template, remove irrelevant "advice" messages
273
+ that are shared with "git status" output.
274
+
275
+ Will merge to 'master' in the fifth batch.
276
+
277
+
278
+* np/lookup-object-hashing (2013-09-11) 1 commit
279
+ (merged to 'next' on 2013-09-12 at d835ef6)
280
+ + lookup_object: remove hashtable_index() and optimize hash_obj()
281
+
282
+ Micro optimize hash function used in the object hash table.
283
+
284
+ Will merge to 'master' in the fifth batch.
285
+
286
+
287
* js/add-i-mingw (2013-09-04) 1 commit
288
(merged to 'next' on 2013-09-10 at 50ab841)
289
+ add--interactive: fix external command invocation on Windows
@@ -302,7 +292,7 @@ of the repositories listed at
292
ActiveState Perl limitation but it by mistake also triggered on Git
293
for Windows where MSYS perl is used.
294
305
- Will merge to 'master' in the third batch.
295
+ Will merge to 'master' in the fourth batch.
296
297
298
* rh/ishes-doc (2013-09-04) 7 commits
@@ -320,30 +310,23 @@ of the repositories listed at
310
their dashed form. More importantly, clarify the documentation on
311
object peeling using these terms.
312
323
- Will merge to 'master' in the third batch.
324
-
325
-
326
-* jc/commit-is-spelled-with-two-ems (2013-09-05) 2 commits
327
- (merged to 'next' on 2013-09-05 at 982aef2)
328
- + typofix: cherry is spelled with two ars
329
- + typofix: commit is spelled with two ems
330
-
331
- Will merge to 'master' in the third batch.
313
+ Will merge to 'master' in the fourth batch.
314
315
334
-* bc/http-backend-allow-405 (2013-09-09) 1 commit
335
- - http-backend: provide Allow header for 405
316
+* bc/http-backend-allow-405 (2013-09-12) 1 commit
317
+ (merged to 'next' on 2013-09-12 at bc1719f)
318
+ + http-backend: provide Allow header for 405
319
320
When the webserver responds with "405 Method Not Allowed", it
321
should tell the client what methods are allowed with the "Allow"
322
header.
323
341
- Will merge to 'next'.
324
+ Will merge to 'master' in the fifth batch.
325
326
344
-* dw/check-ignore-sans-index (2013-09-05) 2 commits
345
- - SQUASH??? do not let --no-index squat on short-and-sweet -i for now
346
- - check-ignore: Add option to ignore index contents
327
+* dw/check-ignore-sans-index (2013-09-12) 1 commit
328
+ (merged to 'next' on 2013-09-13 at 8daec3c)
329
+ + check-ignore: Add option to ignore index contents
330
331
"git check-ignore" follows the same rule as "git add" and "git
332
status" in that the ignore/exclude mechanism does not take effect
@@ -351,31 +334,33 @@ of the repositories listed at
334
can be used to diagnose which paths that should have been ignored
335
have been mistakenly added to the index.
336
354
- Will squash the tip in and merge to 'next'.
337
+ Will merge to 'master' in the fifth batch.
338
339
340
* hu/cherry-pick-previous-branch (2013-09-09) 1 commit
358
- - cherry-pick: allow "-" as abbreviation of '@{-1}'
341
+ (merged to 'next' on 2013-09-12 at 36e4d9b)
342
+ + cherry-pick: allow "-" as abbreviation of '@{-1}'
343
344
Just like "git checkout -" knows to check out and "git merge -"
345
knows to merge the branch you were previously on, teach "git
346
cherry-pick" to understand "-" as the previous branch.
347
364
- Will merge to 'next'.
348
+ Will merge to 'master' in the fifth batch.
349
350
351
* jh/checkout-auto-tracking (2013-09-09) 5 commits
368
- - branch.c: Relax unnecessary requirement on upstream's remote ref name
369
- - t3200: Add test demonstrating minor regression in 41c21f2
370
- - Refer to branch.<name>.remote/merge when documenting --track
371
- - t3200: Minor fix when preparing for tracking failure
372
- - t2024: Fix &&-chaining and a couple of typos
352
+ (merged to 'next' on 2013-09-13 at 2aa1553)
353
+ + branch.c: Relax unnecessary requirement on upstream's remote ref name
354
+ + t3200: Add test demonstrating minor regression in 41c21f2
355
+ + Refer to branch.<name>.remote/merge when documenting --track
356
+ + t3200: Minor fix when preparing for tracking failure
357
+ + t2024: Fix &&-chaining and a couple of typos
358
359
Fix a minor regression in v1.8.3.2 and later that made it
360
impossible to base your local work on anything but a local branch
361
of the upstream repository you are tracking from.
362
378
- Will merge to 'next'.
363
+ Will merge to 'master' in the fifth batch.
364
365
366
* jk/remove-remote-helpers-in-python (2013-09-09) 1 commit
@@ -385,7 +370,7 @@ of the repositories listed at
370
Remove now disused remote-helpers framework for helpers written in
371
Python.
372
388
- Will merge to 'master' in the third batch.
373
+ Will merge to 'master' in the fourth batch.
374
375
376
* jk/upload-pack-keepalive (2013-09-09) 2 commits
@@ -400,14 +385,15 @@ of the repositories listed at
385
386
387
* mm/rebase-continue-freebsd-WB (2013-09-09) 1 commit
403
- - rebase: fix run_specific_rebase's use of "return" on FreeBSD
388
+ (merged to 'next' on 2013-09-13 at 82e8b91)
389
+ + rebase: fix run_specific_rebase's use of "return" on FreeBSD
390
391
Work around a bug in FreeBSD shell that caused a regression to "git
392
rebase" in v1.8.4. It would be lovely to hear from FreeBSD folks a
393
success report to make sure we didn't miss any other use of a bare
394
"return" from dot-sourced script.
395
410
- Will merge to 'next'.
396
+ Will merge to 'master' in the fifth batch.
397
398
399
* ss/doclinks (2013-09-06) 1 commit
@@ -418,40 +404,34 @@ of the repositories listed at
404
to be formatted to AsciiDoc, we did not update links that point at
405
them to refer to the formatted HTML files.
406
421
- Will merge to 'master' in the third batch.
407
+ Will merge to 'master' in the fourth batch.
408
409
410
* uh/git-svn-serf-fix (2013-09-06) 1 commit
425
- - git-svn: fix termination issues for remote svn connections
411
+ (merged to 'next' on 2013-09-13 at d65a9a1)
412
+ + git-svn: fix termination issues for remote svn connections
413
414
"git-svn" used with SVN 1.8.0 when talking over https:// connection
415
dumped core due to a bug in the serf library that SVN uses. Work
416
it around on our side, even though the SVN side is being fixed.
417
431
-
432
-* fc/contrib-bzr-hg-fixes (2013-09-03) 10 commits
433
- - contrib/remote-helpers: quote variable references in redirection targets
434
- - contrib/remote-helpers: style updates for test scripts
435
- - remote-hg: use notes to keep track of Hg revisions
436
- - remote-helpers: cleanup more global variables
437
- - remote-helpers: trivial style fixes
438
- - remote-hg: improve basic test
439
- - remote-hg: add missing &&s in the test
440
- - remote-hg: fix test
441
- - remote-bzr: make bzr branches configurable per-repo
442
- - remote-bzr: fix export of utf-8 authors
443
-
444
- Will merge to 'next'.
418
+ Will merge to 'master' in the fourth batch.
419
420
447
-* jc/pager-configuration-doc (2013-08-29) 1 commit
448
- (merged to 'next' on 2013-09-05 at 3169083)
449
- + config: rewrite core.pager documentation
450
-
451
- It was unclear in the documentation how various configurations and
452
- environment variables determine which pager is eventually used.
421
+* fc/contrib-bzr-hg-fixes (2013-09-03) 10 commits
422
+ (merged to 'next' on 2013-09-12 at f5e8684)
423
+ + contrib/remote-helpers: quote variable references in redirection targets
424
+ + contrib/remote-helpers: style updates for test scripts
425
+ + remote-hg: use notes to keep track of Hg revisions
426
+ + remote-helpers: cleanup more global variables
427
+ + remote-helpers: trivial style fixes
428
+ + remote-hg: improve basic test
429
+ + remote-hg: add missing &&s in the test
430
+ + remote-hg: fix test
431
+ + remote-bzr: make bzr branches configurable per-repo
432
+ + remote-bzr: fix export of utf-8 authors
433
454
- Will merge to 'master' in the third batch.
434
+ Will merge to 'master' in the fourth batch.
435
436
437
* np/pack-v4 (2013-09-11) 88 commits
@@ -470,7 +450,7 @@ of the repositories listed at
450
(merged to 'next' on 2013-09-09 at 3576189)
451
+ clear parsed flag when we free tree buffers
452
473
- Will merge to 'master' in the third batch.
453
+ Will merge to 'master' in the fourth batch.
454
455
456
* jk/has-sha1-file-retry-packed (2013-08-30) 1 commit
@@ -482,7 +462,7 @@ of the repositories listed at
462
prevent racing with a concurrent repacker; teach the same logic to
463
has_sha1_file().
464
485
- Will merge to 'master' in the third batch.
465
+ Will merge to 'master' in the fourth batch.
466
467
468
* ab/gitweb-author-initials (2013-08-30) 1 commit
@@ -493,34 +473,33 @@ of the repositories listed at
473
474
475
* bk/refs-multi-update (2013-09-11) 8 commits
496
- - update-ref: add test cases covering --stdin signature
497
- - update-ref: support multiple simultaneous updates
498
- - refs: add update_refs for multiple simultaneous updates
499
- - refs: add function to repack without multiple refs
500
- - refs: factor delete_ref loose ref step into a helper
501
- - refs: factor update_ref steps into helpers
502
- - refs: report ref type from lock_any_ref_for_update
503
- - reset: rename update_refs to reset_refs
476
+ (merged to 'next' on 2013-09-13 at e6d21af)
477
+ + update-ref: add test cases covering --stdin signature
478
+ + update-ref: support multiple simultaneous updates
479
+ + refs: add update_refs for multiple simultaneous updates
480
+ + refs: add function to repack without multiple refs
481
+ + refs: factor delete_ref loose ref step into a helper
482
+ + refs: factor update_ref steps into helpers
483
+ + refs: report ref type from lock_any_ref_for_update
484
+ + reset: rename update_refs to reset_refs
485
486
Give "update-refs" a "--stdin" option to read multiple update
487
requests and perform them in an all-or-none fashion.
488
508
- Looking good.
509
-
510
- Will merge to 'next'.
489
+ Will merge to 'master' in the fifth batch.
490
491
513
-* fc/at-head (2013-09-09) 3 commits
514
- - SQUASH??? fixup
515
- - Add new @ shortcut for HEAD
516
- - sha1-name: pass len argument to interpret_branch_name()
492
+* fc/at-head (2013-09-12) 2 commits
493
+ (merged to 'next' on 2013-09-13 at d3800c2)
494
+ + Add new @ shortcut for HEAD
495
+ + sha1-name: pass len argument to interpret_branch_name()
496
497
Attempt to resurrect "Type @ for HEAD"; the bottom one seems to be
498
a genuine code improvement, but identifying cases where "@" means
499
HEAD were harder than it should have been. I think the result of
500
squashing the tip one in covers all the necessary cases.
501
523
- Will squash the tip in and merge to 'next'.
502
+ Will merge to 'master' in the fifth batch.
503
504
505
* fc/fast-export (2013-09-03) 2 commits
@@ -530,7 +509,7 @@ of the repositories listed at
509
510
Code simpification.
511
533
- Will merge to 'master' in the third batch.
512
+ Will merge to 'master' in the fourth batch.
513
514
515
* fc/rev-parse-test-updates (2013-09-03) 4 commits
@@ -542,7 +521,7 @@ of the repositories listed at
521
522
Modernize tests.
523
545
- Will merge to 'master' in the third batch.
524
+ Will merge to 'master' in the fourth batch.
525
526
527
* fc/t3200-fixes (2013-09-03) 3 commits
@@ -551,7 +530,7 @@ of the repositories listed at
530
+ t: branch: fix typo
531
+ t: branch: trivial style fix
532
554
- Will merge to 'master' in the third batch.
533
+ Will merge to 'master' in the fourth batch.
534
535
536
* fc/trivial (2013-09-08) 5 commits
@@ -562,19 +541,7 @@ of the repositories listed at
541
+ branch: trivial style fix
542
+ reset: trivial refactoring
543
565
- Will merge to 'master' in the third batch.
566
-
567
-
568
-* jc/ref-excludes (2013-09-03) 2 commits
569
- - document --exclude option
570
- - revision: introduce --exclude=<glob> to tame wildcards
571
-
572
- People often wished a way to tell "git log --branches" (and "git
573
- log --remotes --not --branches") to exclude some local branches
574
- from the expansion of "--branches" (similarly for "--tags", "--all"
575
- and "--glob=<pattern>"). Now they have one.
576
-
577
- Will merge to 'next'.
544
+ Will merge to 'master' in the fourth batch.
545
546
547
* jk/pager-bypass-cat-for-default-pager (2013-09-03) 1 commit
@@ -599,22 +566,24 @@ of the repositories listed at
566
567
568
* nr/git-cd-to-a-directory (2013-09-09) 1 commit
602
- - git: run in a directory given with -C option
569
+ (merged to 'next' on 2013-09-13 at 2b07af9)
570
+ + git: run in a directory given with -C option
571
572
Just like "make -C <directory>", make "git -C <directory> ..." to
573
go there before doing anything else.
574
607
- Will merge to 'next'.
575
+ Will merge to 'master' in the fifth batch.
576
577
578
* rh/peeling-tag-to-tag (2013-09-03) 2 commits
611
- - peel_onion: do not assume length of x_type globals
612
- - peel_onion(): add support for <rev>^{tag}
579
+ (merged to 'next' on 2013-09-12 at 3a1d906)
580
+ + peel_onion: do not assume length of x_type globals
581
+ + peel_onion(): add support for <rev>^{tag}
582
583
Make "foo^{tag}" to peel a tag to itself, i.e. no-op., and fail if
584
"foo" is not a tag.
585
617
- Will merge to 'next'.
586
+ Will merge to 'master' in the fifth batch.
587
588
589
* cc/replace-with-the-same-type (2013-09-09) 8 commits
@@ -639,6 +608,7 @@ of the repositories listed at
608
* jx/clean-interactive (2013-08-28) 1 commit
609
(merged to 'next' on 2013-09-09 at 477fec6)
610
+ documentation: clarify notes for clean.requireForce
611
+ (this branch is used by jx/relative-path-regression-fix.)
612
613
Finishing touches to update the document to adjust to a new option
614
"git clean" learned recently.
@@ -647,12 +617,13 @@ of the repositories listed at
617
618
619
* mm/status-without-comment-char (2013-09-06) 6 commits
650
- - status: add missing blank line after list of "other" files
651
- - tests: don't set status.displayCommentPrefix file-wide
652
- - status: disable display of '#' comment prefix by default
653
- - submodule summary: ignore --for-status option
654
- - wt-status: use argv_array API
655
- - builtin/stripspace.c: fix broken indentation
620
+ (merged to 'next' on 2013-09-12 at 89161b8)
621
+ + status: add missing blank line after list of "other" files
622
+ + tests: don't set status.displayCommentPrefix file-wide
623
+ + status: disable display of '#' comment prefix by default
624
+ + submodule summary: ignore --for-status option
625
+ + wt-status: use argv_array API
626
+ + builtin/stripspace.c: fix broken indentation
627
628
Allow "git status" to omit the prefix to make its output a comment
629
in a commit log editor, which is not necessary for human
@@ -662,7 +633,7 @@ of the repositories listed at
633
blank lines, but that does not have to be in the scope of this
634
series.
635
665
- Will merge to 'next'.
636
+ Will merge to 'master' in the fifth batch.
637
638
639
* bc/submodule-status-ignored (2013-09-11) 3 commits
@@ -672,28 +643,9 @@ of the repositories listed at
643
+ submodule: don't print status output with ignore=all
644
+ submodule: fix confusing variable name
645
675
- Originally merged to 'next' on 2013-08-22
676
-
646
Will cook in 'next' a bit.
647
648
680
-* jk/config-int-range-check (2013-09-09) 5 commits
681
- (merged to 'next' on 2013-09-09 at 9ab779d)
682
- + git-config: always treat --int as 64-bit internally
683
- + config: make numeric parsing errors more clear
684
- + config: set errno in numeric git_parse_* functions
685
- + config: properly range-check integer values
686
- + config: factor out integer parsing from range checks
687
-
688
- Originally merged to 'next' on 2013-08-22
689
-
690
- "git config --int section.var 3g" should somehow diagnose that the
691
- number does not fit in "int" (on 32-bit platforms anyway) but it
692
- did not.
693
-
694
- Will merge to 'master' in the third batch.
695
-
696
-
649
* jk/duplicate-objects-in-packs (2013-09-04) 5 commits
650
(merged to 'next' on 2013-09-09 at 72f2c3d)
651
+ t5308: check that index-pack --strict detects duplicate objects
@@ -708,16 +660,6 @@ of the repositories listed at
660
Will merge to 'master' in the fourth batch.
661
662
711
-* mm/mediawiki-dumb-push-fix (2013-09-03) 4 commits
712
- (merged to 'next' on 2013-09-05 at f8313f4)
713
- + git-remote-mediawiki: no need to update private ref in non-dumb push
714
- + git-remote-mediawiki: use no-private-update capability on dumb push
715
- + transport-helper: add no-private-update capability
716
- + git-remote-mediawiki: add test and check Makefile targets
717
-
718
- Will merge to 'master' in the third batch.
719
-
720
-
663
* dw/diff-no-index-doc (2013-08-28) 2 commits
664
(merged to 'next' on 2013-09-10 at 423c8f6)
665
+ diff --no-index: describe in a separate paragraph
@@ -730,7 +672,7 @@ of the repositories listed at
672
error message when we fell into the "--no-index" mode without an
673
explicit command line option to instruct us to do so.
674
733
- Will merge to 'master' in the third batch.
675
+ Will merge to 'master' in the fourth batch.
676
677
678
* sb/repack-in-c (2013-08-30) 2 commits
@@ -773,28 +715,7 @@ of the repositories listed at
715
716
Some tests were not skipped under NO_PERL build.
717
776
- Will merge to 'master' in the third batch.
777
-
778
-
779
-* mm/fast-import-feature-doc (2013-08-25) 1 commit
780
- (merged to 'next' on 2013-09-05 at 83802e2)
781
- + Documentation/fast-import: clarify summary for `feature` command
782
-
783
- Will merge to 'master' in the third batch.
784
-
785
-
786
-* mm/remote-helpers-doc (2013-08-26) 1 commit
787
- (merged to 'next' on 2013-09-05 at c181b35)
788
- + Documentation/remote-helpers: document common use-case for private ref
789
-
790
- Will merge to 'master' in the third batch.
791
-
792
-
793
-* mn/doc-pack-heu-remove-dead-pastebin (2013-08-23) 1 commit
794
- (merged to 'next' on 2013-09-05 at 5caecec)
795
- + remove dead pastebin link from pack-heuristics document
796
-
797
- Will merge to 'master' in the third batch.
718
+ Will merge to 'master' in the fourth batch.
719
720
721
* ta/user-manual (2013-08-27) 11 commits
@@ -813,7 +734,7 @@ of the repositories listed at
734
735
Update the user's manual to more recent versions of Git.
736
816
- Will merge to 'master' in the third batch.
737
+ Will merge to 'master' in the fourth batch.
738
739
740
* tb/precompose-autodetect-fix (2013-08-27) 1 commit
@@ -824,19 +745,20 @@ of the repositories listed at
745
unicode strings" workaround, but did not automatically enable it.
746
Now we do.
747
827
- Will merge to 'master' in the third batch.
748
+ Will merge to 'master' in the fourth batch.
749
750
751
* jx/branch-vv-always-compare-with-upstream (2013-08-26) 2 commits
831
- - status: always show tracking branch even no change
832
- - branch: report invalid tracking branch as gone
752
+ (merged to 'next' on 2013-09-12 at b5c37f4)
753
+ + status: always show tracking branch even no change
754
+ + branch: report invalid tracking branch as gone
755
756
"git branch -v -v" (and "git status") did not distinguish among a
757
branch that does not build on any other branch, a branch that is in
758
sync with the branch it builds on, and a branch that is configured
759
to build on some other branch that no longer exists.
760
839
- Will merge to 'next'.
761
+ Will merge to 'master' in the fifth batch.
762
763
764
* nd/fetch-into-shallow (2013-08-28) 7 commits
@@ -853,7 +775,7 @@ of the repositories listed at
775
during a fetch into a shallow repository, we unnecessarily sent
776
objects the sending side knows the receiving end has.
777
856
- Will merge to 'master' in the fourth batch.
778
+ Will merge to 'master' in the fifth batch.
779
780
781
* ks/p4-view-spec (2013-09-03) 2 commits
@@ -863,7 +785,7 @@ of the repositories listed at
785
786
Replaced with a reroll that was whitespace damaged.
787
866
- Will merge to 'master' in the third batch.
788
+ Will merge to 'master' in the fourth batch.
789
790
791
* tr/merge-recursive-index-only (2013-07-07) 3 commits
@@ -922,8 +844,6 @@ of the repositories listed at
844
(merged to 'next' on 2013-08-28 at c39bd15)
845
+ pull: require choice between rebase/merge on non-fast-forward pull
846
925
- Originally merged to 'next' on 2013-07-22
926
-
847
Make "git pull" (without arguments that say what branch to
848
integrate from where) refuse with "it does not fast forward; choose
849
between 'pull --merge' and 'pull --rebase'".