What's cooking (2009/01 #07)
Junio C Hamano committed
Jan 28, 2009 at 18:01 UTC
dfcdf2089b9f689b3ad3197233226a7e951ad2f5
1 file changed
+141
-74
whats-cooking.txt
+141
-74
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2009, #06; Sat, 24)
3
-X-master-at: 5dc1308562ab5991ecada68b06707709bea408c9
4
-X-next-at: 7298c8d081d90e4a3c5161414c17908750ecf5a9
2
+Subject: What's cooking in git.git (Jan 2009, #07; Wed, 28)
3
+X-master-at: 8712b3cdb0495f5a56b91cd67e2697412447a886
4
+X-next-at: c2891ee32a7e8274426c22439ed8d536a5b0bb43
5
6
-What's cooking in git.git (Jan 2009, #06; Sat, 24)
6
+What's cooking in git.git (Jan 2009, #07; Wed, 28)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -17,37 +17,80 @@ meant to be merged to the maintenance series have "maint-" in their names.
17
----------------------------------------------------------------
18
[New Topics]
19
20
-* jg/mergetool (Sat Jan 24 00:12:45 2009 +0100) 1 commit
21
- - [wait for an ack from ted] mergetool: Don't repeat merge tool
22
- candidates
20
+* jc/maint-1.6.0-split-diff-metainfo (Mon Jan 26 00:08:24 2009 -0800) 1 commit
21
+ + diff.c: output correct index lines for a split diff
22
24
-* cb/mergetool (Wed Jan 21 22:57:48 2009 +0000) 1 commit
25
- - [wait for ack from ted] mergetool: respect autocrlf by using
26
- checkout-index
23
+This is slated for maintenance series 1.6.0.X, 1.6.1.X and also for
24
+'master'. I think the change is pretty safe and sane to go directly to
25
+'master' but I had too many other topoics to look at that I did not feel
26
+comfortable enough to do so.
27
28
-* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
29
- - git commit: pathspec without -i/-o implies -i semantics during a
30
- merge
31
- - builtin-commit: shorten eye-sore overlong lines
32
- - Add "partial commit" tests during a conflicted merge
28
+* jc/maint-split-diff-metainfo (Tue Jan 27 01:08:02 2009 -0800) 2 commits
29
+ + Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-
30
+ split-diff-metainfo
31
+ + diff.c: output correct index lines for a split diff
32
34
-This is only meant as a weatherballoon to help facilitate discussion.
33
+Early conflict resolution branch for the above to carry it to 1.6.1X
34
+series.
35
36
-* sr/clone-empty (Fri Jan 23 01:07:32 2009 +0100) 1 commit
37
- + Allow cloning an empty repository
36
+* js/maint-rebase-i-submodule (Tue Jan 27 12:42:31 2009 +0100) 2 commits
37
+ + Fix submodule squashing into unrelated commit
38
+ + rebase -i squashes submodule changes into unrelated commit
39
39
-At last ;-) This is a reasonable thing to do, and should be fast tracked
40
-to 'master'.
40
+* jg/tag-contains (Mon Jan 26 09:13:25 2009 -0500) 3 commits
41
+ + git-tag: Add --contains option
42
+ + Make has_commit() non-static
43
+ + Make opt_parse_with_commit() non-static
44
42
-* cc/replace (Fri Jan 23 10:07:46 2009 +0100) 7 commits
43
- - environment: add global variable to disable replacement
44
- - mktag: call "check_sha1_signature" with the replacement sha1
45
- - replace_object: add a test case
46
- - object: call "check_sha1_signature" with the replacement sha1
47
- - sha1_file: add a "read_sha1_file_repl" function
48
- - replace_object: add mechanism to replace objects found in
49
- "refs/replace/"
50
- - refs: add a "for_each_replace_ref" function
45
+* jk/maint-cleanup-after-exec-failure (Wed Jan 28 02:38:14 2009 -0500) 4 commits
46
+ + git: use run_command() to execute dashed externals
47
+ + run_command(): help callers distinguish errors
48
+ + run_command(): handle missing command errors more gracefully
49
+ + git: s/run_command/run_builtin/
50
+
51
+* jc/maint-allow-uninteresting-missing (Tue Jan 27 23:19:30 2009 -0800) 1 commit
52
+ + revision traversal: allow UNINTERESTING objects to be missing
53
+
54
+This is a small follow-up to the fix to send-pack in 1.6.1; meant to go in
55
+1.6.1.X maintenance series and newer.
56
+
57
+* am/maint-push-doc (Mon Jan 26 00:45:33 2009 +0100) 3 commits
58
+ + Documentation: rework src/dst description in git push
59
+ + Documentation: more git push examples
60
+ + Documentation: simplify refspec format description
61
+
62
+* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
63
+ - git-merge-file: allow converting the results for the work tree
64
+
65
+We did not give scripted Porcelains a way to say "this temporary file I am
66
+using for merging is for this path, so use the core.autocrlf and attributes
67
+rules for that final path". Instead, merge-file simply wrote out the
68
+data in the canonical repository representation.
69
+
70
+rerere has the same issue, but it is a lot worse. It reads the three
71
+files (preimage, postimage and thisimage) from the work tree in the work
72
+tree representation, merges them without converting them to the canonical
73
+representation first but inserts the conflict markers with the canonical
74
+representation and writes the resulting mess out. It needs to be fixed to
75
+read with convert_to_git(), merge them while they are still in the
76
+canonical representation and possibly add conflict markers, and then write
77
+the results out after convert_to_working_tree(). It also needs to write
78
+in binary mode as well.
79
+
80
+* jc/maint-add-u-remove-conflicted (Wed Jan 28 14:24:53 2009 -0800) 1 commit
81
+ - add -u: do not fail to resolve a path as deleted
82
+
83
+This has been updated from the posted version with a correction.
84
+
85
+* ns/am-slacker (Sat Jan 24 10:18:02 2009 +0900) 2 commits
86
+ + git-am: Add --ignore-date option
87
+ + am: Add --committer-date-is-author-date option
88
+
89
+It is a (probably) useful new feature with a sort-of cute explanation.
90
+
91
+* jc/maint-apply-fix (Sun Jan 25 23:41:26 2009 -0800) 1 commit
92
+ + builtin-apply.c: do not set bogus mode in check_preimage() for
93
+ deleted path
94
95
----------------------------------------------------------------
96
[Stalled and may need help and prodding to go forward]
@@ -72,6 +115,26 @@ The "spec" did not seem quite well cooked yet, but in the longer term I
115
think something like this to allow interoperating with other SCMs as if
116
the other end is a native git repository is a very worthy goal.
117
118
+* cc/replace (Fri Jan 23 10:07:46 2009 +0100) 7 commits
119
+ - environment: add global variable to disable replacement
120
+ - mktag: call "check_sha1_signature" with the replacement sha1
121
+ - replace_object: add a test case
122
+ - object: call "check_sha1_signature" with the replacement sha1
123
+ - sha1_file: add a "read_sha1_file_repl" function
124
+ - replace_object: add mechanism to replace objects found in
125
+ "refs/replace/"
126
+ - refs: add a "for_each_replace_ref" function
127
+
128
+Nobody has review comments on this yet.
129
+
130
+* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 6 commits
131
+ - archive.c: add support for --submodules[=(all|checkedout)]
132
+ - tree.c: allow read_tree_recursive() to traverse gitlink entries
133
+ + Revert round #1 of the series
134
+ + builtin-ls-tree: enable traversal of submodules
135
+ + archive.c: enable traversal of submodules
136
+ + tree.c: add support for traversal of submodules
137
+
138
----------------------------------------------------------------
139
[Reverted]
140
@@ -89,50 +152,17 @@ This broke git-format-patch badly.
152
- valgrind: ignore ldso errors
153
- Add valgrind support in test scripts
154
92
-Dscho seems to have some updates out of discussion with Peff, which is not
93
-queued here.
94
-
95
-* sp/runtime-prefix (Sun Jan 18 13:00:15 2009 +0100) 7 commits
96
- - Windows: Revert to default paths and convert them by
97
- RUNTIME_PREFIX
98
- - Compute prefix at runtime if RUNTIME_PREFIX is set
99
- - Modify setup_path() to only add git_exec_path() to PATH
100
- - Add calls to git_extract_argv0_path() in programs that call
101
- git_config_*
102
- - git_extract_argv0_path(): Move check for valid argv0 from caller
103
- to callee
104
- - Refactor git_set_argv0_path() to git_extract_argv0_path()
105
- - Move computation of absolute paths from Makefile to runtime (in
106
- preparation for RUNTIME_PREFIX)
107
-
108
-We should move this to 'next' soon with J6t's blessing.
109
-
110
-* lh/submodule-tree-traversal (Mon Jan 12 00:45:55 2009 +0100) 3 commits
111
- + builtin-ls-tree: enable traversal of submodules
112
- + archive.c: enable traversal of submodules
113
- + tree.c: add support for traversal of submodules
114
-
115
-There were a few updates posted, which I haven't picked up.
116
-
117
-* jk/signal-cleanup (Thu Jan 22 01:03:28 2009 -0500) 5 commits
118
- - pager: do wait_for_pager on signal death
119
- - refactor signal handling for cleanup functions
120
- - chain kill signals for cleanup functions
121
- - diff: refactor tempfile cleanup handling
122
- - Windows: Fix signal numbers
123
-
124
-Ready for 'next', but not tonight (yet).
155
+Dscho and Peff had further exchanges on the list; I am sort of waiting for
156
+the conclusion before picking any intermediate version up.
157
126
-* ks/maint-mailinfo-folded (Tue Jan 13 01:21:04 2009 +0300) 5 commits
127
- - mailinfo: tests for RFC2047 examples
128
- - mailinfo: add explicit test for mails like '<a.u.thor@example.com>
158
+* ks/maint-mailinfo-folded (Tue Jan 13 01:21:04 2009 +0300) 4 commits
159
+ + mailinfo: tests for RFC2047 examples
160
+ + mailinfo: add explicit test for mails like '<a.u.thor@example.com>
161
(A U Thor)'
130
- - mailinfo: more smarter removal of rfc822 comments from 'From'
162
+ mailinfo: 'From:' header should be unfold as well
163
+ mailinfo: correctly handle multiline 'Subject:' header
164
134
-As far as I can see, the only remaining thing is a minor fix-up in the
135
-"comment removal" one before we can move this fully to 'next'.
165
+I just got tired of waiting and cleaned up the series myself.
166
167
* js/notes (Tue Jan 13 20:57:16 2009 +0100) 6 commits
168
+ git-notes: fix printing of multi-line notes
@@ -156,13 +186,11 @@ Design discussion between Jakub and Sebastien continues.
186
----------------------------------------------------------------
187
[Graduated to "master"]
188
159
-* js/patience-diff (Thu Jan 1 17:39:37 2009 +0100) 3 commits
160
- + bash completions: Add the --patience option
161
- + Introduce the diff option '--patience'
162
- + Implement the patience diff algorithm
189
+* sr/clone-empty (Fri Jan 23 01:07:32 2009 +0100) 1 commit
190
+ + Allow cloning an empty repository
191
164
-----------------------------------------------------------------
165
-[Will merge to "master" soon]
192
+Has anybody actually tried this and made sure the resulting empty clone
193
+works fine after the clone source gets updated with some contents?
194
195
* kb/lstat-cache (Sun Jan 18 16:14:54 2009 +0100) 5 commits
196
+ lstat_cache(): introduce clear_lstat_cache() function
@@ -205,9 +233,48 @@ Design discussion between Jakub and Sebastien continues.
233
+ Add color_fwrite_lines(), a function coloring each line
234
individually
235
236
+----------------------------------------------------------------
237
+[Will merge to "master" soon]
238
+
239
+* jg/mergetool (Sat Jan 24 00:12:45 2009 +0100) 1 commit
240
+ + mergetool: Don't repeat merge tool candidates
241
+
242
+* cb/mergetool (Wed Jan 21 22:57:48 2009 +0000) 1 commit
243
+ + mergetool: respect autocrlf by using checkout-index
244
+
245
+Now Ted told us not to wait for him, we'll go ahead by ourselves ;-).
246
+
247
+* jk/signal-cleanup (Thu Jan 22 01:03:28 2009 -0500) 5 commits
248
+ + pager: do wait_for_pager on signal death
249
+ + refactor signal handling for cleanup functions
250
+ + chain kill signals for cleanup functions
251
+ + diff: refactor tempfile cleanup handling
252
+ + Windows: Fix signal numbers
253
+
254
+* sp/runtime-prefix (Sun Jan 18 13:00:15 2009 +0100) 7 commits
255
+ + Windows: Revert to default paths and convert them by
256
+ RUNTIME_PREFIX
257
+ + Compute prefix at runtime if RUNTIME_PREFIX is set
258
+ + Modify setup_path() to only add git_exec_path() to PATH
259
+ + Add calls to git_extract_argv0_path() in programs that call
260
+ git_config_*
261
+ + git_extract_argv0_path(): Move check for valid argv0 from caller
262
+ to callee
263
+ + Refactor git_set_argv0_path() to git_extract_argv0_path()
264
+ + Move computation of absolute paths from Makefile to runtime (in
265
+ preparation for RUNTIME_PREFIX)
266
+
267
----------------------------------------------------------------
268
[On Hold]
269
270
+* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
271
+ - git commit: pathspec without -i/-o implies -i semantics during a
272
+ merge
273
+ - builtin-commit: shorten eye-sore overlong lines
274
+ - Add "partial commit" tests during a conflicted merge
275
+
276
+This is only meant as a weatherballoon to help facilitate discussion.
277
+
278
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
279
. diff: enable "too large a rename" warning when -M/-C is explicitly
280
asked for