What's cooking (2011/10 #03)
Junio C Hamano committed
Oct 7, 2011 at 13:25 UTC
fc2becb16a6ebc86821290b35f2593bbb70a1f10
1 file changed
+338
-635
whats-cooking.txt
+338
-635
@@ -1,719 +1,409 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2011, #02; Wed, 5)
2
+Subject: What's cooking in git.git (Oct 2011, #03; Fri, 7)
3
X-master-at: 7f41b6bbe3181dc4d1687db036bf22316997a1bf
4
-X-next-at: 16d0eacc744f9eabe7ef4cdf3f9fece5424b951f
4
+X-next-at: fbb28a2df5b67b80240267347d7f018681c7153c
5
6
-What's cooking in git.git (Oct 2011, #02; Wed, 5)
6
+What's cooking in git.git (Oct 2011, #03; Fri, 7)
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'.
10
+only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
11
12
-The first batch of topics that have been cooking in 'next' have now
13
-graduated to 'master'.
12
+The first wave of topics have been graduated to 'master'. I've rebuilt
13
+'next' while kicking some topics back to 'pu'. Also some topics have been
14
+discarded.
15
16
Here are the repositories that have my integration branches:
17
18
With maint, master, next, pu, todo, html and man:
19
19
- url = git://repo.or.cz/alt-git.git
20
- url = https://code.google.com/p/git-core/
20
+ git://git.kernel.org/pub/scm/git/git.git
21
+ git://repo.or.cz/alt-git.git
22
+ https://code.google.com/p/git-core/
23
+ https://github.com/git/git
24
25
With only maint, master, html and man:
26
24
- url = git://git.sourceforge.jp/gitroot/git-core/git.git
25
- url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
27
+ git://git.sourceforge.jp/gitroot/git-core/git.git
28
+ git://git-core.git.sourceforge.net/gitroot/git-core/git-core
29
30
With all the topics and integration branches but not todo, html or man:
31
29
- url = https://github.com/gitster/git
30
-
31
-Until kernel.org comes back to life, it might be a good idea to
32
-tentatively have the following in your $HOME/.gitconfig:
33
-
34
- [url "http://code.google.com/p/git-core"]
35
- insteadOf = git://git.kernel.org/pub/scm/git/git.git
36
-
37
-I am planning to kick some topics out of 'next' back to 'pu' to give them
38
-a chance to be cleaned up. Not happened yet, but see below for ideas.
32
+ https://github.com/gitster/git
33
34
--------------------------------------------------
35
[New Topics]
36
43
-* sp/smart-http-failure (2011-10-04) 1 commit
44
- (merged to 'next' on 2011-10-05 at 73af367)
45
- + remote-curl: Fix warning after HTTP failure
46
-
47
-Will merge to "master" in the second wave.
48
-
49
---------------------------------------------------
50
-[Graduated to "master"]
51
-
52
-* bc/unstash-clean-crufts (2011-08-27) 4 commits
53
- (merged to 'next' on 2011-09-02 at 7bfd66f)
54
- + git-stash: remove untracked/ignored directories when stashed
55
- + t/t3905: add missing '&&' linkage
56
- + git-stash.sh: fix typo in error message
57
- + t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
58
-
59
-Will merge to "master" in the first wave.
60
-
61
-* bk/ancestry-path (2011-09-15) 4 commits
62
- (merged to 'next' on 2011-09-15 at aa64d04)
63
- + t6019: avoid refname collision on case-insensitive systems
64
- (merged to 'next' on 2011-09-02 at d05ba5d)
65
- + revision: do not include sibling history in --ancestry-path output
66
- + revision: keep track of the end-user input from the command line
67
- + rev-list: Demonstrate breakage with --ancestry-path --all
68
- (this branch is used by jc/request-pull-show-head-4.)
69
-
70
-Will merge to "master" in the first wave.
71
-
72
-* cb/send-email-help (2011-09-12) 1 commit
73
- (merged to 'next' on 2011-09-14 at ae71999)
74
- + send-email: add option -h
75
-
76
-Will merge to "master" in the first wave.
77
-
78
-* cn/eradicate-working-copy (2011-09-21) 1 commit
79
- (merged to 'next' on 2011-09-26 at 2683d36)
80
- + Remove 'working copy' from the documentation and C code
81
-
82
-Will merge to "master" in the first wave.
83
-
84
-* da/make-auto-header-dependencies (2011-08-30) 1 commit
85
- (merged to 'next' on 2011-09-02 at e04a4af)
86
- + Makefile: Improve compiler header dependency check
87
- (this branch uses fk/make-auto-header-dependencies.)
88
-
89
-Will merge to "master" in the first wave.
90
-
91
-* fk/make-auto-header-dependencies (2011-08-18) 1 commit
92
- (merged to 'next' on 2011-08-24 at 3da2c25)
93
- + Makefile: Use computed header dependencies if the compiler supports it
94
- (this branch is used by da/make-auto-header-dependencies.)
95
-
96
-Will merge to "master" in the first wave.
97
-
98
-* fk/use-kwset-pickaxe-grep-f (2011-09-11) 2 commits
99
- (merged to 'next' on 2011-09-14 at 436d858)
100
- + obstack.c: Fix some sparse warnings
101
- + sparse: Fix an "Using plain integer as NULL pointer" warning
102
-
103
-Will merge to "master" in the first wave.
104
-
105
-* gb/am-hg-patch (2011-08-29) 1 commit
106
- (merged to 'next' on 2011-09-02 at 3edfe4c)
107
- + am: preliminary support for hg patches
108
-
109
-Will merge to "master" in the first wave.
110
-
111
-* hl/iso8601-more-zone-formats (2011-09-12) 1 commit
112
- (merged to 'next' on 2011-09-12 at 270f5c7)
113
- + date.c: Support iso8601 timezone formats
114
-
115
-Will merge to "master" in the first wave.
116
-
117
-* jc/diff-index-unpack (2011-08-29) 3 commits
118
- (merged to 'next' on 2011-09-02 at 4206bd9)
119
- + diff-index: pass pathspec down to unpack-trees machinery
120
- + unpack-trees: allow pruning with pathspec
121
- + traverse_trees(): allow pruning with pathspec
122
-
123
-Will merge to "master" in the first wave.
124
-
125
-* jc/fetch-pack-fsck-objects (2011-09-04) 3 commits
126
- (merged to 'next' on 2011-09-12 at a031347)
127
- + test: fetch/receive with fsckobjects
128
- + transfer.fsckobjects: unify fetch/receive.fsckobjects
129
- + fetch.fsckobjects: verify downloaded objects
130
-
131
-We had an option to verify the sent objects before accepting a push but
132
-lacked the corresponding option when fetching. In the light of the recent
133
-k.org incident, a change like this would be a good addition.
134
-
135
-Will merge to "master" in the first wave.
136
-
137
-* jc/fetch-verify (2011-09-01) 3 commits
138
- (merged to 'next' on 2011-09-12 at 3f491ab)
139
- + fetch: verify we have everything we need before updating our ref
140
- + rev-list --verify-object
141
- + list-objects: pass callback data to show_objects()
142
- (this branch uses jc/traverse-commit-list; is tangled with jc/receive-verify.)
143
-
144
-During a fetch, we verify that the pack stream is self consistent,
145
-but did not verify that the refs that are updated are consistent with
146
-objects contained in the packstream, and this adds such a check.
147
-
148
-Will merge to "master" in the first wave.
149
-
150
-* jc/ls-remote-short-help (2011-09-16) 1 commit
151
- (merged to 'next' on 2011-09-26 at e24a27a)
152
- + ls-remote: a lone "-h" is asking for help
153
-
154
-Will merge to "master" in the first wave.
155
-
156
-* jc/maint-bundle-too-quiet (2011-09-19) 1 commit
157
- (merged to 'next' on 2011-09-26 at ba140d4)
158
- + Teach progress eye-candy to fetch_refs_from_bundle()
159
-
160
-Will merge to "master" in the first wave.
161
-
162
-* jc/maint-fsck-fwrite-size-check (2011-09-11) 1 commit
163
- (merged to 'next' on 2011-09-16 at 2258f11)
164
- + fsck: do not abort upon finding an empty blob
165
-
166
-Will merge to "master" in the first wave.
167
-
168
-* jc/receive-verify (2011-09-09) 6 commits
169
- (merged to 'next' on 2011-09-12 at 856de78)
170
- + receive-pack: check connectivity before concluding "git push"
171
- + check_everything_connected(): libify
172
- + check_everything_connected(): refactor to use an iterator
173
- + fetch: verify we have everything we need before updating our ref
174
- + rev-list --verify-object
175
- + list-objects: pass callback data to show_objects()
176
- (this branch uses jc/traverse-commit-list; is tangled with jc/fetch-verify.)
177
-
178
-While accepting a push, we verify that the pack stream is self consistent,
179
-but did not verify that the refs the push updates are consistent with
180
-objects contained in the packstream, and this adds such a check.
181
-
182
-Will merge to "master" in the third wave.
183
-
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
-
189
-Just to make it easier to run a hook that reads from its standard input.
190
-Will merge to "master" in the first wave.
191
-
192
-* jc/traverse-commit-list (2011-08-22) 3 commits
193
- (merged to 'next' on 2011-08-24 at df50dd7)
194
- + revision.c: update show_object_with_name() without using malloc()
195
- + revision.c: add show_object_with_name() helper function
196
- + rev-list: fix finish_object() call
197
- (this branch is used by jc/fetch-verify and jc/receive-verify.)
198
-
199
-Will merge to "master" in the first wave.
200
-
201
-* jc/want-commit (2011-09-15) 1 commit
202
- (merged to 'next' on 2011-09-26 at 5841512)
203
- + Allow git merge ":/<pattern>"
204
-
205
-Will merge to "master" in the first wave.
206
-
207
-* jk/argv-array (2011-09-14) 7 commits
208
- (merged to 'next' on 2011-09-16 at 90feab4)
209
- + run_hook: use argv_array API
210
- + checkout: use argv_array API
211
- + bisect: use argv_array API
212
- + quote: provide sq_dequote_to_argv_array
213
- + refactor argv_array into generic code
214
- + quote.h: fix bogus comment
215
- + add sha1_array API docs
216
- (this branch uses jk/maint-fetch-submodule-check-fix.)
217
-
218
-This has a slight interaction with the "pending_sha1 without having to
219
-read the object" work on rs/pending, but otherwise OK.
37
+* jc/signed-commit (2011-10-05) 4 commits
38
+ - commit: teach --gpg-sign option
39
+ - Split GPG interface into its own helper library
40
+ - rename "match_refs()" to "match_push_refs()"
41
+ - send-pack: typofix error message
42
+ (this branch is tangled with jc/signed-push and jc/signed-push-3.)
43
221
-Will merge to "master" in the first wave.
44
+This is to replace the earlier "signed push" experiments.
45
223
-* jk/filter-branch-require-clean-work-tree (2011-09-15) 1 commit
224
- (merged to 'next' on 2011-09-26 at 206a74a)
225
- + filter-branch: use require_clean_work_tree
46
+* js/maint-merge-one-file-osx-expr (2011-10-06) 1 commit
47
+ (merged to 'next' on 2011-10-07 at fbb28a2)
48
+ + merge-one-file: fix "expr: non-numeric argument"
49
227
-Will merge to "master" in the first wave.
50
+Will merge to 'master' in the third wave.
51
229
-* jk/for-each-ref (2011-09-08) 5 commits
230
- (merged to 'next' on 2011-09-14 at 36ed515)
231
- + for-each-ref: add split message parts to %(contents:*).
232
- + for-each-ref: handle multiline subjects like --pretty
233
- + for-each-ref: refactor subject and body placeholder parsing
234
- + t6300: add more body-parsing tests
235
- + t7004: factor out gpg setup
236
-
237
-Will merge to "master" in the first wave.
238
-
239
-* jk/maint-fetch-submodule-check-fix (2011-09-12) 1 commit
240
- (merged to 'next' on 2011-09-12 at 3c73b8c)
241
- + fetch: avoid quadratic loop checking for updated submodules
242
- (this branch is used by jk/argv-array.)
243
-
244
-Will merge to "master" in the first wave.
245
-
246
-* jn/gitweb-highlite-sanitise (2011-09-16) 1 commit
247
- (merged to 'next' on 2011-09-26 at c79390a)
248
- + gitweb: Strip non-printable characters from syntax highlighter output
249
-
250
-Will merge to "master" in the first wave.
251
-
252
-* js/check-attr-cached (2011-09-22) 2 commits
253
- (merged to 'next' on 2011-09-27 at 74d7b66)
254
- + t0003: remove extra whitespaces
255
- + Teach '--cached' option to check-attr
256
-
257
-Will merge to "master" in the first wave.
258
-
259
-* mg/branch-list (2011-09-13) 7 commits
260
- (merged to 'next' on 2011-09-14 at 6610a2e)
261
- + t3200: clean up checks for file existence
262
- (merged to 'next' on 2011-09-11 at 20a9cdb)
263
- + branch: -v does not automatically imply --list
264
- (merged to 'next' on 2011-09-02 at b818eae)
265
- + branch: allow pattern arguments
266
- + branch: introduce --list option
267
- + git-branch: introduce missing long forms for the options
268
- + git-tag: introduce long forms for the options
269
- + t6040: test branch -vv
270
-
271
-Will merge to "master" in the first wave.
272
-
273
-* mg/maint-doc-sparse-checkout (2011-09-21) 3 commits
274
- (merged to 'next' on 2011-09-21 at f316dec)
275
- + git-read-tree.txt: correct sparse-checkout and skip-worktree description
276
- + git-read-tree.txt: language and typography fixes
277
- + unpack-trees: print "Aborting" to stderr
278
-
279
-Will merge to "master" in the first wave.
280
-
281
-* mm/mediawiki-as-a-remote (2011-09-28) 6 commits
282
- (merged to 'next' on 2011-09-28 at a1c9ae5)
283
- + git-remote-mediawiki: allow a domain to be set for authentication
284
- (merged to 'next' on 2011-09-27 at 7ce8254)
285
- + git-remote-mediawiki: obey advice.pushNonFastForward
286
- + git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflicts
287
- + git-remote-mediawiki: trivial fixes
288
- (merged to 'next' on 2011-09-12 at 163c6a5)
289
- + git-remote-mediawiki: allow push to set MediaWiki metadata
290
- + Add a remote helper to interact with mediawiki (fetch & push)
291
-
292
-Will merge to "master" in the first wave.
293
-
294
-* mm/rebase-i-exec-edit (2011-08-26) 2 commits
295
- (merged to 'next' on 2011-09-02 at e75b1b9)
296
- + rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree
297
- + rebase -i: clean error message for --continue after failed exec
52
+* tm/completion-commit-fixup-squash (2011-10-06) 2 commits
53
+ - completion: commit --fixup and --squash
54
+ - completion: unite --reuse-message and --reedit-message handling
55
299
-Will merge to "master" in the first wave.
300
-
301
-* ms/patch-id-with-overlong-line (2011-09-22) 1 commit
302
- (merged to 'next' on 2011-09-26 at a33d0b2)
303
- + patch-id.c: use strbuf instead of a fixed buffer
304
-
305
-Will merge to "master" in the first wave.
306
-
307
-* nm/grep-object-sha1-lock (2011-08-30) 1 commit
308
- (merged to 'next' on 2011-09-02 at 336f57d)
309
- + grep: Fix race condition in delta_base_cache
310
-
311
-Will merge to "master" in the first wave.
312
-
313
-* rj/maint-t9159-svn-rev-notation (2011-09-21) 1 commit
314
- (merged to 'next' on 2011-09-26 at 525a567)
315
- + t9159-*.sh: skip for mergeinfo test for svn <= 1.4
56
+Looked reasonable but completion is not exactly in my area so I'd like to
57
+see others the test these in the real life and give opinions first.
58
317
-Will merge to "master" in the first wave.
59
+* tm/completion-push-set-upstream (2011-10-06) 1 commit
60
+ - completion: push --set-upstream
61
319
-* rj/quietly-create-dep-dir (2011-09-11) 1 commit
320
- (merged to 'next' on 2011-09-12 at 93d1c6b)
321
- + Makefile: Make dependency directory creation less noisy
62
+Looked reasonable but completion is not exactly in my area so I'd like to
63
+see others the test these in the real life and give opinions first.
64
323
-Will merge to "master" in the first wave.
324
-
325
-* rr/revert-cherry-pick-continue (2011-09-11) 19 commits
326
- (merged to 'next' on 2011-09-11 at 7d78054)
327
- + builtin/revert.c: make commit_list_append() static
328
- (merged to 'next' on 2011-08-24 at 712c115)
329
- + revert: Propagate errors upwards from do_pick_commit
330
- + revert: Introduce --continue to continue the operation
331
- + revert: Don't implicitly stomp pending sequencer operation
332
- + revert: Remove sequencer state when no commits are pending
333
- + reset: Make reset remove the sequencer state
334
- + revert: Introduce --reset to remove sequencer state
335
- + revert: Make pick_commits functionally act on a commit list
336
- + revert: Save command-line options for continuing operation
337
- + revert: Save data for continuing after conflict resolution
338
- + revert: Don't create invalid replay_opts in parse_args
339
- + revert: Separate cmdline parsing from functional code
340
- + revert: Introduce struct to keep command-line options
341
- + revert: Eliminate global "commit" variable
342
- + revert: Rename no_replay to record_origin
343
- + revert: Don't check lone argument in get_encoding
344
- + revert: Simplify and inline add_message_to_msg
345
- + config: Introduce functions to write non-standard file
346
- + advice: Introduce error_resolve_conflict
347
-
348
-Will merge to "master" in the first wave.
349
-
350
-Note that generalized sequencer still needs a bit more thought (see the
351
-summary by Ram at $gmane/179613).
352
-
353
-* sn/doc-update-index-assume-unchanged (2011-09-21) 1 commit
354
- (merged to 'next' on 2011-09-21 at 325e796)
355
- + Documentation/git-update-index: refer to 'ls-files'
356
-
357
-Will merge to "master" in the first wave.
358
-
359
-* tr/doc-note-rewrite (2011-09-13) 1 commit
360
- (merged to 'next' on 2011-09-16 at 5fe813a)
361
- + Documentation: basic configuration of notes.rewriteRef
362
-
363
-Will merge to "master" in the first wave.
364
-
365
-* tr/mergetool-valgrind (2011-08-30) 1 commit
366
- (merged to 'next' on 2011-09-02 at f5f2c61)
367
- + Symlink mergetools scriptlets into valgrind wrappers
65
+* js/no-cherry-pick-head-after-punted (2011-10-06) 1 commit
66
+ - Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pick-head-after-punted
67
+ (this branch uses js/maint-no-cherry-pick-head-after-punted.)
68
369
-Will merge to "master" in the first wave.
69
+Looked reasonable.
70
+Will merge to 'next'.
71
371
-* wh/normalize-alt-odb-path (2011-09-07) 1 commit
372
- (merged to 'next' on 2011-09-14 at 96f722b)
373
- + sha1_file: normalize alt_odb path before comparing and storing
72
+* js/maint-no-cherry-pick-head-after-punted (2011-10-06) 2 commits
73
+ - cherry-pick: do not give irrelevant advice when cherry-pick punted
74
+ - revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
75
+ (this branch is used by js/no-cherry-pick-head-after-punted.)
76
375
-Will merge to "master" in the first wave.
77
+Looked reasonable.
78
+Will merge to 'next'.
79
80
--------------------------------------------------
81
[Stalled]
82
83
+* jk/http-auth-keyring (2011-09-28) 22 commits
84
+ - credential-cache: don't cache items without context
85
+ - check_expirations: don't copy over same element
86
+ - t0300: add missing EOF terminator for <<
87
+ - credential-store: use a better storage format
88
+ - t0300: make alternate username tests more robust
89
+ - t0300: make askpass tests a little more robust
90
+ - credential-cache: fix expiration calculation corner cases
91
+ - docs: minor tweaks to credentials API
92
+ - credentials: make credential_fill_gently() static
93
+ - credentials: add "getpass" helper
94
+ - credentials: add "store" helper
95
+ - credentials: add "cache" helper
96
+ - docs: end-user documentation for the credential subsystem
97
+ - http: use hostname in credential description
98
+ - allow the user to configure credential helpers
99
+ - look for credentials in config before prompting
100
+ - http: use credential API to get passwords
101
+ - introduce credentials API
102
+ - http: retry authentication failures for all http requests
103
+ - remote-curl: don't retry auth failures with dumb protocol
104
+ - improve httpd auth tests
105
+ - url: decode buffers that are not NUL-terminated
106
+ (this branch is used by js/cred-macos-x-keychain-2.)
107
+
108
+Kicked back to 'pu' to allow design level discussions to continue.
109
+
110
+* js/cred-macos-x-keychain-2 (2011-10-06) 1 commit
111
+ - contrib: add a pair of credential helpers for Mac OS X's keychain
112
+ (this branch uses jk/http-auth-keyring.)
113
+
114
+Kicked back to 'pu' to allow design level discussions to continue.
115
+
116
* hv/submodule-merge-search (2011-08-26) 5 commits
117
- submodule: Search for merges only at end of recursive merge
118
- allow multiple calls to submodule merge search for the same path
119
- submodule: Demonstrate known breakage during recursive merge
120
- push: Don't push a repository with unpushed submodules
385
- (merged to 'next' on 2011-08-24 at 398e764)
386
- + push: teach --recurse-submodules the on-demand option
121
+ - push: teach --recurse-submodules the on-demand option
122
(this branch is tangled with fg/submodule-auto-push.)
123
124
The second from the bottom one needs to be replaced with a properly
125
written commit log message.
126
392
-Will kick back to 'pu'.
393
-
394
-* jc/signed-push (2011-09-12) 7 commits
395
- - push -s: support pre-receive-signature hook
396
- - push -s: receiving end
397
- - push -s: send signed push certificate
398
- - push -s: skeleton
399
- - Split GPG interface into its own helper library
400
- - rename "match_refs()" to "match_push_refs()"
401
- - send-pack: typofix error message
402
- (this branch is tangled with jc/signed-push-3.)
403
-
404
-This was the v2 that updated notes tree on the receiving end.
405
-
406
-* jc/signed-push-3 (2011-09-12) 4 commits
407
- . push -s: signed push
408
- - Split GPG interface into its own helper library
409
- - rename "match_refs()" to "match_push_refs()"
410
- - send-pack: typofix error message
411
- (this branch is tangled with jc/signed-push.)
412
-
413
-This is the third edition, that moves the preparation of the notes tree to
414
-the sending end.
415
-I expect that both of these topics will be discarded.
416
-
417
-* jk/add-i-hunk-filter (2011-07-27) 5 commits
418
- (merged to 'next' on 2011-08-11 at 8ff9a56)
419
- + add--interactive: add option to autosplit hunks
420
- + add--interactive: allow negatation of hunk filters
421
- + add--interactive: allow hunk filtering on command line
422
- + add--interactive: factor out regex error handling
423
- + add--interactive: refactor patch mode argument processing
424
-
425
-Will discard.
426
-
427
-* jh/receive-count-limit (2011-05-23) 10 commits
428
- - receive-pack: Allow server to refuse pushes with too many objects
429
- - pack-objects: Estimate pack size; abort early if pack size limit is exceeded
430
- - send-pack/receive-pack: Allow server to refuse pushing too large packs
431
- - pack-objects: Allow --max-pack-size to be used together with --stdout
432
- - send-pack/receive-pack: Allow server to refuse pushes with too many commits
433
- - pack-objects: Teach new option --max-commit-count, limiting #commits in pack
434
- - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
435
- - Tighten rules for matching server capabilities in server_supports()
436
- - send-pack: Attempt to retrieve remote status even if pack-objects fails
437
- - Update technical docs to reflect side-band-64k capability in receive-pack
438
-
439
-Would need another round to separate per-pack and per-session limits.
440
-Will discard.
127
+* fg/submodule-auto-push (2011-09-11) 2 commits
128
+ - submodule.c: make two functions static
129
+ - push: teach --recurse-submodules the on-demand option
130
+ (this branch is tangled with hv/submodule-merge-search.)
131
442
-* jk/generation-numbers (2011-09-11) 8 commits
443
- - metadata-cache.c: make two functions static
444
- - limit "contains" traversals based on commit generation
445
- - check commit generation cache validity against grafts
446
- - pretty: support %G to show the generation number of a commit
447
- - commit: add commit_generation function
448
- - add metadata-cache infrastructure
449
- - decorate: allow storing values instead of pointers
450
- - Merge branch 'jk/tag-contains-ab' (early part) into HEAD
451
-
452
-The initial "tag --contains" de-pessimization without need for generation
453
-numbers is already in.
454
-Will discard.
132
+What the topic aims to achieve may make sense, but the implementation
133
+looked somewhat suboptimal.
134
135
* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
136
- t5800: point out that deleting branches does not work
137
- t5800: document inability to push new branch with old content
138
139
Perhaps 281eee4 (revision: keep track of the end-user input from the
461
-command line, 2011-08-25) in bk/ancestry-path would help.
462
-
463
-* po/cygwin-backslash (2011-08-05) 2 commits
464
- - On Cygwin support both UNIX and DOS style path-names
465
- - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep
466
-
467
-Incomplete with respect to backslash processing in prefix_filename(), and
468
-also loses the ability to escape glob specials.
469
-Will discard.
140
+command line, 2011-08-25) would help.
141
142
--------------------------------------------------
143
[Cooking]
144
145
+* sp/smart-http-failure (2011-10-04) 1 commit
146
+ (merged to 'next' on 2011-10-06 at 02f9982)
147
+ + remote-curl: Fix warning after HTTP failure
148
+
149
+Will merge to 'master' in the second wave.
150
+
151
* cb/do-not-pretend-to-hijack-long-help (2011-10-05) 1 commit
475
- - use -h for synopsis and --help for manpage consistently
152
+ (merged to 'next' on 2011-10-06 at 46851fe)
153
+ + use -h for synopsis and --help for manpage consistently
154
477
-Will merge to "next".
155
+Will merge to 'master' in the second wave.
156
157
* cp/git-web-browse-browsers (2011-10-03) 1 commit
480
- - git-web--browse: avoid the use of eval
158
+ (merged to 'next' on 2011-10-06 at da42ad0)
159
+ + git-web--browse: avoid the use of eval
160
482
-Will merge to "next".
161
+Will merge to 'master' in the third wave.
162
163
* il/archive-err-signal (2011-10-05) 1 commit
485
- - Support ERR in remote archive like in fetch/push
486
-
487
-Will merge to "next".
164
+ (merged to 'next' on 2011-10-06 at 7e3083f)
165
+ + Support ERR in remote archive like in fetch/push
166
167
* nd/daemon-log-sock-errors (2011-10-03) 1 commit
490
- - daemon: log errors if we could not use some sockets
491
-
492
-Will merge to "next".
168
+ (merged to 'next' on 2011-10-06 at 5f3630f)
169
+ + daemon: log errors if we could not use some sockets
170
171
* nd/document-err-packet (2011-10-03) 1 commit
495
- (merged to 'next' on 2011-10-05 at aca0326)
172
+ (merged to 'next' on 2011-10-06 at 0c5f5d0)
173
+ pack-protocol: document "ERR" line
174
498
-Will merge to "master" in the second wave.
175
+Will merge to 'master' in the second wave.
176
177
* nd/git-daemon-error-msgs (2011-10-03) 1 commit
501
- - daemon: return "access denied" if a service is not allowed
502
-
503
-Will merge to "next".
178
+ (merged to 'next' on 2011-10-06 at 209126d)
179
+ + daemon: return "access denied" if a service is not allowed
180
181
* jc/is-url-simplify (2011-10-03) 1 commit
506
- - url.c: simplify is_url()
182
+ (merged to 'next' on 2011-10-06 at d6c6741)
183
+ + url.c: simplify is_url()
184
508
-Will merge to "next".
185
+Will merge to 'master' in the third wave.
186
510
-* jn/ident-from-etc-mailname (2011-10-03) 1 commit
511
- - ident: check /etc/mailname if email is unknown
512
-
513
-Will merge to "next".
514
-
515
-The warning might have to be squelched further, but that can be done as a
516
-separate patch in-tree.
187
+* jn/ident-from-etc-mailname (2011-10-06) 2 commits
188
+ (merged to 'next' on 2011-10-06 at a68770d)
189
+ + ident: do not retrieve default ident when unnecessary
190
+ + ident: check /etc/mailname if email is unknown
191
192
* jn/no-g-plus-s-on-bsd (2011-10-03) 1 commit
519
- - Makefile: do not set setgid bit on directories on GNU/kFreeBSD
193
+ (merged to 'next' on 2011-10-06 at 3d85674)
194
+ + Makefile: do not set setgid bit on directories on GNU/kFreeBSD
195
521
-Will merge to "next".
196
+Will merge to 'master' in the third wave.
197
198
* js/log-show-children (2011-10-04) 1 commit
524
- - log --children
199
+ (merged to 'next' on 2011-10-06 at de8f6f2)
200
+ + log --children
201
526
-Will merge to "next".
202
+Will merge to 'master' in the third wave.
203
204
* rs/name-rev-usage (2011-10-03) 1 commit
529
- (merged to 'next' on 2011-10-05 at 16d0eac)
205
+ (merged to 'next' on 2011-10-06 at e51878e)
206
+ name-rev: split usage string
207
532
-Will merge to "master" in the second wave.
208
+Originally merged to 'next' on 2011-10-05.
209
+Will merge to 'master' in the second wave.
210
211
* rs/test-ctype (2011-10-03) 2 commits
535
- (merged to 'next' on 2011-10-05 at 9a9b0e6)
212
+ (merged to 'next' on 2011-10-06 at b8c26d2)
213
+ test-ctype: add test for is_pathspec_magic
214
+ test-ctype: macrofy
215
539
-Will merge to "master" in the second wave.
216
+Originally merged to 'next' on 2011-10-05.
217
+Will merge to 'master' in the second wave.
218
219
* rs/pending (2011-10-03) 8 commits
542
- - commit: factor out clear_commit_marks_for_object_array
543
- - checkout: use leak_pending flag
544
- - bundle: use leak_pending flag
545
- - bisect: use leak_pending flag
546
- - revision: add leak_pending flag
547
- - checkout: use add_pending_{object,sha1} in orphan check
548
- - revision: factor out add_pending_sha1
549
- - checkout: check for "Previous HEAD" notice in t2020
550
-
551
-Will merge to "next" after reading the series over once more.
220
+ (merged to 'next' on 2011-10-06 at 998462b)
221
+ + commit: factor out clear_commit_marks_for_object_array
222
+ + checkout: use leak_pending flag
223
+ + bundle: use leak_pending flag
224
+ + bisect: use leak_pending flag
225
+ + revision: add leak_pending flag
226
+ + checkout: use add_pending_{object,sha1} in orphan check
227
+ + revision: factor out add_pending_sha1
228
+ + checkout: check for "Previous HEAD" notice in t2020
229
230
* ph/transport-with-gitfile (2011-10-04) 4 commits
554
- - Add test showing git-fetch groks gitfiles
555
- - Teach transport about the gitfile mechanism
556
- - Learn to handle gitfiles in enter_repo
557
- - enter_repo: do not modify input
558
-
559
-Will merge to "next" after reading the series over once more.
231
+ (merged to 'next' on 2011-10-06 at 891b8b6)
232
+ + Add test showing git-fetch groks gitfiles
233
+ + Teach transport about the gitfile mechanism
234
+ + Learn to handle gitfiles in enter_repo
235
+ + enter_repo: do not modify input
236
237
* jc/grep-untracked-exclude (2011-10-04) 1 commit
562
- - Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude
238
+ (merged to 'next' on 2011-10-06 at b16cffe)
239
+ + Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude
240
(this branch uses bw/grep-no-index-no-exclude and jc/maint-grep-untracked-exclude.)
241
565
-Will merge to "next".
566
-
242
* jc/maint-grep-untracked-exclude (2011-10-04) 1 commit
568
- - grep: teach --untracked and --exclude-standard options
243
+ + grep: teach --untracked and --exclude-standard options
244
(this branch is used by jc/grep-untracked-exclude; uses bw/grep-no-index-no-exclude.)
245
571
-Will merge to "next".
572
-
246
* dm/tree-walk (2011-09-28) 2 commits
574
- (merged to 'next' on 2011-10-05 at ca20a51)
247
+ (merged to 'next' on 2011-10-06 at 76e90c3)
248
+ tree-walk: micro-optimization in tree_entry_interesting
249
+ tree-walk: drop unused parameter from match_dir_prefix
250
578
-Will merge to "master" in the second wave.
251
+Originally merged to 'next' on 2011-10-05.
252
+Will merge to 'master' in the second wave.
253
254
* cs/perl-config-path-send-email (2011-09-30) 2 commits
581
- (merged to 'next' on 2011-10-05 at 68dc976)
255
+ (merged to 'next' on 2011-10-06 at 93c00f0)
256
+ use new Git::config_path() for aliasesfile
257
+ Add Git::config_path()
258
585
-Will merge to "master" in the second wave.
259
+Originally merged to 'next' on 2011-10-05.
260
+Will merge to 'master' in the second wave.
261
262
* jc/checkout-from-tree-keep-local-changes (2011-09-30) 1 commit
588
- (merged to 'next' on 2011-10-05 at 15d10f7)
263
+ (merged to 'next' on 2011-10-06 at 64061aa)
264
+ checkout $tree $path: do not clobber local changes in $path not in $tree
265
591
-Will merge to "master" in the fourth wave.
266
+Originally merged to 'next' on 2011-10-05.
267
+Will merge to 'master' in the fourth wave.
268
269
* jc/apply-blank-at-eof-fix (2011-09-26) 1 commit
594
- (merged to 'next' on 2011-10-05 at 99213f2)
270
+ (merged to 'next' on 2011-10-06 at a9dfd8f)
271
+ apply --whitespace=error: correctly report new blank lines at end
272
597
-Will merge to "master" in the third wave.
273
+Originally merged to 'next' on 2011-10-05.
274
+Will merge to 'master' in the third wave.
275
276
* nd/sparse-doc (2011-09-26) 1 commit
600
- (merged to 'next' on 2011-10-05 at 0ee812e)
277
+ (merged to 'next' on 2011-10-06 at f6b8355)
278
+ git-read-tree.txt: update sparse checkout examples
279
603
-Will merge to "master" in the second wave.
280
+Originally merged to 'next' on 2011-10-05.
281
+Will merge to 'master' in the second wave.
282
283
* jp/get-ref-dir-unsorted (2011-09-30) 2 commits
606
- - refs: Use binary search to lookup refs faster
607
- - Don't sort ref_list too early
284
+ (merged to 'next' on 2011-10-06 at 69fe65d)
285
+ + refs: Use binary search to lookup refs faster
286
+ + Don't sort ref_list too early
287
609
-Will merge to "next".
288
+Will merge to 'master' in the third wave.
289
290
* jc/parse-options-boolean (2011-09-28) 5 commits
612
- - apply: use OPT_NOOP_NOARG
613
- - revert: use OPT_NOOP_NOARG
614
- - parseopt: add OPT_NOOP_NOARG
615
- - archive.c: use OPT_BOOL()
616
- - parse-options: deprecate OPT_BOOLEAN
291
+ (merged to 'next' on 2011-10-06 at dd4936c)
292
+ + apply: use OPT_NOOP_NOARG
293
+ + revert: use OPT_NOOP_NOARG
294
+ + parseopt: add OPT_NOOP_NOARG
295
+ + archive.c: use OPT_BOOL()
296
+ + parse-options: deprecate OPT_BOOLEAN
297
618
-Will merge to "next".
298
+Will merge to 'master' in the second wave.
299
300
* mh/maint-notes-merge-pathbuf-fix (2011-09-27) 1 commit
621
- (merged to 'next' on 2011-10-05 at a4ce316)
301
+ (merged to 'next' on 2011-10-06 at 0af69bb)
302
+ notes_merge_commit(): do not pass temporary buffer to other function
303
624
-Will merge to "master" in the second wave.
304
+Originally merged to 'next' on 2011-10-05.
305
+Will merge to 'master' in the second wave.
306
307
* ph/push-to-delete-nothing (2011-09-30) 1 commit
627
- - receive-pack: don't pass non-existent refs to post-{receive,update} hooks
308
+ (merged to 'next' on 2011-10-06 at 33ac777)
309
+ + receive-pack: don't pass non-existent refs to post-{receive,update} hooks
310
629
-Will merge to "next".
311
+Will merge to 'master' in the fourth wave.
312
313
* ps/gitweb-js-with-lineno (2011-09-27) 1 commit
632
- (merged to 'next' on 2011-10-05 at 7f7d5da)
314
+ (merged to 'next' on 2011-10-06 at 9236f5e)
315
+ gitweb: Fix links to lines in blobs when javascript-actions are enabled
316
635
-Will merge to "master" in the second wave.
317
+Originally merged to 'next' on 2011-10-05.
318
+Will merge to 'master' in the second wave.
319
320
* zj/send-email-authen-sasl (2011-09-29) 1 commit
638
- (merged to 'next' on 2011-10-05 at 127f3a5)
321
+ (merged to 'next' on 2011-10-06 at 78b31cd)
322
+ send-email: auth plain/login fix
323
641
-Will merge to "master" in the second wave.
324
+Originally merged to 'next' on 2011-10-05.
325
+Will merge to 'master' in the second wave.
326
327
* jc/maint-diffstat-numstat-context (2011-09-22) 1 commit
644
- (merged to 'next' on 2011-09-26 at 12539ab)
328
+ (merged to 'next' on 2011-10-06 at 36c972d)
329
+ diff: teach --stat/--numstat to honor -U$num
330
331
"diff" is allowed to match the common lines differently depending on how
332
many context lines it is showing, so running --(num)stat with 0 lines of
333
context internally gives a result that may be surprising to some people.
334
651
-Will merge to "master" in the second wave.
335
+Originally merged to 'next' on 2011-09-26.
336
+Will merge to 'master' in the second wave.
337
338
* nd/maint-sparse-errors (2011-09-22) 2 commits
654
- (merged to 'next' on 2011-09-26 at cdcdec5)
339
+ (merged to 'next' on 2011-10-06 at e3cbb90)
340
+ Add explanation why we do not allow to sparse checkout to empty working tree
341
+ sparse checkout: show error messages when worktree shaping fails
342
658
-Will merge to "master" in the third wave.
343
+Originally merged to 'next' on 2011-09-22.
344
+Will merge to 'master' in the third wave.
345
346
* rs/diff-cleanup-records-fix (2011-10-03) 2 commits
661
- - diff: resurrect XDF_NEED_MINIMAL with --minimal
662
- (merged to 'next' on 2011-09-27 at 3bd75d8)
347
+ (merged to 'next' on 2011-10-06 at 91f035f)
348
+ + diff: resurrect XDF_NEED_MINIMAL with --minimal
349
+ Revert removal of multi-match discard heuristic in 27af01
350
665
-Will merge to "next".
351
+Will merge to 'master' in the third wave.
352
353
* di/fast-import-empty-tag-note-fix (2011-09-22) 2 commits
668
- (merged to 'next' on 2011-10-05 at da6cacf)
354
+ (merged to 'next' on 2011-10-06 at 3a01ef1)
355
+ fast-import: don't allow to note on empty branch
356
+ fast-import: don't allow to tag empty branch
357
672
-Will merge to "master" in the fourth wave.
358
+Originally merged to 'next' on 2011-10-05.
359
+Will merge to 'master' in the fourth wave.
360
361
* bw/grep-no-index-no-exclude (2011-09-15) 2 commits
675
- (merged to 'next' on 2011-09-26 at 776f13b)
362
+ (merged to 'next' on 2011-10-06 at 325270b)
363
+ grep --no-index: don't use git standard exclusions
364
+ grep: do not use --index in the short usage output
365
(this branch is used by jc/grep-untracked-exclude and jc/maint-grep-untracked-exclude.)
366
680
-Will merge to "master" in the third wave.
367
+Originally merged to 'next' on 2011-09-26.
368
+Will merge to 'master' in the third wave.
369
370
* mh/check-ref-format-3 (2011-10-05) 23 commits
683
- - add_ref(): verify that the refname is formatted correctly
684
- - resolve_ref(): expand documentation
685
- - resolve_ref(): also treat a too-long SHA1 as invalid
686
- - resolve_ref(): emit warnings for improperly-formatted references
687
- - resolve_ref(): verify that the input refname has the right format
688
- - remote: avoid passing NULL to read_ref()
689
- - remote: use xstrdup() instead of strdup()
690
- - resolve_ref(): do not follow incorrectly-formatted symbolic refs
691
- - resolve_ref(): extract a function get_packed_ref()
692
- - resolve_ref(): turn buffer into a proper string as soon as possible
693
- - resolve_ref(): only follow a symlink that contains a valid, normalized refname
694
- - resolve_ref(): use prefixcmp()
695
- - resolve_ref(): explicitly fail if a symlink is not readable
696
- - Change check_refname_format() to reject unnormalized refnames
697
- - Inline function refname_format_print()
698
- - Make collapse_slashes() allocate memory for its result
699
- - Do not allow ".lock" at the end of any refname component
700
- - Refactor check_refname_format()
701
- - Change check_ref_format() to take a flags argument
702
- - Change bad_ref_char() to return a boolean value
703
- - git check-ref-format: add options --allow-onelevel and --refspec-pattern
704
- - t1402: add some more tests
705
- - get_sha1_hex(): do not read past a NUL character
706
-
707
-Will merge to "next".
371
+ (merged to 'next' on 2011-10-06 at c277498)
372
+ + add_ref(): verify that the refname is formatted correctly
373
+ + resolve_ref(): expand documentation
374
+ + resolve_ref(): also treat a too-long SHA1 as invalid
375
+ + resolve_ref(): emit warnings for improperly-formatted references
376
+ + resolve_ref(): verify that the input refname has the right format
377
+ + remote: avoid passing NULL to read_ref()
378
+ + remote: use xstrdup() instead of strdup()
379
+ + resolve_ref(): do not follow incorrectly-formatted symbolic refs
380
+ + resolve_ref(): extract a function get_packed_ref()
381
+ + resolve_ref(): turn buffer into a proper string as soon as possible
382
+ + resolve_ref(): only follow a symlink that contains a valid, normalized refname
383
+ + resolve_ref(): use prefixcmp()
384
+ + resolve_ref(): explicitly fail if a symlink is not readable
385
+ + Change check_refname_format() to reject unnormalized refnames
386
+ + Inline function refname_format_print()
387
+ + Make collapse_slashes() allocate memory for its result
388
+ + Do not allow ".lock" at the end of any refname component
389
+ + Refactor check_refname_format()
390
+ + Change check_ref_format() to take a flags argument
391
+ + Change bad_ref_char() to return a boolean value
392
+ + git check-ref-format: add options --allow-onelevel and --refspec-pattern
393
+ + t1402: add some more tests
394
+ + get_sha1_hex(): do not read past a NUL character
395
396
* js/bisect-no-checkout (2011-09-21) 1 commit
710
- (merged to 'next' on 2011-09-21 at e94ad3e)
397
+ (merged to 'next' on 2011-10-06 at 0354e94)
398
+ bisect: fix exiting when checkout failed in bisect_start()
399
713
-Will merge to "master" in the third wave.
400
+Originally merged to 'next' on 2011-09-21.
401
+Will merge to 'master' in the third wave.
402
715
-* jc/request-pull-show-head-4 (2011-10-05) 7 commits
716
- (merged to 'next' on 2011-10-05 at 8f2b5a7)
403
+* jc/request-pull-show-head-4 (2011-10-07) 8 commits
404
+ (merged to 'next' on 2011-10-07 at fcaeca0)
405
+ + fmt-merge-msg: use branch.$name.description
406
+ (merged to 'next' on 2011-10-06 at fa5e0fe)
407
+ request-pull: use the branch description
408
+ request-pull: state what commit to expect
409
+ request-pull: modernize style
@@ -722,94 +412,64 @@ Will merge to "master" in the third wave.
412
+ branch: add read_branch_desc() helper function
413
+ Merge branch 'bk/ancestry-path' into jc/branch-desc
414
725
-Will merge to "master" in the fourth wave.
415
+Will merge to 'master' in the fourth wave.
416
417
* jm/mergetool-pathspec (2011-09-26) 2 commits
728
- (merged to 'next' on 2011-09-26 at f699566)
418
+ (merged to 'next' on 2011-10-06 at b8e830f)
419
+ mergetool: no longer need to save standard input
420
+ mergetool: Use args as pathspec to unmerged files
421
732
-Will merge to "master" in the second wave.
422
+Originally merged to 'next' on 2011-09-26.
423
+Will merge to 'master' in the second wave.
424
425
* nd/maint-autofix-tag-in-head (2011-09-18) 4 commits
735
- (merged to 'next' on 2011-09-27 at dc8e2e3)
426
+ (merged to 'next' on 2011-10-06 at c083e69)
427
+ Accept tags in HEAD or MERGE_HEAD
428
+ merge: remove global variable head[]
429
+ merge: use return value of resolve_ref() to determine if HEAD is invalid
430
+ merge: keep stash[] a local variable
431
741
-Will merge to "master" in the third wave.
742
-
743
-* bc/attr-ignore-case (2011-09-14) 5 commits
744
- (merged to 'next' on 2011-09-26 at 1e0814c)
745
- + attr: read core.attributesfile from git_default_core_config
746
- + attr.c: respect core.ignorecase when matching attribute patterns
747
- + builtin/mv.c: plug miniscule memory leak
748
- + cleanup: use internal memory allocation wrapper functions everywhere
749
- + attr.c: avoid inappropriate access to strbuf "buf" member
750
-
751
-Will merge to "master" in the second wave.
752
-
753
-* js/cred-macos-x-keychain-2 (2011-09-14) 1 commit
754
- (merged to 'next' on 2011-09-26 at 4f289a4)
755
- + contrib: add a pair of credential helpers for Mac OS X's keychain
756
- (this branch uses jk/http-auth-keyring.)
757
-
758
-Will kick back to 'pu' together with 'jk/http-auth-keyring'.
432
+Originally merged to 'next' on 2011-09-27.
433
+Will merge to 'master' in the third wave.
434
760
-* jk/default-attr (2011-09-12) 1 commit
761
- - attr: map builtin userdiff drivers to well-known extensions
435
+* bc/attr-ignore-case (2011-10-06) 5 commits
436
+ - attr.c: respect core.ignorecase when matching attribute patterns
437
+ - attr: read core.attributesfile from git_default_core_config
438
+ - builtin/mv.c: plug miniscule memory leak
439
+ - cleanup: use internal memory allocation wrapper functions everywhere
440
+ - attr.c: avoid inappropriate access to strbuf "buf" member
441
763
-Will discard, expecting a fresh re-roll.
764
-
765
-* jc/make-static (2011-09-14) 4 commits
766
- (merged to 'next' on 2011-09-14 at c5943ff)
767
- + exec_cmd.c: prepare_git_cmd() is sometimes used
768
- + environment.c: have_git_dir() has users on Cygwin
769
- (merged to 'next' on 2011-09-11 at 2acb0af)
770
- + vcs-svn: remove unused functions and make some static
771
- + make-static: master
772
-
773
-Will discard (or at least kick it back to 'pu').
442
+Re-rolled.
443
444
* mz/remote-rename (2011-09-11) 4 commits
776
- (merged to 'next' on 2011-09-26 at 5e64f68)
445
+ (merged to 'next' on 2011-10-06 at 96db20d)
446
+ remote: only update remote-tracking branch if updating refspec
447
+ remote rename: warn when refspec was not updated
448
+ remote: "rename o foo" should not rename ref "origin/bar"
449
+ remote: write correct fetch spec when renaming remote 'remote'
450
782
-Will merge to "master" in the second wave.
451
+Originally merged to 'next' on 2011-09-26.
452
+Will merge to 'master' in the second wave.
453
454
* cb/common-prefix-unification (2011-09-12) 3 commits
785
- (merged to 'next' on 2011-09-14 at 24f571f)
455
+ (merged to 'next' on 2011-10-06 at 8349bca)
456
+ rename pathspec_prefix() to common_prefix() and move to dir.[ch]
457
+ consolidate pathspec_prefix and common_prefix
458
+ remove prefix argument from pathspec_prefix
459
790
-Will merge to "master" in the second wave.
460
+Originally merged to 'next' on 2011-09-14.
461
+Will merge to 'master' in the second wave.
462
463
* jn/maint-http-error-message (2011-09-06) 2 commits
793
- (merged to 'next' on 2011-09-12 at a843f03)
464
+ (merged to 'next' on 2011-10-06 at 668a706)
465
+ http: avoid empty error messages for some curl errors
466
+ http: remove extra newline in error message
467
797
-Will merge to "master" in the second wave.
798
-
799
-* fg/submodule-auto-push (2011-09-11) 2 commits
800
- (merged to 'next' on 2011-09-11 at 3fc86f7)
801
- + submodule.c: make two functions static
802
- (merged to 'next' on 2011-08-24 at 398e764)
803
- + push: teach --recurse-submodules the on-demand option
804
- (this branch is tangled with hv/submodule-merge-search.)
805
-
806
-What the topic aims to achieve may make sense, but the implementation
807
-looked somewhat suboptimal.
808
-
809
-Will kick back to "pu" at least tentatively.
468
+Originally merged to 'next' on 2011-09-12.
469
+Will merge to 'master' in the second wave.
470
471
* mh/iterate-refs (2011-09-11) 7 commits
812
- (merged to 'next' on 2011-09-27 at c289699)
472
+ (merged to 'next' on 2011-10-06 at c7a33e5)
473
+ refs.c: make create_cached_refs() static
474
+ Retain caches of submodule refs
475
+ Store the submodule name in struct cached_refs
@@ -818,65 +478,108 @@ Will kick back to "pu" at least tentatively.
478
+ Access reference caches only through new function get_cached_refs()
479
+ Extract a function clear_cached_refs()
480
821
-Will merge to "master" in the second wave.
481
+Originally merged to 'next' on 2011-09-27.
482
+Will merge to 'master' in the second wave.
483
484
* hv/submodule-update-none (2011-08-11) 2 commits
824
- (merged to 'next' on 2011-08-24 at 5302fc1)
485
+ (merged to 'next' on 2011-10-06 at 4c105df)
486
+ add update 'none' flag to disable update of submodule by default
487
+ submodule: move update configuration variable further up
488
828
-Will merge to "master" in the second wave.
489
+Originally merged to 'next' on 2011-08-24.
490
+Will merge to 'master' in the second wave.
491
492
* jc/lookup-object-hash (2011-08-11) 6 commits
831
- (merged to 'next' on 2011-08-24 at 5825411)
832
- + object hash: replace linear probing with 4-way cuckoo hashing
833
- + object hash: we know the table size is a power of two
834
- + object hash: next_size() helper for readability
835
- + pack-objects --count-only
836
- + object.c: remove duplicated code for object hashing
837
- + object.c: code movement for readability
493
+ - object hash: replace linear probing with 4-way cuckoo hashing
494
+ - object hash: we know the table size is a power of two
495
+ - object hash: next_size() helper for readability
496
+ - pack-objects --count-only
497
+ - object.c: remove duplicated code for object hashing
498
+ - object.c: code movement for readability
499
500
I do not think there is anything fundamentally wrong with this series, but
501
the risk of breakage far outweighs observed performance gain in one
502
particular workload. Will keep it in 'next' at least for one cycle.
503
843
-Will kick back to 'pu'.
844
-
504
* fg/submodule-git-file-git-dir (2011-08-22) 2 commits
846
- (merged to 'next' on 2011-08-23 at 762194e)
505
+ (merged to 'next' on 2011-10-06 at 3526bb9)
506
+ Move git-dir for submodules
507
+ rev-parse: add option --resolve-git-dir <path>
508
850
-Will merge to "master" in the second wave.
509
+Originally merged to 'next' on 2011-08-23.
510
+Will merge to 'master' in the second wave.
511
852
-* jk/http-auth-keyring (2011-09-28) 22 commits
853
- (merged to 'next' on 2011-09-28 at 65ce6c2)
854
- + credential-cache: don't cache items without context
855
- (merged to 'next' on 2011-09-16 at b4195eb)
856
- + check_expirations: don't copy over same element
857
- + t0300: add missing EOF terminator for <<
858
- (merged to 'next' on 2011-09-14 at 589c7c9)
859
- + credential-store: use a better storage format
860
- + t0300: make alternate username tests more robust
861
- + t0300: make askpass tests a little more robust
862
- + credential-cache: fix expiration calculation corner cases
863
- + docs: minor tweaks to credentials API
864
- (merged to 'next' on 2011-09-11 at 491ce6a)
865
- + credentials: make credential_fill_gently() static
866
- (merged to 'next' on 2011-08-03 at b06e80e)
867
- + credentials: add "getpass" helper
868
- + credentials: add "store" helper
869
- + credentials: add "cache" helper
870
- + docs: end-user documentation for the credential subsystem
871
- + http: use hostname in credential description
872
- + allow the user to configure credential helpers
873
- + look for credentials in config before prompting
874
- + http: use credential API to get passwords
875
- + introduce credentials API
876
- + http: retry authentication failures for all http requests
877
- + remote-curl: don't retry auth failures with dumb protocol
878
- + improve httpd auth tests
879
- + url: decode buffers that are not NUL-terminated
880
- (this branch is tangled with js/cred-macos-x-keychain-2.)
881
-
882
-Will kick back to 'pu'.
512
+--------------------------------------------------
513
+[Discarded]
514
+
515
+* jk/default-attr (2011-09-12) 1 commit
516
+ . attr: map builtin userdiff drivers to well-known extensions
517
+
518
+Discarded, expecting a fresh re-roll.
519
+
520
+* jc/make-static (2011-09-14) 4 commits
521
+ . exec_cmd.c: prepare_git_cmd() is sometimes used
522
+ . environment.c: have_git_dir() has users on Cygwin
523
+ . vcs-svn: remove unused functions and make some static
524
+ . make-static: master
525
+
526
+* jk/add-i-hunk-filter (2011-07-27) 5 commits
527
+ . add--interactive: add option to autosplit hunks
528
+ . add--interactive: allow negatation of hunk filters
529
+ . add--interactive: allow hunk filtering on command line
530
+ . add--interactive: factor out regex error handling
531
+ . add--interactive: refactor patch mode argument processing
532
+
533
+* jc/signed-push (2011-10-05) 7 commits
534
+ . push -s: support pre-receive-signature hook
535
+ . push -s: receiving end
536
+ . push -s: send signed push certificate
537
+ . push -s: skeleton
538
+ - Split GPG interface into its own helper library
539
+ - rename "match_refs()" to "match_push_refs()"
540
+ - send-pack: typofix error message
541
+ (this branch is tangled with jc/signed-commit and jc/signed-push-3.)
542
+
543
+This was the v2 that updated notes tree on the receiving end.
544
+
545
+* jc/signed-push-3 (2011-10-05) 4 commits
546
+ . push -s: signed push
547
+ - Split GPG interface into its own helper library
548
+ - rename "match_refs()" to "match_push_refs()"
549
+ - send-pack: typofix error message
550
+ (this branch is tangled with jc/signed-commit and jc/signed-push.)
551
+
552
+This is the third edition, that moves the preparation of the notes tree to
553
+the sending end.
554
+
555
+* jh/receive-count-limit (2011-05-23) 10 commits
556
+ . receive-pack: Allow server to refuse pushes with too many objects
557
+ . pack-objects: Estimate pack size; abort early if pack size limit is exceeded
558
+ . send-pack/receive-pack: Allow server to refuse pushing too large packs
559
+ . pack-objects: Allow --max-pack-size to be used together with --stdout
560
+ . send-pack/receive-pack: Allow server to refuse pushes with too many commits
561
+ . pack-objects: Teach new option --max-commit-count, limiting #commits in pack
562
+ . receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
563
+ . Tighten rules for matching server capabilities in server_supports()
564
+ . send-pack: Attempt to retrieve remote status even if pack-objects fails
565
+ . Update technical docs to reflect side-band-64k capability in receive-pack
566
+
567
+Discarded, expecting another round to separate per-pack and per-session
568
+limits.
569
+
570
+* jk/generation-numbers (2011-09-11) 8 commits
571
+ . metadata-cache.c: make two functions static
572
+ . limit "contains" traversals based on commit generation
573
+ . check commit generation cache validity against grafts
574
+ . pretty: support %G to show the generation number of a commit
575
+ . commit: add commit_generation function
576
+ . add metadata-cache infrastructure
577
+ . decorate: allow storing values instead of pointers
578
+ . Merge branch 'jk/tag-contains-ab' (early part) into HEAD
579
+
580
+* po/cygwin-backslash (2011-08-05) 2 commits
581
+ . On Cygwin support both UNIX and DOS style path-names
582
+ . git-compat-util: add generic find_last_dir_sep that respects is_dir_sep
583
+
584
+Incomplete with respect to backslash processing in prefix_filename(), and
585
+also loses the ability to escape glob specials.