What's cooking (2013/10 #08)
Junio C Hamano committed
Oct 30, 2013 at 15:18 UTC
1b91ac656ff31a39a6a9064eaa7275c8a558b961
1 file changed
+258
-309
whats-cooking.txt
+258
-309
@@ -1,31 +1,26 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Oct 2013, #07; Mon, 28)
4
-X-master-at: 0d6cf2471f426dd2b742e2285aad78381738be96
5
-X-next-at: f1bec963d618585da2c32644d95f42c8f174f1ce
3
+Subject: What's cooking in git.git (Oct 2013, #08; Wed, 30)
4
+X-master-at: 42817b96b1b80b56fd5a4d5e0d6239524b1832a3
5
+X-next-at: a9bf06aa4c8db76465f9b7c11b2704229b2adb5a
6
7
-What's cooking in git.git (Oct 2013, #07; Mon, 28)
7
+What's cooking in git.git (Oct 2013, #08; Wed, 30)
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
-It is already 10th week of this cycle, but somehow I completely
15
-forgot where in the cycle we were. Sorry about that.
16
-
17
-I'll tag 1.8.5-rc0 in a few days by the end of this month, and then
18
-hopefully we will have two to three -rc weeks after that, aiming for
19
-the final 1.8.5 release sometime late November (tentative schedule
20
-at http://tinyurl.com/gitCal).
14
+An early preview 1.8.5-rc0 has been tagged. There still are handful
15
+of fixes and enhancements left in 'next' that I'd like to see in the
16
+final, which will hopefully be in when the first release candidate
17
+is tagged.
18
19
As promised/requested, the final steps for 2.0 are in 'next'; they,
20
together with a handful topics that have been merged to 'next'
21
fairly recently, will _not_ be part of the upcoming 1.8.5 release,
22
but will be carried over in 'next' to the next cycle.
23
27
-Also there is 1.8.4.2 maintenance release out.
28
-
24
You can find the changes described here in the integration branches
25
of the repositories listed at
26
@@ -34,123 +29,178 @@ of the repositories listed at
29
--------------------------------------------------
30
[Graduated to "master"]
31
37
-* ew/keepalive (2013-10-16) 2 commits
38
- (merged to 'next' on 2013-10-16 at 56fd9f3)
39
- + http: use curl's tcp keepalive if available
40
- (merged to 'next' on 2013-10-14 at 24d786f)
41
- + http: enable keepalive on TCP sockets
32
+* fc/styles (2013-10-16) 7 commits
33
+ (merged to 'next' on 2013-10-28 at cf592ed)
34
+ + block-sha1/sha1.c: have SP around arithmetic operators
35
+ + base85.c: have SP around arithmetic operators
36
+ + archive.c: have SP around arithmetic operators
37
+ + alloc.c: have SP around arithmetic operators
38
+ + abspath.c: have SP around arithmetic operators
39
+ + alias: have SP around arithmetic operators
40
+ + C: have space around && and || operators
41
43
- The HTTP transport will try to use TCP keepalive when able.
42
+ C coding style fixes.
43
44
46
-* jc/revision-range-unpeel (2013-10-15) 1 commit
47
- (merged to 'next' on 2013-10-16 at d04ddfe)
48
- + revision: do not peel tags used in range notation
45
+* hn/log-graph-color-octopus (2013-10-18) 1 commit
46
+ (merged to 'next' on 2013-10-28 at e103175)
47
+ + graph: fix coloring around octopus merges
48
50
- "git rev-list --objects ^v1.0^ v1.0" gave v1.0 tag itself in the
51
- output, but "git rev-list --objects v1.0^..v1.0" did not.
49
50
+* jc/upload-pack-send-symref (2013-10-22) 10 commits
51
+ (merged to 'next' on 2013-10-23 at 8ef5660)
52
+ + t5570: Update for clone-progress-to-stderr branch
53
+ + Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symref
54
+ + t5570: Update for symref capability
55
+ (merged to 'next' on 2013-10-16 at eb1ae25)
56
+ + clone: test the new HEAD detection logic
57
+ + connect: annotate refs with their symref information in get_remote_head()
58
+ + connect.c: make parse_feature_value() static
59
+ + upload-pack: send non-HEAD symbolic refs
60
+ + upload-pack: send symbolic ref information as capability
61
+ + upload-pack.c: do not pass confusing cb_data to mark_our_ref()
62
+ + t5505: fix "set-head --auto with ambiguous HEAD" test
63
54
-* jk/remote-literal-string-leakfix (2013-10-15) 1 commit
55
- (merged to 'next' on 2013-10-18 at 6abddac)
56
- + remote: do not copy "origin" string literal
64
+ One long-standing flaw in the pack transfer protocol used by "git
65
+ clone" was that there was no way to tell the other end which branch
66
+ "HEAD" points at, and the receiving end needed to guess. A new
67
+ capability has been defined in the pack protocol to convey this
68
+ information so that cloning from a repository with more than one
69
+ branches pointing at the same commit where the HEAD is at now
70
+ reliably sets the initial branch in the resulting repository.
71
72
59
-* jk/split-broken-ident (2013-10-15) 1 commit
60
- (merged to 'next' on 2013-10-18 at 8f4b8b7)
61
- + split_ident: parse timestamp from end of line
73
+* jk/date-c-double-semicolon (2013-10-24) 1 commit
74
+ (merged to 'next' on 2013-10-28 at 00ce440)
75
+ + drop redundant semicolon in empty while
76
63
- Make the fall-back parsing of commit objects with broken author or
64
- committer lines more robust to pick up the timestamps.
77
78
+* jk/http-auth-redirects (2013-10-24) 10 commits
79
+ (merged to 'next' on 2013-10-24 at 4bebb66)
80
+ + http.c: Spell the null pointer as NULL
81
+ + remote-curl: rewrite base url from info/refs redirects
82
+ + remote-curl: store url as a strbuf
83
+ + remote-curl: make refs_url a strbuf
84
+ + http: update base URLs when we see redirects
85
+ + http: provide effective url to callers
86
+ + http: hoist credential request out of handle_curl_result
87
+ (merged to 'next' on 2013-10-14 at a0642be)
88
+ + http: refactor options to http_get_*
89
+ + http_request: factor out curlinfo_strbuf
90
+ + http_get_file: style fixes
91
67
-* jx/relative-path-regression-fix (2013-10-14) 3 commits
68
- (merged to 'next' on 2013-10-18 at b4af45f)
69
- + Use simpler relative_path when set_git_dir
70
- (merged to 'next' on 2013-10-14 at 704b9ee)
71
- + relative_path should honor dos-drive-prefix
72
- + test: use unambigous leading path (/foo) for MSYS
92
+ Handle the case where http transport gets redirected during the
93
+ authorization request better.
94
74
- Will merge to 'master' and later to 'maint'.
95
96
+* jk/refs-c-squelch-gcc (2013-10-24) 1 commit
97
+ (merged to 'next' on 2013-10-28 at d15f7c2)
98
+ + silence gcc array-bounds warning
99
77
-* sb/repack-in-c (2013-10-22) 1 commit
78
- (merged to 'next' on 2013-10-23 at 5d7ac72)
79
- + Reword repack documentation to no longer state it's a script
100
81
- Finishing touches to update documentation.
101
+* jl/pack-transfer-avoid-double-close (2013-10-23) 1 commit
102
+ (merged to 'next' on 2013-10-28 at 4a55bba)
103
+ + Clear fd after closing to avoid double-close error
104
105
+ The codepath that send_pack() calls pack_objects() mistakenly
106
+ closed the same file descriptor twice, leading to potentially
107
+ closing a wrong file descriptor that was opened in the meantime.
108
84
-* sg/prompt-svn-remote-fix (2013-10-15) 1 commit
85
- (merged to 'next' on 2013-10-18 at 20b47eb)
86
- + bash prompt: don't use '+=' operator in show upstream code path
109
88
- Bash portability fix.
110
+* mm/checkout-auto-track-fix (2013-10-18) 2 commits
111
+ (merged to 'next' on 2013-10-28 at f4594ba)
112
+ + checkout: proper error message on 'git checkout foo bar --'
113
+ + checkout: allow dwim for branch creation for "git checkout $branch --"
114
90
---------------------------------------------------
91
-[New Topics]
115
+ "git checkout topic", when there is not yet a local "topic" branch
116
+ but there is a unique remote-tracking branch for a remote "topic"
117
+ branch, pretended as if "git checkout -t -b topic remote/$r/topic"
118
+ (for that unique remote $r) was run. This hack however was not
119
+ implemented for "git checkout topic --".
120
93
-* bw/solaris-sed-tr-test-portability (2013-10-28) 2 commits
94
- - Avoid difference in tr semantics between System V and BSD
95
- - Change sed i\ usage to something Solaris' sed can handle
121
97
- Needs a bit of reroll.
122
+* nd/gc-lock-against-each-other (2013-10-18) 1 commit
123
+ (merged to 'next' on 2013-10-28 at 14bd458)
124
+ + gc: remove gc.pid file at end of execution
125
126
100
-* fc/transport-helper-fixes (2013-10-28) 13 commits
101
- - test: remote-helper: add test for force pushes
102
- - git-remote-testgit: support the new 'force' option
103
- - fixup! transport-helper: add 'force' to 'export' helpers
104
- - transport-helper: don't update refs in dry-run
105
- - transport-helper: add support to delete branches
106
- - fast-export: add support to delete refs
107
- - fast-import: add support to delete refs
108
- - transport-helper: add support for old:new refspec
109
- - fast-export: add new --refspec option
110
- - fast-export: improve argument parsing
111
- - transport-helper: check for 'forced update' message
112
- - transport-helper: fix extra lines
113
- - transport-helper: add 'force' to 'export' helpers
127
+* nd/lift-path-max (2013-10-24) 2 commits
128
+ (merged to 'next' on 2013-10-28 at 07698af)
129
+ + checkout_entry(): clarify the use of topath[] parameter
130
+ + entry.c: convert checkout_entry to use strbuf
131
+
132
+
133
+* nd/magic-pathspec (2013-10-22) 1 commit
134
+ (merged to 'next' on 2013-10-28 at 50eda68)
135
+ + Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags
136
137
+ All callers to parse_pathspec() must choose between getting no
138
+ pathspec or one path that is limited to the current directory
139
+ when there is no paths given on the command line, but there were
140
+ two callers that violated this rule, triggering a BUG().
141
142
117
-* jh/loose-object-dirs-creation-race (2013-10-28) 1 commit
118
- - sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs
143
+* sb/git-svn-docs-indent-with-ht (2013-10-22) 1 commit
144
+ (merged to 'next' on 2013-10-28 at 8a952d1)
145
+ + git-svn docs: Use tabs consistently within the ascii doc
146
147
121
-* js/test-help-format-windows-port-fix (2013-10-28) 1 commit
122
- - PATCH] t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html
148
+* sg/t3600-nul-sha1-fix (2013-10-16) 1 commit
149
+ (merged to 'next' on 2013-10-28 at ac4b703)
150
+ + t3600: fix broken "choking git rm" test
151
+
152
124
- Will merge to 'next' after amending the title.
153
+* tr/gitk-doc-update (2013-10-22) 1 commit
154
+ (merged to 'next' on 2013-10-28 at f4158b8)
155
+ + Documentation: revamp gitk(1)
156
157
127
-* js/tests-windows-port-fix (2013-10-28) 3 commits
128
- - tests: undo special treatment of CRLF for Windows
129
- - Windows: a test_cmp that is agnostic to random LF <> CRLF conversions
130
- - t5300-pack-object: do not compare binary data using test_cmp
158
+* tr/valgrind-test-fix (2013-10-22) 2 commits
159
+ (merged to 'next' on 2013-10-28 at 4d3f31a)
160
+ + Revert "test-lib: allow prefixing a custom string before "ok N" etc."
161
+ + Revert "test-lib: support running tests under valgrind in parallel"
162
+
163
+--------------------------------------------------
164
+[New Topics]
165
+
166
+* jn/test-prereq-perl-doc (2013-10-28) 1 commit
167
+ - t/README: tests can use perl even with NO_PERL
168
169
Will merge to 'next'.
170
171
135
-* nd/liteal-pathspecs (2013-10-28) 1 commit
136
- - pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses
172
+* ak/cvsserver-stabilize-use-of-hash-keys (2013-10-30) 1 commit
173
+ - cvsserver: Determinize output to combat Perl 5.18 hash randomization
174
+
175
+ Will merge to 'next'.
176
177
139
-* rs/web-browse-xdg-open (2013-10-28) 1 commit
140
- - web--browse: Add support for xdg-open.
178
+* jk/replace-perl-in-built-scripts (2013-10-29) 1 commit
179
+ - use @@PERL@@ in built scripts
180
181
Will merge to 'next'.
182
183
145
-* sb/refs-code-cleanup (2013-10-28) 2 commits
146
- - cache: remove unused function 'have_git_dir'
147
- - refs: remove unused function invalidate_ref_cache
184
+* jk/subtree-install-fix (2013-10-30) 1 commit
185
+ - subtree: add makefile target for html docs
186
187
Will merge to 'next'.
188
189
152
-* th/reflog-annotated-tag (2013-10-28) 1 commit
153
- - reflog: handle lightweight and annotated tags equally
190
+* jk/wrap-perl-used-in-tests (2013-10-29) 2 commits
191
+ - t: use perl instead of "$PERL_PATH" where applicable
192
+ - t: provide a perl() function which uses $PERL_PATH
193
+
194
+ Will merge to 'next'.
195
+
196
+
197
+* jt/commit-fixes-footer (2013-10-30) 1 commit
198
+ - commit: Add -f, --fixes <commit> option to add Fixes: line
199
+
200
+ There is an ongoing discussion around this topic; in general I am
201
+ fairly negative on a new feature that is too narrow and prefer a
202
+ more generic solution that can be tailored for specific needs, as
203
+ many people stated in the thread.
204
205
--------------------------------------------------
206
[Stalled]
@@ -170,11 +220,17 @@ of the repositories listed at
220
this topic conflicts with.
221
222
173
-* sc/doc-howto-dumb-http (2013-10-16) 1 commit
174
- . doc/howto: warn about (dumb)http server document being too old
223
+* mf/graph-show-root (2013-10-25) 1 commit
224
+ . graph.c: mark root commit differently
225
+
226
+ In a repository with multiple-roots, "log --graph", especially with
227
+ "--oneline", does not give the reader enough visual cue to see
228
+ where one line of history ended and a separate history began.
229
176
- The new text needs to go somewhere in the body of the document,
177
- not before the title line.
230
+ This is the version that marks the roots 'x' when they would have
231
+ been marked as '*'; Keshav Kini suggested an alternative of giving
232
+ an extra blank line after every root, which I tend to think is a
233
+ better approach to the problem.
234
235
236
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
@@ -262,49 +318,122 @@ of the repositories listed at
318
--------------------------------------------------
319
[Cooking]
320
321
+* sc/doc-howto-dumb-http (2013-10-28) 1 commit
322
+ - doc/howto: warn about (dumb)http server document being too old
323
+
324
+ Will merge to 'next'.
325
+
326
+
327
+* bw/solaris-sed-tr-test-portability (2013-10-30) 2 commits
328
+ - Avoid difference in tr semantics between System V and BSD
329
+ - Change sed i\ usage to something Solaris' sed can handle
330
+
331
+ The bottom one may want to lose the "\<nl>" that seems to be a
332
+ no-op.
333
+
334
+
335
+* fc/transport-helper-fixes (2013-10-28) 13 commits
336
+ - test: remote-helper: add test for force pushes
337
+ - git-remote-testgit: support the new 'force' option
338
+ - fixup! transport-helper: add 'force' to 'export' helpers
339
+ - transport-helper: don't update refs in dry-run
340
+ - transport-helper: add support to delete branches
341
+ - fast-export: add support to delete refs
342
+ - fast-import: add support to delete refs
343
+ - transport-helper: add support for old:new refspec
344
+ - fast-export: add new --refspec option
345
+ - fast-export: improve argument parsing
346
+ - transport-helper: check for 'forced update' message
347
+ - transport-helper: fix extra lines
348
+ - transport-helper: add 'force' to 'export' helpers
349
+
350
+ This may need to be rerolled, taking review comments and
351
+ discussions into account.
352
+
353
+
354
+* jh/loose-object-dirs-creation-race (2013-10-28) 1 commit
355
+ - sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs
356
+
357
+ Will merge to 'next'.
358
+
359
+
360
+* js/test-help-format-windows-port-fix (2013-10-30) 1 commit
361
+ (merged to 'next' on 2013-10-30 at b98e991)
362
+ + t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html
363
+
364
+ Will merge to 'master'.
365
+
366
+
367
+* js/tests-windows-port-fix (2013-10-28) 3 commits
368
+ (merged to 'next' on 2013-10-30 at 61f8e24)
369
+ + tests: undo special treatment of CRLF for Windows
370
+ + Windows: a test_cmp that is agnostic to random LF <> CRLF conversions
371
+ + t5300-pack-object: do not compare binary data using test_cmp
372
+
373
+ Will merge to 'master'.
374
+
375
+
376
+* nd/liteal-pathspecs (2013-10-28) 1 commit
377
+ - pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses
378
+
379
+ Will merge to 'next'.
380
+
381
+
382
+* rs/web-browse-xdg-open (2013-10-30) 1 commit
383
+ (merged to 'next' on 2013-10-30 at 37d6eb4)
384
+ + web--browse: Add support for xdg-open
385
+
386
+ Will merge to 'master'.
387
+
388
+
389
+* sb/refs-code-cleanup (2013-10-28) 2 commits
390
+ (merged to 'next' on 2013-10-30 at a9bf06a)
391
+ + cache: remove unused function 'have_git_dir'
392
+ + refs: remove unused function invalidate_ref_cache
393
+
394
+ Will merge to 'master'.
395
+
396
+
397
+* th/reflog-annotated-tag (2013-10-28) 1 commit
398
+ - reflog: handle lightweight and annotated tags equally
399
+
400
+ Will merge to 'next'.
401
+
402
+
403
* tr/merge-recursive-index-only (2013-10-28) 3 commits
404
- merge-recursive: -Xindex-only to leave worktree unchanged
405
- merge-recursive: internal flag to avoid touching the worktree
406
- merge-recursive: remove dead conditional in update_stages()
407
270
- Holding until there is a caller to learn from.
271
-
408
273
-* bc/http-100-continue (2013-10-28) 1 commit
409
+* bc/http-100-continue (2013-10-29) 1 commit
410
- remote-curl: fix large pushes with GSSAPI
411
412
Conditionally allow "100 Continue" responses to help use of
413
GSS-Negotiate authentication scheme over HTTP transport.
414
279
- Rerolled. Is everybody happy with this version without
280
- configuration?
415
+ Still being updated, but it seems like we are getting there.
416
417
283
-* jc/merge-base-reflog (2013-10-28) 2 commits
418
+* jc/merge-base-reflog (2013-10-29) 2 commits
419
- merge-base: teach "--fork-point" mode
420
- merge-base: use OPT_CMDMODE and clarify the command line parsing
421
422
Code the logic in "pull --rebase" that figures out a fork point
423
from reflog entries in C.
424
290
- Rerolled.
425
+ Will merge to 'next'.
426
427
293
-* jk/date-c-double-semicolon (2013-10-24) 1 commit
294
- (merged to 'next' on 2013-10-28 at 00ce440)
295
- + drop redundant semicolon in empty while
428
+* jk/for-each-ref-skip-parsing (2013-10-30) 1 commit
429
+ (merged to 'next' on 2013-10-30 at 56ea310)
430
+ + for-each-ref: avoid loading objects to print %(objectname)
431
432
Will merge to 'master'.
433
434
300
-* jk/for-each-ref-skip-parsing (2013-10-24) 1 commit
301
- - for-each-ref: avoid loading objects to print %(objectname)
302
-
303
- Will merge to 'next' and then to 'master'.
304
-
305
-
306
-* jk/pack-bitmap (2013-10-28) 20 commits
307
- - count-objects: consider .bitmap without .pack/.idx pair garbage
435
+* jk/pack-bitmap (2013-10-30) 20 commits
436
+ - count-objects: recognize .bitmap in garbage-checking
437
- pack-bitmap: implement optional name_hash cache
438
- t: add basic bitmap functionality tests
439
- repack: consider bitmaps when performing repacks
@@ -329,12 +458,7 @@ of the repositories listed at
458
enumeration of objects involved in a commit range without having to
459
fully traverse the history.
460
332
-
333
-* jk/refs-c-squelch-gcc (2013-10-24) 1 commit
334
- (merged to 'next' on 2013-10-28 at d15f7c2)
335
- + silence gcc array-bounds warning
336
-
337
- Will merge to 'master'.
461
+ Still under discussion.
462
463
464
* jk/robustify-parse-commit (2013-10-24) 6 commits
@@ -348,65 +472,50 @@ of the repositories listed at
472
Will merge to 'next' after taking another look.
473
474
351
-* mh/fetch-tags-in-addition-to-normal-refs (2013-10-24) 16 commits
475
+* mh/fetch-tags-in-addition-to-normal-refs (2013-10-30) 23 commits
476
+ - fetch: improve the error messages emitted for conflicting refspecs
477
+ - handle_duplicate(): mark error message for translation
478
+ - ref_remote_duplicates(): extract a function handle_duplicate()
479
+ - ref_remove_duplicates(): simplify loop logic
480
+ - t5536: new test of refspec conflicts when fetching
481
+ - ref_remove_duplicates(): avoid redundant bisection
482
+ - git-fetch.txt: improve description of tag auto-following
483
+ - fetch-options.txt: simplify ifdef/ifndef/endif usage
484
- fetch, remote: properly convey --no-prune options to subprocesses
485
- builtin/remote.c:update(): use struct argv_array
486
- builtin/remote.c: reorder function definitions
487
- query_refspecs(): move some constants out of the loop
488
- fetch --prune: prune only based on explicit refspecs
357
- - SQUASH??? --tags is no longer a short-hand
489
- fetch --tags: fetch tags *in addition to* other stuff
490
+ - fetch: only opportunistically update references based on command line
491
+ - get_expanded_map(): avoid memory leak
492
+ - get_expanded_map(): add docstring
493
- builtin/fetch.c: reorder function definitions
360
- - ref_remove_duplicates(): improve documentation comment
361
- - ref_remove_duplicates(): simplify function
362
- - ref_remove_duplicates(): avoid redundant bisection
494
- get_ref_map(): rename local variables
495
- api-remote.txt: correct section "struct refspec"
496
- t5510: check that "git fetch --prune --tags" does not prune branches
497
- t5510: prepare test refs more straightforwardly
498
- t5510: use the correct tag name in test
499
369
- Some questionable paragraphs in the doc updates, but other than
370
- that looks reasonably solid.
371
-
372
- Expecting a reroll.
373
-
374
-
375
-* nd/lift-path-max (2013-10-24) 2 commits
376
- (merged to 'next' on 2013-10-28 at 07698af)
377
- + checkout_entry(): clarify the use of topath[] parameter
378
- + entry.c: convert checkout_entry to use strbuf
379
-
380
- Will merge to 'master'.
500
+ Will merge to 'next' after taking another look.
501
502
503
* jk/pack-corruption-post-mortem (2013-10-25) 1 commit
384
- - howto: add article on recovering a corrupted object
504
+ (merged to 'next' on 2013-10-30 at 2248df6)
505
+ + howto: add article on recovering a corrupted object
506
386
- Will merge to 'next' and then to 'master'.
507
+ Will merge to 'master'.
508
509
510
* jk/reset-p-current-head-fix (2013-10-25) 2 commits
390
- - reset: pass real rev name to add--interactive
391
- - add-interactive: handle unborn branch in patch mode
511
+ (merged to 'next' on 2013-10-30 at 37ae6e0)
512
+ + reset: pass real rev name to add--interactive
513
+ + add-interactive: handle unborn branch in patch mode
514
515
"git reset -p HEAD" has codepath to special case it from resetting
516
to contents of other commits, but recent change broke it.
517
396
- Will merge to 'next' and then to 'master'.
397
-
398
-
399
-* mf/graph-show-root (2013-10-25) 1 commit
400
- - graph.c: mark root commit differently
401
-
402
- In a repository with multiple-roots, "log --graph", especially with
403
- "--oneline", does not give the reader enough visual cue to see
404
- where one line of history ended and a separate history began.
405
-
406
- This is the version that marks the roots 'x' when they would have
407
- been marked as '*'; Keshav Kini suggested an alternative of giving
408
- an extra blank line after every root, which I tend to think is a
409
- better approach to the problem.
518
+ Will merge to 'master'.
519
520
521
* nv/parseopt-opt-arg (2013-10-25) 1 commit
@@ -427,101 +536,6 @@ of the repositories listed at
536
quoting them in C style; remote-hg remote helper forgot to unquote
537
such a path.
538
430
- Will merge to 'next'.
431
-
432
-
433
-* jl/pack-transfer-avoid-double-close (2013-10-23) 1 commit
434
- (merged to 'next' on 2013-10-28 at 4a55bba)
435
- + Clear fd after closing to avoid double-close error
436
-
437
- The codepath that send_pack() calls pack_objects() mistakenly
438
- closed the same file descriptor twice, leading to potentially
439
- closing a wrong file descriptor that was opened in the meantime.
440
-
441
- Will merge to 'master' and later to 'maint'.
442
-
443
-
444
-* nd/magic-pathspec (2013-10-22) 1 commit
445
- (merged to 'next' on 2013-10-28 at 50eda68)
446
- + Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags
447
-
448
- All callers to parse_pathspec() must choose between getting no
449
- pathspec or one path that is limited to the current directory
450
- when there is no paths given on the command line, but there were
451
- two callers that violated this rule, triggering a BUG().
452
-
453
- Will merge to 'master'.
454
-
455
-
456
-* sb/git-svn-docs-indent-with-ht (2013-10-22) 1 commit
457
- (merged to 'next' on 2013-10-28 at 8a952d1)
458
- + git-svn docs: Use tabs consistently within the ascii doc
459
-
460
- Will merge to 'master'.
461
-
462
-
463
-* tr/gitk-doc-update (2013-10-22) 1 commit
464
- (merged to 'next' on 2013-10-28 at f4158b8)
465
- + Documentation: revamp gitk(1)
466
-
467
- Will merge to 'master'.
468
-
469
-
470
-* tr/valgrind-test-fix (2013-10-22) 2 commits
471
- (merged to 'next' on 2013-10-28 at 4d3f31a)
472
- + Revert "test-lib: allow prefixing a custom string before "ok N" etc."
473
- + Revert "test-lib: support running tests under valgrind in parallel"
474
-
475
- Will merge to 'master'.
476
-
477
-
478
-* mm/checkout-auto-track-fix (2013-10-18) 2 commits
479
- (merged to 'next' on 2013-10-28 at f4594ba)
480
- + checkout: proper error message on 'git checkout foo bar --'
481
- + checkout: allow dwim for branch creation for "git checkout $branch --"
482
-
483
- "git checkout topic", when there is not yet a local "topic" branch
484
- but there is a unique remote-tracking branch for a remote "topic"
485
- branch, pretended as if "git checkout -t -b topic remote/$r/topic"
486
- (for that unique remote $r) was run. This hack however was not
487
- implemented for "git checkout topic --".
488
-
489
- Will merge to 'master'.
490
-
491
-
492
-* hn/log-graph-color-octopus (2013-10-18) 1 commit
493
- (merged to 'next' on 2013-10-28 at e103175)
494
- + graph: fix coloring around octopus merges
495
-
496
- Will merge to 'master'.
497
-
498
-
499
-* nd/gc-lock-against-each-other (2013-10-18) 1 commit
500
- (merged to 'next' on 2013-10-28 at 14bd458)
501
- + gc: remove gc.pid file at end of execution
502
-
503
- Will merge to 'master'.
504
-
505
-
506
-* fc/styles (2013-10-16) 7 commits
507
- (merged to 'next' on 2013-10-28 at cf592ed)
508
- + block-sha1/sha1.c: have SP around arithmetic operators
509
- + base85.c: have SP around arithmetic operators
510
- + archive.c: have SP around arithmetic operators
511
- + alloc.c: have SP around arithmetic operators
512
- + abspath.c: have SP around arithmetic operators
513
- + alias: have SP around arithmetic operators
514
- + C: have space around && and || operators
515
-
516
- C coding style fixes.
517
-
518
- Will merge to 'master'.
519
-
520
-
521
-* sg/t3600-nul-sha1-fix (2013-10-16) 1 commit
522
- (merged to 'next' on 2013-10-28 at ac4b703)
523
- + t3600: fix broken "choking git rm" test
524
-
539
Will merge to 'master'.
540
541
@@ -550,26 +564,6 @@ of the repositories listed at
564
Will cook in 'next' for the rest of this cycle.
565
566
553
-* jk/http-auth-redirects (2013-10-24) 10 commits
554
- (merged to 'next' on 2013-10-24 at 4bebb66)
555
- + http.c: Spell the null pointer as NULL
556
- + remote-curl: rewrite base url from info/refs redirects
557
- + remote-curl: store url as a strbuf
558
- + remote-curl: make refs_url a strbuf
559
- + http: update base URLs when we see redirects
560
- + http: provide effective url to callers
561
- + http: hoist credential request out of handle_curl_result
562
- (merged to 'next' on 2013-10-14 at a0642be)
563
- + http: refactor options to http_get_*
564
- + http_request: factor out curlinfo_strbuf
565
- + http_get_file: style fixes
566
-
567
- Handle the case where http transport gets redirected during the
568
- authorization request better.
569
-
570
- Will merge to 'master'.
571
-
572
-
567
* jl/submodule-mv (2013-10-13) 1 commit
568
(merged to 'next' on 2013-10-28 at 8dc9b31)
569
+ mv: Fix spurious warning when moving a file in presence of submodules
@@ -602,32 +596,7 @@ of the repositories listed at
596
also squashed in a fix-up by Karsten found at $gmane/236468 (please
597
double-check the result).
598
605
- Will merge to 'next'.
606
-
607
-
608
-* jc/upload-pack-send-symref (2013-10-22) 10 commits
609
- (merged to 'next' on 2013-10-23 at 8ef5660)
610
- + t5570: Update for clone-progress-to-stderr branch
611
- + Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symref
612
- + t5570: Update for symref capability
613
- (merged to 'next' on 2013-10-16 at eb1ae25)
614
- + clone: test the new HEAD detection logic
615
- + connect: annotate refs with their symref information in get_remote_head()
616
- + connect.c: make parse_feature_value() static
617
- + upload-pack: send non-HEAD symbolic refs
618
- + upload-pack: send symbolic ref information as capability
619
- + upload-pack.c: do not pass confusing cb_data to mark_our_ref()
620
- + t5505: fix "set-head --auto with ambiguous HEAD" test
621
-
622
- One long-standing flaw in the pack transfer protocol used by "git
623
- clone" was that there was no way to tell the other end which branch
624
- "HEAD" points at, and the receiving end needed to guess. A new
625
- capability has been defined in the pack protocol to convey this
626
- information so that cloning from a repository with more than one
627
- branches pointing at the same commit where the HEAD is at now
628
- reliably sets the initial branch in the resulting repository.
629
-
630
- Will merge to 'master'.
599
+ More valgrind breakage reported ($gmane/236869).
600
601
602
* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
@@ -665,23 +634,3 @@ of the repositories listed at
634
- diff: remove "diff-files -q" in a version of Git in a distant future
635
636
Will merge to and cook in 'next' until a distant future.
668
-
669
---------------------------------------------------
670
-[Discarded]
671
-
672
-* jh/shorten-refname (2013-05-07) 4 commits
673
- . t1514: refname shortening is done after dereferencing symbolic refs
674
- . shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
675
- . t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
676
- . t1514: Add tests of shortening refnames in strict/loose mode
677
-
678
- When remotes/origin/HEAD is not a symbolic ref, "rev-parse
679
- --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
680
- "origin/HEAD", which is fixed with this series (if it is a symbolic
681
- ref that points at remotes/origin/something, then it should show
682
- "origin/something" and it already does).
683
-
684
- Has been expecting a reroll, as an early part of a larger series.
685
- $gmane/225137
686
-
687
- Discarded due to inactivity, without prejudice.