Skip to content

Commit 0c19f70

Browse files
committed
What's cooking (2012/01 #03)
1 parent 4d9c22f commit 0c19f70

File tree

1 file changed

+112
-85
lines changed

1 file changed

+112
-85
lines changed

whats-cooking.txt

Lines changed: 112 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
To: git@vger.kernel.org
2-
Subject: What's cooking in git.git (Jan 2012, #02; Mon, 9)
3-
X-master-at: beecc7ab65b31c5471331e64acaa3f722125ea67
4-
X-next-at: 6c3c759d2442c2dca37be91f899570e1396d5bd5
2+
Subject: What's cooking in git.git (Jan 2012, #03; Wed, 11)
3+
X-master-at: 0e1cfc52de002e2d9b0e6562e8672fee3bf45a67
4+
X-next-at: 5c0bfa96c2f67a7ac76afe5096f622dced39734f
55

6-
What's cooking in git.git (Jan 2012, #02; Mon, 9)
6+
What's cooking in git.git (Jan 2012, #03; Wed, 11)
77
--------------------------------------------------
88

99
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -38,97 +38,83 @@ The preformatted documentation in HTML and man format are found in:
3838
--------------------------------------------------
3939
[New Topics]
4040

41-
* rs/diff-postimage-in-context (2012-01-06) 1 commit
42-
(merged to 'next' on 2012-01-09 at 9635032)
43-
+ xdiff: print post-image for common records instead of pre-image
41+
* jc/pull-signed-tag (2012-01-11) 1 commit
42+
- merge: use editor by default in interactive sessions
4443

45-
Looked reasonable.
44+
Per Linus's strong suggestion, sugarcoated (aka "taking blame for the
45+
original UI screw-ups") so that it is easier for me to swallow and accept
46+
a potentially huge backward incompatibility issue, "git merge" is made to
47+
launch an editor to explain the merge in the merge commit by default in
48+
interactive sessions.
49+
50+
* jc/request-pull-show-head-4 (2012-01-10) 1 commit
51+
(merged to 'next' on 2012-01-11 at 8d98a6b)
52+
+ request-pull: use the real fork point when preparing the message
53+
54+
Hopefully the final finishing touch to the request-pull script that was
55+
updated during this cycle.
56+
57+
Will merge by 1.7.9-rc1.
58+
59+
* jk/maint-upload-archive (2012-01-11) 1 commit
60+
(merged to 'next' on 2012-01-11 at 5c0bfa9)
61+
+ archive: re-allow HEAD:Documentation on a remote invocation
62+
63+
Running "git archive" remotely and asking for a partial tree of a ref,
64+
e.g. HEAD:$path was forbidden by a recent change to tighten security, but
65+
was found to be overly restrictive.
66+
67+
Will merge by 1.7.9-rc1.
68+
69+
* nd/commit-ignore-i-t-a (2012-01-11) 2 commits
70+
- commit: add --skip-intent-to-add to allow commit with i-t-a entries in index
71+
- cache-tree: update API to take abitrary flags
72+
73+
* nd/maint-refname-in-hierarchy-check (2012-01-11) 1 commit
74+
- Fix incorrect ref namespace check
75+
76+
Avoid getting confused by "ref/headxxx" and mistaking it as if it is under
77+
the "refs/heads/" hierarchy.
4678
Not urgent.
4779

48-
* cb/push-quiet (2012-01-08) 3 commits
49-
- t5541: avoid TAP test miscounting
50-
- fix push --quiet: add 'quiet' capability to receive-pack
51-
- server_supports(): parse feature list more carefully
80+
* rr/sequencer (2012-01-11) 2 commits
81+
- sequencer: factor code out of revert builtin
82+
- revert: prepare to move replay_action to header
5283

53-
Looked reasonable.
84+
Moving large chunk of code out of cherry-pick/revert for later reuse,
85+
primarily to prepare for the next cycle.
5486
Not urgent.
5587

56-
* nd/clone-detached (2012-01-08) 6 commits
57-
- clone: print advice on checking out detached HEAD
58-
- clone: allow --branch to take a tag
59-
- clone: --branch=<branch> always means refs/heads/<branch>
60-
- clone: factor out checkout code
61-
- clone: write detached HEAD in bare repositories
62-
- t5601: add missing && cascade
88+
* ss/maint-msys-cvsexportcommit (2012-01-11) 2 commits
89+
(merged to 'next' on 2012-01-11 at 007aab1)
90+
+ git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS
91+
+ t9200: On MSYS, do not pass Windows-style paths to CVS
6392

64-
I am not sure what the benefit of this is.
93+
Will merge by 1.7.9-rc1.
6594

66-
* nd/clone-single-branch (2012-01-08) 1 commit
67-
(merged to 'next' on 2012-01-09 at 6c3c759)
68-
+ clone: add --single-branch to fetch only one branch
95+
* tr/maint-mailinfo (2012-01-11) 1 commit
96+
(merged to 'next' on 2012-01-11 at d9e344a)
97+
+ mailinfo documentation: accurately describe non -k case
6998

70-
Looked reasonable.
71-
Not urgent.
99+
Will merge by 1.7.9-rc1.
72100

73-
* jn/gitweb-unspecified-action (2012-01-09) 1 commit
74-
- gitweb: Fix actionless dispatch for non-existent objects
101+
* jk/credentials (2012-01-11) 3 commits
102+
- unix-socket: do not let close() or chdir() clobber errno during cleanup
103+
- credential-cache: report more daemon connection errors
104+
- unix-socket: handle long socket pathnames
105+
106+
* pw/p4-view-updates (2012-01-11) 5 commits
107+
- git-p4: add tests demonstrating spec overlay ambiguities
108+
- git-p4: adjust test to adhere to stricter useClientSpec
109+
- git-p4: clarify comment
110+
- git-p4: fix verbose comment typo
111+
- git-p4: only a single ... wildcard is supported
75112

76113
--------------------------------------------------
77114
[Graduated to "master"]
78115

79-
* jc/show-sig (2012-01-05) 6 commits
80-
(merged to 'next' on 2012-01-05 at 5da3ae2)
81-
+ log --show-signature: reword the common two-head merge case
82-
+ log-tree: show mergetag in log --show-signature output
83-
+ log-tree.c: small refactor in show_signature()
84-
+ commit --amend -S: strip existing gpgsig headers
85-
+ verify_signed_buffer: fix stale comment
86-
+ Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'
87-
(this branch uses jc/signed-commit.)
88-
89-
Finishing touches to the already graduated "pull signed tags" topic.
90-
91-
* jc/signed-commit (2011-11-29) 5 commits
92-
(merged to 'next' on 2011-12-21 at 8fcbf00)
93-
+ gpg-interface: allow use of a custom GPG binary
94-
+ pretty: %G[?GS] placeholders
95-
+ test "commit -S" and "log --show-signature"
96-
+ log: --show-signature
97-
+ commit: teach --gpg-sign option
98-
(this branch is used by jc/show-sig.)
99-
100-
* jh/fetch-head-update (2012-01-03) 1 commit
101-
(merged to 'next' on 2012-01-04 at b5778e1)
102-
+ write first for-merge ref to FETCH_HEAD first
103-
104-
* jk/credentials (2012-01-08) 1 commit
105-
(merged to 'next' on 2012-01-08 at 48766c9)
106-
+ credentials: unable to connect to cache daemon
107-
108-
* jm/stash-diff-disambiguate (2012-01-01) 1 commit
109-
(merged to 'next' on 2012-01-05 at 75a283b)
110-
+ stash: Don't fail if work dir contains file named 'HEAD'
111-
112-
* mh/ref-api-less-extra-refs (2012-01-06) 3 commits
113-
(merged to 'next' on 2012-01-06 at 3105696)
114-
+ write_head_info(): handle "extra refs" locally
115-
+ show_ref(): remove unused "flag" and "cb_data" arguments
116-
+ receive-pack: move more work into write_head_info()
117-
118-
* mm/maint-gitweb-project-maxdepth (2012-01-04) 1 commit
119-
(merged to 'next' on 2012-01-06 at bcf3818)
120-
+ gitweb: accept trailing "/" in $project_list
121-
122-
Looked quite sensible.
123-
124-
* pw/p4-view-updates (2012-01-03) 6 commits
125-
(merged to 'next' on 2012-01-03 at c3b5872)
126-
+ git-p4: view spec documentation
127-
+ git-p4: rewrite view handling
128-
+ git-p4: support single file p4 client view maps
129-
+ git-p4: sort client views by reverse View number
130-
+ git-p4: fix test for unsupported P4 Client Views
131-
+ git-p4: test client view handling
116+
* bw/maint-t8006-sed-incomplete-line (2012-01-03) 1 commit
117+
+ Work around sed portability issue in t8006-blame-textconv
132118

133119
--------------------------------------------------
134120
[Stalled]
@@ -168,6 +154,50 @@ should never be translated.
168154
--------------------------------------------------
169155
[Cooking]
170156

157+
* rs/diff-postimage-in-context (2012-01-06) 1 commit
158+
(merged to 'next' on 2012-01-09 at 9635032)
159+
+ xdiff: print post-image for common records instead of pre-image
160+
161+
Looked reasonable.
162+
Not urgent.
163+
164+
* cb/push-quiet (2012-01-08) 3 commits
165+
- t5541: avoid TAP test miscounting
166+
- fix push --quiet: add 'quiet' capability to receive-pack
167+
- server_supports(): parse feature list more carefully
168+
169+
Looked reasonable.
170+
Not urgent.
171+
172+
* nd/clone-detached (2012-01-11) 11 commits
173+
- clone: print advice on checking out detached HEAD
174+
- clone: allow --branch to take a tag
175+
- clone: refuse to clone if --branch points to bogus ref
176+
- clone: --branch=<branch> always means refs/heads/<branch>
177+
- fixup! acd8f20
178+
- clone: delay cloning until after remote HEAD checking
179+
- clone: factor out remote ref writing
180+
- clone: factor out HEAD update code
181+
- clone: factor out checkout code
182+
- clone: write detached HEAD in bare repositories
183+
- t5601: add missing && cascade
184+
185+
Looking good, but I may have screwed up the merge of this into 'pu'.
186+
Not urgent.
187+
188+
* nd/clone-single-branch (2012-01-08) 1 commit
189+
(merged to 'next' on 2012-01-09 at 6c3c759)
190+
+ clone: add --single-branch to fetch only one branch
191+
192+
Looked reasonable.
193+
Not urgent.
194+
195+
* jn/gitweb-unspecified-action (2012-01-09) 1 commit
196+
- gitweb: Fix actionless dispatch for non-existent objects
197+
198+
Looked reasonable.
199+
Not urgent.
200+
171201
* nd/index-pack-no-recurse (2012-01-09) 3 commits
172202
- index-pack: eliminate unlimited recursion in get_delta_base()
173203
- index-pack: eliminate recursion in find_unresolved_deltas
@@ -176,10 +206,7 @@ should never be translated.
176206
The first one looked sensible; I am not sure if the second and third ones
177207
take the right approach.
178208

179-
* bw/maint-t8006-sed-incomplete-line (2012-01-03) 1 commit
180-
- Work around sed portability issue in t8006-blame-textconv
181-
182-
Waiting for a clarification of the reasoning in the log message.
209+
Will defer till the next cycle.
183210

184211
* mh/ref-api-rest (2011-12-12) 35 commits
185212
- repack_without_ref(): call clear_packed_ref_cache()

0 commit comments

Comments
 (0)