What's cooking (2011/11 #05)
Junio C Hamano committed
Nov 28, 2011 at 15:03 UTC
6a279857f536d3dd0ecc159999cf72e784508869
1 file changed
+124
-43
whats-cooking.txt
+124
-43
@@ -1,17 +1,14 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2011, #04; Wed, 16)
3
-X-master-at: 09116a1c31e3754cb18bb69ef057342cd7808935
4
-X-next-at: cc761519149511482c8cf0afc615993437266af7
2
+Subject: What's cooking in git.git (Nov 2011, #05; Mon, 28)
3
+X-master-at: fc14b89a7e6899b8ac3b5751ec2d8c98203ea4c2
4
+X-next-at: 9ef225745e2777b46364afc3297e5b06d1e29033
5
6
-What's cooking in git.git (Nov 2011, #04; Wed, 16)
6
+What's cooking in git.git (Nov 2011, #05; Mon, 28)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
11
12
-One nasty regression killed, hopefully we are good to go for the third
13
-release candidate tomorrow.
14
-
12
Here are the repositories that have my integration branches:
13
14
With maint, master, next, pu, todo:
@@ -40,50 +37,90 @@ The preformatted documentation in HTML and man format are found in:
37
--------------------------------------------------
38
[New Topics]
39
43
-* jk/refresh-porcelain-output (2011-11-14) 5 commits
44
- - perhaps squash? show intent-to-add entries as "A" in verbose refresh
45
- - refresh_index: notice typechanges in output
46
- - read-cache: let refresh_cache_ent pass up changed flags
47
- - refresh_index: mark deletions in porcelain output
48
- - refresh_index: rename format variables
49
-
50
-The tip two commits need to be squashed into one.
51
-
52
-* ab/enable-i18n (2011-11-14) 1 commit
53
- - i18n: add infrastructure for translating Git with gettext
54
-
55
-* gh/userdiff-matlab (2011-11-15) 1 commit
56
- - Add built-in diff patterns for MATLAB code
40
+* cn/maint-lf-to-crlf-filter (2011-11-28) 1 commit
41
+ - convert: track state in LF-to-CRLF filter
42
+
43
+Candidate for early next cycle.
44
+
45
+* nd/maint-ignore-exclude (2011-11-28) 1 commit
46
+ - checkout,merge: loosen overwriting untracked file check based on info/exclude
47
+ (this branch is used by nd/ignore-might-be-precious.)
48
+
49
+Candidate for early next cycle.
50
+
51
+* vr/git-merge-doc (2011-11-21) 1 commit
52
+ - Show error for 'git merge' with unset merge.defaultToUpstream
53
+
54
+Candidate for early next cycle.
55
+
56
+* jn/branch-move-to-self (2011-11-28) 2 commits
57
+ - Allow checkout -B <current-branch> to update the current branch
58
+ - branch: allow a no-op "branch -M <current-branch> HEAD"
59
+
60
+* jk/credentials (2011-11-28) 19 commits
61
+ - compat/getpass: add a /dev/tty implementation
62
+ - credential: use git_prompt instead of git_getpass
63
+ - prompt: add PROMPT_ECHO flag
64
+ - stub out getpass_echo function
65
+ - refactor git_getpass into generic prompt function
66
+ - move git_getpass to its own source file
67
+ - t: add test harness for external credential helpers
68
+ - credentials: add "store" helper
69
+ - strbuf: add strbuf_add*_urlencode
70
+ - credentials: add "cache" helper
71
+ - docs: end-user documentation for the credential subsystem
72
+ - credential: make relevance of http path configurable
73
+ - credential: add credential.*.username
74
+ - credential: apply helper config
75
+ - http: use credential API to get passwords
76
+ - credential: add function for parsing url components
77
+ - introduce credentials API
78
+ - t5550: fix typo
79
+ - test-lib: add test_config_global variant
80
+
81
+* nd/ignore-might-be-precious (2011-11-28) 2 commits
82
+ - checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
83
+ - Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious
84
+ (this branch uses nd/maint-ignore-exclude.)
85
+
86
+* jk/upload-archive-use-start-command (2011-11-21) 1 commit
87
+ - upload-archive: use start_command instead of fork
88
+
89
+* jk/maint-1.6.2-upload-archive (2011-11-21) 1 commit
90
+ - archive: don't let remote clients get unreachable commits
91
+ (this branch is used by jk/maint-upload-archive.)
92
+
93
+* jk/maint-upload-archive (2011-11-21) 1 commit
94
+ - Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive
95
+ (this branch uses jk/maint-1.6.2-upload-archive.)
96
58
-* jc/maint-pack-object-cycle (2011-11-16) 1 commit
59
- - pack-object: tolerate broken packs that have duplicated objects
60
-
61
-Make the client side more robust against bogus pack stream; the problem
62
-was discovered by accident while repacking a clone obtained from somewhat
63
-buggy test server.
97
+--------------------------------------------------
98
+[Graduated to "master"]
99
65
-* jc/index-pack-reject-dups (2011-11-16) 1 commit
66
- - receive-pack, fetch-pack: reject bogus pack that records objects twice
100
+* jc/maint-name-rev-all (2011-11-15) 1 commit
101
+ + name-rev --all: do not even attempt to describe non-commit object
102
68
-And this is the prevention to reject such pack stream in the first place.
103
+Fix for a corner-case bug that was present from day one of the command.
104
70
-* jc/maint-name-rev-all (2011-11-15) 1 commit
71
- - name-rev --all: do not even attempt to describe non-commit object
105
+* jn/revert-quit (2011-11-21) 3 commits
106
+ + revert: improve error message for cherry-pick during cherry-pick
107
+ + revert: rearrange pick_revisions() for clarity
108
+ + revert: rename --reset option to --quit
109
73
-Fix for a corner-case bug? that was present from day one of the command.
110
+Late fix for a recent feature.
111
112
* ml/mailmap (2011-11-16) 1 commit
76
- - mailmap: xcalloc mailmap_info
113
+ + mailmap: xcalloc mailmap_info
114
78
-An obvious(ly correct) cleanup.
115
+An obvious(ly correct) and trivial cleanup.
116
117
* rr/misc-fixes (2011-11-15) 4 commits
81
- - git-compat-util: don't assume value for undefined variable
82
- - sha1_file: don't mix enum with int
83
- - convert: don't mix enum with int
84
- - http: remove unused function hex()
118
+ + git-compat-util: don't assume value for undefined variable
119
+ + sha1_file: don't mix enum with int
120
+ + convert: don't mix enum with int
121
+ + http: remove unused function hex()
122
86
-Obvious(ly correct) cleanups.
123
+Obvious(ly correct) and trivial cleanups.
124
125
--------------------------------------------------
126
[Stalled]
@@ -171,13 +208,53 @@ Not absolutely needed; parked in 'pu' but may drop.
208
--------------------------------------------------
209
[Cooking]
210
211
+* jk/refresh-porcelain-output (2011-11-18) 3 commits
212
+ (merged to 'next' on 2011-11-18 at 872f25e)
213
+ + refresh_index: make porcelain output more specific
214
+ + refresh_index: rename format variables
215
+ + read-cache: let refresh_cache_ent pass up changed flags
216
+
217
+Will keep in 'next' during this cycle.
218
+
219
+* ab/enable-i18n (2011-11-18) 1 commit
220
+ - i18n: add infrastructure for translating Git with gettext
221
+
222
+Not urgent.
223
+
224
+* gh/userdiff-matlab (2011-11-15) 1 commit
225
+ (merged to 'next' on 2011-11-18 at 10cd275)
226
+ + Add built-in diff patterns for MATLAB code
227
+
228
+Will keep in 'next' during this cycle.
229
+
230
+* jc/maint-pack-object-cycle (2011-11-16) 1 commit
231
+ (merged to 'next' on 2011-11-18 at 3715a81)
232
+ + pack-object: tolerate broken packs that have duplicated objects
233
+
234
+Make the client side more robust against bogus pack stream; the problem
235
+was discovered by accident while repacking a clone obtained from somewhat
236
+buggy test server.
237
+
238
+Will keep in 'next' during this cycle.
239
+
240
+* jc/index-pack-reject-dups (2011-11-16) 1 commit
241
+ (merged to 'next' on 2011-11-18 at 2090221)
242
+ + receive-pack, fetch-pack: reject bogus pack that records objects twice
243
+
244
+And this is the prevention to reject such pack stream in the first place.
245
+
246
+Will keep in 'next' during this cycle.
247
+
248
* nd/resolve-ref (2011-11-13) 2 commits
175
- - Copy resolve_ref() return value for longer use
176
- - Convert many resolve_ref() calls to read_ref*() and ref_exists()
249
+ (merged to 'next' on 2011-11-18 at 8e17b34)
250
+ + Copy resolve_ref() return value for longer use
251
+ + Convert many resolve_ref() calls to read_ref*() and ref_exists()
252
253
A fix for an error-reporting codepath that is not a regression, that
254
turned into a patch that touches many callsite.
255
256
+Will keep in 'next' during this cycle.
257
+
258
* vr/msvc (2011-10-31) 3 commits
259
(merged to 'next' on 2011-11-14 at f46d021)
260
+ MSVC: Remove unneeded header stubs
@@ -283,7 +360,11 @@ Will keep in 'next' during this cycle.
360
361
Will keep in 'next' during this cycle.
362
286
-* jc/stream-to-pack (2011-11-03) 4 commits
363
+* jc/stream-to-pack (2011-11-23) 8 commits
364
+ - bulk-checkin: honor pack.packsizelimit
365
+ - bulk-checkin: do not write an object that already exists
366
+ - bulk-checkin: do not write the same object twice
367
+ - csum-file: introduce sha1file_checkpoint
368
- Bulk check-in
369
- finish_tmp_packfile(): a helper function
370
- create_tmp_packfile(): a helper function