What's cooking (2012/08 #10)
Junio C Hamano committed
Aug 31, 2012 at 14:19 UTC
6d5fa44666b0b674bccc5ee4c5d717ccb616ce76
1 file changed
+99
-141
whats-cooking.txt
+99
-141
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2012, #09; Wed, 29)
3
+Subject: What's cooking in git.git (Aug 2012, #10; Fri, 31)
4
X-master-at: 16d26b168b371b2f4f86b1adb61470c6b08b27b9
5
-X-next-at: 9b7ff7f6c17d9531b4ebeb199a70a759872c7d4f
5
+X-next-at: d550ecdc42bd9a5e364767da2177640724535e93
6
7
-What's cooking in git.git (Aug 2012, #09; Wed, 29)
7
+What's cooking in git.git (Aug 2012, #10; Fri, 31)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -23,131 +23,52 @@ repositories listed at
23
http://git-blame.blogspot.com/p/git-public-repositories.html
24
25
--------------------------------------------------
26
-[Graduated to "master"]
27
-
28
-* bc/prune-info (2012-08-07) 1 commit
29
- (merged to 'next' on 2012-08-20 at 1bc9e66)
30
- + prune.c: only print informational message in show_only or verbose mode
31
-
32
-Teach "git prune" without "-v" to be silent about leftover temporary files.
33
-
34
-* ef/win32-cred-helper (2012-08-16) 1 commit
35
- (merged to 'next' on 2012-08-20 at bd5c651)
36
- + contrib: add win32 credential-helper
37
- (this branch is used by ph/credential-refactor.)
38
-
39
-Credential helper for Win32 to allow access to the keychain of
40
-the logged-in user.
41
-
42
-* hv/submodule-path-unmatch (2012-08-14) 1 commit
43
- (merged to 'next' on 2012-08-20 at cbe6483)
44
- + Let submodule command exit with error status if path does not exist
45
-
46
-As the title says.
47
-
48
-* jc/capabilities (2012-08-13) 3 commits
49
- (merged to 'next' on 2012-08-20 at 1976e47)
50
- + fetch-pack: mention server version with verbose output
51
- + parse_feature_request: make it easier to see feature values
52
- + fetch-pack: do not ask for unadvertised capabilities
53
- (this branch uses jk/version-string.)
54
-
55
-Some capabilities were asked by fetch-pack even when upload-pack did
56
-not advertise that they are available. Fix fetch-pack not to do so.
57
-
58
-* jc/maint-protect-sh-from-ifs (2012-08-08) 1 commit
59
- (merged to 'next' on 2012-08-20 at 8b00562)
60
- + sh-setup: protect from exported IFS
61
-
62
-When the user exports a non-default IFS without HT, scripts that
63
-rely on being able to parse "ls-files -s | while read a b c..."
64
-start to fail. Protect them from such a misconfiguration.
65
-
66
-* jk/version-string (2012-08-10) 3 commits
67
- (merged to 'next' on 2012-08-20 at 6d207bb)
68
- + do not send client agent unless server does first
69
- + send-pack: fix capability-sending logic
70
- + include agent identifier in capability string
71
- (this branch is used by jc/capabilities.)
72
-
73
-(Originally merged to 'next' on 2012-08-10)
74
-
75
-Leftover bits from the "git version" code restructuring, that give
76
-us an ability to expose the Git version over the wire in the
77
-protocol exchange. But we do so carefully only to the other end that
78
-understands it.
79
-
80
-* mg/rebase-i-onto-reflog-in-full (2012-08-10) 1 commit
81
- (merged to 'next' on 2012-08-20 at f671bd2)
82
- + rebase -i: use full onto sha1 in reflog
83
-
84
-The reflog entries left by "git rebase" and "git rebase -i" were
85
-inconsistent.
26
+[New Topics]
27
87
-* mh/maint-config-doc-proxy-command (2012-08-18) 2 commits
88
- (merged to 'next' on 2012-08-20 at a484625)
89
- + git-config doc: unconfuse an example
90
- + git-config.txt: fix example
28
+* mz/cherry-pick-cmdline-order (2012-08-30) 3 commits
29
+ (merged to 'next' on 2012-08-31 at fc8eec4)
30
+ + cherry-pick/revert: respect order of revisions to pick
31
+ + demonstrate broken 'git cherry-pick three one two'
32
+ + teach log --no-walk=unsorted, which avoids sorting
33
92
-A minor documentation update.
34
+"git cherry-pick A C B" used to replay changes in A and then B and
35
+then C if these three commits had committer timestamps in that
36
+order, which is not what the user who said "A C B" naturally expects.
37
94
-* mz/cherry-code-cleanup (2012-07-29) 3 commits
95
- (merged to 'next' on 2012-08-20 at bfb0457)
96
- + cherry: remove redundant check for merge commit
97
- + cherry: don't set ignored rev_info options
98
- + remove unnecessary parameter from get_patch_ids()
38
+Will merge to 'master' as part of the fifth batch.
39
100
-Minor code clean-up on the cherry-pick codepath.
40
+* ph/credential-gnome-keyring (2012-08-24) 1 commit
41
+ (merged to 'next' on 2012-08-31 at 6f3b1de)
42
+ + contrib: add credential helper for GnomeKeyring
43
+ (this branch is used by ph/credential-refactor.)
44
102
-* mz/empty-rebase-test (2012-08-09) 1 commit
103
- (merged to 'next' on 2012-08-20 at 53e2419)
104
- + add tests for 'git rebase --keep-empty'
45
+The later refactoring of the shared code in the original series may
46
+not be worth the trouble, so it is split into a separate topic that
47
+builds on top of this one, which independently should be useful.
48
106
-* rr/precompose-utf8-cleanup (2012-08-20) 2 commits
107
- (merged to 'next' on 2012-08-20 at a883c2a)
108
- + precompose-utf8: do not call checks for non-ascii "utf8"
109
- + cleanup precompose_utf8
49
+Will merge to 'master' as part of the fifth batch.
50
111
-A style and code cleanup.
51
+* ms/contrib-thunderbird-updates (2012-08-31) 2 commits
52
+ - [SQUASH] minimum fixup
53
+ - Thunderbird: fix appp.sh format problems
54
113
---------------------------------------------------
114
-[New Topics]
55
+Update helper to send out format-patch output using Thunderbird.
56
116
-* jk/maint-quiet-is-synonym-to-s-in-log (2012-08-28) 1 commit
117
- - log: fix --quiet synonym for -s
118
-
119
-We tried to bend backwards to allow "--quiet" to be a synonym as
120
-"-s" when given as e.g. "git show --quiet", but did not quite
121
-succeed.
57
+* nd/i18n-index-pack (2012-08-31) 1 commit
58
+ - i18n: mark more index-pack strings for translation
59
60
Will merge to 'next'.
61
125
-* nd/checkout-option-parsing-fix (2012-08-29) 3 commits
126
- - checkout: reorder option handling
127
- - checkout: move more parameters to struct checkout_opts
128
- - checkout: pass "struct checkout_opts *" as const pointer
129
-
130
-The option parsing of "git checkout" had error checking, dwim and
131
-defaulting missing options, all mixed in the code, and issuing an
132
-appropriate error message with useful context was getting harder.
133
-Reorganize the code and allow giving a proper diagnosis when the
134
-user says "git checkout -b -t foo bar" (e.g. "-t" is not a good name
135
-for a branch).
136
-
137
-* jc/maint-name-rev (2012-08-29) 3 commits
138
- - name-rev: --weight option (WIP)
139
- - name_rev: clarify when a new tip-name is assigned to a commit
140
- - name-rev: lose unnecessary typedef
141
-
142
-"git name-rev" names the given revision based on a ref that can be
143
-reached in the smallest number of steps from the rev, but that is
144
-not useful when the caller wants to know which tag is the oldest one
145
-that contains the rev. This teaches a new mode to the command that
146
-uses the oldest ref among those which contain the rev.
147
-
62
--------------------------------------------------
63
[Stalled]
64
65
+* jc/maint-push-refs-all (2012-08-27) 2 commits
66
+ - get_fetch_map(): tighten checks on dest refs
67
+ - [BROKEN] fetch/push: allow refs/*:refs/*
68
+
69
+Allows pushing and fetching everything including refs/stash.
70
+This is broken (see the log message there).
71
+
72
* er/doc-fast-import-done (2012-08-22) 1 commit
73
- fast-import: document the --done option
74
@@ -252,10 +173,53 @@ working :-<.
173
--------------------------------------------------
174
[Cooking]
175
255
-* cn/branch-set-upstream-to (2012-08-23) 3 commits
256
- - branch: deprecate --set-upstream and show help if we detect possible mistaken use
257
- - branch: add --unset-upstream option
258
- - branch: introduce --set-upstream-to
176
+* jk/maint-quiet-is-synonym-to-s-in-log (2012-08-28) 1 commit
177
+ (merged to 'next' on 2012-08-31 at 06f6953)
178
+ + log: fix --quiet synonym for -s
179
+
180
+We tried to bend backwards to allow "--quiet" to be a synonym as
181
+"-s" when given as e.g. "git show --quiet", but did not quite
182
+succeed.
183
+
184
+Will merge to 'master' as part of the fifth batch.
185
+
186
+* nd/checkout-option-parsing-fix (2012-08-30) 3 commits
187
+ - checkout: reorder option handling
188
+ - checkout: move more parameters to struct checkout_opts
189
+ - checkout: pass "struct checkout_opts *" as const pointer
190
+
191
+The option parsing of "git checkout" had error checking, dwim and
192
+defaulting missing options, all mixed in the code, and issuing an
193
+appropriate error message with useful context was getting harder.
194
+Reorganize the code and allow giving a proper diagnosis when the
195
+user says "git checkout -b -t foo bar" (e.g. "-t" is not a good name
196
+for a branch).
197
+
198
+* jc/maint-name-rev (2012-08-29) 6 commits
199
+ - describe --contains: use "name-rev --weight"
200
+ - name-rev --weight: tests and documentation
201
+ - name-rev --weight: cache the computed weight in notes
202
+ - name-rev: --weight option
203
+ - name_rev: clarify the logic to assign a new tip-name to a commit
204
+ - name-rev: lose unnecessary typedef
205
+
206
+"git name-rev" names the given revision based on a ref that can be
207
+reached in the smallest number of steps from the rev, but that is
208
+not useful when the caller wants to know which tag is the oldest one
209
+that contains the rev. This teaches a new mode to the command that
210
+uses the oldest ref among those which contain the rev.
211
+
212
+I am not sure if this is worth it; for one thing, even with the help
213
+from notes-cache, it seems to make the "describe --contains" even
214
+slower. Also the command will be unusably slow for a user who does
215
+not have a write access (hence unable to create or update the
216
+notes-cache).
217
+
218
+* cn/branch-set-upstream-to (2012-08-30) 3 commits
219
+ (merged to 'next' on 2012-08-31 at d550ecd)
220
+ + branch: deprecate --set-upstream and show help if we detect possible mistaken use
221
+ + branch: add --unset-upstream option
222
+ + branch: introduce --set-upstream-to
223
224
"git branch --set-upstream origin/master" is a common mistake to
225
create a local branch 'origin/master' and set it to integrate with
@@ -264,8 +228,7 @@ the current branch. With a plan to deprecate this option, introduce
228
current branch to integrate with 'origin/master' remote tracking
229
branch.
230
267
-Waiting for a reroll
268
-that tightens its error checking.
231
+Will merge to 'master' as part of the fifth batch.
232
233
* jc/dotdot-is-parent-directory (2012-08-23) 1 commit
234
(merged to 'next' on 2012-08-28 at 2f2ae87)
@@ -315,21 +278,16 @@ getrlimit(RLIMIT_NOFILE) and/or sysconf(_SC_OPEN_MAX).
278
279
Will merge to 'master' as part of the third batch.
280
318
-* ph/credential-refactor (2012-08-27) 6 commits
281
+* ph/credential-refactor (2012-08-27) 5 commits
282
- wincred: port to generic credential helper (UNTESTED)
283
- Merge branch 'ef/win32-cred-helper' into ph/credential-refactor
284
- osxkeychain: port to generic credential helper implementation
285
- gnome-keyring: port to generic helper implementation
286
- contrib: add generic credential helper
324
- - contrib: add credential helper for GnomeKeyring
325
-
326
-Adds a new credential helper to support Gnome keyring and attempts
327
-to refactor to share code among OSX keychain, Gnome keyring and
328
-Win32 credential helpers.
287
+ (this branch uses ph/credential-gnome-keyring.)
288
330
-Waiting for test results with the tip one
331
-to decide whether the series should be rerolled or reduced to only
332
-the first one.
289
+Attempts to refactor to share code among OSX keychain, Gnome keyring
290
+and Win32 credential helpers.
291
292
* jc/apply-binary-p0 (2012-08-24) 1 commit
293
(merged to 'next' on 2012-08-28 at 6fa690c)
@@ -373,6 +331,8 @@ the username in the URL to force authentication, if the server is
331
configured to allow GET anonymously, while requiring authentication
332
for POST.
333
334
+Will merge to 'master' as part of the fourth batch.
335
+
336
* jx/test-real-path (2012-08-27) 1 commit
337
- test: set the realpath of CWD as TRASH_DIRECTORY
338
@@ -415,18 +375,20 @@ were counting in bytes, not in display columns.
375
376
Will merge to 'master' as part of the fourth batch.
377
418
-* jc/merge-bases (2012-08-28) 5 commits
378
+* jc/merge-bases (2012-08-31) 9 commits
379
+ - reduce_heads(): reimplement on top of remove_redundant()
380
+ - merge-base: "--is-ancestor A B"
381
- get_merge_bases_many(): walk from many tips in parallel
382
+ - in_merge_bases(): use paint_down_to_common()
383
+ - merge_bases_many(): split out the logic to paint history
384
- in_merge_bases(): omit unnecessary redundant common ancestor reduction
385
- http-push: use in_merge_bases() for fast-forward check
386
- receive-pack: use in_merge_bases() for fast-forward check
387
- in_merge_bases(): support only one "other" commit
424
- (this branch is used by jc/xprm-merge-bases-many.)
388
426
-Optimises the "merge-base" computation a bit, and also updates its
389
+Optimise the "merge-base" computation a bit, and also update its
390
users that do not need the full merge-base information to call a
428
-cheaper subset. The most important one is the second from the tip
429
-done by Thomas.
391
+cheaper subset.
392
393
Will merge to 'next'.
394
@@ -489,6 +451,7 @@ Will merge to 'master' as part of the fourth batch.
451
- Implement a remote helper for svn in C
452
(this branch is used by fa/vcs-svn.)
453
454
+A GSoC project.
455
Waiting for comments from mentors and stakeholders.
456
457
* fa/vcs-svn (2012-08-28) 4 commits
@@ -498,6 +461,7 @@ Waiting for comments from mentors and stakeholders.
461
- svndump: move struct definitions to .h
462
(this branch uses fa/remote-svn.)
463
464
+A GSoC project.
465
Waiting for comments from mentors and stakeholders.
466
467
* nd/i18n-parseopt-help (2012-08-22) 66 commits
@@ -652,12 +616,6 @@ used together (the command used to misdetect branches).
616
617
Will merge to 'master' as part of the fourth batch.
618
655
-* jc/maint-push-refs-all (2012-08-27) 2 commits
656
- - get_fetch_map(): tighten checks on dest refs
657
- - [BROKEN] fetch/push: allow refs/*:refs/*
658
-
659
-Allows pushing and fetching refs/stash.
660
-
619
* tg/index-v5 (2012-08-17) 13 commits
620
- p0002-index.sh: add perf test for the index formats
621
- update-index.c: rewrite index when index-version is given
@@ -673,8 +631,8 @@ Allows pushing and fetching refs/stash.
631
- read-cache.c: Re-read index if index file changed
632
- Move index v2 specific functions to their own file
633
676
-A GSoC project, queued here primarily to give people an easier
677
-access to the state of the last posted version.
634
+A GSoC project.
635
+Waiting for comments from mentors and stakeholders.
636
637
* jc/maint-sane-execvp-notdir (2012-07-31) 1 commit
638
(merged to 'next' on 2012-08-20 at 0d76cf2)