@matheusbsbs / matheus-bagliano / commits / 8b2fe5f402

What's in/cooking updates

Junio C Hamano committed Dec 2, 2008 at 22:55 UTC 8b2fe5f402831095079abc97f8c887bdb9981122
4 files changed +410
WC
+1
@@ -37,6 +37,7 @@ mkdir -p "Meta/$lead"
37 exec >"Meta/$lead/$issue.txt"
38
39 cat <<EOF
40 +To: git@vger.kernel.org
41 Subject: What's cooking in git.git ($monthname $year, #$issue; $dow, $date)
42 X-master-at: $master_at
43 X-next-at: $next_at
WI
+1
@@ -34,6 +34,7 @@ mkdir -p "Meta/$lead"
34 exec >"Meta/$lead/$issue.txt"
35
36 cat <<EOF
37 +To: git@vger.kernel.org
38 Subject: What's in git.git ($monthname $year, #$issue; $dow, $date)
39 X-maint-at: $maint_at
40 X-master-at: $master_at
whats/cooking/2008/12/01.txt new
+247
@@ -0,0 +1,247 @@
1 +Subject: What's cooking in git.git (Dec 2008, #01; Tue, 02)
2 +X-master-at: 757c7f60a78004fc3d0ea62f44320d54ef430c10
3 +X-next-at: 44b0c4a7f55234e12cead3e1909c17be7c068dca
4 +
5 +What's cooking in git.git (Dec 2008, #01; Tue, 02)
6 +--------------------------------------------------
7 +
8 +Here are the topics that have been cooking. Commits prefixed
9 +with '-' are only in 'pu' while commits prefixed with '+' are
10 +in 'next'.
11 +
12 +The topics list the commits in reverse chronological order. The topics
13 +meant to be merged to the maintenance series have "maint-" in their names.
14 +
15 +As we have already passed -rc1, things queued in 'next' let alone 'pu' are
16 +unlikely to be merged to 'master' by the end of year unless otherwise
17 +noted.
18 +
19 +----------------------------------------------------------------
20 +[New Topics]
21 +
22 +* gb/gitweb-patch (Sat Nov 29 14:41:11 2008 +0100) 2 commits
23 + - [DONTMERGE: wait for signoff] gitweb: links to patch action in
24 + commitdiff and shortlog view
25 + - gitweb: add patch view
26 +
27 +* lt/reset-merge (Mon Dec 1 09:30:31 2008 -0800) 1 commit
28 + + Add 'merge' mode to 'git reset'
29 +
30 +Unfortunately, I cannot write down a good use case in what circumstances
31 +this is needed, even though I do recall that I occasionally (perhaps once
32 +every two months) needed to do "read-tree -m -u" myself in the past, and
33 +this patch brings that feature close to Porcelain. On the other hand, the
34 +existing "reset --mixed" is very easily explained ("after starting to add
35 +changes to the staging area, you realized that you screwed up, and you
36 +want to redo it from scratch"). Therefore, I cannot justify what the log
37 +message of this change claims myself.
38 +
39 +* jc/rm-i-t-a (Fri Nov 28 19:56:34 2008 -0800) 5 commits
40 + + git add --intent-to-add: do not let an empty blob be committed by
41 + accident
42 + + git add --intent-to-add: fix removal of cached emptiness
43 + + builtin-rm.c: explain and clarify the "local change" logic
44 + + Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
45 + + Extend index to save more flags
46 +
47 +As intent-to-add index entry is a new feature for 1.6.1, it probably is a
48 +good idea to merge this to 'master'. Nitpicks and bugfixes are very much
49 +appreciated.
50 +
51 +* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
52 + - In add --patch, Handle K,k,J,j slightly more gracefully.
53 + - Add / command in add --patch
54 + - git-add -i/-p: Change prompt separater from slash to comma
55 +
56 +There are some other useful bits and pieces around this area exchanged on
57 +the list with the author of these patches. I think it would become a
58 +useful series after reassembling their pieces. Waiting for v2.
59 +
60 +* jn/gitweb-utf8 (Mon Dec 1 19:01:42 2008 +0100) 1 commit
61 + - gitweb: Fix handling of non-ASCII characters in inserted HTML
62 + files.
63 +
64 +Possibly a bugfix worthy to have in 1.6.1.
65 +
66 +* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits
67 + - clone: test the new HEAD detection logic
68 + - Merge commit 'HEAD@{2}' into HEAD
69 + - upload-pack: send the HEAD information
70 + - clone: find the current branch more explicitly
71 + - connect.c::read_extra_info(): find where HEAD points at
72 + - connect.c::read_extra_info(): prepare to receive more than server
73 + capabilities
74 + - get_remote_heads(): refactor code to read "server capabilities"
75 +
76 +This is no way meant for 1.6.1, let alone next, yet.
77 +
78 +----------------------------------------------------------------
79 +[Graduated to "master"]
80 +
81 +* cr/remote-update-v (Tue Nov 18 19:04:02 2008 +0800) 1 commit
82 + + git-remote: add verbose mode to git remote update
83 +
84 +* rs/strbuf-expand (Sun Nov 23 00:16:59 2008 +0100) 6 commits
85 + + remove the unused files interpolate.c and interpolate.h
86 + + daemon: deglobalize variable 'directory'
87 + + daemon: inline fill_in_extra_table_entries()
88 + + daemon: use strbuf_expand() instead of interpolate()
89 + + merge-recursive: use strbuf_expand() instead of interpolate()
90 + + add strbuf_expand_dict_cb(), a helper for simple cases
91 +
92 +* mv/fast-export (Sun Nov 23 12:55:54 2008 +0100) 2 commits
93 + + fast-export: use an unsorted string list for extra_refs
94 + + Add new testcase to show fast-export does not always exports all
95 + tags
96 +
97 +* st/levenshtein (Thu Nov 20 14:27:27 2008 +0100) 2 commits
98 + + Document levenshtein.c
99 + + Fix deletion of last character in levenshtein distance
100 +
101 +* js/mingw-rename-fix (Wed Nov 19 17:25:27 2008 +0100) 1 commit
102 + + compat/mingw.c: Teach mingw_rename() to replace read-only files
103 +
104 +* mv/clone-strbuf (Fri Nov 21 01:45:01 2008 +0100) 3 commits
105 + + builtin_clone: use strbuf in cmd_clone()
106 + + builtin-clone: use strbuf in clone_local() and
107 + copy_or_link_directory()
108 + + builtin-clone: use strbuf in guess_dir_name()
109 +
110 +* pw/maint-p4 (Wed Nov 26 13:52:15 2008 -0500) 1 commit
111 + - git-p4: fix keyword-expansion regex
112 +
113 +* cc/bisect-skip (Sun Nov 23 22:02:49 2008 +0100) 1 commit
114 + - bisect: teach "skip" to accept special arguments like "A..B"
115 +
116 +Should be in 1.6.1-rc1.
117 +
118 +* lt/preload-lstat (Mon Nov 17 09:01:20 2008 -0800) 2 commits
119 + + Fix index preloading for racy dirty case
120 + + Add cache preload facility
121 +
122 +* ta/quiet-pull (Mon Nov 17 23:09:30 2008 +0100) 2 commits
123 + + Retain multiple -q/-v occurrences in git pull
124 + + Teach/Fix pull/fetch -q/-v options
125 +
126 +* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits
127 + + git send-email: ask less questions when --compose is used.
128 + + git send-email: add --annotate option
129 + + git send-email: interpret unknown files as revision lists
130 + + git send-email: make the message file name more specific.
131 +
132 +After merging these to 'master' I found a breakage which I hopefully
133 +fixed.
134 +
135 +----------------------------------------------------------------
136 +[Will merge to "master" soon]
137 +
138 +What are you looking for? We are in -rc ;-)
139 +
140 +----------------------------------------------------------------
141 +[On Hold]
142 +
143 +* cb/mergetool (Thu Nov 13 12:41:15 2008 +0000) 3 commits
144 + - [DONTMERGE] Add -k/--keep-going option to mergetool
145 + - Add -y/--no-prompt option to mergetool
146 + - Fix some tab/space inconsistencies in git-mergetool.sh
147 +
148 +Jeff had good comments on the last one; the discussion needs concluded,
149 +and also waiting for comments from the original author (Ted).
150 +
151 +* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
152 + + blame: show "previous" information in --porcelain/--incremental
153 + format
154 + + git-blame: refactor code to emit "porcelain format" output
155 +
156 +* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
157 + - autoconf: Enable threaded delta search when pthreads are supported
158 +
159 +Rebased to 'master', that introduced NO_PTHREADS.
160 +
161 +* cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits
162 + - bisect: add "--no-replace" option to bisect without using replace
163 + refs
164 + - rev-list: make it possible to disable replacing using "--no-
165 + bisect-replace"
166 + - bisect: use "--bisect-replace" options when checking merge bases
167 + - merge-base: add "--bisect-replace" option to use fixed up revs
168 + - commit: add "bisect_replace_all" prototype to "commit.h"
169 + - rev-list: add "--bisect-replace" to list revisions with fixed up
170 + history
171 + - Documentation: add "git bisect replace" documentation
172 + - bisect: add test cases for "git bisect replace"
173 + - bisect: add "git bisect replace" subcommand
174 +
175 +I really hate the idea of introducing a potentially much more useful
176 +replacement of the existing graft mechanism and tie it very tightly to
177 +bisect, making it unusable from outside.
178 +
179 + (1) I do not think "bisect replace" workflow is a practical and usable
180 + one;
181 +
182 + (2) The underlying mechanism to express "this object replaces that other
183 + object" is much easier to work with than what the graft does which is
184 + "the parents of this commit are these", and idea to use the normal
185 + ref to point at them means this can potentially be used for
186 + transferring the graft information across repositories, which the
187 + current graft mechanism cannot do.
188 +
189 + (3) Because I like the aspect (2) of this series so much, it deeply
190 + disappoints and troubles me that this is implemented minimally near
191 + the surface, and that it is controlled by the "bisect" Porcelain
192 + alone, by explicitly passing command line arguments.
193 +
194 +I think a mechanism like this should be added to replace grafts, but it
195 +should always be enabled for normal revision traversal operation, while
196 +always disabled for object enumeration and transfer operation (iow, fsck,
197 +fetch and push should use the real ancestry information recorded in the
198 +underlying objects, while rev-list, log, etc. should always use the
199 +replaced objects). I have a suspicion that even cat-file could honor it.
200 +
201 +* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 18 commits
202 + - wt-status: show sparse checkout info
203 + - Introduce default sparse patterns (core.defaultsparse)
204 + - checkout: add new options to support sparse checkout
205 + - clone: support sparse checkout with --sparse-checkout option
206 + - unpack_trees(): add support for sparse checkout
207 + - unpack_trees(): keep track of unmerged entries
208 + - Introduce "sparse patterns"
209 + - Merge branch 'master' into nd/narrow
210 + + t2104: touch portability fix
211 + + grep: skip files outside sparse checkout area
212 + + checkout_entry(): CE_NO_CHECKOUT on checked out entries.
213 + + Prevent diff machinery from examining worktree outside sparse
214 + checkout
215 + + ls-files: Add tests for --sparse and friends
216 + + update-index: add --checkout/--no-checkout to update
217 + CE_NO_CHECKOUT bit
218 + + update-index: refactor mark_valid() in preparation for new options
219 + + ls-files: add options to support sparse checkout
220 + + Introduce CE_NO_CHECKOUT bit
221 + + Extend index to save more flags
222 +
223 +Kicked back to 'on hold' until 1.6.1 final by popular(?) demand.
224 +
225 +* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
226 + - "git push": tellme-more protocol extension
227 +
228 +This seems to have a deadlock during communication between the peers.
229 +Someone needs to pick up this topic and resolve the deadlock before it can
230 +continue.
231 +
232 +* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
233 + - diff: enable "too large a rename" warning when -M/-C is explicitly
234 + asked for
235 +
236 +This would be the right thing to do for command line use,
237 +but gitk will be hit due to tcl/tk's limitation, so I am holding
238 +this back for now.
239 +
240 +* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
241 + - git-am --forge: add Signed-off-by: line for the author
242 + - git-am: clean-up Signed-off-by: lines
243 + - stripspace: add --log-clean option to clean up signed-off-by:
244 + lines
245 + - stripspace: use parse_options()
246 + - Add "git am -s" test
247 + - git-am: refactor code to add signed-off-by line for the committer
whats/in/2008/12/01.txt new
+161
@@ -0,0 +1,161 @@
1 +Subject: What's in git.git (Dec 2008, #01; Tue, 02)
2 +X-maint-at: 25e30fa08e687d584d9dd87d13acf84bb1e1858c
3 +X-master-at: 757c7f60a78004fc3d0ea62f44320d54ef430c10
4 +X-maint-was: 5aa3bdd50d4e4f59c41ee6e70ae1e738a3a28cc0
5 +X-master-was: aa14a0c3f191ee4df7344eed119be5b4a527a0ff
6 +
7 +What's in git.git (Dec 2008, #01; Tue, 02)
8 +
9 + maint 25e30fa (User's Manual: remove duplicated url at the end of Appendix B)
10 + master 757c7f6 (git-stash: use git rev-parse -q)
11 +------------------------------------------------------------------------
12 +
13 +We'll probably have 1.6.0.5 by the end of this week.
14 +
15 +The tip of the 'master' branch is at 1.6.1-rc1 with a few more fixes.
16 +Hopefully we will have the final 1.6.1 by the end of the year.
17 +
18 +* The 'maint' branch has these fixes since the last announcement.
19 +
20 +Joey Hess (1):
21 + sha1_file: avoid bogus "file exists" error message
22 +
23 +Johannes Schindelin (1):
24 + fast-export: use an unsorted string list for extra_refs
25 +
26 +Junio C Hamano (1):
27 + Update draft release notes to 1.6.0.5
28 +
29 +Martin Koegler (1):
30 + git push: Interpret $GIT_DIR/branches in a Cogito compatible way
31 +
32 +Matt McCutchen (1):
33 + git checkout: don't warn about unborn branch if -f is already passed
34 +
35 +Miklos Vajna (2):
36 + Add new testcase to show fast-export does not always exports all tags
37 + User's Manual: remove duplicated url at the end of Appendix B
38 +
39 +Nguyễn Thái Ngọc Duy (1):
40 + generate-cmdlist.sh: avoid selecting synopsis at wrong place
41 +
42 +Pete Wyckoff (1):
43 + git-p4: fix keyword-expansion regex
44 +
45 +Ralf Wildenhues (1):
46 + Fix typos in the documentation.
47 +
48 +SZEDER Gábor (2):
49 + bash: remove dashed command leftovers
50 + bash: offer refs instead of filenames for 'git revert'
51 +
52 +Sam Vilain (1):
53 + sha1_file.c: resolve confusion EACCES vs EPERM
54 +
55 +Samuel Tardieu (2):
56 + tag: Check that options are only allowed in the appropriate mode
57 + tag: Add more tests about mixing incompatible modes and options
58 +
59 +
60 +* The 'master' branch has these since the last announcement
61 + in addition to the above.
62 +
63 +Alexander Gavrilov (3):
64 + gitk: Avoid handling the Return key twice in Add Branch
65 + gitk: Make line origin search update the busy status
66 + gitk: Add a menu option to start git gui
67 +
68 +Cheng Renquan (1):
69 + git-remote: add verbose mode to git remote update
70 +
71 +Christian Couder (4):
72 + git-gui: french translation update
73 + bisect: teach "skip" to accept special arguments like "A..B"
74 + bisect: fix "git bisect skip <commit>" and add tests cases
75 + Documentation: describe how to "bisect skip" a range of commits
76 +
77 +Christian Stimming (1):
78 + gitk: Update German translation
79 +
80 +Giuseppe Bilotta (2):
81 + gitweb: make gitweb_check_feature a boolean wrapper
82 + Update comment on gitweb_check/get_feature
83 +
84 +Johannes Schindelin (1):
85 + Document levenshtein.c
86 +
87 +Johannes Sixt (2):
88 + compat/mingw.c: Teach mingw_rename() to replace read-only files
89 + t4030-diff-textconv: Make octal escape sequence more portable
90 +
91 +Junio C Hamano (6):
92 + gitweb: fix 'ctags' feature check and others
93 + gitweb: rename gitweb_check_feature to gitweb_get_feature
94 + send-email: do not reverse the command line arguments
95 + Include git-gui--askpass in git-gui RPM package
96 + GIT 1.6.1-rc1
97 + Makefile: introduce NO_PTHREADS
98 +
99 +Linus Torvalds (3):
100 + Add cache preload facility
101 + Fix index preloading for racy dirty case
102 + Add backslash to list of 'crud' characters in real name
103 +
104 +Mark Burton (1):
105 + git-gui: Teach start_push_anywhere_action{} to notice when remote is a
106 + mirror.
107 +
108 +Michele Ballabio (1):
109 + git gui: update Italian translation
110 +
111 +Miklos Vajna (5):
112 + Update Hungarian translation. 100% completed.
113 + builtin-clone: use strbuf in guess_dir_name()
114 + builtin-clone: use strbuf in clone_local() and copy_or_link_directory()
115 + builtin_clone: use strbuf in cmd_clone()
116 + git-stash: use git rev-parse -q
117 +
118 +Nanako Shiraishi (1):
119 + git-gui: update Japanese translation
120 +
121 +Paul Mackerras (6):
122 + gitk: Index line[hnd]tag arrays by id rather than row number
123 + gitk: Fix switch statement in parseviewargs
124 + gitk: Show local changes properly when we have a path limit
125 + gitk: Fix context menu items for generating diffs when in tree mode
126 + gitk: Highlight only when search type is "containing:".
127 + gitk: Fix bug in accessing undefined "notflag" variable
128 +
129 +Peter Krefting (1):
130 + Updated Swedish translation (514t0f0u).
131 +
132 +Pierre Habouzit (4):
133 + git send-email: make the message file name more specific.
134 + git send-email: interpret unknown files as revision lists
135 + git send-email: add --annotate option
136 + git send-email: ask less questions when --compose is used.
137 +
138 +Ralf Wildenhues (1):
139 + Fix typos in the documentation.
140 +
141 +René Scharfe (6):
142 + add strbuf_expand_dict_cb(), a helper for simple cases
143 + merge-recursive: use strbuf_expand() instead of interpolate()
144 + daemon: use strbuf_expand() instead of interpolate()
145 + daemon: inline fill_in_extra_table_entries()
146 + daemon: deglobalize variable 'directory'
147 + remove the unused files interpolate.c and interpolate.h
148 +
149 +SZEDER Gábor (1):
150 + bash: complete full refs
151 +
152 +Samuel Tardieu (1):
153 + Fix deletion of last character in levenshtein distance
154 +
155 +Scott Chacon (1):
156 + Add a built-in alias for 'stage' to the 'add' command
157 +
158 +Tuncer Ayaz (2):
159 + Teach/Fix pull/fetch -q/-v options
160 + Retain multiple -q/-v occurrences in git pull
161 +