What's cooking (2011/10 #02)
Junio C Hamano committed
Oct 5, 2011 at 15:13 UTC
f909981a9ad412901ce3602a9f78f07f0cbe829b
1 file changed
+464
-434
whats-cooking.txt
+464
-434
@@ -1,14 +1,17 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2011, #01; Tue, 4)
3
-X-master-at: 703f05ad5835cff92b12c29aecf8d724c8c847e2
4
-X-next-at: fb0d39e4afa503eb7e63e40306f6f566df484586
2
+Subject: What's cooking in git.git (Oct 2011, #02; Wed, 5)
3
+X-master-at: 7f41b6bbe3181dc4d1687db036bf22316997a1bf
4
+X-next-at: 16d0eacc744f9eabe7ef4cdf3f9fece5424b951f
5
6
-What's cooking in git.git (Oct 2011, #01; Tue, 4)
6
+What's cooking in git.git (Oct 2011, #02; Wed, 5)
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 first batch of topics that have been cooking in 'next' have now
13
+graduated to 'master'.
14
+
15
Here are the repositories that have my integration branches:
16
17
With maint, master, next, pu, todo, html and man:
@@ -37,86 +40,339 @@ a chance to be cleaned up. Not happened yet, but see below for ideas.
40
--------------------------------------------------
41
[New Topics]
42
40
-* cb/do-not-pretend-to-hijack-long-help (2011-10-03) 2 commits
41
- - fixup: leave uppercase H alone
42
- - use -h for synopsis and --help for manpage consistently
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
44
-Will squash the top one into the original unless somebody objects.
47
+Will merge to "master" in the second wave.
48
46
-* cp/git-web-browse-browsers (2011-10-03) 1 commit
47
- - git-web--browse: avoid the use of eval
49
+--------------------------------------------------
50
+[Graduated to "master"]
51
49
-Will merge to "next".
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
51
-* il/archive-err-signal (2011-10-03) 1 commit
52
- - transport: do not allow to push over git:// protocol
59
+Will merge to "master" in the first wave.
60
54
-Will merge to "next".
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
56
-* nd/daemon-log-sock-errors (2011-10-03) 1 commit
57
- - daemon: log errors if we could not use some sockets
70
+Will merge to "master" in the first wave.
71
59
-Will merge to "next".
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
61
-* nd/document-err-packet (2011-10-03) 1 commit
62
- - pack-protocol: document "ERR" line
76
+Will merge to "master" in the first wave.
77
64
-Will merge to "next".
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
66
-* nd/git-daemon-error-msgs (2011-10-03) 1 commit
67
- - daemon: return "access denied" if a service is not allowed
82
+Will merge to "master" in the first wave.
83
69
-Will merge to "next".
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
71
-* jc/is-url-simplify (2011-10-03) 1 commit
72
- - url.c: simplify is_url()
89
+Will merge to "master" in the first wave.
90
74
-Will merge to "next".
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
76
-* jn/ident-from-etc-mailname (2011-10-03) 1 commit
77
- - ident: check /etc/mailname if email is unknown
96
+Will merge to "master" in the first wave.
97
79
-Will merge to "next".
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
81
-The warning might have to be squelched further, but that can be done as a
82
-separate patch in-tree.
103
+Will merge to "master" in the first wave.
104
84
-* jn/no-g-plus-s-on-bsd (2011-10-03) 1 commit
85
- - Makefile: do not set setgid bit on directories on GNU/kFreeBSD
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
87
-Will merge to "next".
109
+Will merge to "master" in the first wave.
110
89
-* js/log-show-children (2011-10-04) 1 commit
90
- - log --children
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
92
-Will merge to "next".
115
+Will merge to "master" in the first wave.
116
94
-* rs/name-rev-usage (2011-10-03) 1 commit
95
- - name-rev: split usage string
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
97
-Will merge to "next".
123
+Will merge to "master" in the first wave.
124
99
-* rs/test-ctype (2011-10-03) 2 commits
100
- - test-ctype: add test for is_pathspec_magic
101
- - test-ctype: macrofy
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
103
-Will merge to "next".
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
105
-* rs/pending (2011-10-03) 8 commits
106
- - commit: factor out clear_commit_marks_for_object_array
107
- - checkout: use leak_pending flag
108
- - bundle: use leak_pending flag
109
- - bisect: use leak_pending flag
110
- - revision: add leak_pending flag
111
- - checkout: use add_pending_{object,sha1} in orphan check
112
- - revision: factor out add_pending_sha1
113
- - checkout: check for "Previous HEAD" notice in t2020
135
+Will merge to "master" in the first wave.
136
115
-* ph/transport-with-gitfile (2011-10-04) 4 commits
116
- - Add test showing git-fetch groks gitfiles
117
- - Teach transport about the gitfile mechanism
118
- - Learn to handle gitfiles in enter_repo
119
- - enter_repo: do not modify input
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.
220
+
221
+Will merge to "master" in the first wave.
222
+
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
226
+
227
+Will merge to "master" in the first wave.
228
+
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
298
+
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
316
+
317
+Will merge to "master" in the first wave.
318
+
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
322
+
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
368
+
369
+Will merge to "master" in the first wave.
370
+
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
374
+
375
+Will merge to "master" in the first wave.
376
377
--------------------------------------------------
378
[Stalled]
@@ -143,7 +399,7 @@ Will kick back to 'pu'.
399
- Split GPG interface into its own helper library
400
- rename "match_refs()" to "match_push_refs()"
401
- send-pack: typofix error message
146
- (this branch uses jc/run-receive-hook-cleanup; is tangled with jc/signed-push-3.)
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
@@ -152,7 +408,7 @@ This was the v2 that updated notes tree on the receiving end.
408
- Split GPG interface into its own helper library
409
- rename "match_refs()" to "match_push_refs()"
410
- send-pack: typofix error message
155
- (this branch uses jc/run-receive-hook-cleanup; is tangled with jc/signed-push.)
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.
@@ -215,10 +471,99 @@ Will discard.
471
--------------------------------------------------
472
[Cooking]
473
474
+* cb/do-not-pretend-to-hijack-long-help (2011-10-05) 1 commit
475
+ - use -h for synopsis and --help for manpage consistently
476
+
477
+Will merge to "next".
478
+
479
+* cp/git-web-browse-browsers (2011-10-03) 1 commit
480
+ - git-web--browse: avoid the use of eval
481
+
482
+Will merge to "next".
483
+
484
+* 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".
488
+
489
+* 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".
493
+
494
+* nd/document-err-packet (2011-10-03) 1 commit
495
+ (merged to 'next' on 2011-10-05 at aca0326)
496
+ + pack-protocol: document "ERR" line
497
+
498
+Will merge to "master" in the second wave.
499
+
500
+* 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".
504
+
505
+* jc/is-url-simplify (2011-10-03) 1 commit
506
+ - url.c: simplify is_url()
507
+
508
+Will merge to "next".
509
+
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.
517
+
518
+* jn/no-g-plus-s-on-bsd (2011-10-03) 1 commit
519
+ - Makefile: do not set setgid bit on directories on GNU/kFreeBSD
520
+
521
+Will merge to "next".
522
+
523
+* js/log-show-children (2011-10-04) 1 commit
524
+ - log --children
525
+
526
+Will merge to "next".
527
+
528
+* rs/name-rev-usage (2011-10-03) 1 commit
529
+ (merged to 'next' on 2011-10-05 at 16d0eac)
530
+ + name-rev: split usage string
531
+
532
+Will merge to "master" in the second wave.
533
+
534
+* rs/test-ctype (2011-10-03) 2 commits
535
+ (merged to 'next' on 2011-10-05 at 9a9b0e6)
536
+ + test-ctype: add test for is_pathspec_magic
537
+ + test-ctype: macrofy
538
+
539
+Will merge to "master" in the second wave.
540
+
541
+* 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.
552
+
553
+* 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.
560
+
561
* jc/grep-untracked-exclude (2011-10-04) 1 commit
562
- Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude
563
(this branch uses bw/grep-no-index-no-exclude and jc/maint-grep-untracked-exclude.)
564
565
+Will merge to "next".
566
+
567
* jc/maint-grep-untracked-exclude (2011-10-04) 1 commit
568
- grep: teach --untracked and --exclude-standard options
569
(this branch is used by jc/grep-untracked-exclude; uses bw/grep-no-index-no-exclude.)
@@ -226,31 +571,36 @@ Will discard.
571
Will merge to "next".
572
573
* dm/tree-walk (2011-09-28) 2 commits
229
- - tree-walk: micro-optimization in tree_entry_interesting
230
- - tree-walk: drop unused parameter from match_dir_prefix
574
+ (merged to 'next' on 2011-10-05 at ca20a51)
575
+ + tree-walk: micro-optimization in tree_entry_interesting
576
+ + tree-walk: drop unused parameter from match_dir_prefix
577
232
-Will merge to "next".
578
+Will merge to "master" in the second wave.
579
580
* cs/perl-config-path-send-email (2011-09-30) 2 commits
235
- - use new Git::config_path() for aliasesfile
236
- - Add Git::config_path()
581
+ (merged to 'next' on 2011-10-05 at 68dc976)
582
+ + use new Git::config_path() for aliasesfile
583
+ + Add Git::config_path()
584
238
-Will merge to "next".
585
+Will merge to "master" in the second wave.
586
587
* jc/checkout-from-tree-keep-local-changes (2011-09-30) 1 commit
241
- - checkout $tree $path: do not clobber local changes in $path not in $tree
588
+ (merged to 'next' on 2011-10-05 at 15d10f7)
589
+ + checkout $tree $path: do not clobber local changes in $path not in $tree
590
243
-Will merge to "next".
591
+Will merge to "master" in the fourth wave.
592
593
* jc/apply-blank-at-eof-fix (2011-09-26) 1 commit
246
- - apply --whitespace=error: correctly report new blank lines at end
594
+ (merged to 'next' on 2011-10-05 at 99213f2)
595
+ + apply --whitespace=error: correctly report new blank lines at end
596
248
-Will merge to "next".
597
+Will merge to "master" in the third wave.
598
599
* nd/sparse-doc (2011-09-26) 1 commit
251
- - git-read-tree.txt: update sparse checkout examples
600
+ (merged to 'next' on 2011-10-05 at 0ee812e)
601
+ + git-read-tree.txt: update sparse checkout examples
602
253
-Will merge to "next".
603
+Will merge to "master" in the second wave.
604
605
* jp/get-ref-dir-unsorted (2011-09-30) 2 commits
606
- refs: Use binary search to lookup refs faster
@@ -268,9 +618,10 @@ Will merge to "next".
618
Will merge to "next".
619
620
* mh/maint-notes-merge-pathbuf-fix (2011-09-27) 1 commit
271
- - notes_merge_commit(): do not pass temporary buffer to other function
621
+ (merged to 'next' on 2011-10-05 at a4ce316)
622
+ + notes_merge_commit(): do not pass temporary buffer to other function
623
273
-Will merge to "next".
624
+Will merge to "master" in the second wave.
625
626
* ph/push-to-delete-nothing (2011-09-30) 1 commit
627
- receive-pack: don't pass non-existent refs to post-{receive,update} hooks
@@ -278,14 +629,16 @@ Will merge to "next".
629
Will merge to "next".
630
631
* ps/gitweb-js-with-lineno (2011-09-27) 1 commit
281
- - gitweb: Fix links to lines in blobs when javascript-actions are enabled
632
+ (merged to 'next' on 2011-10-05 at 7f7d5da)
633
+ + gitweb: Fix links to lines in blobs when javascript-actions are enabled
634
283
-Will merge to "next".
635
+Will merge to "master" in the second wave.
636
637
* zj/send-email-authen-sasl (2011-09-29) 1 commit
286
- - send-email: auth plain/login fix
638
+ (merged to 'next' on 2011-10-05 at 127f3a5)
639
+ + send-email: auth plain/login fix
640
288
-Will merge to "next".
641
+Will merge to "master" in the second wave.
642
643
* jc/maint-diffstat-numstat-context (2011-09-22) 1 commit
644
(merged to 'next' on 2011-09-26 at 12539ab)
@@ -295,14 +648,14 @@ Will merge to "next".
648
many context lines it is showing, so running --(num)stat with 0 lines of
649
context internally gives a result that may be surprising to some people.
650
298
-Will merge to "master" as the second wave.
651
+Will merge to "master" in the second wave.
652
653
* nd/maint-sparse-errors (2011-09-22) 2 commits
654
(merged to 'next' on 2011-09-26 at cdcdec5)
655
+ Add explanation why we do not allow to sparse checkout to empty working tree
656
+ sparse checkout: show error messages when worktree shaping fails
657
305
-Will merge to "master" as the third wave.
658
+Will merge to "master" in the third wave.
659
660
* rs/diff-cleanup-records-fix (2011-10-03) 2 commits
661
- diff: resurrect XDF_NEED_MINIMAL with --minimal
@@ -312,17 +665,11 @@ Will merge to "master" as the third wave.
665
Will merge to "next".
666
667
* di/fast-import-empty-tag-note-fix (2011-09-22) 2 commits
315
- - fast-import: don't allow to note on empty branch
316
- - fast-import: don't allow to tag empty branch
668
+ (merged to 'next' on 2011-10-05 at da6cacf)
669
+ + fast-import: don't allow to note on empty branch
670
+ + fast-import: don't allow to tag empty branch
671
318
-Will merge to "next".
319
-
320
-* js/check-attr-cached (2011-09-22) 2 commits
321
- (merged to 'next' on 2011-09-27 at 74d7b66)
322
- + t0003: remove extra whitespaces
323
- + Teach '--cached' option to check-attr
324
-
325
-Will merge to "master" as the first wave.
672
+Will merge to "master" in the fourth wave.
673
674
* bw/grep-no-index-no-exclude (2011-09-15) 2 commits
675
(merged to 'next' on 2011-09-26 at 776f13b)
@@ -330,39 +677,9 @@ Will merge to "master" as the first wave.
677
+ grep: do not use --index in the short usage output
678
(this branch is used by jc/grep-untracked-exclude and jc/maint-grep-untracked-exclude.)
679
333
-Will merge to "master" as the third wave.
334
-
335
-* jc/want-commit (2011-09-15) 1 commit
336
- (merged to 'next' on 2011-09-26 at 5841512)
337
- + Allow git merge ":/<pattern>"
338
-
339
-Will merge to "master" as the first wave.
340
-
341
-* jc/ls-remote-short-help (2011-09-16) 1 commit
342
- (merged to 'next' on 2011-09-26 at e24a27a)
343
- + ls-remote: a lone "-h" is asking for help
344
-
345
-Will merge to "master" as the first wave.
346
-
347
-* jc/maint-bundle-too-quiet (2011-09-19) 1 commit
348
- (merged to 'next' on 2011-09-26 at ba140d4)
349
- + Teach progress eye-candy to fetch_refs_from_bundle()
350
-
351
-Will merge to "master" as the first wave.
680
+Will merge to "master" in the third wave.
681
353
-* jk/filter-branch-require-clean-work-tree (2011-09-15) 1 commit
354
- (merged to 'next' on 2011-09-26 at 206a74a)
355
- + filter-branch: use require_clean_work_tree
356
-
357
-Will merge to "master" as the first wave.
358
-
359
-* jn/gitweb-highlite-sanitise (2011-09-16) 1 commit
360
- (merged to 'next' on 2011-09-26 at c79390a)
361
- + gitweb: Strip non-printable characters from syntax highlighter output
362
-
363
-Will merge to "master" as the first wave.
364
-
365
-* mh/check-ref-format-3 (2011-09-16) 22 commits
682
+* 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
@@ -382,62 +699,37 @@ Will merge to "master" as the first wave.
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
385
- - Change bad_ref_char() to return a boolean value
386
- - git check-ref-format: add options --allow-onelevel and --refspec-pattern
387
- - t1402: add some more tests
388
-
389
-Will merge to "next".
390
-
391
-* cn/eradicate-working-copy (2011-09-21) 1 commit
392
- (merged to 'next' on 2011-09-26 at 2683d36)
393
- + Remove 'working copy' from the documentation and C code
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
395
-Will merge to "master" as the first wave.
707
+Will merge to "next".
708
709
* js/bisect-no-checkout (2011-09-21) 1 commit
710
(merged to 'next' on 2011-09-21 at e94ad3e)
711
+ bisect: fix exiting when checkout failed in bisect_start()
712
401
-Will merge to "master" as the third wave.
402
-
403
-* mg/maint-doc-sparse-checkout (2011-09-21) 3 commits
404
- (merged to 'next' on 2011-09-21 at f316dec)
405
- + git-read-tree.txt: correct sparse-checkout and skip-worktree description
406
- + git-read-tree.txt: language and typography fixes
407
- + unpack-trees: print "Aborting" to stderr
408
-
409
-Will merge to "master" as the first wave.
410
-
411
-* ms/patch-id-with-overlong-line (2011-09-22) 1 commit
412
- (merged to 'next' on 2011-09-26 at a33d0b2)
413
- + patch-id.c: use strbuf instead of a fixed buffer
414
-
415
-Will merge to "master" as the first wave.
713
+Will merge to "master" in the third wave.
714
417
-* sn/doc-update-index-assume-unchanged (2011-09-21) 1 commit
418
- (merged to 'next' on 2011-09-21 at 325e796)
419
- + Documentation/git-update-index: refer to 'ls-files'
420
-
421
-Will merge to "master" as the first wave.
715
+* jc/request-pull-show-head-4 (2011-10-05) 7 commits
716
+ (merged to 'next' on 2011-10-05 at 8f2b5a7)
717
+ + request-pull: use the branch description
718
+ + request-pull: state what commit to expect
719
+ + request-pull: modernize style
720
+ + branch: teach --edit-description option
721
+ + format-patch: use branch description in cover letter
722
+ + branch: add read_branch_desc() helper function
723
+ + Merge branch 'bk/ancestry-path' into jc/branch-desc
724
423
-* jc/request-pull-show-head-4 (2011-09-21) 7 commits
424
- - request-pull: use the branch description
425
- - request-pull: state what commit to expect
426
- - request-pull: modernize style
427
- - branch: teach --edit-description option
428
- - format-patch: use branch description in cover letter
429
- - branch: add read_branch_desc() helper function
430
- - Merge branch 'bk/ancestry-path' into jc/branch-desc
431
- (this branch uses bk/ancestry-path.)
432
-
433
-Will merge to "next".
725
+Will merge to "master" in the fourth wave.
726
727
* jm/mergetool-pathspec (2011-09-26) 2 commits
728
(merged to 'next' on 2011-09-26 at f699566)
729
+ mergetool: no longer need to save standard input
730
+ mergetool: Use args as pathspec to unmerged files
731
440
-Will merge to "master" as the second wave.
732
+Will merge to "master" in the second wave.
733
734
* nd/maint-autofix-tag-in-head (2011-09-18) 4 commits
735
(merged to 'next' on 2011-09-27 at dc8e2e3)
@@ -446,14 +738,7 @@ Will merge to "master" as the second wave.
738
+ merge: use return value of resolve_ref() to determine if HEAD is invalid
739
+ merge: keep stash[] a local variable
740
449
-Will merge to "master" as the third wave.
450
-
451
-* jk/maint-fetch-submodule-check-fix (2011-09-12) 1 commit
452
- (merged to 'next' on 2011-09-12 at 3c73b8c)
453
- + fetch: avoid quadratic loop checking for updated submodules
454
- (this branch is used by jk/argv-array.)
455
-
456
-Will merge to "master" as the first wave.
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)
@@ -463,29 +748,7 @@ Will merge to "master" as the first wave.
748
+ cleanup: use internal memory allocation wrapper functions everywhere
749
+ attr.c: avoid inappropriate access to strbuf "buf" member
750
466
-Will merge to "master" as the second wave.
467
-
468
-* jc/maint-fsck-fwrite-size-check (2011-09-11) 1 commit
469
- (merged to 'next' on 2011-09-16 at 2258f11)
470
- + fsck: do not abort upon finding an empty blob
471
-
472
-Will merge to "master" as the first wave.
473
-
474
-* jk/argv-array (2011-09-14) 7 commits
475
- (merged to 'next' on 2011-09-16 at 90feab4)
476
- + run_hook: use argv_array API
477
- + checkout: use argv_array API
478
- + bisect: use argv_array API
479
- + quote: provide sq_dequote_to_argv_array
480
- + refactor argv_array into generic code
481
- + quote.h: fix bogus comment
482
- + add sha1_array API docs
483
- (this branch uses jk/maint-fetch-submodule-check-fix.)
484
-
485
-This has a slight interaction with the "pending_sha1 without having to
486
-read the object" work on rs/pending, but otherwise OK.
487
-
488
-Will merge to "master" as the first wave.
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)
@@ -494,60 +757,11 @@ Will merge to "master" as the first wave.
757
758
Will kick back to 'pu' together with 'jk/http-auth-keyring'.
759
497
-* rj/maint-t9159-svn-rev-notation (2011-09-21) 1 commit
498
- (merged to 'next' on 2011-09-26 at 525a567)
499
- + t9159-*.sh: skip for mergeinfo test for svn <= 1.4
500
-
501
-Will merge to "master" as the first wave.
502
-
503
-* tr/doc-note-rewrite (2011-09-13) 1 commit
504
- (merged to 'next' on 2011-09-16 at 5fe813a)
505
- + Documentation: basic configuration of notes.rewriteRef
506
-
507
-Will merge to "master" as the first wave.
508
-
760
* jk/default-attr (2011-09-12) 1 commit
761
- attr: map builtin userdiff drivers to well-known extensions
762
763
Will discard, expecting a fresh re-roll.
764
514
-* hl/iso8601-more-zone-formats (2011-09-12) 1 commit
515
- (merged to 'next' on 2011-09-12 at 270f5c7)
516
- + date.c: Support iso8601 timezone formats
517
-
518
-Will merge to "master" as the first wave.
519
-
520
-* jc/run-receive-hook-cleanup (2011-09-12) 1 commit
521
- (merged to 'next' on 2011-09-12 at 68dd431)
522
- + refactor run_receive_hook()
523
- (this branch is used by jc/signed-push and jc/signed-push-3.)
524
-
525
-Just to make it easier to run a hook that reads from its standard input.
526
-Will merge to "master" as the first wave.
527
-
528
-* jk/for-each-ref (2011-09-08) 5 commits
529
- (merged to 'next' on 2011-09-14 at 36ed515)
530
- + for-each-ref: add split message parts to %(contents:*).
531
- + for-each-ref: handle multiline subjects like --pretty
532
- + for-each-ref: refactor subject and body placeholder parsing
533
- + t6300: add more body-parsing tests
534
- + t7004: factor out gpg setup
535
-
536
-Will merge to "master" as the first wave.
537
-
538
-* wh/normalize-alt-odb-path (2011-09-07) 1 commit
539
- (merged to 'next' on 2011-09-14 at 96f722b)
540
- + sha1_file: normalize alt_odb path before comparing and storing
541
-
542
-Will merge to "master" as the first wave.
543
-
544
-* fk/use-kwset-pickaxe-grep-f (2011-09-11) 2 commits
545
- (merged to 'next' on 2011-09-14 at 436d858)
546
- + obstack.c: Fix some sparse warnings
547
- + sparse: Fix an "Using plain integer as NULL pointer" warning
548
-
549
-Will merge to "master" as the first wave.
550
-
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
@@ -558,12 +772,6 @@ Will merge to "master" as the first wave.
772
773
Will discard (or at least kick it back to 'pu').
774
561
-* rj/quietly-create-dep-dir (2011-09-11) 1 commit
562
- (merged to 'next' on 2011-09-12 at 93d1c6b)
563
- + Makefile: Make dependency directory creation less noisy
564
-
565
-Will merge to "master" as the first wave.
566
-
775
* mz/remote-rename (2011-09-11) 4 commits
776
(merged to 'next' on 2011-09-26 at 5e64f68)
777
+ remote: only update remote-tracking branch if updating refspec
@@ -571,7 +779,7 @@ Will merge to "master" as the first wave.
779
+ remote: "rename o foo" should not rename ref "origin/bar"
780
+ remote: write correct fetch spec when renaming remote 'remote'
781
574
-Will merge to "master" as the second wave.
782
+Will merge to "master" in the second wave.
783
784
* cb/common-prefix-unification (2011-09-12) 3 commits
785
(merged to 'next' on 2011-09-14 at 24f571f)
@@ -579,141 +787,14 @@ Will merge to "master" as the second wave.
787
+ consolidate pathspec_prefix and common_prefix
788
+ remove prefix argument from pathspec_prefix
789
582
-Will merge to "master" as the second wave.
583
-
584
-* cb/send-email-help (2011-09-12) 1 commit
585
- (merged to 'next' on 2011-09-14 at ae71999)
586
- + send-email: add option -h
587
-
588
-Will merge to "master" as the first wave.
589
-
590
-* jc/fetch-pack-fsck-objects (2011-09-04) 3 commits
591
- (merged to 'next' on 2011-09-12 at a031347)
592
- + test: fetch/receive with fsckobjects
593
- + transfer.fsckobjects: unify fetch/receive.fsckobjects
594
- + fetch.fsckobjects: verify downloaded objects
595
-
596
-We had an option to verify the sent objects before accepting a push but
597
-lacked the corresponding option when fetching. In the light of the recent
598
-k.org incident, a change like this would be a good addition.
599
-
600
-Will merge to "master" as the first wave.
601
-
602
-* jc/fetch-verify (2011-09-01) 3 commits
603
- (merged to 'next' on 2011-09-12 at 3f491ab)
604
- + fetch: verify we have everything we need before updating our ref
605
- + rev-list --verify-object
606
- + list-objects: pass callback data to show_objects()
607
- (this branch uses jc/traverse-commit-list; is tangled with jc/receive-verify.)
608
-
609
-During a fetch, we verify that the pack stream is self consistent,
610
-but did not verify that the refs that are updated are consistent with
611
-objects contained in the packstream, and this adds such a check.
612
-
613
-Will merge to "master" as the first wave.
614
-
615
-* jc/receive-verify (2011-09-09) 6 commits
616
- (merged to 'next' on 2011-09-12 at 856de78)
617
- + receive-pack: check connectivity before concluding "git push"
618
- + check_everything_connected(): libify
619
- + check_everything_connected(): refactor to use an iterator
620
- + fetch: verify we have everything we need before updating our ref
621
- + rev-list --verify-object
622
- + list-objects: pass callback data to show_objects()
623
- (this branch uses jc/traverse-commit-list; is tangled with jc/fetch-verify.)
624
-
625
-While accepting a push, we verify that the pack stream is self consistent,
626
-but did not verify that the refs the push updates are consistent with
627
-objects contained in the packstream, and this adds such a check.
628
-
629
-Will merge to "master" as the third wave.
790
+Will merge to "master" in the second wave.
791
792
* jn/maint-http-error-message (2011-09-06) 2 commits
793
(merged to 'next' on 2011-09-12 at a843f03)
794
+ http: avoid empty error messages for some curl errors
795
+ http: remove extra newline in error message
796
636
-Will merge to "master" as the second wave.
637
-
638
-* bk/ancestry-path (2011-09-15) 4 commits
639
- (merged to 'next' on 2011-09-15 at aa64d04)
640
- + t6019: avoid refname collision on case-insensitive systems
641
- (merged to 'next' on 2011-09-02 at d05ba5d)
642
- + revision: do not include sibling history in --ancestry-path output
643
- + revision: keep track of the end-user input from the command line
644
- + rev-list: Demonstrate breakage with --ancestry-path --all
645
- (this branch is used by jc/request-pull-show-head-4.)
646
-
647
-Will merge to "master" as the first wave.
648
-
649
-* mg/branch-list (2011-09-13) 7 commits
650
- (merged to 'next' on 2011-09-14 at 6610a2e)
651
- + t3200: clean up checks for file existence
652
- (merged to 'next' on 2011-09-11 at 20a9cdb)
653
- + branch: -v does not automatically imply --list
654
- (merged to 'next' on 2011-09-02 at b818eae)
655
- + branch: allow pattern arguments
656
- + branch: introduce --list option
657
- + git-branch: introduce missing long forms for the options
658
- + git-tag: introduce long forms for the options
659
- + t6040: test branch -vv
660
-
661
-Will merge to "master" as the first wave.
662
-
663
-* mm/rebase-i-exec-edit (2011-08-26) 2 commits
664
- (merged to 'next' on 2011-09-02 at e75b1b9)
665
- + rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree
666
- + rebase -i: clean error message for --continue after failed exec
667
-
668
-Will merge to "master" as the first wave.
669
-
670
-* mm/mediawiki-as-a-remote (2011-09-28) 6 commits
671
- (merged to 'next' on 2011-09-28 at a1c9ae5)
672
- + git-remote-mediawiki: allow a domain to be set for authentication
673
- (merged to 'next' on 2011-09-27 at 7ce8254)
674
- + git-remote-mediawiki: obey advice.pushNonFastForward
675
- + git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflicts
676
- + git-remote-mediawiki: trivial fixes
677
- (merged to 'next' on 2011-09-12 at 163c6a5)
678
- + git-remote-mediawiki: allow push to set MediaWiki metadata
679
- + Add a remote helper to interact with mediawiki (fetch & push)
680
-
681
-Will merge to "master" as the first wave.
682
-
683
-* bc/unstash-clean-crufts (2011-08-27) 4 commits
684
- (merged to 'next' on 2011-09-02 at 7bfd66f)
685
- + git-stash: remove untracked/ignored directories when stashed
686
- + t/t3905: add missing '&&' linkage
687
- + git-stash.sh: fix typo in error message
688
- + t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
689
-
690
-Will merge to "master" as the first wave.
691
-
692
-* gb/am-hg-patch (2011-08-29) 1 commit
693
- (merged to 'next' on 2011-09-02 at 3edfe4c)
694
- + am: preliminary support for hg patches
695
-
696
-Will merge to "master" as the first wave.
697
-
698
-* jc/diff-index-unpack (2011-08-29) 3 commits
699
- (merged to 'next' on 2011-09-02 at 4206bd9)
700
- + diff-index: pass pathspec down to unpack-trees machinery
701
- + unpack-trees: allow pruning with pathspec
702
- + traverse_trees(): allow pruning with pathspec
703
-
704
-Will merge to "master" as the first wave.
705
-
706
-* nm/grep-object-sha1-lock (2011-08-30) 1 commit
707
- (merged to 'next' on 2011-09-02 at 336f57d)
708
- + grep: Fix race condition in delta_base_cache
709
-
710
-Will merge to "master" as the first wave.
711
-
712
-* tr/mergetool-valgrind (2011-08-30) 1 commit
713
- (merged to 'next' on 2011-09-02 at f5f2c61)
714
- + Symlink mergetools scriptlets into valgrind wrappers
715
-
716
-Will merge to "master" as the first wave.
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)
@@ -727,29 +808,6 @@ looked somewhat suboptimal.
808
809
Will kick back to "pu" at least tentatively.
810
730
-* jc/traverse-commit-list (2011-08-22) 3 commits
731
- (merged to 'next' on 2011-08-24 at df50dd7)
732
- + revision.c: update show_object_with_name() without using malloc()
733
- + revision.c: add show_object_with_name() helper function
734
- + rev-list: fix finish_object() call
735
- (this branch is used by jc/fetch-verify and jc/receive-verify.)
736
-
737
-Will merge to "master" as the first wave.
738
-
739
-* fk/make-auto-header-dependencies (2011-08-18) 1 commit
740
- (merged to 'next' on 2011-08-24 at 3da2c25)
741
- + Makefile: Use computed header dependencies if the compiler supports it
742
- (this branch is used by da/make-auto-header-dependencies.)
743
-
744
-Will merge to "master" as the first wave.
745
-
746
-* da/make-auto-header-dependencies (2011-08-30) 1 commit
747
- (merged to 'next' on 2011-09-02 at e04a4af)
748
- + Makefile: Improve compiler header dependency check
749
- (this branch uses fk/make-auto-header-dependencies.)
750
-
751
-Will merge to "master" as the first wave.
752
-
811
* mh/iterate-refs (2011-09-11) 7 commits
812
(merged to 'next' on 2011-09-27 at c289699)
813
+ refs.c: make create_cached_refs() static
@@ -760,14 +818,14 @@ Will merge to "master" as the first wave.
818
+ Access reference caches only through new function get_cached_refs()
819
+ Extract a function clear_cached_refs()
820
763
-Will merge to "master" as the second wave.
821
+Will merge to "master" in the second wave.
822
823
* hv/submodule-update-none (2011-08-11) 2 commits
824
(merged to 'next' on 2011-08-24 at 5302fc1)
825
+ add update 'none' flag to disable update of submodule by default
826
+ submodule: move update configuration variable further up
827
770
-Will merge to "master" as the second wave.
828
+Will merge to "master" in the second wave.
829
830
* jc/lookup-object-hash (2011-08-11) 6 commits
831
(merged to 'next' on 2011-08-24 at 5825411)
@@ -789,7 +847,7 @@ Will kick back to 'pu'.
847
+ Move git-dir for submodules
848
+ rev-parse: add option --resolve-git-dir <path>
849
792
-Will merge to "master" as the second wave.
850
+Will merge to "master" in the second wave.
851
852
* jk/http-auth-keyring (2011-09-28) 22 commits
853
(merged to 'next' on 2011-09-28 at 65ce6c2)
@@ -822,31 +880,3 @@ Will merge to "master" as the second wave.
880
(this branch is tangled with js/cred-macos-x-keychain-2.)
881
882
Will kick back to 'pu'.
825
-
826
-* rr/revert-cherry-pick-continue (2011-09-11) 19 commits
827
- (merged to 'next' on 2011-09-11 at 7d78054)
828
- + builtin/revert.c: make commit_list_append() static
829
- (merged to 'next' on 2011-08-24 at 712c115)
830
- + revert: Propagate errors upwards from do_pick_commit
831
- + revert: Introduce --continue to continue the operation
832
- + revert: Don't implicitly stomp pending sequencer operation
833
- + revert: Remove sequencer state when no commits are pending
834
- + reset: Make reset remove the sequencer state
835
- + revert: Introduce --reset to remove sequencer state
836
- + revert: Make pick_commits functionally act on a commit list
837
- + revert: Save command-line options for continuing operation
838
- + revert: Save data for continuing after conflict resolution
839
- + revert: Don't create invalid replay_opts in parse_args
840
- + revert: Separate cmdline parsing from functional code
841
- + revert: Introduce struct to keep command-line options
842
- + revert: Eliminate global "commit" variable
843
- + revert: Rename no_replay to record_origin
844
- + revert: Don't check lone argument in get_encoding
845
- + revert: Simplify and inline add_message_to_msg
846
- + config: Introduce functions to write non-standard file
847
- + advice: Introduce error_resolve_conflict
848
-
849
-Will merge to "master" as the first wave.
850
-
851
-Note that generalized sequencer still needs a bit more thought (see the
852
-summary by Ram at $gmane/179613).