What's cooking (2012/03 #09)
Junio C Hamano committed
Mar 26, 2012 at 14:34 UTC
f8b7bd2f86d6d79205c090efeca33679dba09c0e
1 file changed
+49
-41
whats-cooking.txt
+49
-41
@@ -1,15 +1,15 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2012, #08; Fri, 23)
3
-X-master-at: c16df57c5a778ef14ede7ad202c74146269d61ac
4
-X-next-at: 1bdf608349ec8c63dd8b91991095c3368a1e8a87
2
+Subject: What's cooking in git.git (Mar 2012, #09; Mon, 26)
3
+X-master-at: fae9d761c78cba1039854b51df6c2f7360e59cba
4
+X-next-at: 74cd462aafcd177c1507741065d5836c6f8424aa
5
6
-What's cooking in git.git (Mar 2012, #08; Fri, 23)
6
+What's cooking in git.git (Mar 2012, #09; Mon, 26)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
11
12
-The tip of 'master' was tagged as 1.7.10-rc2 today.
12
+The updates for "gitk" part is now ready for 1.7.10.
13
14
You can find the changes described here in the integration branches of the
15
repositories listed at
@@ -17,18 +17,23 @@ repositories listed at
17
http://git-blame.blogspot.com/p/git-public-repositories.html
18
19
--------------------------------------------------
20
-[Graduated to "master"]
20
+[New Topics]
21
+
22
+* rs/combine-diff-zero-context-at-the-beginning (2012-03-25) 1 commit
23
+ - combine-diff: fix loop index underflow
24
22
-* am/completion-zsh-fix (2012-03-21) 1 commit
23
- + contrib/completion: "local var=()" is misinterpreted as func-decl by zsh
25
+Fixes an age old corner case bug in combine diff (only triggered with -U0
26
+and the hunk at the beginning of the file needs to be shown).
27
25
-* dw/gitweb-doc-grammo (2012-03-23) 1 commit
26
- + Documentation/gitweb: trivial English fixes
28
+* sl/autoconf (2012-03-26) 3 commits
29
+ - configure: be more idiomatic
30
+ - configure: avoid some code repetitions thanks to m4_{push,pop}def
31
+ - configure: move definitions of private m4 macros before AC_INIT invocation
32
28
-Typofix.
33
+Updates our configure.ac to follow a better "autoconf" style.
34
35
--------------------------------------------------
31
-[New Topics]
36
+[Stalled]
37
38
* lp/maint-diff-three-dash-with-graph (2012-03-20) 3 commits
39
- t4202: add test for "log --graph --stat -p" separator lines
@@ -45,33 +50,8 @@ can be back-merged to older codebase that did not have 7f81463 (Use
50
correct grammar in diffstat summary line, 2012-02-01) that first appeared
51
in v1.7.9.2
52
48
-* wk/gitweb-snapshot-use-if-modified-since (2012-03-20) 1 commit
49
- - Pull gitweb If-Modified-Since handling out into its own function and use for snapshots.
50
-
51
-Unreviewed; the title looks way too long and does not sit well in the
52
-shortlog output.
53
-
54
-* jc/maint-merge-autoedit (2012-03-20) 1 commit
55
- - merge: backport GIT_MERGE_AUTOEDIT support
56
-
57
-In 1.7.10, we added GIT_MERGE_AUTOEDIT=no environment variable to help
58
-older scripts to let them refuse giving users a chance to explain the
59
-merge, but forgot that 1.7.9 automatically opens an editor when merging an
60
-annotated tag, and there is no equivalent escape hatch. A merge of this
61
-topic to 1.7.10 track becomes a no-op, but we may want to apply this to
62
-the 1.7.9.x series.
63
-
64
-* jk/diff-no-rename-empty (2012-03-23) 4 commits
65
- - merge-recursive: don't detect renames of empty files
66
- - teach diffcore-rename to optionally ignore empty content
67
- - make is_empty_blob_sha1 available everywhere
68
- - drop casts from users EMPTY_TREE_SHA1_BIN
69
-
70
-Forbids rename detection logic from matching two empty files as renames
71
-during merge-recursive to prevent mismerges.
72
-
73
---------------------------------------------------
74
-[Stalled]
53
+With a review from Zbigniew, I would expect that this would be rerolled
54
+again.
55
56
* cn/apply-fix-ws-can-lengthen-lines (2012-03-11) 1 commit
57
. apply: reallocate the postimage buffer when needed
@@ -181,7 +161,34 @@ not working :-(.
161
--------------------------------------------------
162
[Cooking]
163
184
-* th/difftool-diffall (2012-03-23) 9 commits
164
+* wk/gitweb-snapshot-use-if-modified-since (2012-03-26) 3 commits
165
+ - gitweb: add If-Modified-Since handling to git_snapshot().
166
+ - gitweb: refactor If-Modified-Since handling
167
+ - gitweb: add `status` headers to git_feed() responses.
168
+
169
+Makes 'snapshot' request to "gitweb" honor If-Modified-Since: header,
170
+based on the commit date.
171
+
172
+* jc/maint-merge-autoedit (2012-03-20) 1 commit
173
+ - merge: backport GIT_MERGE_AUTOEDIT support
174
+
175
+In 1.7.10, we added GIT_MERGE_AUTOEDIT=no environment variable to help
176
+older scripts to let them refuse giving users a chance to explain the
177
+merge, but forgot that 1.7.9 automatically opens an editor when merging an
178
+annotated tag, and there is no equivalent escape hatch. A merge of this
179
+topic to 1.7.10 track becomes a no-op, but we may want to apply this to
180
+the 1.7.9.x series.
181
+
182
+* jk/diff-no-rename-empty (2012-03-23) 4 commits
183
+ - merge-recursive: don't detect renames of empty files
184
+ - teach diffcore-rename to optionally ignore empty content
185
+ - make is_empty_blob_sha1 available everywhere
186
+ - drop casts from users EMPTY_TREE_SHA1_BIN
187
+
188
+Forbids rename detection logic from matching two empty files as renames
189
+during merge-recursive to prevent mismerges.
190
+
191
+* th/difftool-diffall (2012-03-26) 9 commits
192
- difftool: print list of valid tools with '--tool-help'
193
- difftool: teach difftool to handle directory diffs
194
- difftool: replace system call with Git::command_noisy
@@ -208,7 +215,8 @@ working trees that are at the top-level of the current project by mistake.
215
216
Not urgent.
217
211
-* ct/advise-push-default (2012-03-19) 1 commit
218
+* ct/advise-push-default (2012-03-26) 2 commits
219
+ - clean up struct ref's nonfastforward field
220
- push: Provide situational hints for non-fast-forward errors
221
222
Breaks down the cases in which "git push" fails due to non-ff into three