@matheusbsbs / matheus-bagliano / commits / 9e9d8b3227

What's cooking 2009-04 #3

Junio C Hamano committed Apr 15, 2009 at 22:46 UTC 9e9d8b3227245744378acd4a57916faa863a4abe
1 file changed +253
whats/cooking/2009/04/03.txt new
+253
@@ -0,0 +1,253 @@
1 +To: git@vger.kernel.org
2 +Subject: What's cooking in git.git (Apr 2009, #03; Wed, 15)
3 +X-master-at: f800b65bea1504299747e7be03ee279508a74e1f
4 +X-next-at: 40869ef2c65a11295fc4c83e257fa4564b3e18f5
5 +
6 +What's cooking in git.git (Apr 2009, #03; Wed, 15)
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 +The topics list the commits in reverse chronological order. The topics
15 +meant to be merged to the maintenance series have "maint-" in their names.
16 +
17 +We are a bit past 1.6.3-rc0, and this report will show pretty much what
18 +the final should look like from the feature-set point-of-view.
19 +
20 +----------------------------------------------------------------
21 +[New Topics]
22 +
23 +* ac/color-graph (Mon Apr 13 15:53:41 2009 -0400) 1 commit
24 + + graph API: Added logic for colored edges
25 +
26 +This has been under discussion since before 1.6.3-rc0, hopefully in
27 +1.6.3-rc1.
28 +
29 +* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits
30 + - send-email: Remove superfluous `my $editor = ...'
31 + - send-email: 'References:' should only reference what is sent
32 + - send-email: Handle "GIT:" rather than "GIT: " during --compose
33 + - Docs: send-email: --smtp-server-port can take symbolic ports
34 + - Docs: send-email: Refer to CONFIGURATION section for
35 + sendemail.multiedit
36 + - Docs: send-email: Put options back into alphabetical order
37 +
38 +Only partially queued, but this is not 1.6.3 material and we are not in a
39 +hurry.
40 +
41 +* jk/cobdoc (Mon Apr 13 07:21:04 2009 -0400) 5 commits
42 + + docs/checkout: clarify what "non-branch" means
43 + + doc/checkout: split checkout and branch creation in synopsis
44 + + doc/checkout: refer to git-branch(1) as appropriate
45 + + doc: refer to tracking configuration as "upstream"
46 + + doc: clarify --no-track option
47 +
48 +For 1.6.3
49 +
50 +* mk/apply-swap (Sat Apr 11 21:31:00 2009 +0200) 2 commits
51 + + builtin-apply: keep information about files to be deleted
52 + + tests: test applying criss-cross rename patch
53 +
54 +For 1.6.3; perhaps needs to be cherry-picked to 1.6.2.X series as well.
55 +
56 +----------------------------------------------------------------
57 +[Will merge to 'master' before 1.6.3-rc1]
58 +
59 +* mm/add-p-quit (Fri Apr 10 16:57:01 2009 +0200) 1 commit
60 + + git add -p: new "quit" command at the prompt.
61 +
62 +I did a minimal documentation update myself.
63 +
64 +* eb/upload-archive-from-git-shell (Thu Apr 9 21:58:52 2009 +0200) 1 commit
65 + + git-shell: Add 'git-upload-archive' to allowed commands.
66 +
67 +* jc/shared-literally (Sun Apr 12 17:55:18 2009 -0700) 2 commits
68 + + Mark t1301 permission test to depend on POSIXPERM
69 + + t1301-shared-repo: fix forced modes test
70 +
71 +* jc/maint-shared-literally (Sun Apr 12 21:22:02 2009 +0200) 1 commit
72 + + t1301-shared-repo: fix forced modes test
73 +
74 +J6t's updates to fix permission tests and make sure they won't run on
75 +systems without permission bits on the filesystem.
76 +
77 +* ns/am-to-empty (Fri Apr 10 09:34:42 2009 +0900) 1 commit
78 + + git-am: teach git-am to apply a patch to an unborn branch
79 +
80 +* bw/short-ref-strict (Mon Apr 13 13:20:26 2009 +0200) 3 commits
81 + + rev-parse: --abbrev-ref option to shorten ref name
82 + + for-each-ref: utilize core.warnAmbiguousRefs for :short-format
83 + + shorten_unambiguous_ref(): add strict mode
84 +
85 +* da/difftool (Sat Apr 11 20:41:56 2009 -0700) 16 commits
86 + + mergetool--lib: simplify API usage by removing more global
87 + variables
88 + + Fix misspelled mergetool.keepBackup
89 + + difftool/mergetool: refactor commands to use git-mergetool--lib
90 + + mergetool: use $( ... ) instead of `backticks`
91 + + bash completion: add git-difftool
92 + + difftool: add support for a difftool.prompt config variable
93 + + difftool: add various git-difftool tests
94 + + difftool: move 'git-difftool' out of contrib
95 + + difftool/mergetool: add diffuse as merge and diff tool
96 + + difftool: add a -y shortcut for --no-prompt
97 + + difftool: use perl built-ins when testing for msys
98 + + difftool: remove the backup file feature
99 + + difftool: remove merge options for opendiff, tkdiff, kdiff3 and
100 + xxdiff
101 + + git-mergetool: add new merge tool TortoiseMerge
102 + + git-mergetool/difftool: make (g)vimdiff workable under Windows
103 + + doc/merge-config: list ecmerge as a built-in merge tool
104 +
105 +----------------------------------------------------------------
106 +[Graduated to "master"]
107 +
108 +(none)
109 +
110 +----------------------------------------------------------------
111 +[Stalled and may need help and prodding to go forward]
112 +
113 +* lt/bool-on-off (Thu Apr 9 12:40:39 2009 -0700) 1 commit
114 + + Allow users to un-configure rename detection
115 +
116 +Still lacks doc updates.
117 +
118 +* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
119 + - blame.c: start libifying the blame infrastructure
120 +
121 +A few minor point remains in this initial one. I hate to do these minor
122 +fix-ups myself, but I may end up doing so...
123 +
124 +* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
125 + - Allow --date=local --date=other-format to work as expected
126 +
127 +The one I posted had a few corner-case bugs that was caught with the test
128 +suite; this one has them fixed. People did not like the UI so it is kept
129 +out of 'next'
130 +
131 +* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
132 + - git-merge-file: allow converting the results for the work tree
133 +
134 +This is a feature waiting for a user.
135 +
136 +We did not give scripted Porcelains a way to say "this temporary file I am
137 +using for merging is for this path, so use the core.autocrlf and attributes
138 +rules for that final path". Instead, merge-file simply wrote out the
139 +data in the canonical repository representation.
140 +
141 +rerere has the same issue, but it is a lot worse. It reads the three
142 +files (preimage, postimage and thisimage) from the work tree in the work
143 +tree representation, merges them without converting them to the canonical
144 +representation first but inserts the conflict markers with the canonical
145 +representation and writes the resulting mess out. It needs to be fixed to
146 +read with convert_to_git(), merge them while they are still in the
147 +canonical representation and possibly add conflict markers, and then write
148 +the results out after convert_to_working_tree(). It also needs to write
149 +in binary mode as well.
150 +
151 +* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
152 + - Add option for using a foreign VCS
153 + - Document details of transport function APIs
154 + - Allow late reporting of fetched hashes
155 +
156 +* js/notes (Tue Apr 14 00:03:36 2009 +0200) 15 commits
157 + - Documentation: fix 'linkgit' macro in "git-notes.txt"
158 + - tests: fix "export var=val"
159 + - notes: refuse to edit notes outside refs/notes/
160 + - t3301: use test_must_fail instead of !
161 + - t3301: fix confusing quoting in test for valid notes ref
162 + - notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
163 + - notes: only clean up message file when editing
164 + - handle empty notes gracefully
165 + - git notes show: test empty notes
166 + - git-notes: fix printing of multi-line notes
167 + - notes: fix core.notesRef documentation
168 + - Add an expensive test for git-notes
169 + - Speed up git notes lookup
170 + - Add a script to edit/inspect notes
171 + - Introduce commit notes
172 +
173 +* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
174 + - t/t9600: remove exit after test_done
175 + - cvsimport: extend testcase about patchset order to contain
176 + branches
177 + - cvsimport: add test illustrating a bug in cvsps
178 + + Add a test of "git cvsimport"'s handling of tags and branches
179 + + Add some tests of git-cvsimport's handling of vendor branches
180 + + Test contents of entire cvsimported "master" tree contents
181 + + Use CVS's -f option if available (ignore user's ~/.cvsrc file)
182 + + Start a library for cvsimport-related tests
183 +
184 +Two cvsimport test topics were rewound from 'next' and merged into this
185 +one. I'll keep this in 'pu' so that people can polish their cvsps skilz
186 +to resolve issues these tests identify.
187 +
188 +----------------------------------------------------------------
189 +[Actively cooking]
190 +
191 +* lt/pack-object-memuse (Fri Apr 10 18:15:26 2009 -0700) 2 commits
192 + + show_object(): push path_name() call further down
193 + + process_{tree,blob}: show objects without buffering
194 +
195 +This had some conflicts with Christian's bisect topic; I think I resolved
196 +them correctly, but double-checking would be nice.
197 +
198 +* nd/archive-attribute (Mon Apr 13 14:18:39 2009 +0200) 5 commits
199 + + archive test: test new --fix-attributes feature
200 + + archive: do not read .gitattributes in working directory
201 + + unpack-trees: do not muck with attributes when we are not checking
202 + out
203 + + attr: add GIT_ATTR_INDEX "direction"
204 + + archive tests: do not use .gitattributes in working directory
205 +
206 +With fix-ups from René and myself. Perhaps 1.6.3 material, perhaps not.
207 +
208 +* js/add-edit (Wed Apr 8 23:30:24 2009 +0200) 1 commit
209 + - git-add: introduce --edit (to edit the diff vs. the index)
210 +
211 +* cc/replace (Tue Apr 14 00:36:59 2009 +0200) 13 commits
212 + - Documentation: add documentation for "git replace"
213 + - Add git-replace to .gitignore
214 + - builtin-replace: use "usage_msg_opt" to give better error messages
215 + - parse-options: add new function "usage_msg_opt"
216 + - builtin-replace: teach "git replace" to actually replace
217 + - Add new "git replace" command
218 + - environment: add global variable to disable replacement
219 + - mktag: call "check_sha1_signature" with the replacement sha1
220 + - replace_object: add a test case
221 + - object: call "check_sha1_signature" with the replacement sha1
222 + - sha1_file: add a "read_sha1_file_repl" function
223 + - replace_object: add mechanism to replace objects found in
224 + "refs/replace/"
225 + - refs: add a "for_each_replace_ref" function
226 +
227 +I suspect an attempt to replace an object that is directly listed on the
228 +command line would not work very well with this series.
229 +
230 +----------------------------------------------------------------
231 +[Reverted]
232 +
233 +* mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits
234 + + Add a test of "git cvsimport"'s handling of tags and branches
235 + + Add some tests of git-cvsimport's handling of vendor branches
236 + + Test contents of entire cvsimported "master" tree contents
237 + + Use CVS's -f option if available (ignore user's ~/.cvsrc file)
238 + + Start a library for cvsimport-related tests
239 +
240 +This has been reverted out of 'next' for some time now.
241 +
242 +----------------------------------------------------------------
243 +[On Hold]
244 +
245 +* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
246 + - receive-pack: default receive.denyDeleteCurrent to refuse
247 +
248 +* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
249 + - Refuse updating the current branch in a non-bare repository via
250 + push
251 +
252 +These are for 1.7.0, but the messages when they trigger together may need
253 +to be rethought.