@matheusbsbs / matheus-bagliano / commits / 4b61e3cbc8

What's in/cooking

Junio C Hamano committed May 9, 2009 at 23:42 UTC 4b61e3cbc8af275a1751012605825a14e11e0e41
2 files changed +273
whats/cooking/2009/05/01.txt new
+231
@@ -0,0 +1,231 @@
1 +To: git@vger.kernel.org
2 +Subject: What's cooking in git.git (May 2009, #01; Sat, 09)
3 +X-master-at: 6345d7a0d151afc3d2a10ada3ecacf54c3fee2d0
4 +X-next-at: 99c766e3a22715646df19711aeaf76e0c938bacd
5 +
6 +What's cooking in git.git (May 2009, #01; Sat, 09)
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 +----------------------------------------------------------------
18 +[New Topics]
19 +
20 +* mt/submodule-reference (Mon May 4 22:30:01 2009 +0300) 1 commit
21 + + Add --reference option to git submodule.
22 +
23 +* rr/forbid-bs-in-ref (Fri May 8 07:32:37 2009 +0200) 1 commit
24 + + Disallow '\' in ref names
25 +
26 +* jk/maint-add-empty (Tue Apr 28 23:21:01 2009 -0400) 1 commit
27 + - add: don't complain when adding empty project root
28 +
29 +* lt/maint-diff-reduce-lstat (Sat May 9 15:11:17 2009 -0700) 2 commits
30 + + Teach 'git checkout' to preload the index contents
31 + + Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
32 +
33 +* jk/maint-1.6.0-trace-argv (Fri May 8 05:06:15 2009 -0400) 1 commit
34 + + fix GIT_TRACE segfault with shell-quoted aliases
35 +
36 +* hv/sample-update (Fri May 8 17:22:30 2009 +0200) 1 commit
37 + + Extend sample update hook, disable modifying of existing tags
38 +
39 +* rs/grep-parseopt (Thu May 7 21:46:48 2009 +0200) 5 commits
40 + + grep: use parseopt
41 + + grep: remove global variable builtin_grep
42 + + parseopt: add PARSE_OPT_NODASH
43 + + parseopt: add OPT_NUMBER_CALLBACK
44 + + parseopt: add OPT_NEGBIT
45 +
46 +* do/maint-merge-recursive-fix (Sat May 9 14:49:59 2009 -0700) 1 commit
47 + + merge-recursive: never leave index unmerged while recursing
48 +
49 +* np/push-delta (Fri May 1 16:56:47 2009 -0400) 1 commit
50 + + allow OFS_DELTA objects during a push
51 +
52 +* jm/format-patch-no-auto-n-when-k-is-given (Sat May 9 10:12:01 2009 +0200) 1 commit
53 + + format-patch let -k override a config-specified format.numbered
54 +
55 +* da/mergetool-lib (Sat May 2 01:57:21 2009 -0700) 1 commit
56 + - mergetool--lib: specialize diff options for emerge and ecmerge
57 +
58 +* jk/no-no-no-empty-directory (Fri May 8 01:01:17 2009 -0400) 2 commits
59 + + parseopt: add OPT_NEGBIT
60 + + parseopt: add OPT_NEGBIT
61 +
62 +* fl/git-pm (Thu May 7 15:41:28 2009 +0200) 2 commits
63 + + Git.pm: Always set Repository to absolute path if autodetecting
64 + + Git.pm: Set GIT_WORK_TREE if we set GIT_DIR
65 +
66 +----------------------------------------------------------------
67 +[Will merge to "master" soon]
68 +
69 +
70 +----------------------------------------------------------------
71 +[Stalled and may need help and prodding to go forward]
72 +
73 +* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
74 + - blame.c: start libifying the blame infrastructure
75 +
76 +A few minor point remains in this initial one. I hate to do these minor
77 +fix-ups myself, but I may end up doing so...
78 +
79 +* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
80 + - Allow --date=local --date=other-format to work as expected
81 +
82 +The one I posted had a few corner-case bugs that was caught with the test
83 +suite; this one has them fixed. People did not like the UI so it is kept
84 +out of 'next'
85 +
86 +* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
87 + - git-merge-file: allow converting the results for the work tree
88 +
89 +This is a feature waiting for a user.
90 +
91 +We did not give scripted Porcelains a way to say "this temporary file I am
92 +using for merging is for this path, so use the core.autocrlf and attributes
93 +rules for that final path". Instead, merge-file simply wrote out the
94 +data in the canonical repository representation.
95 +
96 +rerere has the same issue, but it is a lot worse. It reads the three
97 +files (preimage, postimage and thisimage) from the work tree in the work
98 +tree representation, merges them without converting them to the canonical
99 +representation first but inserts the conflict markers with the canonical
100 +representation and writes the resulting mess out. It needs to be fixed to
101 +read with convert_to_git(), merge them while they are still in the
102 +canonical representation and possibly add conflict markers, and then write
103 +the results out after convert_to_working_tree(). It also needs to write
104 +in binary mode as well.
105 +
106 +* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
107 + - Add option for using a foreign VCS
108 + - Document details of transport function APIs
109 + - Allow late reporting of fetched hashes
110 +
111 +* js/notes (Tue Apr 14 00:03:36 2009 +0200) 15 commits
112 + - Documentation: fix 'linkgit' macro in "git-notes.txt"
113 + - tests: fix "export var=val"
114 + - notes: refuse to edit notes outside refs/notes/
115 + - t3301: use test_must_fail instead of !
116 + - t3301: fix confusing quoting in test for valid notes ref
117 + - notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
118 + - notes: only clean up message file when editing
119 + - handle empty notes gracefully
120 + - git notes show: test empty notes
121 + - git-notes: fix printing of multi-line notes
122 + - notes: fix core.notesRef documentation
123 + - Add an expensive test for git-notes
124 + - Speed up git notes lookup
125 + - Add a script to edit/inspect notes
126 + - Introduce commit notes
127 +
128 +* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
129 + - t/t9600: remove exit after test_done
130 + - cvsimport: extend testcase about patchset order to contain
131 + branches
132 + - cvsimport: add test illustrating a bug in cvsps
133 + - Add a test of "git cvsimport"'s handling of tags and branches
134 + - Add some tests of git-cvsimport's handling of vendor branches
135 + - Test contents of entire cvsimported "master" tree contents
136 + - Use CVS's -f option if available (ignore user's ~/.cvsrc file)
137 + - Start a library for cvsimport-related tests
138 +
139 +----------------------------------------------------------------
140 +[Actively cooking]
141 +
142 +* cc/bisect (Fri Apr 24 08:29:01 2009 +0200) 10 commits
143 + - am: simplify "sq" function by using "git rev-parse --sq-quote"
144 + - bisect: use "git rev-parse --sq-quote" instead of a custom "sq"
145 + function
146 + - rev-parse: add --sq-quote to shell quote arguments
147 + - rev-list: remove stringed output flag from "show_bisect_vars"
148 + - bisect--helper: remove "--next-vars" option as it is now useless
149 + - bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"
150 + - bisect--helper: add "--next-exit" to output bisect results
151 + - bisect: move common bisect functionality to "bisect_common"
152 + - rev-list: refactor printing bisect vars
153 + - rev-list: make "estimate_bisect_steps" non static
154 +
155 +* mh/show-branch-color (Sat Apr 25 13:46:14 2009 +0200) 2 commits
156 + + bash completion: show-branch color support
157 + + show-branch: color the commit status signs
158 +
159 +* ac/graph-horizontal-line (Tue Apr 21 08:47:01 2009 -0400) 1 commit
160 + + graph API: Use horizontal lines for more compact graphs
161 +
162 +* ar/merge-one-file-diag (Wed Apr 29 23:40:50 2009 +0200) 1 commit
163 + - Clarify kind of conflict in merge-one-file helper
164 +
165 +* mh/diff-stat-color (Sat Apr 25 00:06:47 2009 +0200) 1 commit
166 + - diff: do not color --stat output like patch context
167 +
168 +* rc/http-push (Sat Apr 25 00:35:57 2009 +0800) 3 commits
169 + - http-push: send out fetch requests on queue
170 + - t5540-http-push: test fetching of packed objects
171 + - t5540-http-push: test fetching of loose objects
172 +
173 +* ae/anon-fetch-info (Fri Apr 17 10:20:11 2009 +0200) 1 commit
174 + + fetch: Strip usernames from url's before storing them
175 +
176 +* ar/unlink-err (Wed Apr 29 23:24:52 2009 +0200) 3 commits
177 + - print unlink(2) errno in copy_or_link_directory
178 + - replace direct calls to unlink(2) with unlink_or_warn
179 + - Introduce an unlink(2) wrapper which gives warning if unlink
180 + failed
181 +
182 +* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit
183 + - git-submodule: add support for --rebase.
184 +
185 +* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits
186 + - send-email: Remove superfluous `my $editor = ...'
187 + - send-email: 'References:' should only reference what is sent
188 + - send-email: Handle "GIT:" rather than "GIT: " during --compose
189 + - Docs: send-email: --smtp-server-port can take symbolic ports
190 + - Docs: send-email: Refer to CONFIGURATION section for
191 + sendemail.multiedit
192 + - Docs: send-email: Put options back into alphabetical order
193 +
194 +Only partially queued, but this is not 1.6.3 material and we are not in a
195 +hurry.
196 +
197 +* js/add-edit (Mon Apr 27 19:51:42 2009 +0200) 2 commits
198 + + t3702: fix reliance on SHELL_PATH being '/bin/sh'
199 + + git-add: introduce --edit (to edit the diff vs. the index)
200 +
201 +* cc/replace (Tue Apr 14 00:36:59 2009 +0200) 13 commits
202 + - Documentation: add documentation for "git replace"
203 + - Add git-replace to .gitignore
204 + - builtin-replace: use "usage_msg_opt" to give better error messages
205 + - parse-options: add new function "usage_msg_opt"
206 + - builtin-replace: teach "git replace" to actually replace
207 + - Add new "git replace" command
208 + - environment: add global variable to disable replacement
209 + - mktag: call "check_sha1_signature" with the replacement sha1
210 + - replace_object: add a test case
211 + - object: call "check_sha1_signature" with the replacement sha1
212 + - sha1_file: add a "read_sha1_file_repl" function
213 + - replace_object: add mechanism to replace objects found in
214 + "refs/replace/"
215 + - refs: add a "for_each_replace_ref" function
216 +
217 +I suspect an attempt to replace an object that is directly listed on the
218 +command line would not work very well with this series.
219 +
220 +----------------------------------------------------------------
221 +[On Hold]
222 +
223 +* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
224 + - receive-pack: default receive.denyDeleteCurrent to refuse
225 +
226 +* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
227 + - Refuse updating the current branch in a non-bare repository via
228 + push
229 +
230 +These are for 1.7.0, but the messages when they trigger together may need
231 +to be rethought.
whats/in/2009/05/01.txt new
+42
@@ -0,0 +1,42 @@
1 +To: git@vger.kernel.org
2 +Subject: What's in git.git (May 2009, #01; Sat, 09)
3 +X-maint-at: ec00d6e0038e030cf73182374e21025c2776cb23
4 +X-master-at: 6345d7a0d151afc3d2a10ada3ecacf54c3fee2d0
5 +X-maint-was: f01f1099f40f24fe6f7802185340a6fa3a3d4f35
6 +X-master-was: f01f1099f40f24fe6f7802185340a6fa3a3d4f35
7 +
8 +What's in git.git (May 2009, #01; Sat, 09)
9 +
10 + maint ec00d6e (Documentation: cloning to empty directory is allowed)
11 + master 6345d7a (Merge branch 'maint')
12 +------------------------------------------------------------------------
13 +
14 +1.6.3 is out; 'maint' branch is now for 1.6.3.X maintenance series.
15 +
16 +* The 'maint' branch has these fixes since v1.6.3.
17 +
18 +Alex Riesen (1):
19 + Clarify kind of conflict in merge-one-file helper
20 +
21 +Alexander Potashev (1):
22 + Documentation: cloning to empty directory is allowed
23 +
24 +Felipe Contreras (1):
25 + git config: clarify --add and --get-color
26 +
27 +Junio C Hamano (2):
28 + Start 1.6.3.1 maintenance series.
29 + archive-tar.c: squelch a type mismatch warning
30 +
31 +
32 +* The 'master' branch has these since v1.6.3, in addition to the above.
33 +
34 +Jakub Narebski (1):
35 + gitweb: Remove function prototypes (cleanup)
36 +
37 +Junio C Hamano (1):
38 + Start 1.6.4 development
39 +
40 +Sitaram Chamarty (1):
41 + allow -t abbreviation for --track in git branch
42 +