What's cooking (2013/03 #03)
Junio C Hamano committed
Mar 11, 2013 at 15:22 UTC
38fb6b58678c3218ba65b6a530537a9b3a4af580
1 file changed
+156
-89
whats-cooking.txt
+156
-89
@@ -1,18 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2013, #02; Thu, 7)
4
-X-master-at: aadb70a5594222cac215f9590017f05d5d0f31b2
5
-X-next-at: 73fd3fa695a58ff3bcd7342bf03a18bb4617bcf8
3
+Subject: What's cooking in git.git (Mar 2013, #03; Mon, 11)
4
+X-master-at: ce432cac30f98b291be609a0fc974042a2156f55
5
+X-next-at: a3a3ddd090a4feb8ff0eca6d353f517c26c37842
6
7
-What's cooking in git.git (Mar 2013, #02; Thu, 7)
7
+What's cooking in git.git (Mar 2013, #03; Mon, 11)
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 tip of the 'master' is at 1.8.2-rc3. Hopefully we can tag the
15
-final sometime next week.
14
+The final will be tagged in a few days; we have enough material for
15
+post 1.8.2 cycle already, and it will be a busy few weeks towards
16
+the end of the month once the dust settles.
17
18
You can find the changes described here in the integration branches of the
19
repositories listed at
@@ -22,15 +23,126 @@ repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
25
-* mp/complete-paths (2013-03-05) 1 commit
26
- (merged to 'next' on 2013-03-05 at 929f7c5)
27
- + git-completion.zsh: define __gitcomp_file compatibility function
28
-
29
- A finishing touch for a new feature in the upcoming release.
26
+* gp/add-u-A-documentation (2013-03-07) 1 commit
27
+ (merged to 'next' on 2013-03-08 at d86f8b3)
28
+ + add: Clarify documentation of -A and -u
29
+ (this branch is used by jc/add-2.0-delete-default and jc/add-2.0-u-A-sans-pathspec.)
30
31
--------------------------------------------------
32
[New Topics]
33
34
+* jc/maint-push-refspec-default-doc (2013-03-08) 1 commit
35
+ - Documentation/git-push: clarify the description of defaults
36
+
37
+ Clarify in the documentation "what" gets pushed to "where" when the
38
+ command line to "git push" does not say these explicitly.
39
+
40
+ Needs proofreading.
41
+
42
+
43
+* jc/reflog-reverse-walk (2013-03-08) 3 commits
44
+ - reflog: add for_each_reflog_ent_reverse() API
45
+ - for_each_recent_reflog_ent(): simplify opening of a reflog file
46
+ - for_each_reflog_ent(): extract a helper to process a single entry
47
+
48
+ An internal function used to implementate "git checkout @{-1}" was
49
+ hard to use correctly.
50
+
51
+
52
+* jk/alias-in-bare (2013-03-08) 3 commits
53
+ (merged to 'next' on 2013-03-09 at 2f9d72a)
54
+ + setup: suppress implicit "." work-tree for bare repos
55
+ + environment: add GIT_PREFIX to local_repo_env
56
+ + cache.h: drop LOCAL_REPO_ENV_SIZE
57
+
58
+ An aliased command spawned from a bare repository that does not say
59
+ it is bare with "core.bare = yes" is treated as non-bare by mistake.
60
+
61
+ Will cook in 'next'.
62
+
63
+
64
+* pw/p4-symlinked-root (2013-03-11) 3 commits
65
+ - git p4: avoid expanding client paths in chdir
66
+ - git p4 test: should honor symlink in p4 client root
67
+ - git p4 test: make sure P4CONFIG relative path works
68
+
69
+ Will merge to 'next'.
70
+
71
+
72
+* jc/add-2.0-delete-default (2013-03-08) 3 commits
73
+ - git add <pathspec>... defaults to "-A"
74
+ - git add: start preparing for "git add <pathspec>..." to default to "-A"
75
+ - builtin/add.c: simplify boolean variables
76
+
77
+ "git add dir/" updated modified files and added new files, but does
78
+ not notice removed files, which may be "Huh?" to some users. They
79
+ can of course use "git add -A dir/", but why should they?
80
+
81
+ There seemed to be some interest in this topic, so resurrected and
82
+ rebased on top of recent documentation updates to propose a
83
+ possible transition plan.
84
+
85
+
86
+* jc/add-2.0-u-A-sans-pathspec (2013-03-11) 1 commit
87
+ - git add: -u/-A now affects the entire working tree
88
+
89
+ "git add -u/-A" without pathspec has traditonally limited its
90
+ operation to the current directory and its subdirectories, but in
91
+ Git 1.8.2 we started encouraging users to be more explicit to
92
+ specify "." when they mean it (and use ":/" to make it affect the
93
+ entire working tree). With this, we finally change the behaviour
94
+ and make it affect the entire working tree in Git 2.0.
95
+
96
+
97
+* jk/empty-archive (2013-03-10) 2 commits
98
+ - archive: handle commits with an empty tree
99
+ - test-lib: factor out $GIT_UNZIP setup
100
+
101
+ "git archive" reports a failure when asked to create an archive out
102
+ of an empty tree. It would be more intuitive to give an empty
103
+ archive back in such a case.
104
+
105
+ Will merge to 'next'.
106
+
107
+
108
+* kb/p4merge (2013-03-09) 3 commits
109
+ - git-merge-one-file: revise merge error reporting
110
+ - mergetools/p4merge: create a base if none available
111
+ - mergetools/p4merge: swap LOCAL and REMOTE
112
+
113
+ Expecting a reroll.
114
+
115
+--------------------------------------------------
116
+[Stalled]
117
+
118
+* mb/gitweb-highlight-link-target (2012-12-20) 1 commit
119
+ - Highlight the link target line in Gitweb using CSS
120
+
121
+ Expecting a reroll.
122
+ $gmane/211935
123
+
124
+
125
+* mb/remote-default-nn-origin (2012-07-11) 6 commits
126
+ - Teach get_default_remote to respect remote.default.
127
+ - Test that plain "git fetch" uses remote.default when on a detached HEAD.
128
+ - Teach clone to set remote.default.
129
+ - Teach "git remote" about remote.default.
130
+ - Teach remote.c about the remote.default configuration setting.
131
+ - Rename remote.c's default_remote_name static variables.
132
+
133
+ When the user does not specify what remote to interact with, we
134
+ often attempt to use 'origin'. This can now be customized via a
135
+ configuration variable.
136
+
137
+ Expecting a reroll.
138
+ $gmane/210151
139
+
140
+ "The first remote becomes the default" bit is better done as a
141
+ separate step.
142
+
143
+--------------------------------------------------
144
+[Cooking]
145
+
146
* po/help-guides (2013-03-03) 5 commits
147
- help doc: include --guide option description
148
- help.c: add list_common_guides_help() function
@@ -73,14 +185,17 @@ repositories listed at
185
186
187
* jc/push-follow-tag (2013-03-05) 4 commits
76
- - push: --follow-tags
77
- - commit.c: use clear_commit_marks_many() in in_merge_bases_many()
78
- - commit.c: add in_merge_bases_many()
79
- - commit.c: add clear_commit_marks_many()
188
+ (merged to 'next' on 2013-03-09 at 748fbed)
189
+ + push: --follow-tags
190
+ + commit.c: use clear_commit_marks_many() in in_merge_bases_many()
191
+ + commit.c: add in_merge_bases_many()
192
+ + commit.c: add clear_commit_marks_many()
193
194
The new "--follow-tags" option tells "git push" to push relevant
195
tags when pushing branches out.
196
197
+ Will cook in 'next'.
198
+
199
200
* jc/maint-reflog-expire-clean-mark-typofix (2013-03-05) 1 commit
201
(merged to 'next' on 2013-03-07 at 0a61cbb)
@@ -89,80 +204,31 @@ repositories listed at
204
Will cook in 'next'.
205
206
92
-* aw/setup-prefix-pathspec (2013-03-07) 1 commit
207
+* aw/setup-prefix-pathspec (2013-03-09) 2 commits
208
+ - setup.c: check that the pathspec magic ends with ")"
209
- setup.c: stop prefix_pathspec() from looping past the end of string
210
95
- Expecting a reroll.
96
- $gmane/217618
97
-
98
-
99
-* gp/add-u-A-documentation (2013-03-07) 1 commit
100
- - add: Clarify documentation of -A and -u
101
-
102
- Looked good. We would need to start preparing a xx/add-u-A-2.0-default-to-top
103
- topic and update the messages this topic touches soon, though.
104
-
105
- Waiting for comments and then will merge to 'next'.
211
+ Will merge to 'next'.
212
213
108
-* lf/bundle-verify-list-prereqs (2013-03-07) 2 commits
109
- - bundle: Add colons to list headings in "verify"
110
- - bundle: Fix "verify" output if history is complete
214
+* lf/bundle-verify-list-prereqs (2013-03-08) 2 commits
215
+ (merged to 'next' on 2013-03-08 at 9e55d6d)
216
+ + bundle: Add colons to list headings in "verify"
217
+ + bundle: Fix "verify" output if history is complete
218
112
- Will merge to 'next'.
219
+ Will cook in 'next'.
220
221
115
-* ks/rfc2047-one-char-at-a-time (2013-03-07) 1 commit
116
- - format-patch: RFC 2047 says multi-octet character may not be split
222
+* ks/rfc2047-one-char-at-a-time (2013-03-09) 1 commit
223
+ (merged to 'next' on 2013-03-09 at a12465e)
224
+ + format-patch: RFC 2047 says multi-octet character may not be split
225
226
When "format-patch" quoted a non-ascii strings on the header files,
227
it incorrectly applied rfc2047 and chopped a single character in
228
the middle of it.
229
122
---------------------------------------------------
123
-[Stalled]
124
-
125
-* mb/gitweb-highlight-link-target (2012-12-20) 1 commit
126
- - Highlight the link target line in Gitweb using CSS
127
-
128
- Expecting a reroll.
129
- $gmane/211935
130
-
131
-
132
-* jc/add-delete-default (2012-08-13) 1 commit
133
- - git add: notice removal of tracked paths by default
134
-
135
- "git add dir/" updated modified files and added new files, but does
136
- not notice removed files, which may be "Huh?" to some users. They
137
- can of course use "git add -A dir/", but why should they?
138
-
139
- Resurrected from graveyard, as I thought it was a worthwhile thing
140
- to do in the longer term.
141
-
142
- There seems to be some interest. Let's see if it results in a solid
143
- execution of a sensible transition plan towards Git 2.0.
144
-
145
-
146
-* mb/remote-default-nn-origin (2012-07-11) 6 commits
147
- - Teach get_default_remote to respect remote.default.
148
- - Test that plain "git fetch" uses remote.default when on a detached HEAD.
149
- - Teach clone to set remote.default.
150
- - Teach "git remote" about remote.default.
151
- - Teach remote.c about the remote.default configuration setting.
152
- - Rename remote.c's default_remote_name static variables.
153
-
154
- When the user does not specify what remote to interact with, we
155
- often attempt to use 'origin'. This can now be customized via a
156
- configuration variable.
157
-
158
- Expecting a reroll.
159
- $gmane/210151
160
-
161
- "The first remote becomes the default" bit is better done as a
162
- separate step.
230
+ Will cook in 'next'.
231
164
---------------------------------------------------
165
-[Cooking]
232
233
* kb/name-hash (2013-02-27) 1 commit
234
(merged to 'next' on 2013-03-05 at 7f7e5d4)
@@ -185,14 +251,13 @@ repositories listed at
251
Will cook in 'next'.
252
253
188
-* hv/config-from-strbuf (2013-02-28) 4 commits
254
+* hv/config-from-strbuf (2013-03-10) 4 commits
255
- teach config parsing to read from strbuf
256
- config: make parsing stack struct independent from actual data source
257
- config: drop file pointer validity check in get_next_char()
258
- config: factor out config file stack management
259
194
- Expecting a reroll.
195
- $gmane/217163
260
+ Rerolled.
261
262
263
* jc/describe (2013-02-28) 1 commit
@@ -533,12 +598,11 @@ repositories listed at
598
Will cook in 'next'.
599
600
536
-* jn/shell-disable-interactive (2013-02-11) 2 commits
537
- - shell: pay attention to exit status from 'help' command
601
+* jn/shell-disable-interactive (2013-03-09) 2 commits
602
+ - shell: new no-interactive-login command to print a custom message
603
- shell doc: emphasize purpose and security model
604
540
- Expecting a reroll.
541
- $gmane/216229
605
+ Rerolled.
606
607
608
* jc/fetch-raw-sha1 (2013-02-07) 4 commits
@@ -570,12 +634,15 @@ repositories listed at
634
635
636
* nd/branch-show-rebase-bisect-state (2013-03-06) 4 commits
573
- - branch: show more information when HEAD is detached
574
- - status: show more info than "currently not on any branch"
575
- - wt-status: move wt_status_get_state() out to wt_status_print()
576
- - wt-status: split wt_status_state parsing function out
577
-
578
- This is hopefully almost there.
637
+ . branch: show more information when HEAD is detached
638
+ . status: show more info than "currently not on any branch"
639
+ . wt-status: move wt_status_get_state() out to wt_status_print()
640
+ . wt-status: split wt_status_state parsing function out
641
+
642
+ Kicked out of 'pu'; if the function to read reflog backwards,
643
+ introduced by jc/reflog-reverse-walk, turns out to be a good idea
644
+ to avoid mistaken use of the existing function, this topic can be
645
+ rerolled using the new function.
646
647
648
* nd/count-garbage (2013-02-15) 4 commits