What's cooking (2011/09 #07)
Junio C Hamano committed
Sep 23, 2011 at 16:31 UTC
93a0a7c580ccd8519e0a4078062bf41687609307
1 file changed
+110
-111
whats-cooking.txt
+110
-111
@@ -1,118 +1,64 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2011, #06; Wed, 21)
3
-X-master-at: 5ec8217eb6c89974fda94808a310aa651577b25d
4
-X-next-at: f316dec93e8cd645d8185a80b972857985dc33a4
2
+Subject: What's cooking in git.git (Sep 2011, #07; Fri, 23)
3
+X-master-at: 85e9c7e1d42849c5c3084a9da748608468310c0e
4
+X-next-at: 6bcf0e2b7ff196fa238fc8d8e9e9e116e0a55e25
5
6
-What's cooking in git.git (Sep 2011, #06; Wed, 21)
6
+What's cooking in git.git (Sep 2011, #07; Fri, 23)
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
+We are at 1.7.7-rc3 as of today; I had to make a quick fix for a recent
13
+regression directly on master, and I would like to cook it for a few days,
14
+so the final has to wait til mid next week.
15
+
16
Here are the repositories that have my integration branches:
17
14
-With maint, master, next, pu and todo:
18
+With maint, master, next, pu, todo, html and man:
19
20
url = git://repo.or.cz/alt-git.git
21
url = https://code.google.com/p/git-core/
22
19
-With only maint and master:
23
+With only maint, master, html and man:
24
25
url = git://git.sourceforge.jp/gitroot/git-core/git.git
26
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
27
24
-With all the topics and integration branches:
28
+With all the topics and integration branches but not todo, html or man:
29
30
url = https://github.com/gitster/git
31
28
---------------------------------------------------
29
-[New Topics]
30
-
31
-* bw/grep-no-index-no-exclude (2011-09-15) 2 commits
32
- - grep --no-index: don't use git standard exclusions
33
- - grep: do not use --index in the short usage output
34
-
35
-* jc/namespace-doc-with-old-asciidoc (2011-09-16) 1 commit
36
- - Documentation/gitnamespaces.txt: cater to older asciidoc
37
-
38
-* jc/want-commit (2011-09-15) 1 commit
39
- - Allow git merge ":/<pattern>"
40
-
41
-* jc/ls-remote-short-help (2011-09-16) 1 commit
42
- - ls-remote: a lone "-h" is asking for help
43
-
44
-* jc/maint-bundle-too-quiet (2011-09-19) 1 commit
45
- - Teach progress eye-candy to fetch_refs_from_bundle()
46
-
47
-* jk/filter-branch-require-clean-work-tree (2011-09-15) 1 commit
48
- - filter-branch: use require_clean_work_tree
49
-
50
-* jn/gitweb-highlite-sanitise (2011-09-16) 1 commit
51
- - gitweb: Strip non-printable characters from syntax highlighter output
52
-
53
-* mh/check-ref-format-3 (2011-09-16) 22 commits
54
- - add_ref(): verify that the refname is formatted correctly
55
- - resolve_ref(): expand documentation
56
- - resolve_ref(): also treat a too-long SHA1 as invalid
57
- - resolve_ref(): emit warnings for improperly-formatted references
58
- - resolve_ref(): verify that the input refname has the right format
59
- - remote: avoid passing NULL to read_ref()
60
- - remote: use xstrdup() instead of strdup()
61
- - resolve_ref(): do not follow incorrectly-formatted symbolic refs
62
- - resolve_ref(): extract a function get_packed_ref()
63
- - resolve_ref(): turn buffer into a proper string as soon as possible
64
- - resolve_ref(): only follow a symlink that contains a valid, normalized refname
65
- - resolve_ref(): use prefixcmp()
66
- - resolve_ref(): explicitly fail if a symlink is not readable
67
- - Change check_refname_format() to reject unnormalized refnames
68
- - Inline function refname_format_print()
69
- - Make collapse_slashes() allocate memory for its result
70
- - Do not allow ".lock" at the end of any refname component
71
- - Refactor check_refname_format()
72
- - Change check_ref_format() to take a flags argument
73
- - Change bad_ref_char() to return a boolean value
74
- - git check-ref-format: add options --allow-onelevel and --refspec-pattern
75
- - t1402: add some more tests
76
-
77
-* cn/eradicate-working-copy (2011-09-21) 2 commits
78
- - patch-id.c: use strbuf instead of a fixed buffer
79
- - Remove 'working copy' from the documentation and C code
32
+Until kernel.org comes back to life, it might be a good idea to
33
+tentatively have the following in your $HOME/.gitconfig:
34
81
-* js/bisect-no-checkout (2011-09-21) 1 commit
82
- (merged to 'next' on 2011-09-21 at e94ad3e)
83
- + bisect: fix exiting when checkout failed in bisect_start()
35
+ [url "http://code.google.com/p/git-core"]
36
+ insteadOf = git://git.kernel.org/pub/scm/git/git.git
37
85
-* mg/maint-doc-sparse-checkout (2011-09-21) 3 commits
86
- (merged to 'next' on 2011-09-21 at f316dec)
87
- + git-read-tree.txt: correct sparse-checkout and skip-worktree description
88
- + git-read-tree.txt: language and typography fixes
89
- + unpack-trees: print "Aborting" to stderr
38
+--------------------------------------------------
39
+[New Topics]
40
91
-* ms/patch-id-with-overlong-line (2011-09-21) 1 commit
92
- - patch-id.c: use strbuf instead of a fixed buffer
41
+* jc/maint-diffstat-numstat-context (2011-09-22) 1 commit
42
+ - diff: teach --stat/--numstat to honor -U$num
43
94
-* sn/doc-update-index-assume-unchanged (2011-09-21) 1 commit
95
- (merged to 'next' on 2011-09-21 at 325e796)
96
- + Documentation/git-update-index: refer to 'ls-files'
44
+* nd/maint-sparse-errors (2011-09-22) 2 commits
45
+ - Add explanation why we do not allow to sparse checkout to empty working tree
46
+ - sparse checkout: show error messages when worktree shaping fails
47
98
-* jc/request-pull-show-head-4 (2011-09-21) 7 commits
99
- - request-pull: use the branch description
100
- - request-pull: state what commit to expect
101
- - request-pull: modernize style
102
- - branch: teach --edit-description option
103
- - format-patch: use branch description in cover letter
104
- - branch: add read_branch_desc() helper function
105
- - Merge branch 'bk/ancestry-path' into jc/branch-desc
106
- (this branch uses bk/ancestry-path.)
48
+* rs/diff-cleanup-records-fix (2011-09-22) 1 commit
49
+ - Revert a part of rc/diff-cleanup-records
50
108
---------------------------------------------------
109
-[Graduated to "master"]
51
+It seems that the differences (the reverse of) this patch introduces are
52
+of harmless kind but not very well explained in the original series. We
53
+would need to try harder to write our log messages better next time.
54
111
-* ph/format-patch-no-color (2011-09-12) 1 commit
112
- (merged to 'next' on 2011-09-12 at 20283e8)
113
- + format-patch: ignore ui.color
55
+* di/fast-import-empty-tag-note-fix (2011-09-22) 2 commits
56
+ - fast-import: don't allow to note on empty branch
57
+ - fast-import: don't allow to tag empty branch
58
115
-A fix for the recent regression.
59
+* js/check-attr-cached (2011-09-22) 2 commits
60
+ - t0003: remove extra whitespaces
61
+ - Teach '--cached' option to check-attr
62
63
--------------------------------------------------
64
[Stalled]
@@ -193,6 +139,82 @@ also loses the ability to escape glob specials. Perhaps drop?
139
--------------------------------------------------
140
[Cooking]
141
142
+* bw/grep-no-index-no-exclude (2011-09-15) 2 commits
143
+ - grep --no-index: don't use git standard exclusions
144
+ - grep: do not use --index in the short usage output
145
+
146
+* jc/namespace-doc-with-old-asciidoc (2011-09-16) 1 commit
147
+ - Documentation/gitnamespaces.txt: cater to older asciidoc
148
+
149
+* jc/want-commit (2011-09-15) 1 commit
150
+ - Allow git merge ":/<pattern>"
151
+
152
+* jc/ls-remote-short-help (2011-09-16) 1 commit
153
+ - ls-remote: a lone "-h" is asking for help
154
+
155
+* jc/maint-bundle-too-quiet (2011-09-19) 1 commit
156
+ - Teach progress eye-candy to fetch_refs_from_bundle()
157
+
158
+* jk/filter-branch-require-clean-work-tree (2011-09-15) 1 commit
159
+ - filter-branch: use require_clean_work_tree
160
+
161
+* jn/gitweb-highlite-sanitise (2011-09-16) 1 commit
162
+ - gitweb: Strip non-printable characters from syntax highlighter output
163
+
164
+* mh/check-ref-format-3 (2011-09-16) 22 commits
165
+ - add_ref(): verify that the refname is formatted correctly
166
+ - resolve_ref(): expand documentation
167
+ - resolve_ref(): also treat a too-long SHA1 as invalid
168
+ - resolve_ref(): emit warnings for improperly-formatted references
169
+ - resolve_ref(): verify that the input refname has the right format
170
+ - remote: avoid passing NULL to read_ref()
171
+ - remote: use xstrdup() instead of strdup()
172
+ - resolve_ref(): do not follow incorrectly-formatted symbolic refs
173
+ - resolve_ref(): extract a function get_packed_ref()
174
+ - resolve_ref(): turn buffer into a proper string as soon as possible
175
+ - resolve_ref(): only follow a symlink that contains a valid, normalized refname
176
+ - resolve_ref(): use prefixcmp()
177
+ - resolve_ref(): explicitly fail if a symlink is not readable
178
+ - Change check_refname_format() to reject unnormalized refnames
179
+ - Inline function refname_format_print()
180
+ - Make collapse_slashes() allocate memory for its result
181
+ - Do not allow ".lock" at the end of any refname component
182
+ - Refactor check_refname_format()
183
+ - Change check_ref_format() to take a flags argument
184
+ - Change bad_ref_char() to return a boolean value
185
+ - git check-ref-format: add options --allow-onelevel and --refspec-pattern
186
+ - t1402: add some more tests
187
+
188
+* cn/eradicate-working-copy (2011-09-21) 1 commit
189
+ - Remove 'working copy' from the documentation and C code
190
+
191
+* js/bisect-no-checkout (2011-09-21) 1 commit
192
+ (merged to 'next' on 2011-09-21 at e94ad3e)
193
+ + bisect: fix exiting when checkout failed in bisect_start()
194
+
195
+* mg/maint-doc-sparse-checkout (2011-09-21) 3 commits
196
+ (merged to 'next' on 2011-09-21 at f316dec)
197
+ + git-read-tree.txt: correct sparse-checkout and skip-worktree description
198
+ + git-read-tree.txt: language and typography fixes
199
+ + unpack-trees: print "Aborting" to stderr
200
+
201
+* ms/patch-id-with-overlong-line (2011-09-22) 1 commit
202
+ - patch-id.c: use strbuf instead of a fixed buffer
203
+
204
+* sn/doc-update-index-assume-unchanged (2011-09-21) 1 commit
205
+ (merged to 'next' on 2011-09-21 at 325e796)
206
+ + Documentation/git-update-index: refer to 'ls-files'
207
+
208
+* jc/request-pull-show-head-4 (2011-09-21) 7 commits
209
+ - request-pull: use the branch description
210
+ - request-pull: state what commit to expect
211
+ - request-pull: modernize style
212
+ - branch: teach --edit-description option
213
+ - format-patch: use branch description in cover letter
214
+ - branch: add read_branch_desc() helper function
215
+ - Merge branch 'bk/ancestry-path' into jc/branch-desc
216
+ (this branch uses bk/ancestry-path.)
217
+
218
* jm/mergetool-pathspec (2011-09-16) 2 commits
219
- mergetool: no longer need to save standard input
220
- mergetool: Use args as pathspec to unmerged files
@@ -235,7 +257,7 @@ is in the upcoming release.
257
258
* js/cred-macos-x-keychain-2 (2011-09-14) 1 commit
259
- contrib: add a pair of credential helpers for Mac OS X's keychain
238
- (this branch is tangled with jk/http-auth-keyring.)
260
+ (this branch uses jk/http-auth-keyring.)
261
262
Welcome addition to build our confidence in the jk/http-auth-keyring topic.
263
@@ -550,29 +572,6 @@ feature. Will keep it in 'next' at least for one cycle.
572
--------------------------------------------------
573
[Discarded]
574
553
-* mh/check-ref-format (2011-09-11) 8 commits
554
- . Add tools to avoid the use of unnormalized refnames.
555
- . Do not allow ".lock" at the end of any refname component
556
- . Add a library function normalize_refname()
557
- . Change check_ref_format() to take a flags argument
558
- . fixup asciidoc formatting
559
- . git check-ref-format: add options --allow-onelevel and --refspec-pattern
560
- . Change bad_ref_char() to return a boolean value
561
- . t1402: add some more tests
562
-
563
-Rerolled
564
-
565
-* jk/pager-with-alias (2011-08-19) 1 commit
566
- . support pager.* for aliases
567
-
568
-* cb/maint-quiet-push (2011-09-05) 4 commits
569
- . t5541: avoid TAP test miscounting
570
- . push: old receive-pack does not understand --quiet
571
- . fix push --quiet via http
572
- . tests for push --quiet
573
-
574
-Dropped for rerolling after 1.7.7 cycle.
575
-
575
* js/cred-macos-x-keychain (2011-09-11) 15 commits
576
(merged to 'next' on 2011-09-12 at 8d17f94)
577
+ contrib: add a credential helper for Mac OS X's keychain