@matheusbsbs / matheus-bagliano / commits / a1f4ea0861

What's cooking/in 2008 Sep #2

Junio C Hamano committed Sep 18, 2008 at 20:12 UTC a1f4ea08614ff703e683fe12bfc06b64dd591401
2 files changed +356
whats/cooking/2008/09/02.txt new
+262
@@ -0,0 +1,262 @@
1 +Subject: What's cooking in git.git (Sep 2008, #02; Wed, 10)
2 +X-master-at: ede4caf6e3204f9d63758d6410d0f124b0caab32
3 +X-next-at: c8d31b67b3f0e13f6b8ad782dadc6e8a8bc06bbb
4 +
5 +What's cooking in git.git (Sep 2008, #02; Wed, 10)
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 +----------------------------------------------------------------
16 +[New Topics]
17 +
18 +Many 'maint' material to go through the usual 'next' to 'master' to
19 +'maint' cycle..
20 +
21 +* mh/maint-honor-no-ssl-verify (Thu Feb 21 15:10:37 2008 -0800) 1 commit
22 + + Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
23 +
24 +* dp/maint-rebase-fix (Tue Sep 9 16:05:26 2008 +0400) 2 commits
25 + + git-rebase--interactive: auto amend only edited commit
26 + + git-rebase-interactive: do not squash commits on abort
27 +
28 +* jc/maint-checkout-keep-remove (Sun Sep 7 19:49:25 2008 -0700) 1 commit
29 + + checkout: do not lose staged removal
30 +
31 +* jc/maint-template-permbits (Thu Aug 21 19:31:50 2008 -0500) 1 commit
32 + + Fix permission bits on sources checked out with an overtight umask
33 +
34 +* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits
35 + - wt-status: Teach how to discard changes in the working directory
36 + - wt-status: Split header generation into three functions
37 +
38 +This is what I commented as "making status output even chattier", but
39 +parked here to see what people think.
40 +
41 +* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
42 + - t7603: add new testcases to ensure builtin-commit uses
43 + reduce_heads()
44 + - builtin-commit: use commit_tree()
45 + - commit_tree(): add a new author parameter
46 +
47 +* pb/autocorrect-wrapper (Wed Sep 10 14:44:20 2008 -0700) 2 commits
48 + - Fixup -- waiting for response
49 + - git wrapper: also uses aliases to suggest mistyped commands
50 +
51 +* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits
52 + - push: receiver end advertises refs from alternate repositories
53 + - push: prepare sender to receive extended ref information from the
54 + receiver
55 + - receive-pack: make it a builtin
56 + - is_directory(): a generic helper function
57 +
58 +----------------------------------------------------------------
59 +[Graduated to "master"]
60 +
61 +* jc/hide-cr-in-diff-from-less (Wed Aug 27 19:48:01 2008 -0700) 1 commit
62 + + diff: Help "less" hide ^M from the output
63 +
64 +* jc/maint-checkout-fix (Fri Aug 29 13:40:36 2008 -0700) 1 commit
65 + + checkout: do not check out unmerged higher stages randomly
66 +
67 +This is the same one as the bottom of "better conflict resolution" series.
68 +
69 +* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
70 + + configure: auto detect dynamic library path switches
71 + + Makefile: Allow CC_LD_DYNPATH to be overriden
72 +
73 +I decided to push this forward; it might break minority configurations,
74 +but it appears nobody pays attention until it actually hurts, so let's see
75 +what happens when this hits 'master'.
76 +
77 +* ar/autospell (Sun Aug 31 15:54:58 2008 +0200) 2 commits
78 + + Add help.autocorrect to enable/disable autocorrecting
79 + + git wrapper: DWIM mistyped commands
80 +
81 +----------------------------------------------------------------
82 +[Stalled -- Needs Action to Proceed (or to be dropped)]
83 +
84 +* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
85 + - Use xdiff caching to improve git blame performance
86 + - Allow xdiff machinery to cache hash results for a file
87 + - Always initialize xpparam_t to 0
88 + - Bypass textual patch generation and parsing in git blame
89 + - Allow alternate "low-level" emit function from xdl_diff
90 +
91 +Réne had good comments on how the callback should be structured.
92 +
93 +* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
94 + - git-am: Pass the --directory option through to git-apply
95 +
96 +I think this is still buggy and drops the option when am stops with
97 +conflicts.
98 +
99 +* dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits
100 + - Teach git.el to mark/unmark files by regexp
101 + - git.el: Diff only file at point by default
102 +
103 +These are still queued but Alexandre had improvement requests so these
104 +will likely be dropped.
105 +
106 +----------------------------------------------------------------
107 +[Will be merged to "master" soon]
108 +
109 +* np/pack (Tue Sep 2 10:22:22 2008 -0400) 4 commits
110 + + t5300: improve SHA1 collision test
111 + + pack-objects: don't include missing preferred base objects
112 + + sha1write: don't copy full sized buffers
113 + + Merge branch 'np/maint-safer-pack' into np/pack
114 +
115 +* bw/shortref (Fri Sep 5 23:16:23 2008 +0200) 1 commit
116 + + for-each-ref: `:short` format for `refname`
117 +
118 +* rs/decorate (Thu Sep 4 23:40:03 2008 +0200) 3 commits
119 + + add '%d' pretty format specifier to show decoration
120 + + move load_ref_decorations() to log-tree.c and export it
121 + + log: add load_ref_decorations()
122 +
123 +* tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 2 commits
124 + + t6013: replace use of 'tac' with equivalent Perl
125 + + rev-list: fix --reverse interaction with --parents
126 +
127 +* cc/bisect (Sat Sep 6 07:27:03 2008 +0200) 3 commits
128 + + bisect: remove "checkout_done" variable used when checking merge
129 + bases
130 + + bisect: only check merge bases when needed
131 + + bisect: test merge base if good rev is not an ancestor of bad rev
132 +
133 +* jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit
134 + + daemon.c: avoid setlinebuf()
135 +
136 +* jc/maint-diff-quiet (Mon Sep 1 23:20:26 2008 -0700) 2 commits
137 + + diff --quiet: make it synonym to --exit-code >/dev/null
138 + + diff Porcelain: do not disable auto index refreshing on -C -C
139 +
140 +----------------------------------------------------------------
141 +[Actively Cooking]
142 +
143 +* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
144 + + diff --dirstat-by-file: count changed files, not lines
145 +
146 +* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
147 + + safe_create_leading_directories(): make it about "leading"
148 + directories
149 +
150 +* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
151 + - git-apply:--include=pathspec
152 +
153 +* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit
154 + + builtin-commit.c: show on which branch a commit was added
155 +
156 +* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 15 commits
157 + + Fix AsciiDoc errors in merge documentation
158 + + git-merge documentation: describe how conflict is presented
159 + + checkout --conflict=<style>: recreate merge in a non-default style
160 + + checkout -m: recreate merge when checking out of unmerged index
161 + + Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-
162 + resolution'
163 + + git-merge-recursive: learn to honor merge.conflictstyle
164 + + merge.conflictstyle: choose between "merge" and "diff3 -m" styles
165 + + rerere: understand "diff3 -m" style conflicts with the original
166 + + rerere.c: use symbolic constants to keep track of parsing states
167 + + xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or
168 + less
169 + + xmerge.c: minimum readability fixups
170 + + xdiff-merge: optionally show conflicts in "diff3 -m" style
171 + + xdl_fill_merge_buffer(): separate out a too deeply nested function
172 + + checkout --ours/--theirs: allow checking out one side of a
173 + conflicting merge
174 + + checkout -f: allow ignoring unmerged paths when checking out of
175 + the index
176 +
177 +* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
178 + + date/time: do not get confused by fractional seconds
179 +
180 +* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
181 + + discard_cache: reset lazy name_hash bit
182 +
183 +I spotted this by accident while working on something unrelated.
184 +
185 +When a program calls discard_cache() to read the index again, we do not
186 +properly re-initialize the name_hash structure that is used by the case
187 +insensitivitly logic. This _might_ improve issues people may be having on
188 +case insensitive filesystems. I dunno.
189 +
190 +* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
191 + + git-add --intent-to-add (-N)
192 +
193 +Teaches "git add" to record only the intent to add a path later.
194 +I rerolled this without the fake empty blob object.
195 +
196 +* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
197 + + builtin-merge: release the lockfile in try_merge_strategy()
198 + + merge-recursive: get rid of virtual_id
199 + + merge-recursive: move current_{file,directory}_set to struct
200 + merge_options
201 + + merge-recursive: move the global obuf to struct merge_options
202 + + merge-recursive: get rid of the index_only global variable
203 + + merge-recursive: move call_depth to struct merge_options
204 + + cherry-pick/revert: make direct internal call to merge_tree()
205 + + builtin-merge: avoid run_command_v_opt() for recursive and subtree
206 + + merge-recursive: introduce merge_options
207 + + merge-recursive.c: Add more generic merge_recursive_generic()
208 + + Split out merge_recursive() to merge-recursive.c
209 +
210 +* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
211 + + diff: vary default prefix depending on what are compared
212 +
213 +As some people may have noticed, I've been running with this one when
214 +sending out "How about this" patches to the discussion threads.
215 +
216 +* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
217 + - revision --simplify-merges: incremental simplification
218 + - revision --simplify-merges: prepare for incremental simplification
219 +
220 +I started making this incremental but the progress is not so great.
221 +
222 +----------------------------------------------------------------
223 +[On Hold]
224 +
225 +* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
226 + - git-am --forge: add Signed-off-by: line for the author
227 + - git-am: clean-up Signed-off-by: lines
228 + - stripspace: add --log-clean option to clean up signed-off-by:
229 + lines
230 + - stripspace: use parse_options()
231 + - Add "git am -s" test
232 + - git-am: refactor code to add signed-off-by line for the committer
233 +
234 +The one at second from the tip needs reworking.
235 +
236 +* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
237 + - "git push": tellme-more protocol extension
238 +
239 +* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
240 + - WIP: start teaching the --whitespace=fix to merge machinery
241 +
242 +* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
243 + - blame: show "previous" information in --porcelain/--incremental
244 + format
245 + - git-blame: refactor code to emit "porcelain format" output
246 +
247 +* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
248 + + merge: remove deprecated summary and diffstat options and config
249 + variables
250 +
251 +This was previously in "will be in master soon" category, but it turns out
252 +that the synonyms to the ones this one deletes are fairly new invention
253 +that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
254 +in 1.7.0, but with the loud whining about moving git-foo out of $PATH we
255 +have been hearing, it might not be a bad idea to drop this.
256 +
257 +* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
258 + - diff: enable "too large a rename" warning when -M/-C is explicitly
259 + asked for
260 +
261 +This would be the right thing to do for command line use, but gitk will be
262 +hit due to tcl/tk's limitation, so I am holding this back for now.
whats/in/2008/09/02.txt new
+94
@@ -0,0 +1,94 @@
1 +Subject: What's in git.git (Sep 2008, #02; Wed, 10)
2 +X-maint-at: 873358dd2ac3bf2cea9a370d8586378a27a092f2
3 +X-master-at: ede4caf6e3204f9d63758d6410d0f124b0caab32
4 +X-maint-was: aaefbfa66c348a461b3081873ef42819c8b38dac
5 +X-master-was: ec3a4ba519c0012d58584d23f407c302e7b80eb6
6 +
7 +What's in git.git (Sep 2008, #02; Wed, 10)
8 +
9 + maint 873358d (Update draft release notes for 1.6.0.2)
10 + master ede4caf (Install git-cvsserver in $(bindir))
11 +------------------------------------------------------------------------
12 +
13 +BLURB HERE
14 +
15 +* The 'maint' branch has these fixes since the last announcement.
16 +
17 +Arjen Laarhoven (1):
18 + Use compatibility regex library for OSX/Darwin
19 +
20 +Junio C Hamano (4):
21 + checkout: do not check out unmerged higher stages randomly
22 + diff: Help "less" hide ^M from the output
23 + log --author/--committer: really match only with name part
24 + Update draft release notes for 1.6.0.2
25 +
26 +Marcus Griep (2):
27 + Git.pm: Use File::Temp->tempfile instead of ->new
28 + git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl
29 +
30 +Miklos Vajna (1):
31 + t7501: always use test_cmp instead of diff
32 +
33 +Nicolas Pitre (5):
34 + pack-objects: improve returned information from write_one()
35 + improve reliability of fixup_pack_header_footer()
36 + pack-objects: use fixup_pack_header_footer()'s validation mode
37 + index-pack: use fixup_pack_header_footer()'s validation mode
38 + fixup_pack_header_footer(): use nicely aligned buffer sizes
39 +
40 +
41 +* The 'master' branch has these since the last announcement
42 + in addition to the above.
43 +
44 +Alex Riesen (1):
45 + Add help.autocorrect to enable/disable autocorrecting
46 +
47 +Andreas Ericsson (1):
48 + Teach "git diff -p" to locate PHP class methods
49 +
50 +Arjen Laarhoven (1):
51 + t6023-merge-file: Work around non-portable sed usage
52 +
53 +Christian Couder (1):
54 + refs: improve comments about "reading" argument of "resolve_ref"
55 +
56 +Dotan Barak (1):
57 + Use xmalloc() and friends to catch allocation failures
58 +
59 +Eric Wong (1):
60 + git-svn: fix handling of even funkier branch names
61 +
62 +Giovanni Funchal (1):
63 + configure: auto detect dynamic library path switches
64 +
65 +Heikki Orsila (1):
66 + Start conforming code to "git subcmd" style part 2
67 +
68 +Johannes Schindelin (1):
69 + git wrapper: DWIM mistyped commands
70 +
71 +Johannes Sixt (1):
72 + Windows: git-shell can be compiled again
73 +
74 +Junio C Hamano (2):
75 + Makefile: Allow CC_LD_DYNPATH to be overriden
76 + Fix git-diff-tree --stdin
77 +
78 +Michael J Gruber (2):
79 + allow installation of man and html doc from the man and html branches
80 + separate build targets for man and html documentation
81 +
82 +Mikael Magnusson (1):
83 + Correct output of git-count-objects.
84 +
85 +Nanako Shiraishi (8):
86 + t/t91XX-svn: start removing use of "git-" from these tests
87 + t/t91XX git-svn tests: run "git svn" not "git-svn"
88 + t9200: use "git cvsexportcommit" without dash
89 + t9300, t9301: use "git fast-import/fast-export" without dash
90 + t9700: use "git config" without dash
91 + tests: use "git foo" without dash in strings
92 + t9101: use "git hash-object" without dash
93 + Install git-cvsserver in $(bindir)
94 +