What's cooking (2011/10 #04)
Junio C Hamano committed
Oct 12, 2011 at 11:49 UTC
d8e11c5f892e689fecdd1b5ab97cce6e84923750
1 file changed
+279
-257
whats-cooking.txt
+279
-257
@@ -1,17 +1,18 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2011, #03; Fri, 7)
3
-X-master-at: 7f41b6bbe3181dc4d1687db036bf22316997a1bf
4
-X-next-at: fbb28a2df5b67b80240267347d7f018681c7153c
2
+Subject: What's cooking in git.git (Oct 2011, #04; Wed, 12)
3
+X-master-at: 8b0e15fa95e11965f18c8d2585dc8ffd9bfc9356
4
+X-next-at: 6d5841794ba7a676b5918d0bc8cbad836597555b
5
6
-What's cooking in git.git (Oct 2011, #03; Fri, 7)
6
+What's cooking in git.git (Oct 2011, #04; Wed, 12)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
11
12
-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.
12
+As reported earlier, 'next' has been rebuilt with some topics kicked back
13
+to 'pu'. Also, k.org is back.
14
+
15
+The second wave of topics are starting to graduate to 'master'.
16
17
Here are the repositories that have my integration branches:
18
@@ -34,48 +35,221 @@ With all the topics and integration branches but not todo, html or man:
35
--------------------------------------------------
36
[New Topics]
37
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.)
38
+* cn/fetch-prune (2011-10-07) 4 commits
39
+ - fetch: treat --tags like refs/tags/*:refs/tags/* when pruning
40
+ - fetch: honor the user-provided refspecs when pruning refs
41
+ - t5510: add tests for fetch --prune
42
+ - fetch: free all the additional refspecs
43
+
44
+* ef/mingw-syslog (2011-10-07) 1 commit
45
+ (merged to 'next' on 2011-10-11 at d5d6945)
46
+ + mingw: avoid using strbuf in syslog
47
+
48
+* jk/name-hash-dirent (2011-10-07) 1 commit
49
+ (merged to 'next' on 2011-10-11 at e2ea68b)
50
+ + fix phantom untracked files when core.ignorecase is set
51
+
52
+* jn/gitweb-manpages (2011-10-10) 6 commits
53
+ . gitweb: Add gitweb manpages to 'gitweb' package in git.spec
54
+ . Documentation: Add gitweb config variables to git-config(1)
55
+ . Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages
56
+ . gitweb: Add manpage for gitweb
57
+ . gitweb: Add manpage for gitweb configuration files
58
+ . Documentation: Preparation for gitweb manpages
59
+
60
+A re-roll already being discussed.
61
+
62
+* js/merge-edit-option (2011-10-10) 2 commits
63
+ - fixup! 0f6adfe2a26287c5c13366975f621c818bb3214d
64
+ - Teach merge the '[-e|--edit]' option
65
+
66
+The part to tweak builtin/merge.c in the fix-up should be removed but
67
+otherwise ready to be squashed into one and merged to 'next'.
68
+
69
+* mm/maint-config-explicit-bool-display (2011-10-10) 1 commit
70
+ (merged to 'next' on 2011-10-11 at 795939f)
71
+ + config: display key_delim for config --bool --get-regexp
72
+
73
+* rr/revert-cherry-pick (2011-10-10) 7 commits
74
+ - fixup! 82d520bd
75
+ - revert: Simplify passing command-line arguments around
76
+ - revert: Allow mixed pick and revert instructions
77
+ - revert: Make commit descriptions in insn sheet optional
78
+ - revert: Fix buffer overflow in insn sheet parser
79
+ - revert: Simplify getting commit subject
80
+ - revert: Free memory after get_message call
81
+
82
+Probably needs a little bit more polish.
83
+
84
+* rs/diff-whole-function (2011-10-10) 2 commits
85
+ (merged to 'next' on 2011-10-11 at 6196752)
86
+ + diff: add option to show whole functions as context
87
+ + xdiff: factor out get_func_line()
88
+
89
+* rs/pickaxe (2011-10-07) 7 commits
90
+ (merged to 'next' on 2011-10-11 at 27d02b2)
91
+ + pickaxe: factor out pickaxe
92
+ + pickaxe: give diff_grep the same signature as has_changes
93
+ + pickaxe: pass diff_options to contains and has_changes
94
+ + pickaxe: factor out has_changes
95
+ + pickaxe: plug regex/kws leak
96
+ + pickaxe: plug regex leak
97
+ + pickaxe: plug diff filespec leak with empty needle
98
+
99
+* sc/difftool-skip (2011-10-10) 1 commit
100
+ (merged to 'next' on 2011-10-11 at 38d7e84)
101
+ + git-difftool: allow skipping file by typing 'n' at prompt
102
+
103
+* sg/completion (2011-10-10) 2 commits
104
+ (merged to 'next' on 2011-10-11 at 4724640)
105
+ + completion: unite --format and --pretty for 'log' and 'show'
106
+ + completion: unite --reuse-message and --reedit-message for 'notes'
107
+ (this branch uses tm/completion-commit-fixup-squash.)
108
+
109
+* tc/fetch-leak (2011-10-07) 1 commit
110
+ (merged to 'next' on 2011-10-11 at d867153)
111
+ + fetch: plug two leaks on error exit in store_updated_refs
112
+
113
+* jc/check-ref-format-fixup (2011-10-12) 2 commits
114
+ - Restrict ref-like names immediately below $GIT_DIR
115
+ - refs.c: move dwim_ref()/dwim_log() from sha1_name.c
116
+
117
+An attempt to fix-up unfortunate side effect of mh/check-ref-format-3
118
+topic. "git show -s config" is never meant to refer to $GIT_DIR/config
119
+and treat it as a file that records an object name.
120
+
121
+* jc/maint-remove-renamed-ref (2011-10-12) 1 commit
122
+ - branch -m/-M: remove undocumented RENAMED-REF
123
44
-This is to replace the earlier "signed push" experiments.
124
+--------------------------------------------------
125
+[Graduated to "master"]
126
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"
127
+* cb/common-prefix-unification (2011-09-12) 3 commits
128
+ (merged to 'next' on 2011-10-06 at 8349bca)
129
+ + rename pathspec_prefix() to common_prefix() and move to dir.[ch]
130
+ + consolidate pathspec_prefix and common_prefix
131
+ + remove prefix argument from pathspec_prefix
132
50
-Will merge to 'master' in the third wave.
133
+Originally merged to 'next' on 2011-09-14.
134
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
135
+* dm/tree-walk (2011-09-28) 2 commits
136
+ (merged to 'next' on 2011-10-06 at 76e90c3)
137
+ + tree-walk: micro-optimization in tree_entry_interesting
138
+ + tree-walk: drop unused parameter from match_dir_prefix
139
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.
140
+Originally merged to 'next' on 2011-10-05.
141
59
-* tm/completion-push-set-upstream (2011-10-06) 1 commit
60
- - completion: push --set-upstream
142
+* fg/submodule-git-file-git-dir (2011-08-22) 2 commits
143
+ (merged to 'next' on 2011-10-06 at 3526bb9)
144
+ + Move git-dir for submodules
145
+ + rev-parse: add option --resolve-git-dir <path>
146
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.
147
+Originally merged to 'next' on 2011-08-23.
148
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.)
149
+* hv/submodule-update-none (2011-08-11) 2 commits
150
+ (merged to 'next' on 2011-10-06 at 4c105df)
151
+ + add update 'none' flag to disable update of submodule by default
152
+ + submodule: move update configuration variable further up
153
69
-Looked reasonable.
70
-Will merge to 'next'.
154
+Originally merged to 'next' on 2011-08-24.
155
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.)
156
+* jc/maint-diffstat-numstat-context (2011-09-22) 1 commit
157
+ (merged to 'next' on 2011-10-06 at 36c972d)
158
+ + diff: teach --stat/--numstat to honor -U$num
159
+
160
+"diff" is allowed to match the common lines differently depending on how
161
+many context lines it is showing, so running --(num)stat with 0 lines of
162
+context internally gives a result that may be surprising to some people.
163
+
164
+Originally merged to 'next' on 2011-09-26.
165
+
166
+* jm/mergetool-pathspec (2011-09-26) 2 commits
167
+ (merged to 'next' on 2011-10-06 at b8e830f)
168
+ + mergetool: no longer need to save standard input
169
+ + mergetool: Use args as pathspec to unmerged files
170
+
171
+Originally merged to 'next' on 2011-09-26.
172
+
173
+* jn/maint-http-error-message (2011-09-06) 2 commits
174
+ (merged to 'next' on 2011-10-06 at 668a706)
175
+ + http: avoid empty error messages for some curl errors
176
+ + http: remove extra newline in error message
177
+
178
+Originally merged to 'next' on 2011-09-12.
179
+
180
+* jp/get-ref-dir-unsorted (2011-09-30) 2 commits
181
+ (merged to 'next' on 2011-10-06 at 69fe65d)
182
+ + refs: Use binary search to lookup refs faster
183
+ + Don't sort ref_list too early
184
+
185
+* mh/check-ref-format-3 (2011-10-05) 23 commits
186
+ (merged to 'next' on 2011-10-06 at c277498)
187
+ + add_ref(): verify that the refname is formatted correctly
188
+ + resolve_ref(): expand documentation
189
+ + resolve_ref(): also treat a too-long SHA1 as invalid
190
+ + resolve_ref(): emit warnings for improperly-formatted references
191
+ + resolve_ref(): verify that the input refname has the right format
192
+ + remote: avoid passing NULL to read_ref()
193
+ + remote: use xstrdup() instead of strdup()
194
+ + resolve_ref(): do not follow incorrectly-formatted symbolic refs
195
+ + resolve_ref(): extract a function get_packed_ref()
196
+ + resolve_ref(): turn buffer into a proper string as soon as possible
197
+ + resolve_ref(): only follow a symlink that contains a valid, normalized refname
198
+ + resolve_ref(): use prefixcmp()
199
+ + resolve_ref(): explicitly fail if a symlink is not readable
200
+ + Change check_refname_format() to reject unnormalized refnames
201
+ + Inline function refname_format_print()
202
+ + Make collapse_slashes() allocate memory for its result
203
+ + Do not allow ".lock" at the end of any refname component
204
+ + Refactor check_refname_format()
205
+ + Change check_ref_format() to take a flags argument
206
+ + Change bad_ref_char() to return a boolean value
207
+ + git check-ref-format: add options --allow-onelevel and --refspec-pattern
208
+ + t1402: add some more tests
209
+ + get_sha1_hex(): do not read past a NUL character
210
+
211
+An unpleasant minor side effect was discovered with this one. If you try
212
+"git show -s config", the code warns that $GIT_DIR/config is not formatted
213
+correctly as a ref, which is technically correct but totally unwarranted.
214
+
215
+* mh/iterate-refs (2011-09-11) 7 commits
216
+ (merged to 'next' on 2011-10-06 at c7a33e5)
217
+ + refs.c: make create_cached_refs() static
218
+ + Retain caches of submodule refs
219
+ + Store the submodule name in struct cached_refs
220
+ + Allocate cached_refs objects dynamically
221
+ + Change the signature of read_packed_refs()
222
+ + Access reference caches only through new function get_cached_refs()
223
+ + Extract a function clear_cached_refs()
224
+
225
+Originally merged to 'next' on 2011-09-27.
226
+
227
+* mh/maint-notes-merge-pathbuf-fix (2011-09-27) 1 commit
228
+ (merged to 'next' on 2011-10-06 at 0af69bb)
229
+ + notes_merge_commit(): do not pass temporary buffer to other function
230
+
231
+Originally merged to 'next' on 2011-10-05.
232
+
233
+* mz/remote-rename (2011-09-11) 4 commits
234
+ (merged to 'next' on 2011-10-06 at 96db20d)
235
+ + remote: only update remote-tracking branch if updating refspec
236
+ + remote rename: warn when refspec was not updated
237
+ + remote: "rename o foo" should not rename ref "origin/bar"
238
+ + remote: write correct fetch spec when renaming remote 'remote'
239
+
240
+Originally merged to 'next' on 2011-09-26.
241
+
242
+* nd/sparse-doc (2011-09-26) 1 commit
243
+ (merged to 'next' on 2011-10-06 at f6b8355)
244
+ + git-read-tree.txt: update sparse checkout examples
245
+
246
+Originally merged to 'next' on 2011-10-05.
247
+
248
+* ps/gitweb-js-with-lineno (2011-09-27) 1 commit
249
+ (merged to 'next' on 2011-10-06 at 9236f5e)
250
+ + gitweb: Fix links to lines in blobs when javascript-actions are enabled
251
77
-Looked reasonable.
78
-Will merge to 'next'.
252
+Originally merged to 'next' on 2011-10-05.
253
254
--------------------------------------------------
255
[Stalled]
@@ -142,6 +316,44 @@ command line, 2011-08-25) would help.
316
--------------------------------------------------
317
[Cooking]
318
319
+* jc/signed-commit (2011-10-05) 4 commits
320
+ - commit: teach --gpg-sign option
321
+ - Split GPG interface into its own helper library
322
+ - rename "match_refs()" to "match_push_refs()"
323
+ - send-pack: typofix error message
324
+
325
+This is to replace the earlier "signed push" experiments.
326
+
327
+* js/maint-merge-one-file-osx-expr (2011-10-06) 1 commit
328
+ (merged to 'next' on 2011-10-07 at fbb28a2)
329
+ + merge-one-file: fix "expr: non-numeric argument"
330
+
331
+Will merge to 'master' in the third wave.
332
+
333
+* tm/completion-commit-fixup-squash (2011-10-06) 2 commits
334
+ (merged to 'next' on 2011-10-11 at 6bb192e)
335
+ + completion: commit --fixup and --squash
336
+ + completion: unite --reuse-message and --reedit-message handling
337
+ (this branch is used by sg/completion.)
338
+
339
+* tm/completion-push-set-upstream (2011-10-06) 1 commit
340
+ (merged to 'next' on 2011-10-11 at 85544e5)
341
+ + completion: push --set-upstream
342
+
343
+* js/no-cherry-pick-head-after-punted (2011-10-06) 1 commit
344
+ (merged to 'next' on 2011-10-10 at acb29ee)
345
+ + Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pick-head-after-punted
346
+ (this branch uses js/maint-no-cherry-pick-head-after-punted.)
347
+
348
+Will merge to 'master' in the third wave.
349
+
350
+* js/maint-no-cherry-pick-head-after-punted (2011-10-06) 2 commits
351
+ + cherry-pick: do not give irrelevant advice when cherry-pick punted
352
+ + revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
353
+ (this branch is used by js/no-cherry-pick-head-after-punted.)
354
+
355
+Will merge to 'maint' later.
356
+
357
* sp/smart-http-failure (2011-10-04) 1 commit
358
(merged to 'next' on 2011-10-06 at 02f9982)
359
+ remote-curl: Fix warning after HTTP failure
@@ -164,10 +376,14 @@ Will merge to 'master' in the third wave.
376
(merged to 'next' on 2011-10-06 at 7e3083f)
377
+ Support ERR in remote archive like in fetch/push
378
379
+Will merge to 'master' in the third wave.
380
+
381
* nd/daemon-log-sock-errors (2011-10-03) 1 commit
382
(merged to 'next' on 2011-10-06 at 5f3630f)
383
+ daemon: log errors if we could not use some sockets
384
385
+Will merge to 'master' in the third wave.
386
+
387
* nd/document-err-packet (2011-10-03) 1 commit
388
(merged to 'next' on 2011-10-06 at 0c5f5d0)
389
+ pack-protocol: document "ERR" line
@@ -178,6 +394,8 @@ Will merge to 'master' in the second wave.
394
(merged to 'next' on 2011-10-06 at 209126d)
395
+ daemon: return "access denied" if a service is not allowed
396
397
+Will merge to 'master' in the third wave.
398
+
399
* jc/is-url-simplify (2011-10-03) 1 commit
400
(merged to 'next' on 2011-10-06 at d6c6741)
401
+ url.c: simplify is_url()
@@ -189,6 +407,8 @@ Will merge to 'master' in the third wave.
407
+ ident: do not retrieve default ident when unnecessary
408
+ ident: check /etc/mailname if email is unknown
409
410
+Will merge to 'master' in the third wave.
411
+
412
* jn/no-g-plus-s-on-bsd (2011-10-03) 1 commit
413
(merged to 'next' on 2011-10-06 at 3d85674)
414
+ Makefile: do not set setgid bit on directories on GNU/kFreeBSD
@@ -227,29 +447,31 @@ Will merge to 'master' in the second wave.
447
+ revision: factor out add_pending_sha1
448
+ checkout: check for "Previous HEAD" notice in t2020
449
230
-* ph/transport-with-gitfile (2011-10-04) 4 commits
450
+Will merge to 'master' in the third wave.
451
+
452
+* ph/transport-with-gitfile (2011-10-11) 5 commits
453
+ (merged to 'next' on 2011-10-12 at 6d58417)
454
+ + Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfile
455
(merged to 'next' on 2011-10-06 at 891b8b6)
456
+ Add test showing git-fetch groks gitfiles
457
+ Teach transport about the gitfile mechanism
458
+ Learn to handle gitfiles in enter_repo
459
+ enter_repo: do not modify input
460
461
+Will merge to 'master' in the third wave.
462
+
463
* jc/grep-untracked-exclude (2011-10-04) 1 commit
464
(merged to 'next' on 2011-10-06 at b16cffe)
465
+ Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude
466
(this branch uses bw/grep-no-index-no-exclude and jc/maint-grep-untracked-exclude.)
467
468
+Will merge to 'master' in the third wave.
469
+
470
* jc/maint-grep-untracked-exclude (2011-10-04) 1 commit
471
+ grep: teach --untracked and --exclude-standard options
472
(this branch is used by jc/grep-untracked-exclude; uses bw/grep-no-index-no-exclude.)
473
246
-* dm/tree-walk (2011-09-28) 2 commits
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
-
251
-Originally merged to 'next' on 2011-10-05.
252
-Will merge to 'master' in the second wave.
474
+Will merge to 'maint' later.
475
476
* cs/perl-config-path-send-email (2011-09-30) 2 commits
477
(merged to 'next' on 2011-10-06 at 93c00f0)
@@ -273,20 +495,6 @@ Will merge to 'master' in the fourth wave.
495
Originally merged to 'next' on 2011-10-05.
496
Will merge to 'master' in the third wave.
497
276
-* nd/sparse-doc (2011-09-26) 1 commit
277
- (merged to 'next' on 2011-10-06 at f6b8355)
278
- + git-read-tree.txt: update sparse checkout examples
279
-
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
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
-
288
-Will merge to 'master' in the third wave.
289
-
498
* jc/parse-options-boolean (2011-09-28) 5 commits
499
(merged to 'next' on 2011-10-06 at dd4936c)
500
+ apply: use OPT_NOOP_NOARG
@@ -297,26 +505,12 @@ Will merge to 'master' in the third wave.
505
506
Will merge to 'master' in the second wave.
507
300
-* mh/maint-notes-merge-pathbuf-fix (2011-09-27) 1 commit
301
- (merged to 'next' on 2011-10-06 at 0af69bb)
302
- + notes_merge_commit(): do not pass temporary buffer to other function
303
-
304
-Originally merged to 'next' on 2011-10-05.
305
-Will merge to 'master' in the second wave.
306
-
508
* ph/push-to-delete-nothing (2011-09-30) 1 commit
509
(merged to 'next' on 2011-10-06 at 33ac777)
510
+ receive-pack: don't pass non-existent refs to post-{receive,update} hooks
511
512
Will merge to 'master' in the fourth wave.
513
313
-* ps/gitweb-js-with-lineno (2011-09-27) 1 commit
314
- (merged to 'next' on 2011-10-06 at 9236f5e)
315
- + gitweb: Fix links to lines in blobs when javascript-actions are enabled
316
-
317
-Originally merged to 'next' on 2011-10-05.
318
-Will merge to 'master' in the second wave.
319
-
514
* zj/send-email-authen-sasl (2011-09-29) 1 commit
515
(merged to 'next' on 2011-10-06 at 78b31cd)
516
+ send-email: auth plain/login fix
@@ -324,17 +518,6 @@ Will merge to 'master' in the second wave.
518
Originally merged to 'next' on 2011-10-05.
519
Will merge to 'master' in the second wave.
520
327
-* jc/maint-diffstat-numstat-context (2011-09-22) 1 commit
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
-
335
-Originally merged to 'next' on 2011-09-26.
336
-Will merge to 'master' in the second wave.
337
-
521
* nd/maint-sparse-errors (2011-09-22) 2 commits
522
(merged to 'next' on 2011-10-06 at e3cbb90)
523
+ Add explanation why we do not allow to sparse checkout to empty working tree
@@ -367,32 +550,6 @@ Will merge to 'master' in the fourth wave.
550
Originally merged to 'next' on 2011-09-26.
551
Will merge to 'master' in the third wave.
552
370
-* mh/check-ref-format-3 (2011-10-05) 23 commits
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
-
553
* js/bisect-no-checkout (2011-09-21) 1 commit
554
(merged to 'next' on 2011-10-06 at 0354e94)
555
+ bisect: fix exiting when checkout failed in bisect_start()
@@ -400,7 +557,10 @@ Will merge to 'master' in the third wave.
557
Originally merged to 'next' on 2011-09-21.
558
Will merge to 'master' in the third wave.
559
403
-* jc/request-pull-show-head-4 (2011-10-07) 8 commits
560
+* jc/request-pull-show-head-4 (2011-10-09) 10 commits
561
+ (merged to 'next' on 2011-10-10 at 092175e)
562
+ + environment.c: Fix an sparse "symbol not declared" warning
563
+ + builtin/log.c: Fix an "Using plain integer as NULL pointer" warning
564
(merged to 'next' on 2011-10-07 at fcaeca0)
565
+ fmt-merge-msg: use branch.$name.description
566
(merged to 'next' on 2011-10-06 at fa5e0fe)
@@ -414,14 +574,6 @@ Will merge to 'master' in the third wave.
574
575
Will merge to 'master' in the fourth wave.
576
417
-* jm/mergetool-pathspec (2011-09-26) 2 commits
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
-
422
-Originally merged to 'next' on 2011-09-26.
423
-Will merge to 'master' in the second wave.
424
-
577
* nd/maint-autofix-tag-in-head (2011-09-18) 4 commits
578
(merged to 'next' on 2011-10-06 at c083e69)
579
+ Accept tags in HEAD or MERGE_HEAD
@@ -432,63 +584,16 @@ Will merge to 'master' in the second wave.
584
Originally merged to 'next' on 2011-09-27.
585
Will merge to 'master' in the third wave.
586
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
587
+* bc/attr-ignore-case (2011-10-11) 5 commits
588
+ (merged to 'next' on 2011-10-11 at daa6b51)
589
+ + attr.c: respect core.ignorecase when matching attribute patterns
590
+ + attr: read core.attributesfile from git_default_core_config
591
+ + builtin/mv.c: plug miniscule memory leak
592
+ + cleanup: use internal memory allocation wrapper functions everywhere
593
+ + attr.c: avoid inappropriate access to strbuf "buf" member
594
595
Re-rolled.
596
444
-* mz/remote-rename (2011-09-11) 4 commits
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
-
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
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
-
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
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
-
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
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
476
- + Allocate cached_refs objects dynamically
477
- + Change the signature of read_packed_refs()
478
- + Access reference caches only through new function get_cached_refs()
479
- + Extract a function clear_cached_refs()
480
-
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
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
-
489
-Originally merged to 'next' on 2011-08-24.
490
-Will merge to 'master' in the second wave.
491
-
597
* jc/lookup-object-hash (2011-08-11) 6 commits
598
- object hash: replace linear probing with 4-way cuckoo hashing
599
- object hash: we know the table size is a power of two
@@ -500,86 +605,3 @@ Will merge to 'master' in the second wave.
605
I do not think there is anything fundamentally wrong with this series, but
606
the risk of breakage far outweighs observed performance gain in one
607
particular workload. Will keep it in 'next' at least for one cycle.
503
-
504
-* fg/submodule-git-file-git-dir (2011-08-22) 2 commits
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
-
509
-Originally merged to 'next' on 2011-08-23.
510
-Will merge to 'master' in the second wave.
511
-
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.