@matheusbsbs / matheus-bagliano / commits / 572c1f1c62

What's in/cooking

Junio C Hamano committed Sep 22, 2008 at 12:41 UTC 572c1f1c62c49cd66d295387033b831956606434
2 files changed +404
whats/cooking/2008/09/04.txt new
+266
@@ -0,0 +1,266 @@
1 +Subject: What's cooking in git.git (Sep 2008, #04; Mon, 22)
2 +X-master-at: c76dc9592d1c770212d50ee7a7028a74f472f23b
3 +X-next-at: 7f0eb98a28d41e28f6a7b72e118d72de01bab1a7
4 +
5 +What's cooking in git.git (Sep 2008, #04; Mon, 22)
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 +I'll be on vacation til Oct 08; proposal/review/discussion/improvement
16 +cycle based on e-mails and the distributed nature of git mean that it
17 +shouldn't keep the participants from further improving the system. I've
18 +asked Shawn to look after in-flight patches during the time, so hopefully
19 +when I come back I'll see a much better git ;-).
20 +
21 +----------------------------------------------------------------
22 +[New Topics]
23 +
24 +* nd/narrow (Sun Sep 14 20:07:59 2008 +0700) 9 commits
25 + - grep: skip files that have not been checked out
26 + - checkout_entry(): CE_NO_CHECKOUT on checked out entries.
27 + - Prevent diff machinery from examining worktree outside narrow
28 + checkout
29 + - Add tests for updating no-checkout entries in index
30 + - ls-files: add --narrow-checkout option to "will checkout" entries
31 + - update-index: add --checkout/--no-checkout to update
32 + CE_NO_CHECKOUT bit
33 + - update-index: refactor mark_valid() in preparation for new options
34 + - Introduce CE_NO_CHECKOUT bit
35 + - Extend index to save more flags
36 +
37 +This is an early half of the earlier series (I haven't had chance to look
38 +at the updated series yet), and should be replaced with the updated one
39 +posted recently.
40 +
41 +----------------------------------------------------------------
42 +[Stalled -- Needs Action to Proceed (or to be dropped)]
43 +
44 +* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
45 + - t7400: Add short "git submodule add" testsuite
46 +
47 +Waiting for a reroll.
48 +
49 +* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
50 + - Use xdiff caching to improve git blame performance
51 + - Allow xdiff machinery to cache hash results for a file
52 + - Always initialize xpparam_t to 0
53 + - Bypass textual patch generation and parsing in git blame
54 + - Allow alternate "low-level" emit function from xdl_diff
55 +
56 +Réne had good comments on how the callback should be structured.
57 +
58 +* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
59 + - git-am: Pass the --directory option through to git-apply
60 +
61 +I think this is still buggy and drops the option when am stops with
62 +conflicts.
63 +
64 +----------------------------------------------------------------
65 +[Will be merged to 'master/maint' soon]
66 +
67 +* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
68 + + builtin-merge: release the lockfile in try_merge_strategy()
69 + + merge-recursive: get rid of virtual_id
70 + + merge-recursive: move current_{file,directory}_set to struct
71 + merge_options
72 + + merge-recursive: move the global obuf to struct merge_options
73 + + merge-recursive: get rid of the index_only global variable
74 + + merge-recursive: move call_depth to struct merge_options
75 + + cherry-pick/revert: make direct internal call to merge_tree()
76 + + builtin-merge: avoid run_command_v_opt() for recursive and subtree
77 + + merge-recursive: introduce merge_options
78 + + merge-recursive.c: Add more generic merge_recursive_generic()
79 + + Split out merge_recursive() to merge-recursive.c
80 +
81 +(Tip at 4271666)
82 +
83 +* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
84 + + diff --dirstat-by-file: count changed files, not lines
85 +
86 +(Tip at fd33777)
87 +
88 +* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
89 + + safe_create_leading_directories(): make it about "leading"
90 + directories
91 +
92 +(Tip at 5f0bdf5)
93 +
94 +* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
95 + + git-apply:--include=pathspec
96 +
97 +(Tip at 6ecb1ee)
98 +
99 +* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
100 + + t7603: add new testcases to ensure builtin-commit uses
101 + reduce_heads()
102 + + builtin-commit: use commit_tree()
103 + + commit_tree(): add a new author parameter
104 +
105 +(Tip at 7a172b0)
106 +
107 +* pb/autocorrect-wrapper (Wed Sep 10 17:54:28 2008 +0200) 1 commit
108 + + git wrapper: also use aliases to correct mistyped commands
109 +
110 +(Tip at 746c221)
111 +
112 +* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 15 commits
113 + + Fix AsciiDoc errors in merge documentation
114 + + git-merge documentation: describe how conflict is presented
115 + + checkout --conflict=<style>: recreate merge in a non-default style
116 + + checkout -m: recreate merge when checking out of unmerged index
117 + + Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-
118 + resolution'
119 + + git-merge-recursive: learn to honor merge.conflictstyle
120 + + merge.conflictstyle: choose between "merge" and "diff3 -m" styles
121 + + rerere: understand "diff3 -m" style conflicts with the original
122 + + rerere.c: use symbolic constants to keep track of parsing states
123 + + xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or
124 + less
125 + + xmerge.c: minimum readability fixups
126 + + xdiff-merge: optionally show conflicts in "diff3 -m" style
127 + + xdl_fill_merge_buffer(): separate out a too deeply nested function
128 + + checkout --ours/--theirs: allow checking out one side of a
129 + conflicting merge
130 + + checkout -f: allow ignoring unmerged paths when checking out of
131 + the index
132 +
133 +(Tip at 3407a7a)
134 +
135 +* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits
136 + + push: receiver end advertises refs from alternate repositories
137 + + push: prepare sender to receive extended ref information from the
138 + receiver
139 + + receive-pack: make it a builtin
140 + + is_directory(): a generic helper function
141 +
142 +(Tip at d79796b)
143 +
144 +* bc/master-diff-hunk-header-fix (Sat Sep 20 18:36:22 2008 -0700) 10 commits
145 + + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
146 + hunk-header-fix
147 + + diff hunk pattern: fix misconverted "\{" tex macro introducers
148 + + diff: fix "multiple regexp" semantics to find hunk header comment
149 + + diff: use extended regexp to find hunk headers
150 + + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
151 + hunk-header-fix
152 + + diff: use extended regexp to find hunk headers
153 + + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
154 + hunk-header-fix
155 + + diff.*.xfuncname which uses "extended" regex's for hunk header
156 + selection
157 + + diff.c: associate a flag with each pattern and use it for
158 + compiling regex
159 + + diff.c: return pattern entry pointer rather than just the hunk
160 + header pattern
161 +
162 +(Tip at 92bb978)
163 +
164 +* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits
165 + + wt-status: Teach how to discard changes in the working directory
166 + + wt-status: Split header generation into three functions
167 +
168 +(Tip at 4d6e4c4)
169 +
170 +I think the above are all ready for 'master'.
171 +
172 +* mg/maint-remote-fix (Mon Sep 22 10:57:51 2008 +0200) 1 commit
173 + + make "git remote" report multiple URLs
174 +
175 +(Tip at 7d20e21)
176 +
177 +* bc/maint-diff-hunk-header-fix (Sat Sep 20 15:30:12 2008 -0700) 5 commits
178 + + diff hunk pattern: fix misconverted "\{" tex macro introducers
179 + + diff: use extended regexp to find hunk headers
180 + + diff.*.xfuncname which uses "extended" regex's for hunk header
181 + selection
182 + + diff.c: associate a flag with each pattern and use it for
183 + compiling regex
184 + + diff.c: return pattern entry pointer rather than just the hunk
185 + header pattern
186 +
187 +(Tip at 96d1a8e)
188 +
189 +The above two are ready for 'maint'.
190 +
191 +----------------------------------------------------------------
192 +[Actively Cooking]
193 +
194 +* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
195 + + Documentation: Refer to git-rebase(1) to warn against rewriting
196 + + Documentation: new upstream rebase recovery section in git-rebase
197 +
198 +My impression from the last round of discusson on the third patch in this
199 +series (not queued here) was that as long as we do not present it as "One
200 +True Workflow", the description was a good starting point, possibly others
201 +to add other recommended flows later.
202 +
203 +* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit
204 + + builtin-commit.c: show on which branch a commit was added
205 +
206 +Tentatively kicked back to "still cooking" status after Jeff voiced his
207 +annoyance. I personally do not like making this multi-line as Jeff
208 +suggested as an alternative (the message already is too verbose to my
209 +taste).
210 +
211 +* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
212 + + date/time: do not get confused by fractional seconds
213 +
214 +* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
215 + + git-add --intent-to-add (-N)
216 +
217 +Teaches "git add" to record only the intent to add a path later.
218 +I rerolled this without the fake empty blob object.
219 +
220 +* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
221 + - revision --simplify-merges: incremental simplification
222 + - revision --simplify-merges: prepare for incremental simplification
223 +
224 +I started making this incremental but the progress is not so great.
225 +
226 +----------------------------------------------------------------
227 +[On Hold]
228 +
229 +* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
230 + - git-am --forge: add Signed-off-by: line for the author
231 + - git-am: clean-up Signed-off-by: lines
232 + - stripspace: add --log-clean option to clean up signed-off-by:
233 + lines
234 + - stripspace: use parse_options()
235 + - Add "git am -s" test
236 + - git-am: refactor code to add signed-off-by line for the committer
237 +
238 +The one at second from the tip needs reworking.
239 +
240 +* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
241 + - "git push": tellme-more protocol extension
242 +
243 +* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
244 + - WIP: start teaching the --whitespace=fix to merge machinery
245 +
246 +* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
247 + - blame: show "previous" information in --porcelain/--incremental
248 + format
249 + - git-blame: refactor code to emit "porcelain format" output
250 +
251 +* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
252 + + merge: remove deprecated summary and diffstat options and config
253 + variables
254 +
255 +This was previously in "will be in master soon" category, but it turns out
256 +that the synonyms to the ones this one deletes are fairly new invention
257 +that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
258 +in 1.7.0, but with the loud whining about moving git-foo out of $PATH we
259 +have been hearing, it might not be a bad idea to drop this.
260 +
261 +* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
262 + - diff: enable "too large a rename" warning when -M/-C is explicitly
263 + asked for
264 +
265 +This would be the right thing to do for command line use, but gitk will be
266 +hit due to tcl/tk's limitation, so I am holding this back for now.
whats/in/2008/09/03.txt new
+138
@@ -0,0 +1,138 @@
1 +Subject: What's in git.git (Sep 2008, #03; Mon, 22)
2 +X-maint-at: 8b4eb6b6cd65042c6ecb4f06f19c1f2441899ed6
3 +X-master-at: c76dc9592d1c770212d50ee7a7028a74f472f23b
4 +X-maint-was: 873358dd2ac3bf2cea9a370d8586378a27a092f2
5 +X-master-was: ede4caf6e3204f9d63758d6410d0f124b0caab32
6 +
7 +What's in git.git (Sep 2008, #03; Mon, 22)
8 +
9 + maint 8b4eb6b (Do not perform cross-directory renames when creating packs)
10 + master c76dc95 (Merge branch 'maint')
11 +------------------------------------------------------------------------
12 +
13 +I think 'maint' has all the known fixes and is ready to become 1.6.0.3
14 +(but I may not have enough time or energy to do the release engineering
15 +before I leave for two weeks).
16 +
17 +* The 'maint' branch has these fixes since the last announcement.
18 +
19 +Alec Berryman (2):
20 + git-svn: factor out svnserve test code for later use
21 + git-svn: Always create a new RA when calling do_switch for svn://
22 +
23 +Brandon Casey (2):
24 + t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()
25 + t9700/test.pl: remove File::Temp requirement
26 +
27 +Charles Bailey (2):
28 + Add new test to demonstrate git archive core.autocrlf inconsistency
29 + Make git archive respect core.autocrlf when creating zip format archives
30 +
31 +Dmitry Potapov (2):
32 + git-rebase-interactive: do not squash commits on abort
33 + git-rebase--interactive: auto amend only edited commit
34 +
35 +Eric Raible (1):
36 + completion: git commit should list --interactive
37 +
38 +Eric Wong (1):
39 + git-svn: fix handling of even funkier branch names
40 +
41 +Fabrizio Chiarello (1):
42 + builtin-clone: fix typo
43 +
44 +Garry Dolley (1):
45 + Clarified gitattributes documentation regarding custom hunk header.
46 +
47 +Heikki Orsila (3):
48 + Start conforming code to "git subcmd" style part 2
49 + Start conforming code to "git subcmd" style part 3
50 + Cosmetical command name fix
51 +
52 +Jeff King (1):
53 + Use compatibility regex library also on FreeBSD
54 +
55 +Joey Hess (1):
56 + gitweb: avoid warnings for commits without body
57 +
58 +Johannes Sixt (2):
59 + Use compatibility regex library also on AIX
60 + git-remote: do not use user input in a printf format string
61 +
62 +Junio C Hamano (9):
63 + discard_cache: reset lazy name_hash bit
64 + diff Porcelain: do not disable auto index refreshing on -C -C
65 + diff --quiet: make it synonym to --exit-code >/dev/null
66 + Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
67 + Fix permission bits on sources checked out with an overtight umask
68 + checkout: do not lose staged removal
69 + GIT 1.6.0.2
70 + diff/diff-files: do not use --cc too aggressively
71 + Start draft release notes for 1.6.0.3
72 +
73 +Mikael Magnusson (2):
74 + Typo "bogos" in format-patch error message.
75 + git-repack uses --no-repack-object, not --no-repack-delta.
76 +
77 +Petr Baudis (1):
78 + Do not perform cross-directory renames when creating packs
79 +
80 +Ralf Wildenhues (1):
81 + Fix some manual typos.
82 +
83 +Thomas Rast (1):
84 + sha1_file: link() returns -1 on failure, not errno
85 +
86 +Todd Zullinger (1):
87 + Use dashless git commands in setgitperms.perl
88 +
89 +Yann Dirson (1):
90 + Bust the ghost of long-defunct diffcore-pathspec.
91 +
92 +
93 +* The 'master' branch has these since the last announcement
94 + in addition to the above.
95 +
96 +Bert Wesarg (1):
97 + for-each-ref: `:short` format for `refname`
98 +
99 +Christian Couder (3):
100 + bisect: test merge base if good rev is not an ancestor of bad rev
101 + bisect: only check merge bases when needed
102 + bisect: remove "checkout_done" variable used when checking merge bases
103 +
104 +Daniel Barkalow (1):
105 + Check early that a new branch is new and valid
106 +
107 +Deskin Miler (1):
108 + git-svn: testcase for partial rebuild
109 +
110 +Deskin Miller (1):
111 + git-svn: do a partial rebuild if rev_map is out-of-date
112 +
113 +Junio C Hamano (4):
114 + diff: vary default prefix depending on what are compared
115 + daemon.c: avoid setlinebuf()
116 + Update draft release notes to 1.6.1
117 + t5510: test "git fetch" following tags minimally
118 +
119 +Nicolas Pitre (3):
120 + sha1write: don't copy full sized buffers
121 + pack-objects: don't include missing preferred base objects
122 + t5300: improve SHA1 collision test
123 +
124 +Quy Tonthat (1):
125 + Update RPM spec for the new location of git-cvsserver.
126 +
127 +René Scharfe (3):
128 + log: add load_ref_decorations()
129 + move load_ref_decorations() to log-tree.c and export it
130 + add '%d' pretty format specifier to show decoration
131 +
132 +SZEDER Gábor (1):
133 + bash: use for-each-ref format 'refname:short'
134 +
135 +Thomas Rast (2):
136 + rev-list: fix --reverse interaction with --parents
137 + t6013: replace use of 'tac' with equivalent Perl
138 +