What's in/cooking
Junio C Hamano committed
Nov 15, 2008 at 14:11 UTC
742d36744e08b6964b0ed8f7ba713f4f5ee447a0
2 files changed
+356
whats/cooking/2008/11/05.txt
new
+192
@@ -0,0 +1,192 @@
1
+Subject: What's cooking in git.git (Nov 2008, #05; Sat, 15)
2
+X-master-at: ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd
3
+X-next-at: a277108ccd37bb47333edf23a681288943b48ef3
4
+
5
+What's cooking in git.git (Nov 2008, #05; Sat, 15)
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
+* lt/preload-lstat (Thu Nov 13 16:36:30 2008 -0800) 1 commit
19
+ - Add cache preload facility
20
+
21
+* cb/mergetool (Thu Nov 13 12:41:15 2008 +0000) 3 commits
22
+ - [DONTMERGE] Add -k/--keep-going option to mergetool
23
+ - Add -y/--no-prompt option to mergetool
24
+ - Fix some tab/space inconsistencies in git-mergetool.sh
25
+
26
+Jeff had good comments on the last one; the discussion needs concluded,
27
+and also waiting for comments from the original author (Ted).
28
+
29
+* ta/quiet-pull (Sat Nov 15 01:14:24 2008 +0100) 1 commit
30
+ - Teach/Fix pull/fetch -q/-v options
31
+
32
+This has my fixes to preserve "fetch -v -v" behaviour squashed in.
33
+
34
+----------------------------------------------------------------
35
+[Graduated to "master"]
36
+
37
+* mk/maint-cg-push (Mon Nov 10 22:47:11 2008 +0100) 1 commit
38
+ + git push: Interpret $GIT_DIR/branches in a Cogito compatible way
39
+
40
+Will need to further downmerge to 'maint'.
41
+
42
+* jk/maint-commit-v-strip (Wed Nov 12 03:25:52 2008 -0500) 1 commit
43
+ + commit: Fix stripping of patch in verbose mode.
44
+
45
+Will need to further downmerge to 'maint'.
46
+
47
+* st/maint-tag (Wed Nov 5 00:20:36 2008 +0100) 2 commits
48
+ + tag: Add more tests about mixing incompatible modes and options
49
+ + tag: Check that options are only allowed in the appropriate mode
50
+
51
+Will need to further downmerge to 'maint'.
52
+
53
+* jk/deny-push-to-current (Sat Nov 8 20:49:27 2008 -0500) 2 commits
54
+ + receive-pack: detect push to current branch of non-bare repo
55
+ + t5516: refactor oddball tests
56
+
57
+* dl/xdiff (Fri Nov 7 21:24:33 2008 -0800) 1 commit
58
+ + xdiff: give up scanning similar lines early
59
+
60
+This performance fix may eventually need to be cherry-picked to 'maint'.
61
+
62
+* lt/decorate (Wed Nov 12 11:51:28 2008 +0100) 7 commits
63
+ + rev-list documentation: clarify the two parts of history
64
+ simplification
65
+ + Document "git log --simplify-by-decoration"
66
+ + Document "git log --source"
67
+ + revision traversal: '--simplify-by-decoration'
68
+ + Make '--decorate' set an explicit 'show_decorations' flag
69
+ + revision: make tree comparison functions take commits rather than
70
+ trees
71
+ + Add a 'source' decorator for commits
72
+
73
+* gb/gitweb-snapshot-pathinfo (Sun Nov 2 10:21:39 2008 +0100) 3 commits
74
+ + gitweb: embed snapshot format parameter in PATH_INFO
75
+ + gitweb: retrieve snapshot format from PATH_INFO
76
+ + gitweb: make the supported snapshot formats array global
77
+
78
+* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
79
+ + gitweb: Better processing format string in custom links in navbar
80
+
81
+* jk/diff-convfilter (Sun Oct 26 00:50:02 2008 -0400) 8 commits
82
+ + enable textconv for diff in verbose status/commit
83
+ + wt-status: load diff ui config
84
+ + only textconv regular files
85
+ + userdiff: require explicitly allowing textconv
86
+ + refactor userdiff textconv code
87
+ + add userdiff textconv tests
88
+ + document the diff driver textconv feature
89
+ + diff: add missing static declaration
90
+
91
+* jk/diff-convfilter-test-fix (Fri Oct 31 01:09:13 2008 -0400) 1 commit
92
+ + Avoid using non-portable `echo -n` in tests.
93
+
94
+An update to the one above.
95
+
96
+* np/pack-safer (Sun Nov 9 13:11:06 2008 -0800) 11 commits
97
+ + t5303: fix printf format string for portability
98
+ + t5303: work around printf breakage in dash
99
+ + pack-objects: don't leak pack window reference when splitting
100
+ packs
101
+ + extend test coverage for latest pack corruption resilience
102
+ improvements
103
+ + pack-objects: allow "fixing" a corrupted pack without a full
104
+ repack
105
+ + make find_pack_revindex() aware of the nasty world
106
+ + make check_object() resilient to pack corruptions
107
+ + make packed_object_info() resilient to pack corruptions
108
+ + make unpack_object_header() non fatal
109
+ + better validation on delta base object offsets
110
+ + close another possibility for propagating pack corruption
111
+
112
+* mv/remote-rename (Mon Nov 10 21:43:03 2008 +0100) 4 commits
113
+ + git-remote: document the migration feature of the rename
114
+ subcommand
115
+ + git-remote rename: migrate from remotes/ and branches/
116
+ + remote: add a new 'origin' variable to the struct
117
+ + Implement git remote rename
118
+
119
+----------------------------------------------------------------
120
+[Will merge to "master" soon]
121
+
122
+* bc/maint-keep-pack (Thu Nov 13 14:11:46 2008 -0600) 1 commit
123
+ + repack: only unpack-unreachable if we are deleting redundant packs
124
+
125
+This makes "repack -A -d" without -d do the same thing as "repack -a -d",
126
+which makes sense. This does not have to go to 'maint', though.
127
+
128
+* jk/commit-v-strip (Wed Nov 12 03:23:37 2008 -0500) 4 commits
129
+ + status: show "-v" diff even for initial commit
130
+ + Merge branch 'jk/maint-commit-v-strip' into jk/commit-v-strip
131
+ + wt-status: refactor initial commit printing
132
+ + define empty tree sha1 as a macro
133
+
134
+----------------------------------------------------------------
135
+[Actively Cooking]
136
+
137
+* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
138
+ + grep: skip files outside sparse checkout area
139
+ + checkout_entry(): CE_NO_CHECKOUT on checked out entries.
140
+ + Prevent diff machinery from examining worktree outside sparse
141
+ checkout
142
+ + ls-files: Add tests for --sparse and friends
143
+ + update-index: add --checkout/--no-checkout to update
144
+ CE_NO_CHECKOUT bit
145
+ + update-index: refactor mark_valid() in preparation for new options
146
+ + ls-files: add options to support sparse checkout
147
+ + Introduce CE_NO_CHECKOUT bit
148
+ + Extend index to save more flags
149
+
150
+I think the basic idea and structure of this is sound. Let's see if
151
+people who try this feature can find holes in what it currently does.
152
+
153
+* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
154
+ - autoconf: Enable threaded delta search when pthreads are supported
155
+
156
+* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits
157
+ - git send-email: ask less questions when --compose is used.
158
+ - git send-email: add --annotate option
159
+ - git send-email: interpret unknown files as revision lists
160
+ - git send-email: make the message file name more specific.
161
+
162
+* nd/rename-cache (Sat Nov 8 18:27:33 2008 +0700) 2 commits
163
+ - diffcore-rename: add config option to allow to cache renames
164
+ - diffcore-rename: support rename cache
165
+
166
+I am moderately negative on this one in its current shape. We shouldn't
167
+have to be storing what can be recomputed (and recomputed differently in
168
+later software), and we shouldn't be keeping such cached result
169
+indefinitely.
170
+
171
+* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
172
+ + blame: show "previous" information in --porcelain/--incremental
173
+ format
174
+ + git-blame: refactor code to emit "porcelain format" output
175
+
176
+----------------------------------------------------------------
177
+[On Hold]
178
+
179
+* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
180
+ - "git push": tellme-more protocol extension
181
+
182
+This seems to have a deadlock during communication between the peers.
183
+Someone needs to pick up this topic and resolve the deadlock before it can
184
+continue.
185
+
186
+* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
187
+ - diff: enable "too large a rename" warning when -M/-C is explicitly
188
+ asked for
189
+
190
+This would be the right thing to do for command line use,
191
+but gitk will be hit due to tcl/tk's limitation, so I am holding
192
+this back for now.
whats/in/2008/11/03.txt
new
+164
@@ -0,0 +1,164 @@
1
+Subject: What's in git.git (Nov 2008, #03; Sat, 15)
2
+X-maint-at: 9e77353e0ea6e9e6d88ad1943570afb526d54a16
3
+X-master-at: ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd
4
+X-maint-was: c14639f7b14d3d856c7c1f6c097dd1cb9615a5d0
5
+X-master-was: 171d7661eda111d3e35f6e8097a1a3a07b30026c
6
+
7
+What's in git.git (Nov 2008, #03; Sat, 15)
8
+
9
+ maint 9e77353 (Documentation: git-svn: fix example for centralized SVN clone)
10
+ master ea4f2bd (Merge branch 'maint')
11
+------------------------------------------------------------------------
12
+
13
+Consider that the tip of 'master' is 1.6.1-rc0, although I haven't tagged
14
+it as such. There are a handful more topics cooking in 'next' and they
15
+are worthy of being in 1.6.1 final.
16
+
17
+
18
+* The 'maint' branch has these fixes since the last announcement.
19
+
20
+Brandon Casey (1):
21
+ revision.c: use proper data type in call to sizeof() within xrealloc
22
+
23
+Christian Couder (1):
24
+ Documentation: fix links to "everyday.html"
25
+
26
+Jan Krüger (1):
27
+ Documentation: git-svn: fix example for centralized SVN clone
28
+
29
+Linus Torvalds (1):
30
+ date/time: do not get confused by fractional seconds
31
+
32
+
33
+* The 'master' branch has these since the last announcement
34
+ in addition to the above.
35
+
36
+Alexander Gavrilov (14):
37
+ gitk: Allow forcing branch creation if it already exists
38
+ gitk: Fix file list context menu for merge commits
39
+ gitk: Allow starting gui blame for a specific line
40
+ gitk: Add Return and Escape bindings to dialogs
41
+ gitk: Make gitk dialog windows transient
42
+ gitk: Make cherry-pick call git-citool on conflicts
43
+ gitk: Implement a user-friendly Edit View dialog
44
+ git-gui: Fix focus transition in the blame viewer.
45
+ git-gui: Add the Show SSH Key item to the clone dialog.
46
+ git-gui: Request blame metadata in utf-8.
47
+ gitk: Add accelerators to frequently used menu commands
48
+ gitk: Fix transient windows on Win32 and MacOS
49
+ gitk: Fix commit encoding support
50
+ Documentation: New GUI configuration and command-line options.
51
+
52
+Brandon Casey (10):
53
+ t7700: demonstrate mishandling of objects in packs with a .keep file
54
+ packed_git: convert pack_local flag into a bitfield and add pack_keep
55
+ pack-objects: new option --honor-pack-keep
56
+ repack: don't repack local objects in packs with .keep file
57
+ repack: do not fall back to incremental repacking with [-a|-A]
58
+ builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
59
+ t7700: demonstrate mishandling of loose objects in an alternate ODB
60
+ sha1_file.c: split has_loose_object() into local and non-local
61
+ counterparts
62
+ pack-objects: extend --local to mean ignore non-local loose objects too
63
+ t7700: test that 'repack -a' packs alternate packed objects
64
+
65
+Brian Gernhardt (1):
66
+ Avoid using non-portable `echo -n` in tests.
67
+
68
+David M. Syzdek (4):
69
+ Build: add NO_UINTMAX_T to support ancient systems
70
+ Add Makefile check for FreeBSD 4.9-SECURITY
71
+ Make Pthread link flags configurable
72
+ Add autoconf tests for pthreads
73
+
74
+Davide Libenzi (1):
75
+ xdiff: give up scanning similar lines early
76
+
77
+Deskin Miller (2):
78
+ git-svn: proper detection of bare repositories
79
+ git-svn: proper detection of bare repositories
80
+
81
+Eric Wong (4):
82
+ git-svn: don't escape tilde ('~') for http(s) URLs
83
+ git-svn: respect i18n.commitencoding config
84
+ git-svn: don't escape tilde ('~') for http(s) URLs
85
+ git-svn: respect i18n.commitencoding config
86
+
87
+Giuseppe Bilotta (3):
88
+ gitweb: make the supported snapshot formats array global
89
+ gitweb: retrieve snapshot format from PATH_INFO
90
+ gitweb: embed snapshot format parameter in PATH_INFO
91
+
92
+Jakub Narebski (1):
93
+ gitweb: Better processing format string in custom links in navbar
94
+
95
+Jeff King (11):
96
+ diff: add missing static declaration
97
+ document the diff driver textconv feature
98
+ refactor userdiff textconv code
99
+ userdiff: require explicitly allowing textconv
100
+ only textconv regular files
101
+ wt-status: load diff ui config
102
+ add userdiff textconv tests
103
+ enable textconv for diff in verbose status/commit
104
+ t5516: refactor oddball tests
105
+ receive-pack: detect push to current branch of non-bare repo
106
+ commit: Fix stripping of patch in verbose mode.
107
+
108
+Junio C Hamano (3):
109
+ t5303: work around printf breakage in dash
110
+ t5303: fix printf format string for portability
111
+ Update draft release notes to 1.6.1
112
+
113
+Linus Torvalds (4):
114
+ Add a 'source' decorator for commits
115
+ revision: make tree comparison functions take commits rather than trees
116
+ Make '--decorate' set an explicit 'show_decorations' flag
117
+ revision traversal: '--simplify-by-decoration'
118
+
119
+Marten Svanfeldt (dev) (2):
120
+ Git.pm: Make _temp_cache use the repository directory
121
+ git-svn: Update git-svn to use the ability to place temporary files
122
+ within repository directory
123
+
124
+Martin Koegler (1):
125
+ git push: Interpret $GIT_DIR/branches in a Cogito compatible way
126
+
127
+Miklos Vajna (4):
128
+ Implement git remote rename
129
+ remote: add a new 'origin' variable to the struct
130
+ git-remote rename: migrate from remotes/ and branches/
131
+ git-remote: document the migration feature of the rename subcommand
132
+
133
+Nanako Shiraishi (2):
134
+ Document "git log --source"
135
+ Document "git log --simplify-by-decoration"
136
+
137
+Nicolas Pitre (9):
138
+ close another possibility for propagating pack corruption
139
+ better validation on delta base object offsets
140
+ make unpack_object_header() non fatal
141
+ make packed_object_info() resilient to pack corruptions
142
+ make check_object() resilient to pack corruptions
143
+ make find_pack_revindex() aware of the nasty world
144
+ pack-objects: allow "fixing" a corrupted pack without a full repack
145
+ extend test coverage for latest pack corruption resilience improvements
146
+ pack-objects: don't leak pack window reference when splitting packs
147
+
148
+Paul Mackerras (8):
149
+ gitk: Fix some off-by-one errors in computing which line to blame
150
+ gitk: Add a menu item to show where a given line comes from
151
+ gitk: Make the background color of marked lines configurable
152
+ gitk: Unify handling of merge diffs with normal 2-way diffs
153
+ gitk: Make "show origin of this line" work on fake commits
154
+ gitk: Cope with unmerged files in local changes
155
+ gitk: Improve cherry-pick error handling
156
+ gitk: Fix linehtag undefined error with file highlighting
157
+
158
+Samuel Tardieu (2):
159
+ tag: Check that options are only allowed in the appropriate mode
160
+ tag: Add more tests about mixing incompatible modes and options
161
+
162
+Santi Béjar (1):
163
+ rev-list documentation: clarify the two parts of history simplification
164
+