What's in/cooking update
Junio C Hamano committed
Aug 27, 2008 at 20:02 UTC
159dba1d8ec0bd484b5ff8173415576601222168
2 files changed
+326
whats/cooking/2008/08/08.txt
new
+219
@@ -0,0 +1,219 @@
1
+Subject: What's cooking in git.git (Aug 2008, #08; Wed, 27)
2
+X-master-at: a1184d85e8752658f02746982822f43f32316803
3
+X-next-at: 9f25cb4fbeed4ff00c19fe462492a5ee6dfb82b3
4
+
5
+What's cooking in git.git (Aug 2008, #08; Wed, 27)
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
+* dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits
19
+ - Teach git.el to mark/unmark files by regexp
20
+ - git.el: Diff only file at point by default
21
+
22
+With my limited elisp expertise I did not see anything obviously wrong
23
+with these two patches from David Kågedal and David Christensen.
24
+
25
+* tl/p4 (Thu Aug 28 00:36:12 2008 +0200) 1 commit
26
+ - git-p4: Fix checkout bug when using --import-local.
27
+
28
+A fix forked from 'maint' waiting for an Ack.
29
+
30
+----------------------------------------------------------------
31
+[Stalled -- Needs Action to Proceed (or to be dropped)]
32
+
33
+* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
34
+ . Use xdiff caching to improve git blame performance
35
+ . Allow xdiff machinery to cache hash results for a file
36
+ . Always initialize xpparam_t to 0
37
+ . Bypass textual patch generation and parsing in git blame
38
+ . Allow alternate "low-level" emit function from xdl_diff
39
+
40
+Réne had good comments on how the callback should be structured.
41
+
42
+* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
43
+ - discard_cache: reset lazy name_hash bit
44
+
45
+I spotted this by accident while working on something unrelated.
46
+
47
+When a program calls discard_cache() to read the index again, we do not
48
+properly re-initialize the name_hash structure that is used by the case
49
+insensitivitly logic. This _might_ improve issues people may be having on
50
+case insensitive filesystems. I dunno.
51
+
52
+* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
53
+ - configure: auto detect dynamic library path switches
54
+ - Makefile: Allow CC_LD_DYNPATH to be overriden
55
+
56
+Needs success reports from people who do use user-defined dynamic library
57
+path when they build their "git" before this series can go anywhere.
58
+
59
+* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
60
+ - date/time: do not get confused by fractional seconds
61
+
62
+Linus hints further enhancements as "the right way", so let's see if
63
+somebody else steps up and tries it before merging this to 'next'.
64
+
65
+----------------------------------------------------------------
66
+[Actively Cooking]
67
+
68
+* sb/daemon (Sun Aug 24 13:27:10 2008 -0700) 5 commits
69
+ + daemon.c: minor style fixup
70
+ + git-daemon: rewrite kindergarden, new option --max-connections
71
+ + git-daemon: Simplify dead-children reaping logic
72
+ + git-daemon: use LOG_PID, simplify logging code
73
+ + git-daemon: call logerror() instead of error()
74
+
75
+I re-reviewed the changes and they look quite sane. Hopefully be moved to
76
+'master' soonish.
77
+
78
+* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 3 commits
79
+ - git-add --intent-to-add (-N)
80
+ - cached_object: learn empty blob
81
+ - sha1_object_info(): pay attention to cached objects
82
+
83
+Teaches "git add" to record only the intent to add a path later.
84
+I think this is better done without the hardcoded empty blob object.
85
+
86
+* cc/bisect (Fri Aug 22 05:52:29 2008 +0200) 2 commits
87
+ + bisect: only check merge bases when needed
88
+ + bisect: test merge base if good rev is not an ancestor of bad rev
89
+
90
+* mv/merge-recursive (Mon Aug 25 16:25:57 2008 +0200) 3 commits
91
+ - merge-recursive: introduce merge_options
92
+ - merge-recursive.c: Add more generic merge_recursive_generic()
93
+ - Split out merge_recursive() to merge-recursive.c
94
+
95
+Miklos's update; will move to 'next' shortly after reading it again.
96
+
97
+* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
98
+ - diff: vary default prefix depending on what are compared
99
+
100
+As some people may have noticed, I've been running with this one when
101
+sending out "How about this" patches to the discussion threads.
102
+
103
+* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
104
+ + pack-objects: Allow missing base objects when creating thin packs
105
+
106
+* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 7 commits
107
+ + filter-branch: use --simplify-merges
108
+ + filter-branch: fix ref rewriting with --subdirectory-filter
109
+ + filter-branch: Extend test to show rewriting bug
110
+
111
+Fixes a longstanding filter branch bug. Success stories?
112
+Later parts depends on the earlier part of "--simplify-merges"
113
+
114
+* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 8 commits
115
+ - revision --simplify-merges: incremental simplification
116
+ - revision --simplify-merges: prepare for incremental simplification
117
+ - revision --simplify-merges: make it a no-op without pathspec
118
+ + revision --simplify-merges: do not leave commits unprocessed
119
+ + revision --simplify-merges: use decoration instead of commit->util
120
+ field
121
+ + Topo-sort before --simplify-merges
122
+ + revision traversal: show full history with merge simplification
123
+ + revision.c: whitespace fix
124
+
125
+"log --full-history" is with too much clutter, "log" itself is too cleverer
126
+than some people, and here is the middle level of merge simplification.
127
+
128
+I started making this incremental but the progress is not so great.
129
+
130
+* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 5 commits
131
+ + Documentation: rev-list-options: move --simplify-merges
132
+ documentation
133
+
134
+----------------------------------------------------------------
135
+[On Hold]
136
+
137
+* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
138
+ - git-am --forge: add Signed-off-by: line for the author
139
+ - git-am: clean-up Signed-off-by: lines
140
+ - stripspace: add --log-clean option to clean up signed-off-by:
141
+ lines
142
+ - stripspace: use parse_options()
143
+ - Add "git am -s" test
144
+ - git-am: refactor code to add signed-off-by line for the committer
145
+
146
+* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
147
+ - "git push": tellme-more protocol extension
148
+
149
+* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
150
+ - WIP: start teaching the --whitespace=fix to merge machinery
151
+
152
+* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
153
+ - blame: show "previous" information in --porcelain/--incremental
154
+ format
155
+ - git-blame: refactor code to emit "porcelain format" output
156
+
157
+* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
158
+ + merge: remove deprecated summary and diffstat options and config
159
+ variables
160
+
161
+This was previously in "will be in master soon" category, but it turns out
162
+that the synonyms to the ones this one deletes are fairly new invention
163
+that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
164
+in 1.7.0, but with the loud whining about moving git-foo out of $PATH we
165
+have been hearing, it might not be a bad idea to drop this.
166
+
167
+* jc/dashless (Wed Jun 25 15:55:11 2008 -0700) 1 commit
168
+ . Make clients ask for "git program" over ssh and local transport
169
+
170
+And this is now dropped.
171
+
172
+* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
173
+ - diff: enable "too large a rename" warning when -M/-C is explicitly
174
+ asked for
175
+
176
+This would be the right thing to do for command line use, but gitk will be
177
+hit due to tcl/tk's limitation, so I am holding this back for now.
178
+
179
+----------------------------------------------------------------
180
+[Graduated to "master"]
181
+
182
+* mv/maint-merge-fix (Sat Aug 23 12:56:57 2008 -0700) 1 commit
183
+ + merge: fix numerus bugs around "trivial merge" area
184
+
185
+* ml/submodule (Thu Aug 21 19:54:01 2008 -0400) 2 commits
186
+ + git-submodule.sh - Remove trailing / from URL if found
187
+ + git-submodule.sh - Remove trailing / from URL if found
188
+
189
+Soon to be in 'master', I guess.
190
+
191
+* np/verify-pack (Fri Aug 22 15:45:53 2008 -0400) 1 commit
192
+ + discard revindex data when pack list changes
193
+
194
+* jc/no-slim-shell (Tue Aug 19 18:05:43 2008 -0700) 2 commits
195
+ + Build-in "git-shell"
196
+ + shell: do not play duplicated definition games to shrink the
197
+ executable
198
+
199
+* mv/merge-custom (Sat Aug 23 19:23:22 2008 -0700) 9 commits
200
+ + t7606: fix custom merge test
201
+ + Fix "git-merge -s bogo" help text
202
+ + Update .gitignore to ignore git-help
203
+ + Builtin git-help.
204
+ + builtin-help: always load_command_list() in cmd_help()
205
+ + Add a second testcase for handling invalid strategies in git-merge
206
+ + Add a new test for using a custom merge strategy
207
+ + builtin-merge: allow using a custom strategy
208
+ + builtin-help: make some internal functions available to other
209
+ builtins
210
+
211
+The one at the tip fixes a test that assumed git-merge has a broken
212
+"trivial merge" implementation.
213
+
214
+* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
215
+ + builtin-add.c: optimize -A option and "git add ."
216
+ + builtin-add.c: restructure the code for maintainability
217
+
218
+* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
219
+ + Make cherry-pick use rerere for conflict resolution.
whats/in/2008/08/07.txt
new
+107
@@ -0,0 +1,107 @@
1
+Subject: What's in git.git (Aug 2008, #07; Wed, 27)
2
+X-maint-at: c67b1fa349cc7b4341b32b9ef1c58a3821ce0830
3
+X-master-at: a1184d85e8752658f02746982822f43f32316803
4
+X-maint-was: 913e0e99b6a6e63af6a062622a1f94bd78fd8052
5
+X-master-was: d6096f17d2d5d9ccb453aabf8edc6ee238b166fc
6
+
7
+What's in git.git (Aug 2008, #07; Wed, 27)
8
+
9
+ maint c67b1fa (ctype.c: protect tiny C preprocessor constants)
10
+ master a1184d8 (Merge branch 'mv/merge-custom')
11
+------------------------------------------------------------------------
12
+
13
+Handful fixes went to 1.6.0.1 and then a few more are on 'maint'.
14
+
15
+On the 'master' front, among other things:
16
+
17
+ - "git cherry-pick" can reuse earlier conflict resolution.
18
+
19
+ - "git merge" can use a custom strategy (if you write one).
20
+
21
+ - "git-shell" was broken and then fixed.
22
+
23
+ - "git submodule sync" is a new subcommand.
24
+
25
+* The 'maint' branch has these fixes since the last announcement.
26
+
27
+Alexander Gavrilov (1):
28
+ Respect core.autocrlf in combined diff
29
+
30
+Jeff King (1):
31
+ Fix "git log -i --grep"
32
+
33
+Jonathan Nieder (2):
34
+ Documentation: clarify pager.<cmd> configuration
35
+ Documentation: clarify pager configuration
36
+
37
+Junio C Hamano (3):
38
+ merge: fix numerous bugs around "trivial merge" area
39
+ GIT 1.6.0.1
40
+ ctype.c: protect tiny C preprocessor constants
41
+
42
+Linus Torvalds (1):
43
+ index-pack: be careful after fixing up the header/footer
44
+
45
+Miklos Vajna (1):
46
+ Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX
47
+
48
+Nguyễn Thái Ngọc Duy (1):
49
+ index-pack: setup git repository
50
+
51
+Ramsay Allan Jones (2):
52
+ Fix a warning (on cygwin) to allow -Werror
53
+ Suppress some bash redirection error messages
54
+
55
+Simon Hausmann (1):
56
+ Clean up the git-p4 documentation
57
+
58
+
59
+* The 'master' branch has these since the last announcement
60
+ in addition to the above.
61
+
62
+Abhijit Menon-Sen (1):
63
+ Make cherry-pick use rerere for conflict resolution.
64
+
65
+Andreas Färber (1):
66
+ Makefile: always provide a fallback when hardlinks fail
67
+
68
+David Aguilar (1):
69
+ git-submodule: add "sync" command
70
+
71
+Gustaf Hendeby (1):
72
+ Update .gitignore to ignore git-help
73
+
74
+Jeff King (1):
75
+ format-patch: use default diff format even with patch options
76
+
77
+Junio C Hamano (7):
78
+ builtin-add.c: restructure the code for maintainability
79
+ builtin-add.c: optimize -A option and "git add ."
80
+ shell: do not play duplicated definition games to shrink the executable
81
+ Build-in "git-shell"
82
+ Fix "git-merge -s bogo" help text
83
+ t7606: fix custom merge test
84
+ Revert "Build-in "git-shell""
85
+
86
+Mark Levedahl (3):
87
+ git-submodule.sh - Remove trailing / from URL if found
88
+ git-submodule.sh - Remove trailing / from URL if found
89
+ git-submodule - Use "get_default_remote" from git-parse-remote
90
+
91
+Miklos Vajna (6):
92
+ builtin-help: make some internal functions available to other builtins
93
+ builtin-merge: allow using a custom strategy
94
+ Add a new test for using a custom merge strategy
95
+ Add a second testcase for handling invalid strategies in git-merge
96
+ builtin-help: always load_command_list() in cmd_help()
97
+ Builtin git-help.
98
+
99
+Nicolas Pitre (1):
100
+ discard revindex data when pack list changes
101
+
102
+Simon Hausmann (1):
103
+ Make it possible to abort the submission of a change to Perforce
104
+
105
+Tommi Virtanen (1):
106
+ Install git-shell in bindir, too
107
+