What's cooking (2010/03 #07)
Junio C Hamano committed
Mar 28, 2010 at 21:48 UTC
8fe581bef92f9925f3c19731e6d33b76efeaefda
1 file changed
+89
-101
whats-cooking.txt
+89
-101
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2010, #06; Wed, 24)
3
-X-master-at: 5e4f61474202122f376b16181b760f390623bf4e
4
-X-next-at: 82eebc138fb5ed99525fe1c2d3062e9256495a05
2
+Subject: What's cooking in git.git (Mar 2010, #07; Sun, 28)
3
+X-master-at: faf752693abd0a891a9a47a2d398353cc59ee93a
4
+X-next-at: 133563ba0a1cd78841512283a1069b49bf69373e
5
6
-What's cooking in git.git (Mar 2010, #06; Wed, 24)
6
+What's cooking in git.git (Mar 2010, #07; Sun, 28)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,64 +11,83 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11
marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
-The tip of 'pu' is broken right now; it does not pass t7006.
14
+As it has been about 6 weeks since the previous feature release, I'd want
15
+to start making noises about feature freeze for 1.7.1 in a few days. I
16
+expect that the changes still under discussion will be ready by the time
17
+the post 1.7.1 cycle begins, and we will hopefully have a cycle for 1.7.2
18
+that is shorter than usual to include them.
19
20
--------------------------------------------------
17
-[Graduated to "master"]
18
-
19
-* jh/maint-submodule-status-in-void (2010-03-09) 2 commits
20
- (merged to 'next' on 2010-03-15 at 49af9de)
21
- + git submodule summary: Handle HEAD as argument when on an unborn branch
22
- (merged to 'next' on 2010-03-08 at 0697bf4)
23
- + submodule summary: do not fail before the first commit
24
-
25
-* jc/maint-refs-dangling (2010-03-15) 1 commit
26
- (merged to 'next' on 2010-03-16 at 376027b)
27
- + refs: ref entry with NULL sha1 is can be a dangling symref
28
-
29
-* pb/log-first-parent-p-m (2010-03-09) 5 commits
30
- (merged to 'next' on 2010-03-15 at 0ae494e)
31
- + show --first-parent/-m: do not default to --cc
32
- + show -c: show patch text
33
- + revision: introduce setup_revision_opt
34
- + t4013: add tests for log -p -m --first-parent
35
- (merged to 'next' on 2010-02-17 at 2f8e5ae)
36
- + git log -p -m: document -m and honor --first-parent
21
+[New Topics]
22
38
-Ready for 'master'.
23
+* da/maint-python-startup (2010-03-27) 1 commit
24
+ - Makefile: Remove usage of deprecated Python "has_key" method
25
40
-* jl/submodule-diff-dirtiness (2010-03-13) 5 commits
41
- (merged to 'next' on 2010-03-15 at 9601fd9)
42
- + git status: ignoring untracked files must apply to submodules too
43
- (merged to 'next' on 2010-03-13 at f9bfd8a)
44
- + git status: Fix false positive "new commits" output for dirty submodules
45
- + Refactor dirty submodule detection in diff-lib.c
46
- (merged to 'next' on 2010-03-08 at 33f7a57)
47
- + git status: Show detailed dirty status of submodules in long format
48
- (merged to 'next' on 2010-03-04 at 58b2645)
49
- + git diff --submodule: Show detailed dirty status of submodules
26
+Another thing that this fixes is not described in the log message.
27
51
-Ready for 'master'.
28
+* jc/conflict-marker-size (2010-03-24) 1 commit
29
+ - diff --check: honor conflict-marker-size attribute
30
53
-* tr/notes-display (2010-03-12) 13 commits
54
- (merged to 'next' on 2010-03-15 at 3329361)
55
- + git-notes(1): add a section about the meaning of history
56
- + notes: track whether notes_trees were changed at all
57
- + notes: add shorthand --ref to override GIT_NOTES_REF
58
- + commit --amend: copy notes to the new commit
59
- + rebase: support automatic notes copying
60
- + notes: implement helpers needed for note copying during rewrite
61
- + notes: implement 'git notes copy --stdin'
62
- + rebase -i: invoke post-rewrite hook
63
- + rebase: invoke post-rewrite hook
64
- + commit --amend: invoke post-rewrite hook
65
- + Documentation: document post-rewrite hook
66
- + Support showing notes from more than one notes tree
67
- + test-lib: unset GIT_NOTES_REF to stop it from influencing tests
68
- (this branch is used by sb/notes-parse-opt.)
31
+* ld/discovery-limit-to-fs (2010-03-17) 3 commits
32
+ - Add support for GIT_ONE_FILESYSTEM
33
+ - truncate cwd string before printing error message
34
+ - config.c: remove static keyword from git_env_bool()
35
+
36
+* sb/fmt-merge-msg (2010-03-24) 7 commits
37
+ - fmt-merge-msg: hide summary option
38
+ - fmt-merge-msg: remove custom string_list implementation
39
+ - string-list: add unsorted_string_list_lookup()
40
+ - fmt-merge-msg: use pretty.c routines
41
+ - t6200: test fmt-merge-msg more
42
+ - t6200: modernize with test_tick
43
+ - fmt-merge-msg: be quiet if nothing to merge
44
+
45
+* pc/remove-warn (2010-03-26) 4 commits
46
+ . Remove a redundant errno test in a usage of remove_path
47
+ . Introduce remove_or_warn function
48
+ . Implement the rmdir_or_warn function
49
+ . Generalise the unlink_or_warn function
50
51
--------------------------------------------------
71
-[New Topics]
52
+[Stalled]
53
+
54
+* cw/test-lib-relicense (2010-02-22) 1 commit
55
+ . test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
56
+
57
+Ack-collection stopped at the last three names. I am hoping Carl can take
58
+it from there without my keeping an eye on it.
59
+
60
+* js/rebase-origin-x (2010-02-05) 1 commit
61
+ - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
62
+
63
+I retract my objection against the idea of -x; needs polishing before
64
+moving forward.
65
+
66
+* sg/bash-completion (2010-02-23) 4 commits
67
+ (merged to 'next' on 2010-03-08 at bc59860)
68
+ + bash: completion for gitk aliases
69
+ + bash: support user-supplied completion scripts for aliases
70
+ + bash: support user-supplied completion scripts for user's git commands
71
+ + bash: improve aliased command recognition
72
+
73
+Perhaps rename _git_frotz -> _git_complete_frotz? I dunno.
74
+
75
+* sd/log-decorate (2010-02-17) 3 commits
76
+ (merged to 'next' on 2010-03-08 at 58a6fba)
77
+ + log.decorate: usability fixes
78
+ + Add `log.decorate' configuration variable.
79
+ + git_config_maybe_bool()
80
+
81
+Needs squelching the configuration setting when "--pretty=raw" is given,
82
+at least, or possibly when any "--pretty" is explicitly given.
83
+
84
+--------------------------------------------------
85
+[Cooking]
86
+
87
+* np/malloc-threading (2010-03-24) 1 commit
88
+ - Make xmalloc and xrealloc thread-safe
89
+
90
+Still has locking issues?
91
92
* bw/git-completion-rpmspec (2010-03-20) 1 commit
93
- Add a git-completion rpm subpackage to the spec
@@ -97,13 +116,14 @@ Soon in 'next'.
116
Soon in 'next'.
117
118
* mg/maint-send-email-lazy-editor (2010-03-22) 1 commit
100
- - [reword?] send-email: lazily assign editor variable
119
+ - send-email: lazily assign editor variable
120
+
121
+Soon in 'next'.
122
123
* mg/use-default-abbrev-length-in-rev-list (2010-03-22) 1 commit
124
- rev-list: use default abbrev length when abbrev-commit is in effect
125
105
-* np/malloc-threading (2010-03-24) 1 commit
106
- - Make xmalloc and xrealloc thread-safe
126
+Soon in 'next'.
127
128
* rb/maint-python-path (2010-03-21) 1 commit
129
- Correct references to /usr/bin/python which does not exist on FreeBSD
@@ -120,43 +140,8 @@ Soon in 'next'.
140
141
Soon in 'next'.
142
123
---------------------------------------------------
124
-[Stalled]
125
-
126
-* cw/test-lib-relicense (2010-02-22) 1 commit
127
- . test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
128
-
129
-Ack-collection stopped at the last three names. I am hoping Carl can take
130
-it from there without my keeping an eye on it.
131
-
132
-* js/rebase-origin-x (2010-02-05) 1 commit
133
- - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
134
-
135
-I retract my objection against the idea of -x; needs polishing before
136
-moving forward.
137
-
138
-* sg/bash-completion (2010-02-23) 4 commits
139
- (merged to 'next' on 2010-03-08 at bc59860)
140
- + bash: completion for gitk aliases
141
- + bash: support user-supplied completion scripts for aliases
142
- + bash: support user-supplied completion scripts for user's git commands
143
- + bash: improve aliased command recognition
144
-
145
-Perhaps rename _git_frotz -> _git_complete_frotz? I dunno.
146
-
147
-* sd/log-decorate (2010-02-17) 3 commits
148
- (merged to 'next' on 2010-03-08 at 58a6fba)
149
- + log.decorate: usability fixes
150
- + Add `log.decorate' configuration variable.
151
- + git_config_maybe_bool()
152
-
153
-Needs squelching the configuration setting when "--pretty=raw" is given,
154
-at least, or possibly when any "--pretty" is explicitly given.
155
-
156
---------------------------------------------------
157
-[Cooking]
158
-
159
-* ar/config-from-command-line (2010-03-19) 1 commit
143
+* ar/config-from-command-line (2010-03-26) 2 commits
144
+ - Use strbufs instead of open-coded string manipulation
145
- Allow passing of configuration parameters in the command line
146
147
* bc/t5505-fix (2010-03-19) 3 commits
@@ -231,6 +216,12 @@ Looked reasonable. Soon in 'next'.
216
217
Looked reasonable. Soon in 'next'.
218
219
+* sb/notes-parse-opt (2010-02-27) 1 commit
220
+ (merged to 'next' on 2010-03-24 at 82eebc1)
221
+ + notes: rework subcommands and parse options
222
+
223
+Ready for 'master'.
224
+
225
* gh/maint-stash-show-error-message (2010-03-16) 1 commit
226
- Improve error messages from 'git stash show'
227
@@ -266,7 +257,10 @@ Ready for 'master'.
257
258
The tip one will be soon in 'next', but one step at a time.
259
269
-* nd/setup (2010-03-21) 40 commits
260
+* nd/setup (2010-03-25) 43 commits
261
+ - builtins: do not commit pager choice early
262
+ - builtins: reset startup_info->have_run_setup_gitdir when unsetting up repository
263
+ - builtins: setup repository before print unknown command error
264
- Guard unallowed access to repository when it's not set up
265
- alias: keep repository found while collecting aliases as long as possible
266
- Allow to undo setup_git_directory_gently() gracefully (and fix alias code)
@@ -307,9 +301,3 @@ The tip one will be soon in 'next', but one step at a time.
301
- config: use RUN_SETUP_GENTLY
302
- builtin: Support RUN_SETUP_GENTLY to set up repository early if found
303
- builtin: introduce startup_info struct
310
-
311
-This seems to break t7006 when merged to 'pu'.
312
-
313
-* sb/notes-parse-opt (2010-02-27) 1 commit
314
- (merged to 'next' on 2010-03-24 at 82eebc1)
315
- + notes: rework subcommands and parse options