What's in/cooking post 1.6.4
Junio C Hamano committed
Jul 29, 2009 at 14:06 UTC
7a2c58a4320ecc00212f3a790f5b356f32a12ffb
2 files changed
+275
whats/cooking/2009/07/03.txt
new
+230
@@ -0,0 +1,230 @@
1
+To: git@vger.kernel.org
2
+Subject: What's cooking in git.git (Jul 2009, #03; Wed, 29)
3
+X-master-at: e6580020057afd207b7cfb9c96905f99e13cfe4d
4
+X-next-at: 4719968c98d7ad8352bb14916c65c094842a980d
5
+
6
+What's cooking in git.git (Jul 2009, #03; Wed, 29)
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
+I've already merged the "diff --exit-code --ignore-whitespace" change and
23
+"push safety" change.
24
+
25
+I'll rewind 'next' sometime this weekend.
26
+
27
+----------------------------------------------------------------
28
+[In 'next']
29
+
30
+* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit
31
+ + Shift object enumeration out of upload-pack
32
+
33
+* js/run-command-updates (Sat Jul 4 21:26:43 2009 +0200) 6 commits
34
+ + receive-pack: remove unnecessary run_status report
35
+ + run_command: report failure to execute the program, but optionally
36
+ don't
37
+ + run_command: encode deadly signal number in the return value
38
+ + run_command: report system call errors instead of returning error
39
+ codes
40
+ + run_command: return exit code as positive value
41
+ + MinGW: simplify waitpid() emulation macros
42
+
43
+* sb/maint-pull-rebase (Sun Jul 19 09:45:16 2009 +0200) 2 commits
44
+ + pull: support rebased upstream + fetch + pull --rebase
45
+ + t5520-pull: Test for rebased upstream + fetch + pull --rebase
46
+
47
+* jc/1.7.0-diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
48
+ + diff: Rename QUIET internal option to QUICK
49
+ + diff: change semantics of "ignore whitespace" options
50
+
51
+This changes exit code from "git diff --ignore-whitespace" and friends
52
+when there is no actual output. It is a backward incompatible change, but
53
+we could argue that it is a bugfix.
54
+
55
+* jc/1.7.0-push-safety (Mon Feb 9 00:19:46 2009 -0800) 2 commits
56
+ + Refuse deleting the current branch via push
57
+ + Refuse updating the current branch in a non-bare repository via
58
+ push
59
+
60
+This is old 'jc/deny-delete-current-1.7.0' and 'jc/1.7.0-push-safety'
61
+topics redone.
62
+
63
+* sb/read-tree (Thu Jun 25 22:14:10 2009 -0700) 2 commits
64
+ + read-tree: migrate to parse-options
65
+ + read-tree: convert unhelpful usage()'s to helpful die()'s
66
+
67
+* sb/parse-options (Tue Jul 7 22:15:41 2009 -0700) 4 commits
68
+ + prune-packed: migrate to parse-options
69
+ + verify-pack: migrate to parse-options
70
+ + verify-tag: migrate to parse-options
71
+ + write-tree: migrate to parse-options
72
+
73
+Parse-options migration; should be in 'master' soonish.
74
+
75
+* mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit
76
+ + grep: Add --max-depth option.
77
+
78
+* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
79
+ + t6050: check pushing something based on a replaced commit
80
+ + Documentation: add documentation for "git replace"
81
+ + Add git-replace to .gitignore
82
+ + builtin-replace: use "usage_msg_opt" to give better error messages
83
+ + parse-options: add new function "usage_msg_opt"
84
+ + builtin-replace: teach "git replace" to actually replace
85
+ + Add new "git replace" command
86
+ + environment: add global variable to disable replacement
87
+ + mktag: call "check_sha1_signature" with the replacement sha1
88
+ + replace_object: add a test case
89
+ + object: call "check_sha1_signature" with the replacement sha1
90
+ + sha1_file: add a "read_sha1_file_repl" function
91
+ + replace_object: add mechanism to replace objects found in
92
+ "refs/replace/"
93
+ + refs: add a "for_each_replace_ref" function
94
+
95
+Does not seem to hurt normal operation without "replace". The basic idea
96
+should be easier and safer to use than the graft mechanism. I haven't
97
+tried the replacement myself, though.
98
+
99
+* ns/init-mkdir (Sat Jul 25 06:59:28 2009 +0900) 1 commit
100
+ + git init: optionally allow a directory argument
101
+
102
+Straightforward usability change. Should be in 'master' soonish.
103
+
104
+* mk/init-db-parse-options (Sun Jul 12 12:24:32 2009 +0200) 1 commit
105
+ + init-db: migrate to parse-options
106
+
107
+* jk/maint-show-tag (Sat Jul 18 06:14:37 2009 -0400) 2 commits
108
+ + show: add space between multiple items
109
+ + show: suppress extra newline when showing annotated tag
110
+
111
+* jc/apply-epoch-patch (Fri Jul 10 18:38:08 2009 -0700) 1 commit
112
+ + apply: notice creation/removal patches produced by GNU diff
113
+
114
+Better acceptance of some "GNU patch" output to create or remove files.
115
+
116
+----------------------------------------------------------------
117
+[In 'pu']
118
+
119
+* jp/symlink-dirs (Sun Jun 14 15:08:28 2009 +0200) 2 commits
120
+ - lstat_cache: guard against full match of length of 'name'
121
+ parameter
122
+ - Demonstrate bugs when a directory is replaced with a symlink
123
+
124
+James's test scripts to expose corner case bugs in the merge and branch
125
+switching machinery.
126
+
127
+* jh/vcs-cvs (Mon Jul 27 03:04:17 2009 +0200) 15 commits
128
+ - Introduce a 'marks <filename>' feature to the foreign transport
129
+ code
130
+ - Teach foreign transport code to perform the "capabilities" command
131
+ - Preliminary clarifications to git-vcs documentation
132
+ - fast-import: Add support for importing commit notes
133
+ - Add a transport implementation using git-vcs-* helpers
134
+ - Allow programs to not depend on remotes having urls
135
+ - Use a function to determine whether a remote is valid
136
+ - Add specification of git-vcs-* helper programs
137
+ - Merge branch 'db/transport-shim' into jh/vcs-cvs
138
+ - git-http-fetch: not a builtin
139
+ - Use an external program to implement fetching with curl
140
+ - Add support for external programs for handling native fetches
141
+ - Add option for using a foreign VCS
142
+ - Document details of transport function APIs
143
+ - Allow late reporting of fetched hashes
144
+
145
+With its 6th patch replaced to keep the pathname syntax of the fast-import
146
+language, but without the commits near the tip of the old series.
147
+
148
+* db/transport-shim (Tue Jul 28 02:08:53 2009 -0400) 3 commits
149
+ - git-http-fetch: not a builtin
150
+ - Use an external program to implement fetching with curl
151
+ - Add support for external programs for handling native fetches
152
+
153
+* jh/notes (Wed Jul 29 04:25:26 2009 +0200) 8 commits
154
+ - t3302-notes-index-expensive: Speed up create_repo()
155
+ - fast-import: Add support for importing commit notes
156
+ - First draft of notes tree parser with support for fanout subtrees
157
+ - Teach "-m <msg>" and "-F <file>" to "git notes edit"
158
+ - Add an expensive test for git-notes
159
+ - Speed up git notes lookup
160
+ - Add a script to edit/inspect notes
161
+ - Introduce commit notes
162
+
163
+jh/vcs-cvs topic needs to be rebuilt, merging this instead of having its
164
+own copy of "fast-import: Add support for importing commit notes".
165
+
166
+* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
167
+ - Add option for using a foreign VCS
168
+ - Document details of transport function APIs
169
+ - Allow late reporting of fetched hashes
170
+
171
+* cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits
172
+ - rebase -i: use "git sequencer--helper --make-patch"
173
+ - sequencer: free memory used in "make_patch" function
174
+ - sequencer: add "make_patch" function to save a patch
175
+ - sequencer: add "builtin-sequencer--helper.c"
176
+
177
+I do not know how this will interact with what Dscho has been doing.
178
+
179
+* jc/mailinfo-remove-brackets (Wed Jul 15 15:31:12 2009 -0700) 1 commit
180
+ - mailinfo: -b option keeps [bracketed] strings that is not a
181
+ [PATCH] marker
182
+
183
+* jn/gitweb-blame (Sat Jul 25 00:44:10 2009 +0200) 10 commits
184
+ - gitweb: Create links leading to 'blame_incremental' using
185
+ JavaScript
186
+ - gitweb: Incremental blame (proof of concept)
187
+ - gitweb: Add optional "time to generate page" info in footer
188
+ - gitweb: Add -partial_query option to href() subroutine
189
+ - gitweb: Use light/dark for class names also in 'blame' view
190
+ - gitweb: Add author initials in 'blame' view, a la "git gui blame"
191
+ - gitweb: Mark commits with no "previous" in 'blame' view
192
+ - gitweb: Use "previous" header of git-blame -p in 'blame' view
193
+ - gitweb: Mark boundary commits in 'blame' view
194
+ - gitweb: Make .error style generic
195
+
196
+There may have been updates during 1.6.4-rc period that I missed.
197
+
198
+* tr/reset-checkout-patch (Tue Jul 28 23:20:11 2009 +0200) 5 commits
199
+ - Implement 'git stash save --patch'
200
+ - Implement 'git checkout --patch'
201
+ - Implement 'git reset --patch'
202
+ - builtin-add: refactor the meat of interactive_add()
203
+ - git-apply--interactive: Refactor patch mode code
204
+
205
+* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
206
+ - Allow --date=local --date=other-format to work as expected
207
+
208
+* pb/tracking (Thu Jul 16 16:26:15 2009 -0500) 7 commits
209
+ - branch.c: if remote is not config'd for branch, don't try delete
210
+ push config
211
+ - branch, checkout: introduce autosetuppush
212
+ - move deletion of merge configuration to branch.c
213
+ - remote: add per-remote autosetupmerge and autosetuprebase
214
+ configuration
215
+ - introduce a struct tracking_config
216
+ - branch: install_branch_config and struct tracking refactoring
217
+ - config: allow false and true values for branch.autosetuprebase
218
+
219
+This has been reverted from 'next' for now to give it a fresh start.
220
+
221
+----------------------------------------------------------------
222
+[Dropped]
223
+
224
+* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
225
+ . Fix for a merge where a branch has an F->D transition
226
+ . Add a reminder test case for a merge with F/D transition
227
+
228
+The fix the author hinted iffy is dropped for now, but the test case is
229
+already in 'master' to remind us.
230
+
whats/in/2009/07/02.txt
new
+45
@@ -0,0 +1,45 @@
1
+To: git@vger.kernel.org
2
+Subject: What's in git.git (Jul 2009, #02; Wed, 29)
3
+X-maint-at: 0a53e9ddeaddad63ad106860237bbf53411d11a7
4
+X-master-at: e6580020057afd207b7cfb9c96905f99e13cfe4d
5
+X-maint-was: 0a53e9ddeaddad63ad106860237bbf53411d11a7
6
+X-master-was: 0a53e9ddeaddad63ad106860237bbf53411d11a7
7
+
8
+What's in git.git (Jul 2009, #02; Wed, 29)
9
+
10
+ maint 0a53e9d (GIT 1.6.4)
11
+ master e658002 (Translate the tutorial to Brazillian Portuguese)
12
+------------------------------------------------------------------------
13
+
14
+I took advices from the list and merged tests that have been parked in
15
+'pu' during the 1.6.4 cycle to 'master'. Even though I did not see much
16
+feedback to the pt_BR translation of the tutorial, I decided to merge it
17
+as well, since I do not read/speak the language.
18
+
19
+We have reasonably solid topics that have been cooking in 'next' for quite
20
+some time. Hopefully the 1.6.5 cycle will be short and smooth.
21
+
22
+* The 'master' branch has these since the last announcement.
23
+
24
+Alex Riesen (1):
25
+ Add a reminder test case for a merge with F/D transition
26
+
27
+Heiko Voigt (2):
28
+ cvsimport: add test illustrating a bug in cvsps
29
+ cvsimport: extend testcase about patchset order to contain branches
30
+
31
+Junio C Hamano (3):
32
+ t/t9600: remove exit after test_done
33
+ Start 1.6.5 cycle
34
+ request-pull: optionally show a patch as well
35
+
36
+Michael Haggerty (5):
37
+ Start a library for cvsimport-related tests
38
+ Use CVS's -f option if available (ignore user's ~/.cvsrc file)
39
+ Test contents of entire cvsimported "master" tree contents
40
+ Add some tests of git-cvsimport's handling of vendor branches
41
+ Add a test of "git cvsimport"'s handling of tags and branches
42
+
43
+Thadeu Lima de Souza Cascardo (1):
44
+ Translate the tutorial to Brazillian Portuguese
45
+