What's cooking (2010/08 #01)
Junio C Hamano committed
Aug 4, 2010 at 15:23 UTC
be43755840e84f08f6bbd90aaf1b3ffd3bfa28bf
1 file changed
+85
-89
whats-cooking.txt
+85
-89
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2010, #05; Wed, 28)
3
-X-master-at: 61bf126ecb24977b883079942b71ff96174c19fb
4
-X-next-at: 75e8ac1bc0d18c1f8ca82f22ec04c8407298f41f
2
+Subject: What's cooking in git.git (Aug 2010, #01; Wed, 4)
3
+X-master-at: 721e76cbfac650ce676fc789b717eb21e1daa46e
4
+X-next-at: 7f78604dbfb7c90248f8142905329a97e26c8539
5
6
-What's cooking in git.git (Jul 2010, #05; Wed, 28)
6
+What's cooking in git.git (Aug 2010, #01; Wed, 4)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,12 +11,72 @@ 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
-Now that the latest feature release 1.7.2 is out, we should rewind and
15
-rebuild 'next' and start cooking new topics.
14
+The tip of 'next' has been rewound and rebuilt on top of v1.7.2; also a
15
+few topics have been ejected as I've been warning to. I'll start merging
16
+more stuff to 'next' in the next round after reading them over again.
17
+
18
+--------------------------------------------------
19
+[Graduated to "master"]
20
+
21
+* gp/pack-refs-remove-empty-dirs (2010-07-06) 1 commit
22
+ (merged to 'next' on 2010-07-14 at 7d25131)
23
+ + pack-refs: remove newly empty directories
24
+
25
+* pt/git-gui (2010-08-02) 13 commits
26
+ + Merge git://repo.or.cz/git-gui into pt/git-gui
27
+ + git-gui: fix size and position of window panes on startup
28
+ + git-gui: mc cannot be used before msgcat has been loaded
29
+ + git-gui: use textconv filter for diff and blame
30
+ + git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32
31
+ + git-gui: fix shortcut creation on cygwin
32
+ + git-gui: fix PATH environment for mingw development environment
33
+ + git-gui: fix usage of _gitworktree when creating shortcut for windows
34
+ + git-gui: fix "Explore Working Copy" for Windows again
35
+ + git-gui: fix usage of themed widgets variable
36
+ + git-gui: Handle failure of core.worktree to identify the working directory.
37
+ + Merge branch 'maint'
38
+ + git-gui: check whether systems nice command works or disable it
39
+
40
+* rr/svn-fe (2010-07-29) 2 commits
41
+ + contrib/svn-fe: Add the svn-fe target to .gitignore
42
+ + contrib/svn-fe: Fix IncludePath
43
+
44
+* sv/maint-diff-q-clear-fix (2010-08-02) 1 commit
45
+ + Fix DIFF_QUEUE_CLEAR refactoring
46
47
--------------------------------------------------
48
[New Topics]
49
50
+* jc/sha1-name-find-fix (2010-08-02) 1 commit
51
+ - sha1_name.c: fix parsing of ":/token" syntax
52
+
53
+* jn/doc-pull (2010-08-02) 1 commit
54
+ - Documentation: flesh out “git pull” description
55
+
56
+* jn/maint-gitweb-dynconf (2010-07-30) 1 commit
57
+ - gitweb: allow configurations that change with each request
58
+
59
+* sr/local-config (2010-08-03) 1 commit
60
+ - config: add --local option
61
+
62
+--------------------------------------------------
63
+[Stalled]
64
+
65
+* zl/mailinfo-recode-patch (2010-06-14) 2 commits
66
+ - add --recode-patch option to git-am
67
+ - add --recode-patch option to git-mailinfo
68
+
69
+I recall there was another round of re-roll planned for this one.
70
+
71
+* jk/tag-contains (2010-07-05) 4 commits
72
+ - Why is "git tag --contains" so slow?
73
+ - default core.clockskew variable to one day
74
+ - limit "contains" traversals based on commit timestamp
75
+ - tag: speed up --contains calculation
76
+
77
+--------------------------------------------------
78
+[Cooking]
79
+
80
* ab/test-coverage (2010-07-26) 8 commits
81
- Makefile: make gcov invocation configurable
82
- t/README: Add a note about the dangers of coverage chasing
@@ -72,10 +132,11 @@ rebuild 'next' and start cooking new topics.
132
- checkout, commit: remove confusing assignments to rev.abbrev
133
- archive: abbreviate substituted commit ids again
134
75
-* jn/maint-setup-fix (2010-07-24) 10 commits
135
+* jn/maint-setup-fix (2010-07-24) 11 commits
136
- setup: split off a function to handle ordinary .git directories
137
- Revert "rehabilitate 'git index-pack' inside the object store"
138
- setup: do not forget working dir from subdir of gitdir
139
+ - t4111 (apply): refresh index before applying patches to it
140
- setup: split off get_device_or_die helper
141
- setup: split off a function to handle hitting ceiling in repo search
142
- setup: split off code to handle stumbling upon a repository
@@ -94,16 +155,19 @@ rebuild 'next' and start cooking new topics.
155
* ml/rebase-x-strategy (2010-07-29) 1 commit
156
- rebase: support -X to pass through strategy options
157
97
-* mm/shortopt-detached (2010-07-28) 4 commits
98
- - Allow detached form for --glob, --branches, --tags and --remote.
99
- - Allow detached form (e.g. "git log --grep foo") in log options.
100
- - Allow detached form for git diff --stat-name-width and --stat-width.
101
- - Allow detached form (e.g. "-S foo" instead of "-Sfoo") for diff options
158
+* mm/shortopt-detached (2010-07-30) 5 commits
159
+ - log: parse detached option for --glob
160
+ - log: parse detached options like git log --grep foo
161
+ - diff: parse detached options --stat-width n, --stat-name-width n
162
+ - diff: split off a function for --stat-* option parsing
163
+ - diff: parse detached options like -S foo
164
103
-* nd/fix-sparse-checkout (2010-07-26) 3 commits
104
- - Mark new entries skip-worktree appropriately
105
- - unpack-trees.c: Do not check ce_stage in will_have_skip_worktree()
106
- - Fix sparse checkout not removing files from index
165
+* nd/fix-sparse-checkout (2010-07-31) 5 commits
166
+ - unpack-trees: mark new entries skip-worktree appropriately
167
+ - unpack-trees: do not check for conflict entries too early
168
+ - unpack-trees: let read-tree -u remove index entries outside sparse area
169
+ - unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set
170
+ - t1011 (sparse checkout): style nitpicks
171
172
* tr/ab-i18n-fix (2010-07-25) 1 commit
173
- tests: locate i18n lib&data correctly under --valgrind
@@ -118,71 +182,6 @@ rebuild 'next' and start cooking new topics.
182
* vs/doc-spell (2010-07-20) 1 commit
183
- Documentation: spelling fixes
184
121
---------------------------------------------------
122
-[Stalled -- would discard unless there are some movements soon]
123
-
124
-* by/log-range-diff (2010-07-12) 18 commits
125
- . Minimum fix to make by/log-range-diff topic at least compile
126
- . add test cases for '--graph' of line level log
127
- . line.c output the '--graph' padding before each line
128
- . add parent rewrite feature to line level log
129
- . make rewrite_parents an external function
130
- . some document update
131
- . add two test cases
132
- . add --always-print option
133
- . map/print ranges along traversing the history topologically
134
- . print the line log
135
- . map/take range to parent
136
- . add range clone functions
137
- . export three functions from diff.c
138
- . parse the -L options
139
- . refactor parse_loc
140
- . add the basic data structure for line level history
141
- . parse-options: add two helper functions
142
- . parse-options: stop when encounter a non-option
143
-
144
-Perhaps a re-roll is coming? I suspect that we would have some overlaps
145
-to mm/shortopt-detached topic.
146
-
147
-* ps/gitweb-soc (2010-06-02) 2 commits
148
- (merged to 'next' on 2010-06-13 at 92245ae)
149
- + git-instaweb: Add option to reuse previous config file
150
- + Makefile: Use $(sharedir)/gitweb for target 'install-gitweb'
151
-
152
-If we are going to have a configuration variable to control this, I
153
-strongly suspect that --reuse-config should be renamed so that the
154
-variable can be named more sanely and in line with whatever option
155
-that replaces it.
156
-
157
-No responses; I think we will eventually want to have a configuration to
158
-always enable the new option, so the renaming of the command line option
159
-is inevitable. I plan to kick this out of 'next' once the upcoming
160
-release is out, and expect a re-roll with configuration variable.
161
-
162
-* js/rebase-origin-x (2010-02-05) 1 commit
163
- - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
164
-
165
-I retract my objection against the idea of -x; needs polishing before
166
-moving forward.
167
-
168
-No responses; I plan to drop this entirely after the upcoming release
169
-without prejudice.
170
-
171
-* zl/mailinfo-recode-patch (2010-06-14) 2 commits
172
- - add --recode-patch option to git-am
173
- - add --recode-patch option to git-mailinfo
174
-
175
-I recall there was another round of re-roll planned for this one.
176
-
177
-* jk/tag-contains (2010-07-05) 4 commits
178
- - Why is "git tag --contains" so slow?
179
- - default core.clockskew variable to one day
180
- - limit "contains" traversals based on commit timestamp
181
- - tag: speed up --contains calculation
182
-
183
---------------------------------------------------
184
-[Cooking]
185
-
185
* ab/report-corrupt-object-with-type (2010-06-10) 1 commit
186
- sha1_file: Show the the type and path to corrupt objects
187
@@ -211,7 +210,8 @@ I recall there was another round of re-roll planned for this one.
210
- Documentation/reset: separate options by mode
211
- Documentation/git-reset: reorder modes for soft-mixed-hard progression
212
214
-* rr/svn-export (2010-07-15) 8 commits
213
+* rr/svn-export (2010-07-29) 9 commits
214
+ - vcs-svn: Remove stray calls to removed functions
215
- Add SVN dump parser
216
- Add infrastructure to write revisions in fast-export format
217
- Add stream helper library
@@ -234,15 +234,12 @@ I recall there was another round of re-roll planned for this one.
234
- Add a for_each_string_list_item macro
235
(this branch is used by tf/string-list-init.)
236
237
-* il/rfc-remote-fd-ext (2010-07-19) 3 commits
237
+* il/rfc-remote-fd-ext (2010-07-31) 4 commits
238
+ - Rewrite bidirectional traffic loop
239
- gitignore: Ignore the new /git-remote-{ext,fd} helpers
240
- New remote helper: git-remote-ext
241
- New remote helper git-remote-fd
242
242
-* gp/pack-refs-remove-empty-dirs (2010-07-06) 1 commit
243
- (merged to 'next' on 2010-07-14 at 7d25131)
244
- + pack-refs: remove newly empty directories
245
-
243
* hv/submodule-find-ff-merge (2010-07-07) 3 commits
244
- Implement automatic fast-forward merge for submodules
245
- setup_revisions(): Allow walking history in a submodule
@@ -260,9 +257,8 @@ I recall there was another round of re-roll planned for this one.
257
(this branch uses ar/string-list-foreach.)
258
259
* en/d-f-conflict-fix (2010-07-27) 7 commits
263
- (merged to 'next' on 2010-07-28 at 75e8ac1)
260
+ (merged to 'next' on 2010-08-03 at 7f78604)
261
+ t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
265
- (merged to 'next' on 2010-07-14 at 2b2a810)
262
+ fast-import: Improve robustness when D->F changes provided in wrong order
263
+ fast-export: Fix output order of D/F changes
264
+ merge_recursive: Fix renames across paths below D/F conflicts