What's cooking (2008/08 #03)
Junio C Hamano committed
Aug 14, 2008 at 01:52 UTC
23ac596017942f315e1498499a74e809699be667
1 file changed
+81
-17
whats-cooking.txt
+81
-17
@@ -1,8 +1,8 @@
1
-Subject: What's cooking in git.git (Aug 2008, #02; Mon, 11)
2
-X-master-at: 10d9d887ecdc81197162d7bbe5dfc0d028498fd6
3
-X-next-at: 3cb9d94cdc74f3137599446af9f5442b7ae1ab27
1
+Subject: What's cooking in git.git (Aug 2008, #03; Thu, 14)
2
+X-master-at: a0653d550524a0263d36fde6a8cf98941dd057ab
3
+X-next-at: 8dd0c03fb2b8807ef71d5e807e65818dbd05a118
4
5
-What's cooking in git.git (Aug 2008, #02; Mon, 11)
5
+What's cooking in git.git (Aug 2008, #03; Thu, 14)
6
--------------------------------------------------
7
8
Here are the topics that have been cooking. Commits prefixed
@@ -15,6 +15,74 @@ meant to be merged to the maintenance series have "maint-" in their names.
15
----------------------------------------------------------------
16
[New Topics]
17
18
+* ak/p4 (Sun Aug 10 19:26:35 2008 +0100) 12 commits
19
+ + Put in the two other configuration elements found in the source
20
+ + Put some documentation in about the parameters that have been
21
+ added
22
+ + Move git-p4.syncFromOrigin into a configuration parameters section
23
+ + Consistently use 'git-p4' for the configuration entries
24
+ + If the user has configured various parameters, use them.
25
+ + Switch to using 'p4_build_cmd'
26
+ + If we are in verbose mode, output what we are about to run (or
27
+ return)
28
+ + Add a single command that will be used to construct the 'p4'
29
+ command
30
+ + Utilise the new 'p4_system' function.
31
+ + Have a command that specifically invokes 'p4' (via system)
32
+ + Utilise the new 'p4_read_pipe_lines' command
33
+ + Create a specific version of the read_pipe_lines command for p4
34
+ invocations
35
+
36
+Warmly received by the primary contributor of git-p4; I do not mind
37
+merging this before 1.6.0.
38
+
39
+* mv/merge-recursive (Tue Aug 12 22:14:00 2008 +0200) 3 commits
40
+ - Make builtin-revert.c use merge_recursive_generic()
41
+ - merge-recursive.c: Add more generic merge_recursive_generic()
42
+ - Split out merge_recursive() to merge-recursive.c
43
+
44
+I do not think builtlin-revert should use "recursive", but these patches
45
+give a good starting point to separate the bulk of the "rename-aware
46
+three-way merge" into library form.
47
+
48
+* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 1 commit
49
+ + Documentation: rev-list-options: move --simplify-merges
50
+ documentation
51
+
52
+* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
53
+ + pack-objects: Allow missing base objects when creating thin packs
54
+
55
+* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 4 commits
56
+ - filter-branch: use --simplify-merges
57
+ - Merge branch 'jc/post-simplify' into tr/filter-branch
58
+ - filter-branch: fix ref rewriting with --subdirectory-filter
59
+ - filter-branch: Extend test to show rewriting bug
60
+
61
+* js/checkout-dwim-local (Sat Aug 9 16:00:12 2008 +0200) 1 commit
62
+ + checkout --track: make up a sensible branch name if '-b' was
63
+ omitted
64
+
65
+I like this low-impact usability enhancement; will most likely be in
66
+master soon after 1.6.0.
67
+
68
+* bd/diff-strbuf (Wed Aug 13 23:18:22 2008 -0700) 3 commits
69
+ + xdiff-interface: hide the whole "xdiff_emit_state" business from
70
+ the caller
71
+ + Use strbuf for struct xdiff_emit_state's remainder
72
+ + Make xdi_diff_outf interface for running xdiff_outf diffs
73
+
74
+Gives measurable performance improvement to textual diff generation. For
75
+improving "blame" performance, it might be more effective to hook directly
76
+to lower level of xdiff machinery so that we do not even have to generate
77
+patch only to discard after reading "@@ -l,k +m,n @@" lines, but that
78
+would be a separate topic.
79
+
80
+* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
81
+ + Make cherry-pick use rerere for conflict resolution.
82
+
83
+----------------------------------------------------------------
84
+[On Hold and/or Cooking]
85
+
86
* jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit
87
- tests: use $TEST_DIRECTORY to refer to the t/ directory
88
@@ -30,21 +98,16 @@ meant to be merged to the maintenance series have "maint-" in their names.
98
'clean'
99
+ t9700: remove useless check
100
33
-* xx/post-1.6.0 (Sun Aug 10 19:10:04 2008 -0400) 3 commits
101
+* xx/post-1.6.0 (Mon Aug 11 21:45:52 2008 -0400) 7 commits
102
+ + git-submodule foreach - Include output and clarify usage.
103
+ + Fix commit_tree() buffer leak
104
+ + Teach git log --exit-code to return an appropriate exit code
105
+ + Teach git log --check to return an appropriate exit code
106
+ git-submodule - Add 'foreach' subcommand
107
+ builtin-reflog: Allow reflog expire to name partial ref
108
+ git-am: ignore --binary option
109
38
-Some collection of patches to queue for post-1.6.0 development.
39
-
40
-----------------------------------------------------------------
41
-[Graduated to "master"]
42
-
43
-* rs/archive-parse-options (Fri Jul 25 12:41:26 2008 +0200) 1 commit
44
- + archive: allow --exec and --remote without equal sign
45
-
46
-----------------------------------------------------------------
47
-[On Hold and/or Cooking]
110
+Random collection of patches to queue for post-1.6.0 development.
111
112
* jc/post-simplify (Sun Aug 3 17:47:16 2008 -0700) 3 commits
113
+ Topo-sort before --simplify-merges
@@ -81,7 +144,8 @@ a similar fix for the case where "a" is a submodule.
144
Gives a bit more flexibility to hash-objects by allowing us to lie about
145
the path the contents comes from.
146
84
-* mv/merge-custom (Sat Aug 2 10:08:38 2008 +0200) 6 commits
147
+* mv/merge-custom (Wed Aug 13 23:32:43 2008 +0200) 7 commits
148
+ + Update .gitignore to ignore git-help
149
+ Builtin git-help.
150
+ builtin-help: always load_command_list() in cmd_help()
151
+ Add a second testcase for handling invalid strategies in git-merge
@@ -91,7 +155,7 @@ the path the contents comes from.
155
builtins
156
157
* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits
94
- - git-merge-octopus: use (merge-base A (merge B C D E...)) for
158
+ + git-merge-octopus: use (merge-base A (merge B C D E...)) for
159
stepwise merge
160
+ merge-base-many: add trivial tests based on the documentation
161
+ documentation: merge-base: explain "git merge-base" with more than