What's cooking (2011/09 #05)
Junio C Hamano committed
Sep 14, 2011 at 21:35 UTC
7bde2fe7915b74ae46de1096ef9eaa838b821937
1 file changed
+176
-178
whats-cooking.txt
+176
-178
@@ -1,26 +1,14 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2011, #04; Mon, 12)
3
-X-master-at: 5738c9c21e53356ab5020912116e7f82fd2d428f
4
-X-next-at: f7b2633f782e177423b9f0a0fb76c4f5ae0d8364
2
+Subject: What's cooking in git.git (Sep 2011, #05; Wed, 14)
3
+X-master-at: 1e5814f3def08452aef4caa703f074ba7d167867
4
+X-next-at: 872ee2d61fac3d9dd13d38dcf7d86c7059b4ca79
5
6
-What's cooking in git.git (Sep 2011, #04; Mon, 12)
6
+What's cooking in git.git (Sep 2011, #05; Wed, 14)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' while commits prefixed with '+' are in 'next'.
11
12
-The tip of 'master' is tagged as 1.7.7-rc1. Unfortunately k.org seems to
13
-be still down, so there will be no pre-built rpms nor pre-formatted manual
14
-or documentation pages.
15
-
16
-I've tentatively uploaded a release candidate tarball at:
17
-
18
- http://code.google.com/p/git-core/downloads/list
19
-
20
-and its SHA-1 checksum is:
21
-
22
-80dfcce410d2f36ffed4c8b48c8c896a45159e41 git-1.7.7.rc1.tar.gz
23
-
12
Here are the repositories that have my integration branches:
13
14
With maint, master, next, pu and todo:
@@ -40,30 +28,65 @@ With all the topics and integration branches:
28
--------------------------------------------------
29
[New Topics]
30
43
-* ph/format-patch-no-color (2011-09-12) 1 commit
44
- - format-patch: ignore ui.color
31
+* jk/maint-fetch-submodule-check-fix (2011-09-12) 1 commit
32
+ (merged to 'next' on 2011-09-12 at 3c73b8c)
33
+ + fetch: avoid quadratic loop checking for updated submodules
34
+ (this branch is used by jk/argv-array.)
35
+
36
+* bc/attr-ignore-case (2011-09-14) 5 commits
37
+ - attr: read core.attributesfile from git_default_core_config
38
+ - attr.c: respect core.ignorecase when matching attribute patterns
39
+ - builtin/mv.c: plug miniscule memory leak
40
+ - cleanup: use internal memory allocation wrapper functions everywhere
41
+ - attr.c: avoid inappropriate access to strbuf "buf" member
42
+
43
+* jc/maint-fsck-fwrite-size-check (2011-09-11) 1 commit
44
+ - fsck: do not abort upon finding an empty blob
45
+
46
+* jc/request-pull-show-head-2 (2011-09-13) 2 commits
47
+ - request-pull: state exact commit object name
48
+ - fetch: allow asking for an explicit commit object by name
49
+
50
+* jk/argv-array (2011-09-14) 7 commits
51
+ - run_hook: use argv_array API
52
+ - checkout: use argv_array API
53
+ - bisect: use argv_array API
54
+ - quote: provide sq_dequote_to_argv_array
55
+ - refactor argv_array into generic code
56
+ - quote.h: fix bogus comment
57
+ - add sha1_array API docs
58
+ (this branch uses jk/maint-fetch-submodule-check-fix.)
59
+
60
+* js/cred-macos-x-keychain-2 (2011-09-14) 1 commit
61
+ - contrib: add a pair of credential helpers for Mac OS X's keychain
62
+ (this branch uses jk/http-auth-keyring; is tangled with js/cred-macos-x-keychain.)
63
46
-This fix for the recent regression probably should be in 1.7.7 final.
47
-Will merge to "master" soonish.
64
+Welcome addition to build our confidence in the jk/http-auth-keyring topic.
65
66
--------------------------------------------------
50
-[Graduated to "master"]
51
-
52
-* jl/maint-fetch-submodule-check-fix (2011-09-09) 1 commit
53
- + fetch: skip on-demand checking when no submodules are configured
67
+[Stalled]
68
55
-* jn/remote-helpers-doc (2011-09-01) 3 commits
56
- + (short) documentation for the testgit remote helper
57
- + Documentation/git-remote-helpers: explain how import works with multiple refs
58
- + Documentation/remote-helpers: explain capabilities first
69
+* jc/signed-push (2011-09-12) 7 commits
70
+ . push -s: support pre-receive-signature hook
71
+ . push -s: receiving end
72
+ . push -s: send signed push certificate
73
+ . push -s: skeleton
74
+ - Split GPG interface into its own helper library
75
+ - rename "match_refs()" to "match_push_refs()"
76
+ - send-pack: typofix error message
77
+ (this branch uses jc/run-receive-hook-cleanup; is tangled with jc/signed-push-3.)
78
60
---------------------------------------------------
61
-[Stalled]
79
+This was the v2 that updated notes tree on the receiving end.
80
63
-* jk/default-attr (2011-08-26) 1 commit
64
- - attr: map builtin userdiff drivers to well-known extensions
81
+* jc/signed-push-3 (2011-09-12) 4 commits
82
+ - push -s: signed push
83
+ - Split GPG interface into its own helper library
84
+ - rename "match_refs()" to "match_push_refs()"
85
+ - send-pack: typofix error message
86
+ (this branch uses jc/run-receive-hook-cleanup; is tangled with jc/signed-push.)
87
66
-Not urgent; I fixed up the test breakage just for fun.
88
+This is the third edition, that moves the preparation of the notes tree to
89
+the sending end.
90
91
* nd/maint-autofix-tag-in-head (2011-08-26) 3 commits
92
- Accept tags in HEAD or MERGE_HEAD
@@ -73,11 +96,6 @@ Not urgent; I fixed up the test breakage just for fun.
96
Probably needs a re-roll to aim a bit higher.
97
Not urgent; will not be in 1.7.7.
98
76
-* tr/doc-note-rewrite (2011-09-05) 1 commit
77
- - Documentation: "on for all" configuration of notes.rewriteRef
78
-
79
-It was questioned if the new text suggests a sane and safe thing to do.
80
-
99
* jk/add-i-hunk-filter (2011-07-27) 5 commits
100
(merged to 'next' on 2011-08-11 at 8ff9a56)
101
+ add--interactive: add option to autosplit hunks
@@ -86,8 +104,7 @@ It was questioned if the new text suggests a sane and safe thing to do.
104
+ add--interactive: factor out regex error handling
105
+ add--interactive: refactor patch mode argument processing
106
89
-Needs documentation updates, tests, and integration with the higher level
90
-callers, e.g. "git add -p".
107
+Will be dropped.
108
109
* jh/receive-count-limit (2011-05-23) 10 commits
110
- receive-pack: Allow server to refuse pushes with too many objects
@@ -108,7 +125,7 @@ Would need another round to separate per-pack and per-session limits.
125
- mergetool: Add tests for filename with whitespace
126
127
I think this is a good idea, but it probably needs a re-roll.
111
-Cf. $gmane/176254, 176255, 166256
128
+Cf. $gmane/176254 and 176255.
129
130
* jk/generation-numbers (2011-09-11) 8 commits
131
- metadata-cache.c: make two functions static
@@ -127,51 +144,49 @@ numbers is already in; backburnered.
144
- t5800: point out that deleting branches does not work
145
- t5800: document inability to push new branch with old content
146
147
+Perhaps 281eee4 (revision: keep track of the end-user input from the
148
+command line, 2011-08-25) in bk/ancestry-path would help.
149
+
150
* po/cygwin-backslash (2011-08-05) 2 commits
151
- On Cygwin support both UNIX and DOS style path-names
152
- git-compat-util: add generic find_last_dir_sep that respects is_dir_sep
153
154
+Incomplete with respect to backslash processing in prefix_filename(), and
155
+also loses the ability to escape glob specials. Perhaps drop?
156
+
157
--------------------------------------------------
158
[Cooking]
159
137
-* hl/iso8601-more-zone-formats (2011-09-09) 2 commits
138
- - fixup? simplification and tightening
139
- - date.c: Support iso8601 timezone formats
160
+* rj/maint-t9159-svn-rev-notation (2011-09-13) 1 commit
161
+ - t9159-*.sh: t9159-*.sh: skip for mergeinfo test for svn <= 1.4
162
141
-Not urgent.
142
-Will squash them into one and push them forward to "next", though.
163
+* tr/doc-note-rewrite (2011-09-13) 1 commit
164
+ - Documentation: basic configuration of notes.rewriteRef
165
144
-* jc/signed-push (2011-09-09) 7 commits
145
- . push -s: support pre-receive-signature hook
146
- . push -s: receiving end
147
- . push -s: send signed push certificate
148
- . push -s: skeleton
149
- . refactor run_receive_hook()
150
- - Split GPG interface into its own helper library
151
- - send-pack: typofix error message
152
- (this branch is tangled with jc/signed-push-3.)
166
+Updated to a safer wording.
167
154
-This was the v2 that updated notes tree on the receiving end.
168
+* jk/default-attr (2011-09-12) 1 commit
169
+ - attr: map builtin userdiff drivers to well-known extensions
170
156
-* jc/signed-push-3 (2011-09-09) 4 commits
157
- - push -s: signed push
158
- - rename "match_refs()" to "match_push_refs()"
159
- - Split GPG interface into its own helper library
160
- - send-pack: typofix error message
161
- (this branch is tangled with jc/signed-push.)
171
+Will be re-rolled after 1.7.7 final.
172
163
-This is the third edition, that moves the preparation of the notes tree to
164
-the sending end.
173
+* ph/format-patch-no-color (2011-09-12) 1 commit
174
+ (merged to 'next' on 2011-09-12 at 20283e8)
175
+ + format-patch: ignore ui.color
176
166
-* jc/run-receive-hook-cleanup (2011-09-09) 1 commit
167
- - refactor run_receive_hook()
177
+This fix for the recent regression probably should be in 1.7.7 final.
178
+Will merge to "master" soonish.
179
+
180
+* hl/iso8601-more-zone-formats (2011-09-12) 1 commit
181
+ (merged to 'next' on 2011-09-12 at 270f5c7)
182
+ + date.c: Support iso8601 timezone formats
183
169
-This is a remnant in the jc/signed-push topic that has become unnecessary
170
-for the purpose of jc/signed-push-3, but is retained for its clean-up
171
-value.
184
+* jc/run-receive-hook-cleanup (2011-09-12) 1 commit
185
+ (merged to 'next' on 2011-09-12 at 68dd431)
186
+ + refactor run_receive_hook()
187
+ (this branch is used by jc/signed-push and jc/signed-push-3.)
188
173
-The corresponding one will be dropped when rebuilding the jc/signed-push
174
-topic on top of this topic later.
189
+Just to make it easier to run a hook that reads from its standard input.
190
191
* jk/for-each-ref (2011-09-08) 5 commits
192
- for-each-ref: add split message parts to %(contents:*).
@@ -180,14 +195,12 @@ topic on top of this topic later.
195
- t6300: add more body-parsing tests
196
- t7004: factor out gpg setup
197
183
-Not urgent.
184
-Looked more or less reasonable, though.
198
+Will merge to "next".
199
200
* wh/normalize-alt-odb-path (2011-09-07) 1 commit
201
- sha1_file: normalize alt_odb path before comparing and storing
202
189
-Not urgent.
190
-Looked more or less reasonable, though.
203
+Will merge to "next".
204
205
* fk/use-kwset-pickaxe-grep-f (2011-09-11) 2 commits
206
- obstack.c: Fix some sparse warnings
@@ -196,26 +209,22 @@ Looked more or less reasonable, though.
209
In general we would prefer to see these fixed at the upstream first, but
210
we have essentially forked from them at their last GPLv2 versions...
211
199
-* jc/make-static (2011-09-11) 2 commits
212
+Will merge to "next".
213
+
214
+* jc/make-static (2011-09-14) 4 commits
215
+ (merged to 'next' on 2011-09-14 at c5943ff)
216
+ + exec_cmd.c: prepare_git_cmd() is sometimes used
217
+ + environment.c: have_git_dir() has users on Cygwin
218
(merged to 'next' on 2011-09-11 at 2acb0af)
219
+ vcs-svn: remove unused functions and make some static
220
+ make-static: master
221
+ (this branch is tangled with jc/reflog-walk-use-only-nsha1.)
222
204
-I am not sure about the droppage of a few unused functions in the topmost
205
-patch.
223
+With a few fix-ups.
224
225
* rj/quietly-create-dep-dir (2011-09-11) 1 commit
208
- - Makefile: Make dependency directory creation less noisy
209
-
210
-Not urgent.
211
-Will merge to "next", though.
212
-
213
-* js/cred-macos-x-keychain (2011-09-11) 1 commit
214
- - contrib: add a credential helper for Mac OS X's keychain
215
- (this branch uses jk/http-auth-keyring.)
216
-
217
-Welcome addition to build our confidence in the jk/http-auth-keyring topic.
218
-Will merge to "next".
226
+ (merged to 'next' on 2011-09-12 at 93d1c6b)
227
+ + Makefile: Make dependency directory creation less noisy
228
229
* mh/check-ref-format (2011-09-11) 8 commits
230
- Add tools to avoid the use of unnormalized refnames.
@@ -235,76 +244,60 @@ Another reroll coming.
244
- remote: "rename o foo" should not rename ref "origin/bar"
245
- remote: write correct fetch spec when renaming remote 'remote'
246
238
-* rj/maint-t9159-svn-rev-notation (2011-09-11) 1 commit
239
- - t9159-*.sh: Add an svn version check
240
-
241
-Ack/Nack from people involved in git-svn?
242
-
243
-* cb/common-prefix-unification (2011-09-11) 4 commits
244
- - dir.c: make common_prefix_len() static
247
+* cb/common-prefix-unification (2011-09-12) 3 commits
248
- rename pathspec_prefix() to common_prefix() and move to dir.[ch]
249
- consolidate pathspec_prefix and common_prefix
250
- remove prefix argument from pathspec_prefix
251
249
-Will merge to "next" after squashing the tip one into "consolidate" patch.
252
+Will merge to "next".
253
251
-* cb/send-email-help (2011-09-05) 1 commit
254
+* cb/send-email-help (2011-09-12) 1 commit
255
- send-email: add option -h
256
254
-I think we should further amend to drop the fully-spelled "help" that will
255
-be intercepted by "git" wrapper before moving this forward.
256
-
257
A separate set of patches to remove the hidden fully-spelled "help" from
258
other commands would be nice to have as companion patches as well.
259
260
+Will merge to "next".
261
+
262
* jc/fetch-pack-fsck-objects (2011-09-04) 3 commits
261
- - test: fetch/receive with fsckobjects
262
- - transfer.fsckobjects: unify fetch/receive.fsckobjects
263
- - fetch.fsckobjects: verify downloaded objects
263
+ (merged to 'next' on 2011-09-12 at a031347)
264
+ + test: fetch/receive with fsckobjects
265
+ + transfer.fsckobjects: unify fetch/receive.fsckobjects
266
+ + fetch.fsckobjects: verify downloaded objects
267
268
We had an option to verify the sent objects before accepting a push but
269
lacked the corresponding option when fetching. In the light of the recent
270
k.org incident, a change like this would be a good addition.
271
269
-Will merge to "next" to cook for more.
270
-
272
* jc/fetch-verify (2011-09-01) 3 commits
272
- - fetch: verify we have everything we need before updating our ref
273
- - rev-list --verify-object
274
- - list-objects: pass callback data to show_objects()
273
+ (merged to 'next' on 2011-09-12 at 3f491ab)
274
+ + fetch: verify we have everything we need before updating our ref
275
+ + rev-list --verify-object
276
+ + list-objects: pass callback data to show_objects()
277
(this branch uses jc/traverse-commit-list; is tangled with jc/receive-verify.)
278
279
During a fetch, we verify that the pack stream is self consistent,
280
but did not verify that the refs that are updated are consistent with
281
objects contained in the packstream, and this adds such a check.
282
281
-Will merge to "next" to cook for more.
282
-
283
* jc/receive-verify (2011-09-09) 6 commits
284
- - receive-pack: check connectivity before concluding "git push"
285
- - check_everything_connected(): libify
286
- - check_everything_connected(): refactor to use an iterator
287
- - fetch: verify we have everything we need before updating our ref
288
- - rev-list --verify-object
289
- - list-objects: pass callback data to show_objects()
284
+ (merged to 'next' on 2011-09-12 at 856de78)
285
+ + receive-pack: check connectivity before concluding "git push"
286
+ + check_everything_connected(): libify
287
+ + check_everything_connected(): refactor to use an iterator
288
+ + fetch: verify we have everything we need before updating our ref
289
+ + rev-list --verify-object
290
+ + list-objects: pass callback data to show_objects()
291
(this branch uses jc/traverse-commit-list; is tangled with jc/fetch-verify.)
292
293
While accepting a push, we verify that the pack stream is self consistent,
294
but did not verify that the refs the push updates are consistent with
295
objects contained in the packstream, and this adds such a check.
296
296
-Will merge to "next" to cook for more.
297
-
298
-* jc/request-pull-show-head (2011-09-06) 1 commit
299
- - State what commit to expect in request-pull
300
-
301
-Will merge to "next".
302
-
297
* jn/maint-http-error-message (2011-09-06) 2 commits
304
- - http: avoid empty error messages for some curl errors
305
- - http: remove extra newline in error message
306
-
307
-Will merge to "next".
298
+ (merged to 'next' on 2011-09-12 at a843f03)
299
+ + http: avoid empty error messages for some curl errors
300
+ + http: remove extra newline in error message
301
302
* bk/ancestry-path (2011-08-25) 3 commits
303
(merged to 'next' on 2011-09-02 at d05ba5d)
@@ -312,10 +305,9 @@ Will merge to "next".
305
+ revision: keep track of the end-user input from the command line
306
+ rev-list: Demonstrate breakage with --ancestry-path --all
307
315
-The topic came up a bit too late in the cycle.
316
-Will cook for a while.
317
-
318
-* mg/branch-list (2011-09-08) 6 commits
308
+* mg/branch-list (2011-09-13) 7 commits
309
+ (merged to 'next' on 2011-09-14 at 6610a2e)
310
+ + t3200: clean up checks for file existence
311
(merged to 'next' on 2011-09-11 at 20a9cdb)
312
+ branch: -v does not automatically imply --list
313
(merged to 'next' on 2011-09-02 at b818eae)
@@ -325,15 +317,11 @@ Will cook for a while.
317
+ git-tag: introduce long forms for the options
318
+ t6040: test branch -vv
319
328
-Not urgent; the topic came up a bit too late in the cycle.
329
-
320
* mm/rebase-i-exec-edit (2011-08-26) 2 commits
321
(merged to 'next' on 2011-09-02 at e75b1b9)
322
+ rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree
323
+ rebase -i: clean error message for --continue after failed exec
324
335
-Not urgent; the topic came up a bit too late in the cycle.
336
-
325
* hv/submodule-merge-search (2011-08-26) 5 commits
326
- submodule: Search for merges only at end of recursive merge
327
- allow multiple calls to submodule merge search for the same path
@@ -343,16 +331,15 @@ Not urgent; the topic came up a bit too late in the cycle.
331
+ push: teach --recurse-submodules the on-demand option
332
(this branch is tangled with fg/submodule-auto-push.)
333
346
-Not urgent; the topic came up a bit too late in the cycle. The second
347
-from the bottom one needs to be replaced with a properly written commit
348
-log message.
334
+The second from the bottom one needs to be replaced with a properly
335
+written commit log message.
336
337
* mm/mediawiki-as-a-remote (2011-09-01) 2 commits
351
- - git-remote-mediawiki: allow push to set MediaWiki metadata
352
- - Add a remote helper to interact with mediawiki (fetch & push)
338
+ (merged to 'next' on 2011-09-12 at 163c6a5)
339
+ + git-remote-mediawiki: allow push to set MediaWiki metadata
340
+ + Add a remote helper to interact with mediawiki (fetch & push)
341
342
Fun.
355
-Not urgent; the topic came up a bit too late in the cycle.
343
344
* bc/unstash-clean-crufts (2011-08-27) 4 commits
345
(merged to 'next' on 2011-09-02 at 7bfd66f)
@@ -361,41 +348,29 @@ Not urgent; the topic came up a bit too late in the cycle.
348
+ git-stash.sh: fix typo in error message
349
+ t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
350
364
-Not urgent; the topic came up a bit too late in the cycle.
365
-
351
* da/make-auto-header-dependencies (2011-08-30) 1 commit
352
(merged to 'next' on 2011-09-02 at e04a4af)
353
+ Makefile: Improve compiler header dependency check
354
(this branch uses fk/make-auto-header-dependencies.)
355
371
-Not urgent; will not be in 1.7.7.
372
-
356
* gb/am-hg-patch (2011-08-29) 1 commit
357
(merged to 'next' on 2011-09-02 at 3edfe4c)
358
+ am: preliminary support for hg patches
359
377
-Not urgent; the topic came up a bit too late in the cycle.
378
-
360
* jc/diff-index-unpack (2011-08-29) 3 commits
361
(merged to 'next' on 2011-09-02 at 4206bd9)
362
+ diff-index: pass pathspec down to unpack-trees machinery
363
+ unpack-trees: allow pruning with pathspec
364
+ traverse_trees(): allow pruning with pathspec
365
385
-Will cook for a while.
386
-
366
* nm/grep-object-sha1-lock (2011-08-30) 1 commit
367
(merged to 'next' on 2011-09-02 at 336f57d)
368
+ grep: Fix race condition in delta_base_cache
369
391
-Not urgent; the topic came up a bit too late in the cycle.
392
-
370
* tr/mergetool-valgrind (2011-08-30) 1 commit
371
(merged to 'next' on 2011-09-02 at f5f2c61)
372
+ Symlink mergetools scriptlets into valgrind wrappers
373
397
-Not urgent; the topic came up a bit too late in the cycle.
398
-
374
* fg/submodule-auto-push (2011-09-11) 2 commits
375
(merged to 'next' on 2011-09-11 at 3fc86f7)
376
+ submodule.c: make two functions static
@@ -413,15 +388,11 @@ looked somewhat suboptimal.
388
+ rev-list: fix finish_object() call
389
(this branch is used by jc/fetch-verify and jc/receive-verify.)
390
416
-Not urgent; will not be in 1.7.7.
417
-
391
* fk/make-auto-header-dependencies (2011-08-18) 1 commit
392
(merged to 'next' on 2011-08-24 at 3da2c25)
393
+ Makefile: Use computed header dependencies if the compiler supports it
394
(this branch is used by da/make-auto-header-dependencies.)
395
423
-Not urgent; will not be in 1.7.7.
424
-
396
* mh/iterate-refs (2011-09-11) 7 commits
397
- refs.c: make create_cached_refs() static
398
- Retain caches of submodule refs
@@ -436,15 +407,11 @@ unclear what the benefit of these changes are. If the series were to read
407
parts of the ref hierarchy (like refs/heads/) lazily, the story would
408
have been different, though.
409
439
-Not urgent; will not be in 1.7.7.
440
-
410
* hv/submodule-update-none (2011-08-11) 2 commits
411
(merged to 'next' on 2011-08-24 at 5302fc1)
412
+ add update 'none' flag to disable update of submodule by default
413
+ submodule: move update configuration variable further up
414
446
-Not urgent; will not be in 1.7.7.
447
-
415
* jc/lookup-object-hash (2011-08-11) 6 commits
416
(merged to 'next' on 2011-08-24 at 5825411)
417
+ object hash: replace linear probing with 4-way cuckoo hashing
@@ -458,8 +425,6 @@ I do not think there is anything fundamentally wrong with this series, but
425
the risk of breakage far outweighs observed performance gain in one
426
particular workload. Will keep it in 'next' at least for one cycle.
427
461
-Not urgent; will not be in 1.7.7.
462
-
428
* fg/submodule-git-file-git-dir (2011-08-22) 2 commits
429
(merged to 'next' on 2011-08-23 at 762194e)
430
+ Move git-dir for submodules
@@ -469,9 +434,13 @@ I do not think there is anything fundamentally wrong with this series, but
434
the risk of breakage outweighs any benefit for having this new
435
feature. Will keep it in 'next' at least for one cycle.
436
472
-Not urgent; will not be in 1.7.7.
473
-
474
-* jk/http-auth-keyring (2011-09-11) 14 commits
437
+* jk/http-auth-keyring (2011-09-14) 19 commits
438
+ (merged to 'next' on 2011-09-14 at 589c7c9)
439
+ + credential-store: use a better storage format
440
+ + t0300: make alternate username tests more robust
441
+ + t0300: make askpass tests a little more robust
442
+ + credential-cache: fix expiration calculation corner cases
443
+ + docs: minor tweaks to credentials API
444
(merged to 'next' on 2011-09-11 at 491ce6a)
445
+ credentials: make credential_fill_gently() static
446
(merged to 'next' on 2011-08-03 at b06e80e)
@@ -488,14 +457,7 @@ Not urgent; will not be in 1.7.7.
457
+ remote-curl: don't retry auth failures with dumb protocol
458
+ improve httpd auth tests
459
+ url: decode buffers that are not NUL-terminated
491
- (this branch is used by js/cred-macos-x-keychain.)
492
-
493
-Looked mostly reasonable except for the limitation that it is not clear
494
-how to deal with a site at which a user needs to use different passwords
495
-for different repositories. Will keep it in "next" at least for one cycle,
496
-until we start hearing real-world success reports on the list.
497
-
498
-Not urgent; will not be in 1.7.7.
460
+ (this branch is used by js/cred-macos-x-keychain-2; is tangled with js/cred-macos-x-keychain.)
461
462
* rr/revert-cherry-pick-continue (2011-09-11) 19 commits
463
(merged to 'next' on 2011-09-11 at 7d78054)
@@ -520,9 +482,6 @@ Not urgent; will not be in 1.7.7.
482
+ config: Introduce functions to write non-standard file
483
+ advice: Introduce error_resolve_conflict
484
523
-Will keep it in 'next' at least for one cycle.
524
-Not urgent; will not be in 1.7.7.
525
-
485
--------------------------------------------------
486
[Discarded]
487
@@ -536,3 +495,42 @@ Not urgent; will not be in 1.7.7.
495
. tests for push --quiet
496
497
Dropped for rerolling after 1.7.7 cycle.
498
+
499
+* js/cred-macos-x-keychain (2011-09-11) 15 commits
500
+ (merged to 'next' on 2011-09-12 at 8d17f94)
501
+ + contrib: add a credential helper for Mac OS X's keychain
502
+ (merged to 'next' on 2011-09-11 at 491ce6a)
503
+ + credentials: make credential_fill_gently() static
504
+ (merged to 'next' on 2011-08-03 at b06e80e)
505
+ + credentials: add "getpass" helper
506
+ + credentials: add "store" helper
507
+ + credentials: add "cache" helper
508
+ + docs: end-user documentation for the credential subsystem
509
+ + http: use hostname in credential description
510
+ + allow the user to configure credential helpers
511
+ + look for credentials in config before prompting
512
+ + http: use credential API to get passwords
513
+ + introduce credentials API
514
+ + http: retry authentication failures for all http requests
515
+ + remote-curl: don't retry auth failures with dumb protocol
516
+ + improve httpd auth tests
517
+ + url: decode buffers that are not NUL-terminated
518
+ (this branch is tangled with jk/http-auth-keyring and js/cred-macos-x-keychain-2.)
519
+
520
+Reverted out of 'next'.
521
+
522
+* jc/reflog-walk-use-only-nsha1 (2011-09-13) 4 commits
523
+ . (baloon) teach reflog-walk to look at only new-sha1 field
524
+ + environment.c: have_git_dir() has users on Cygwin
525
+ (merged to 'next' on 2011-09-11 at 2acb0af)
526
+ + vcs-svn: remove unused functions and make some static
527
+ + make-static: master
528
+ (this branch is tangled with jc/make-static.)
529
+
530
+* jc/request-pull-show-head (2011-09-13) 2 commits
531
+ (merged to 'next' on 2011-09-13 at c82fb3a)
532
+ + Revert "State what commit to expect in request-pull"
533
+ (merged to 'next' on 2011-09-12 at c1c7b73)
534
+ + State what commit to expect in request-pull
535
+
536
+Reverted out of 'next'.