What's cooking (2010/07 #04)
Junio C Hamano committed
Jul 19, 2010 at 13:08 UTC
52c39b1259bfe2b82391fd72ea5ce4c1a4c96f0d
1 file changed
+46
-96
whats-cooking.txt
+46
-96
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2010, #03; Fri, 16)
3
-X-master-at: 24e7a5be373c95f977bab4f0f41f736bb1d25075
4
-X-next-at: 917297fa2312cb1baef4b7467153f116c1850589
2
+Subject: What's cooking in git.git (Jul 2010, #04; Mon, 19)
3
+X-master-at: c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68
4
+X-next-at: b7c600f132949b7f995ac2643ab9728272d3aaab
5
6
-What's cooking in git.git (Jul 2010, #03; Fri, 16)
6
+What's cooking in git.git (Jul 2010, #04; Mon, 19)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,100 +12,17 @@ marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
I've ended up merging a few more fixes to 'master'; please give it a good
15
-final round of testing so that we can have the real thing mid next week.
15
+final round of testing so that we can have the real thing in a couple of
16
+days.
17
18
Thanks.
19
19
---------------------------------------------------
20
-[New Topics]
21
-
22
-* ab/report-corrupt-object-with-type (2010-06-10) 1 commit
23
- - sha1_file: Show the the type and path to corrupt objects
24
-
25
-* cc/revert (2010-07-14) 4 commits
26
- - revert: improve success message by adding abbreviated commit sha1
27
- - revert: don't print "Finished one cherry-pick." if commit failed
28
- - revert: refactor commit code into a new run_git_commit() function
29
- - revert: report success when using option --strategy
30
-
31
-* en/fast-export-fix (2010-07-07) 2 commits
32
- . fast-export: Add a --full-tree option
33
- . fast-export: Fix dropping of files with --import-marks and path limiting
34
-
35
-Seems to have breakage in test 9350 (possibly others but I didn't look).
36
-
37
-* jn/parse-date-basic (2010-07-15) 1 commit
38
- - Export parse_date_basic() to convert a date string to timestamp
39
- (this branch is used by rr/svn-export.)
40
-
41
-* kf/post-receive-sample-hook (2010-07-16) 1 commit
42
- - post-receive-email: optional message line count limit
43
-
44
-* tr/rfc-reset-doc (2010-07-16) 5 commits
45
- - Documentation/reset: move "undo permanently" example behind "make topic"
46
- - Documentation/reset: reorder examples to match description
47
- - Documentation/reset: promote 'examples' one section up
48
- - Documentation/reset: separate options by mode
49
- - Documentation/git-reset: reorder modes for soft-mixed-hard progression
50
-
20
--------------------------------------------------
21
[Graduated to "master"]
22
54
-* ab/submodule-add-f (2010-07-05) 1 commit
55
- (merged to 'next' on 2010-07-14 at 4ab3d00)
56
- + git submodule: add submodules with git add -f <path>
57
-
58
-* bc/maint-makefile-fixes (2010-07-06) 2 commits
59
- (merged to 'next' on 2010-07-14 at 294ab08)
60
- + Makefile: work around ksh's failure to handle missing list argument to for loop
61
- + Makefile: remove some unnecessary curly braces
62
-
63
-* eb/doc-log-manpage (2010-07-07) 1 commit
64
- (merged to 'next' on 2010-07-14 at d073ef2)
65
- + Reorganize `git-log' man page to clarify common diff options.
66
-
67
-* jc/diff-merge-base-multi (2010-07-16) 2 commits
68
- + diff A...B: do not limit the syntax too narrowly
69
- + diff A...B: give one possible diff when there are more than one merge-base
70
-
71
-* jc/rebase-i-commit-msg-fix (2010-07-05) 2 commits
72
- (merged to 'next' on 2010-07-14 at 2273bd2)
73
- + rebase-i: do not get fooled by a log message ending with backslash
74
- + rebase-i: style fix
75
-
76
-* jk/maint-status-keep-index-timestamp (2010-07-06) 1 commit
77
- (merged to 'next' on 2010-07-14 at 43cc5ef)
78
- + do not write out index when status does not have to
79
-
80
-* jn/grep-open (2010-07-02) 1 commit
81
- (merged to 'next' on 2010-07-14 at c057fd6)
82
- + grep -O: Do not pass color sequences as filenames to pager
83
-
84
-* jn/paginate-fix (2010-06-26) 4 commits
85
- + git --paginate: do not commit pager choice too early
86
- + tests: local config file should be honored from subdirs of toplevel
87
- + t7006: test pager configuration for several git commands
88
- + t7006 (pager): introduce helper for parameterized tests
89
-
90
-* jn/tests (2010-07-10) 1 commit
91
- (merged to 'next' on 2010-07-14 at 390c1f6)
92
- + t3000 (ls-files -o): modernize style
93
-
94
-* js/merge-rr-fix (2010-07-14) 1 commit
95
- + MERGE_RR is in .git, not .git/rr-cache
96
-
97
-* mg/revision-doc (2010-07-05) 3 commits
98
- (merged to 'next' on 2010-07-14 at 416a2ad)
99
- + Documentation: link to gitrevisions rather than git-rev-parse
100
- + Documentation: gitrevisions
101
- + Documentation: split off rev doc into include file
102
-
103
-* ns/merge-recursive-uptodate (2010-07-09) 1 commit
104
- + merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
105
-
106
-* wp/merge-tree-fix (2010-07-14) 2 commits
107
- + merge-tree: fix where two branches share no changes
108
- + add basic tests for merge-tree
23
+* jl/add-n-ignore-missing (2010-07-10) 2 commits
24
+ + git submodule add: Require the new --force option to add ignored paths
25
+ + git add: Add the "--ignore-missing" option for the dry run
26
27
--------------------------------------------------
28
[Stalled -- would discard unless there are some movements soon]
@@ -142,12 +59,20 @@ strongly suspect that --reuse-config should be renamed so that the
59
variable can be named more sanely and in line with whatever option
60
that replaces it.
61
62
+No responses; I think we will eventually want to have a configuration to
63
+always enable the new option, so the renaming of the command line option
64
+is inevitable. I plan to kick this out of 'next' once the upcoming
65
+release is out, and expect a re-roll with configuration variable.
66
+
67
* js/rebase-origin-x (2010-02-05) 1 commit
68
- [RFC w/o test and incomplete] rebase: add -x option to record original commit name
69
70
I retract my objection against the idea of -x; needs polishing before
71
moving forward.
72
73
+No responses; I plan to drop this entirely after the upcoming release
74
+without prejudice.
75
+
76
* zl/mailinfo-recode-patch (2010-06-14) 2 commits
77
- add --recode-patch option to git-am
78
- add --recode-patch option to git-mailinfo
@@ -163,6 +88,33 @@ I recall there was another round of re-roll planned for this one.
88
--------------------------------------------------
89
[Cooking]
90
91
+* ab/report-corrupt-object-with-type (2010-06-10) 1 commit
92
+ - sha1_file: Show the the type and path to corrupt objects
93
+
94
+* cc/revert (2010-07-14) 4 commits
95
+ - revert: improve success message by adding abbreviated commit sha1
96
+ - revert: don't print "Finished one cherry-pick." if commit failed
97
+ - revert: refactor commit code into a new run_git_commit() function
98
+ - revert: report success when using option --strategy
99
+
100
+* en/fast-export-fix (2010-07-17) 2 commits
101
+ - fast-export: Add a --full-tree option
102
+ - fast-export: Fix dropping of files with --import-marks and path limiting
103
+
104
+* jn/parse-date-basic (2010-07-15) 1 commit
105
+ - Export parse_date_basic() to convert a date string to timestamp
106
+ (this branch is used by rr/svn-export.)
107
+
108
+* kf/post-receive-sample-hook (2010-07-16) 1 commit
109
+ - post-receive-email: optional message line count limit
110
+
111
+* tr/rfc-reset-doc (2010-07-18) 5 commits
112
+ - Documentation/reset: move "undo permanently" example behind "make topic"
113
+ - Documentation/reset: reorder examples to match description
114
+ - Documentation/reset: promote 'examples' one section up
115
+ - Documentation/reset: separate options by mode
116
+ - Documentation/git-reset: reorder modes for soft-mixed-hard progression
117
+
118
* rr/svn-export (2010-07-15) 8 commits
119
- Add SVN dump parser
120
- Add infrastructure to write revisions in fast-export format
@@ -181,15 +133,13 @@ I recall there was another round of re-roll planned for this one.
133
- Enable custom schemes for column colors in the graph API
134
- Make graph_next_line() available in the graph.h API
135
184
-* jl/add-n-ignore-missing (2010-07-10) 1 commit
185
- - git add: Add the "--ignore-missing" option for the dry run
186
-
136
* ar/string-list-foreach (2010-07-03) 2 commits
137
- Convert the users of for_each_string_list to for_each_string_list_item macro
138
- Add a for_each_string_list_item macro
139
(this branch is used by tf/string-list-init.)
140
192
-* il/rfc-remote-fd-ext (2010-06-28) 2 commits
141
+* il/rfc-remote-fd-ext (2010-07-19) 3 commits
142
+ - gitignore: Ignore the new /git-remote-{ext,fd} helpers
143
- New remote helper: git-remote-ext
144
- New remote helper git-remote-fd
145