What's in/cooking
Junio C Hamano committed
Aug 5, 2009 at 14:49 UTC
6849908a55d0e7a95fa715310f739cfab4dd8def
2 files changed
+320
whats/cooking/2009/08/01.txt
new
+228
@@ -0,0 +1,228 @@
1
+To: git@vger.kernel.org
2
+Subject: What's cooking in git.git (Aug 2009, #01; Wed, 05)
3
+X-master-at: 3f55e4107f7906134df029f9a5c44864f9258110
4
+X-next-at: 2981fa5b8f20e8ff086aceb252c0e693fa2d0c75
5
+
6
+What's cooking in git.git (Aug 2009, #01; Wed, 05)
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'. The ones
11
+marked with '.' do not appear in any of the branches, but I am still
12
+holding onto them.
13
+
14
+In preparation for rewinding 'next' after a major release, one topic was
15
+reverted and kicked back to 'pu' to give it a fresh start.
16
+
17
+After the 1.6.5 cycle, the next release will be 1.7.0, and we will push
18
+out the planned "push safety" change. 1.7.0 would be a good time to
19
+introduce "justifiable" changes that are not strictly backward compatible.
20
+
21
+During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
22
+
23
+----------------------------------------------------------------
24
+[New Topics]
25
+
26
+* gb/apply-ignore-whitespace (Tue Aug 4 13:16:49 2009 +0200) 1 commit
27
+ - git apply: option to ignore whitespace differences
28
+
29
+* db/vcs-helper (Wed Aug 5 01:02:25 2009 -0400) 13 commits
30
+ - Changes for new vcs-helper series
31
+ - Add simple test cases of git-vcs-cvs functionality
32
+ - First draft of CVS importer using the foreign-scm machinery
33
+ - Allow helpers to request marks for fast-import
34
+ - Allow helpers to report in "list" command that the ref is
35
+ unchanged
36
+ - Add support for "import" helper command
37
+ - Add a config option for remotes to specify a foreign vcs
38
+ - Allow programs to not depend on remotes having urls
39
+ - Allow fetch to modify refs
40
+ - Use a function to determine whether a remote is valid
41
+ - git-http-fetch: not a builtin
42
+ - Use an external program to implement fetching with curl
43
+ - Add support for external programs for handling native fetches
44
+
45
+This consolidates various previous rounds from Daniel and Johan.
46
+
47
+* je/send-email-no-subject (Wed Aug 5 18:49:54 2009 +0200) 1 commit
48
+ - send-email: confirm on empty mail subjects
49
+
50
+* zf/maint-gitweb-acname (Sun Aug 2 09:42:24 2009 +0200) 1 commit
51
+ - gitweb: parse_commit_text encoding fix
52
+
53
+* jc/maint-clean-nested-dir-safety (Tue Jun 30 15:33:45 2009 -0700) 1 commit
54
+ - clean: require double -f options to nuke nested git repository and
55
+ work tree
56
+
57
+* jc/shortstatus (Tue Aug 4 23:55:22 2009 -0700) 5 commits
58
+ - shortstatus: a new command
59
+ - status: show worktree status of conflicted paths separately
60
+ - wt-status.c: rework the way changes to the index and work tree are
61
+ summarized
62
+ - diff-index: keep the original index intact
63
+ - diff-index: report unmerged new entries
64
+
65
+* bc/mailsplit-cr-at-eol (Tue Aug 4 22:31:59 2009 -0500) 4 commits
66
+ - Allow mailsplit (and hence git-am) to handle mails with CRLF line-
67
+ endings
68
+ - builtin-mailsplit.c: remove read_line_with_nul() since it is no
69
+ longer used
70
+ - builtin-mailinfo,builtin-mailsplit: use strbufs
71
+ - strbuf: add new function strbuf_getwholeline()
72
+
73
+* jc/maint-merge-recursive-fix (Thu Jul 30 17:38:15 2009 -0700) 1 commit
74
+ - merge-recursive: don't segfault while handling rename clashes
75
+
76
+----------------------------------------------------------------
77
+[Graduated to "master"]
78
+
79
+* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit
80
+ + Shift object enumeration out of upload-pack
81
+
82
+* sb/maint-pull-rebase (Sun Jul 19 09:45:16 2009 +0200) 2 commits
83
+ + pull: support rebased upstream + fetch + pull --rebase
84
+ + t5520-pull: Test for rebased upstream + fetch + pull --rebase
85
+
86
+* sb/read-tree (Thu Jun 25 22:14:10 2009 -0700) 2 commits
87
+ + read-tree: migrate to parse-options
88
+ + read-tree: convert unhelpful usage()'s to helpful die()'s
89
+
90
+* sb/parse-options (Tue Jul 7 22:15:41 2009 -0700) 4 commits
91
+ + prune-packed: migrate to parse-options
92
+ + verify-pack: migrate to parse-options
93
+ + verify-tag: migrate to parse-options
94
+ + write-tree: migrate to parse-options
95
+
96
+* ns/init-mkdir (Sat Jul 25 06:59:28 2009 +0900) 1 commit
97
+ + git init: optionally allow a directory argument
98
+
99
+Straightforward usability change.
100
+
101
+* mk/init-db-parse-options (Sun Jul 12 12:24:32 2009 +0200) 1 commit
102
+ + init-db: migrate to parse-options
103
+
104
+* jk/maint-show-tag (Sat Jul 18 06:14:37 2009 -0400) 2 commits
105
+ + show: add space between multiple items
106
+ + show: suppress extra newline when showing annotated tag
107
+
108
+* jc/apply-epoch-patch (Fri Jul 10 18:38:08 2009 -0700) 1 commit
109
+ + apply: notice creation/removal patches produced by GNU diff
110
+
111
+----------------------------------------------------------------
112
+[In 'next']
113
+
114
+* js/run-command-updates (Tue Aug 4 11:28:40 2009 +0200) 7 commits
115
+ + run-command.c: squelch a "use before assignment" warning
116
+ + receive-pack: remove unnecessary run_status report
117
+ + run_command: report failure to execute the program, but optionally
118
+ don't
119
+ + run_command: encode deadly signal number in the return value
120
+ + run_command: report system call errors instead of returning error
121
+ codes
122
+ + run_command: return exit code as positive value
123
+ + MinGW: simplify waitpid() emulation macros
124
+
125
+Will merge soon.
126
+
127
+* mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit
128
+ + grep: Add --max-depth option.
129
+
130
+Will merge soon.
131
+
132
+* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
133
+ + t6050: check pushing something based on a replaced commit
134
+ + Documentation: add documentation for "git replace"
135
+ + Add git-replace to .gitignore
136
+ + builtin-replace: use "usage_msg_opt" to give better error messages
137
+ + parse-options: add new function "usage_msg_opt"
138
+ + builtin-replace: teach "git replace" to actually replace
139
+ + Add new "git replace" command
140
+ + environment: add global variable to disable replacement
141
+ + mktag: call "check_sha1_signature" with the replacement sha1
142
+ + replace_object: add a test case
143
+ + object: call "check_sha1_signature" with the replacement sha1
144
+ + sha1_file: add a "read_sha1_file_repl" function
145
+ + replace_object: add mechanism to replace objects found in
146
+ "refs/replace/"
147
+ + refs: add a "for_each_replace_ref" function
148
+
149
+Does not seem to hurt normal operation without "replace". The basic idea
150
+should be easier and safer to use than the graft mechanism. I haven't
151
+tried the replacement myself, though.
152
+
153
+* jp/symlink-dirs (Wed Jul 29 20:22:25 2009 -0700) 3 commits
154
+ + git-checkout: be careful about untracked symlinks
155
+ + lstat_cache: guard against full match of length of 'name'
156
+ parameter
157
+ + Demonstrate bugs when a directory is replaced with a symlink
158
+
159
+James's test scripts to expose corner case bugs in the merge and branch
160
+switching machinery, and a few fix-ups.
161
+
162
+* jn/gitweb-blame (Sat Jul 25 00:44:10 2009 +0200) 10 commits
163
+ + gitweb: Create links leading to 'blame_incremental' using
164
+ JavaScript
165
+ + gitweb: Incremental blame (proof of concept)
166
+ + gitweb: Add optional "time to generate page" info in footer
167
+ + gitweb: Add -partial_query option to href() subroutine
168
+ + gitweb: Use light/dark for class names also in 'blame' view
169
+ + gitweb: Add author initials in 'blame' view, a la "git gui blame"
170
+ + gitweb: Mark commits with no "previous" in 'blame' view
171
+ + gitweb: Use "previous" header of git-blame -p in 'blame' view
172
+ + gitweb: Mark boundary commits in 'blame' view
173
+ + gitweb: Make .error style generic
174
+
175
+Will merge soon.
176
+
177
+* jc/1.7.0-diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
178
+ + diff: Rename QUIET internal option to QUICK
179
+ + diff: change semantics of "ignore whitespace" options
180
+
181
+This changes exit code from "git diff --ignore-whitespace" and friends
182
+when there is no actual output. It is a backward incompatible change, but
183
+we could argue that it is a bugfix.
184
+
185
+* jc/1.7.0-push-safety (Mon Feb 9 00:19:46 2009 -0800) 2 commits
186
+ + Refuse deleting the current branch via push
187
+ + Refuse updating the current branch in a non-bare repository via
188
+ push
189
+
190
+----------------------------------------------------------------
191
+[In 'pu']
192
+
193
+* jh/notes (Wed Jul 29 04:25:26 2009 +0200) 8 commits
194
+ - t3302-notes-index-expensive: Speed up create_repo()
195
+ - fast-import: Add support for importing commit notes
196
+ - First draft of notes tree parser with support for fanout subtrees
197
+ - Teach "-m <msg>" and "-F <file>" to "git notes edit"
198
+ - Add an expensive test for git-notes
199
+ - Speed up git notes lookup
200
+ - Add a script to edit/inspect notes
201
+ - Introduce commit notes
202
+
203
+* cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits
204
+ - rebase -i: use "git sequencer--helper --make-patch"
205
+ - sequencer: free memory used in "make_patch" function
206
+ - sequencer: add "make_patch" function to save a patch
207
+ - sequencer: add "builtin-sequencer--helper.c"
208
+
209
+* jc/mailinfo-remove-brackets (Wed Jul 15 15:31:12 2009 -0700) 1 commit
210
+ - mailinfo: -b option keeps [bracketed] strings that is not a
211
+ [PATCH] marker
212
+
213
+* tr/reset-checkout-patch (Tue Jul 28 23:20:12 2009 +0200) 8 commits
214
+ - DWIM 'git stash save -p' for 'git stash -p'
215
+ - Merge branch 'js/stash-dwim' into tr/reset-checkout-patch
216
+ - Make 'git stash -k' a short form for 'git stash save --keep-index'
217
+ - Implement 'git stash save --patch'
218
+ - Implement 'git checkout --patch'
219
+ - Implement 'git reset --patch'
220
+ - builtin-add: refactor the meat of interactive_add()
221
+ - git-apply--interactive: Refactor patch mode code
222
+
223
+* js/stash-dwim (Mon Jul 27 20:37:10 2009 +0200) 1 commit
224
+ - Make 'git stash -k' a short form for 'git stash save --keep-index'
225
+
226
+* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
227
+ - Allow --date=local --date=other-format to work as expected
228
+
whats/in/2009/08/01.txt
new
+92
@@ -0,0 +1,92 @@
1
+To: git@vger.kernel.org
2
+Subject: What's in git.git (Aug 2009, #01; Wed, 05)
3
+X-maint-at: f0df1293acdba9513cae17e2c63b4169f1347371
4
+X-master-at: 3f55e4107f7906134df029f9a5c44864f9258110
5
+X-maint-was: 0a53e9ddeaddad63ad106860237bbf53411d11a7
6
+X-master-was: e6580020057afd207b7cfb9c96905f99e13cfe4d
7
+
8
+What's in git.git (Aug 2009, #01; Wed, 05)
9
+
10
+ maint f0df129 (Merge branch 'maint-1.6.3' into maint)
11
+ master 3f55e41 (Merge branch 'sb/read-tree')
12
+------------------------------------------------------------------------
13
+
14
+The 1.6.4 release seems to have been quite solid, and there is no
15
+brown-paper-bag bugfixes on 'maint' yet ;-).
16
+
17
+A handful of topics have graduated to 'master'.
18
+
19
+* The 'maint' branch has these fixes since the last announcement.
20
+
21
+Björn Steinbrink (1):
22
+ config: Keep inner whitespace verbatim
23
+
24
+Erik Faye-Lund (1):
25
+ send-email: remove debug trace
26
+
27
+Jakub Narebski (1):
28
+ gitweb/README: Document $base_url
29
+
30
+Jens Lehmann (1):
31
+ Documentation: git submodule: add missing options to synopsis
32
+
33
+Matthieu Moy (1):
34
+ Better usage string for reflog.
35
+
36
+Miklos Vajna (1):
37
+ hg-to-git: don't import the unused popen2 module
38
+
39
+
40
+* The 'master' branch has these since the last announcement
41
+ in addition to the above.
42
+
43
+André Goddard Rosa (1):
44
+ Fix typos on pt_BR/gittutorial.txt translation
45
+
46
+Geoffrey Irving (1):
47
+ git fast-export: add --no-data option
48
+
49
+Giuseppe Bilotta (1):
50
+ gitweb: fix 'Use of uninitialized value' error in href()
51
+
52
+Jeff King (2):
53
+ show: suppress extra newline when showing annotated tag
54
+ show: add space between multiple items
55
+
56
+Johannes Schindelin (1):
57
+ parse-opt: optionally show "--no-" option string
58
+
59
+Junio C Hamano (1):
60
+ apply: notice creation/removal patches produced by GNU diff
61
+
62
+Michael J Gruber (3):
63
+ t6010-merge-base.sh: Depict the octopus test graph
64
+ git-merge-base/git-show-branch: Cleanup documentation and usage
65
+ git-merge-base/git-show-branch --merge-base: Documentation and test
66
+
67
+Michał Kiedrowicz (1):
68
+ init-db: migrate to parse-options
69
+
70
+Nanako Shiraishi (1):
71
+ git init: optionally allow a directory argument
72
+
73
+Nick Edelen (1):
74
+ Shift object enumeration out of upload-pack
75
+
76
+Santi Béjar (2):
77
+ t5520-pull: Test for rebased upstream + fetch + pull --rebase
78
+ pull: support rebased upstream + fetch + pull --rebase
79
+
80
+Stephen Boyd (7):
81
+ read-tree: convert unhelpful usage()'s to helpful die()'s
82
+ read-tree: migrate to parse-options
83
+ write-tree: migrate to parse-options
84
+ verify-tag: migrate to parse-options
85
+ verify-pack: migrate to parse-options
86
+ prune-packed: migrate to parse-options
87
+ technical-docs: document tree-walking API
88
+
89
+Wesley J. Landaker (2):
90
+ Documentation: git-send-email: fix submission port number
91
+ Documentation: git-send-email: correct statement about standard ports
92
+