Skip to content

Commit 9c36507

Browse files
gitstergitster
committed
What's in/cooking updates
1 parent 742d367 commit 9c36507

File tree

2 files changed

+321
-0
lines changed

2 files changed

+321
-0
lines changed

‎whats/cooking/2008/11/06.txt‎

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
1+
Subject: What's cooking in git.git (Nov 2008, #06; Wed, 26)
2+
X-master-at: aa14a0c3f191ee4df7344eed119be5b4a527a0ff
3+
X-next-at: 406979f7fe53d139cdb79bf8c5eecf8735f4f146
4+
5+
What's cooking in git.git (Nov 2008, #06; Wed, 26)
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+
* cr/remote-update-v (Tue Nov 18 19:04:02 2008 +0800) 1 commit
19+
+ git-remote: add verbose mode to git remote update
20+
21+
Should be in 1.6.1-rc1.
22+
23+
* rs/strbuf-expand (Sun Nov 23 00:16:59 2008 +0100) 6 commits
24+
+ remove the unused files interpolate.c and interpolate.h
25+
+ daemon: deglobalize variable 'directory'
26+
+ daemon: inline fill_in_extra_table_entries()
27+
+ daemon: use strbuf_expand() instead of interpolate()
28+
+ merge-recursive: use strbuf_expand() instead of interpolate()
29+
+ add strbuf_expand_dict_cb(), a helper for simple cases
30+
31+
Should be in 1.6.1-rc1.
32+
33+
* mv/fast-export (Sun Nov 23 12:55:54 2008 +0100) 2 commits
34+
+ fast-export: use an unsorted string list for extra_refs
35+
+ Add new testcase to show fast-export does not always exports all
36+
tags
37+
38+
Should be in 1.6.1-rc1 and backmerged to 'maint'.
39+
40+
* st/levenshtein (Thu Nov 20 14:27:27 2008 +0100) 2 commits
41+
+ Document levenshtein.c
42+
+ Fix deletion of last character in levenshtein distance
43+
44+
Should be in 1.6.1-rc1.
45+
46+
* js/mingw-rename-fix (Wed Nov 19 17:25:27 2008 +0100) 1 commit
47+
+ compat/mingw.c: Teach mingw_rename() to replace read-only files
48+
49+
Should be in 1.6.1-rc1 and backmerged to 'maint'.
50+
51+
* mv/clone-strbuf (Fri Nov 21 01:45:01 2008 +0100) 3 commits
52+
+ builtin_clone: use strbuf in cmd_clone()
53+
+ builtin-clone: use strbuf in clone_local() and
54+
copy_or_link_directory()
55+
+ builtin-clone: use strbuf in guess_dir_name()
56+
57+
Should be in 1.6.1-rc1.
58+
59+
* pw/maint-p4 (Wed Nov 26 13:52:15 2008 -0500) 1 commit
60+
- git-p4: fix keyword-expansion regex
61+
62+
Waiting for Ack from git-p4 folks.
63+
64+
* cc/bisect-skip (Sun Nov 23 22:02:49 2008 +0100) 1 commit
65+
- bisect: teach "skip" to accept special arguments like "A..B"
66+
67+
Should be in 1.6.1-rc1.
68+
69+
* cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits
70+
- bisect: add "--no-replace" option to bisect without using replace
71+
refs
72+
- rev-list: make it possible to disable replacing using "--no-
73+
bisect-replace"
74+
- bisect: use "--bisect-replace" options when checking merge bases
75+
- merge-base: add "--bisect-replace" option to use fixed up revs
76+
- commit: add "bisect_replace_all" prototype to "commit.h"
77+
- rev-list: add "--bisect-replace" to list revisions with fixed up
78+
history
79+
- Documentation: add "git bisect replace" documentation
80+
- bisect: add test cases for "git bisect replace"
81+
- bisect: add "git bisect replace" subcommand
82+
83+
I really hate the idea of introducing a potentially much more useful
84+
replacement of the existing graft mechanism and tie it very tightly to
85+
bisect, making it unusable from outside.
86+
87+
(1) I do not think "bisect replace" workflow is a practical and usable
88+
one;
89+
90+
(2) The underlying mechanism to express "this object replaces that other
91+
object" is much easier to work with than what the graft does which is
92+
"the parents of this commit are these", and idea to use the normal
93+
ref to point at them means this can potentially be used for
94+
transferring the graft information across repositories, which the
95+
current graft mechanism cannot do.
96+
97+
(3) Because I like the aspect (2) of this series so much, it deeply
98+
disappoints and troubles me that this is implemented minimally near
99+
the surface, and that it is controlled by the "bisect" Porcelain
100+
alone, by explicitly passing command line arguments.
101+
102+
I think a mechanism like this should be added to replace grafts, but it
103+
should always be enabled for normal revision traversal operation, while
104+
always disabled for object enumeration and transfer operation (iow, fsck,
105+
fetch and push should use the real ancestry information recorded in the
106+
underlying objects, while rev-list, log, etc. should always use the
107+
replaced objects). I have a suspicion that even cat-file could honor it.
108+
109+
----------------------------------------------------------------
110+
[Graduated to "master"]
111+
112+
* bc/maint-keep-pack (Thu Nov 13 14:11:46 2008 -0600) 1 commit
113+
+ repack: only unpack-unreachable if we are deleting redundant packs
114+
115+
This makes "repack -A -d" without -d do the same thing as "repack -a -d",
116+
which makes sense. This does not have to go to 'maint', though.
117+
118+
* jk/commit-v-strip (Wed Nov 12 03:23:37 2008 -0500) 4 commits
119+
+ status: show "-v" diff even for initial commit
120+
+ Merge branch 'jk/maint-commit-v-strip' into jk/commit-v-strip
121+
+ wt-status: refactor initial commit printing
122+
+ define empty tree sha1 as a macro
123+
124+
----------------------------------------------------------------
125+
[Will merge to "master" soon]
126+
127+
* lt/preload-lstat (Mon Nov 17 09:01:20 2008 -0800) 2 commits
128+
+ Fix index preloading for racy dirty case
129+
+ Add cache preload facility
130+
131+
* ta/quiet-pull (Mon Nov 17 23:09:30 2008 +0100) 2 commits
132+
+ Retain multiple -q/-v occurrences in git pull
133+
+ Teach/Fix pull/fetch -q/-v options
134+
135+
* nd/narrow (Tue Nov 18 06:33:16 2008 -0500) 10 commits
136+
+ t2104: touch portability fix
137+
+ grep: skip files outside sparse checkout area
138+
+ checkout_entry(): CE_NO_CHECKOUT on checked out entries.
139+
+ Prevent diff machinery from examining worktree outside sparse
140+
checkout
141+
+ ls-files: Add tests for --sparse and friends
142+
+ update-index: add --checkout/--no-checkout to update
143+
CE_NO_CHECKOUT bit
144+
+ update-index: refactor mark_valid() in preparation for new options
145+
+ ls-files: add options to support sparse checkout
146+
+ Introduce CE_NO_CHECKOUT bit
147+
+ Extend index to save more flags
148+
149+
* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits
150+
+ git send-email: ask less questions when --compose is used.
151+
+ git send-email: add --annotate option
152+
+ git send-email: interpret unknown files as revision lists
153+
+ git send-email: make the message file name more specific.
154+
155+
----------------------------------------------------------------
156+
[Actively Cooking]
157+
158+
* cb/mergetool (Thu Nov 13 12:41:15 2008 +0000) 3 commits
159+
- [DONTMERGE] Add -k/--keep-going option to mergetool
160+
- Add -y/--no-prompt option to mergetool
161+
- Fix some tab/space inconsistencies in git-mergetool.sh
162+
163+
Jeff had good comments on the last one; the discussion needs concluded,
164+
and also waiting for comments from the original author (Ted).
165+
166+
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
167+
- autoconf: Enable threaded delta search when pthreads are supported
168+
169+
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
170+
+ blame: show "previous" information in --porcelain/--incremental
171+
format
172+
+ git-blame: refactor code to emit "porcelain format" output
173+
174+
----------------------------------------------------------------
175+
[On Hold]
176+
177+
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
178+
- "git push": tellme-more protocol extension
179+
180+
This seems to have a deadlock during communication between the peers.
181+
Someone needs to pick up this topic and resolve the deadlock before it can
182+
continue.
183+
184+
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
185+
- diff: enable "too large a rename" warning when -M/-C is explicitly
186+
asked for
187+
188+
This would be the right thing to do for command line use,
189+
but gitk will be hit due to tcl/tk's limitation, so I am holding
190+
this back for now.
191+
192+
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
193+
- git-am --forge: add Signed-off-by: line for the author
194+
- git-am: clean-up Signed-off-by: lines
195+
- stripspace: add --log-clean option to clean up signed-off-by:
196+
lines
197+
- stripspace: use parse_options()
198+
- Add "git am -s" test
199+
- git-am: refactor code to add signed-off-by line for the committer
200+

‎whats/in/2008/11/04.txt‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
Subject: What's in git.git (Nov 2008, #04; Wed, 26)
2+
X-maint-at: 5aa3bdd50d4e4f59c41ee6e70ae1e738a3a28cc0
3+
X-master-at: aa14a0c3f191ee4df7344eed119be5b4a527a0ff
4+
X-maint-was: 9e77353e0ea6e9e6d88ad1943570afb526d54a16
5+
X-master-was: ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd
6+
7+
What's in git.git (Nov 2008, #04; Wed, 26)
8+
9+
maint 5aa3bdd (Merge branch 'mm/maint-sort-config-doc' into maint)
10+
master aa14a0c (Merge branch 'maint')
11+
------------------------------------------------------------------------
12+
13+
I suspect many people especially the ones in the US will be in vacation
14+
mode and not near their keyboards til next week, but here is an update.
15+
16+
There are a few 'maint' material cooking in 'next' and v1.6.0.5 should be
17+
tagged at the end of the month.
18+
19+
At around the same time I am hoping majority of topics cooking in 'next'
20+
tonight can be in 'master' and we can tagl v1.6.1-rc1.
21+
22+
* The 'maint' branch has these fixes since the last announcement.
23+
24+
Bryan Drewery (1):
25+
Fix misleading wording for git-cherry-pick
26+
27+
Junio C Hamano (3):
28+
builtin-ls-files.c: coding style fix.
29+
Teach ls-files --with-tree=<tree> to work with options other than -c
30+
Teach "git diff" to honour --[no-]ext-diff
31+
32+
Matt McCutchen (1):
33+
config.txt: alphabetize configuration sections
34+
35+
Stefan Naewe (1):
36+
request-pull: make usage string match manpage
37+
38+
39+
* The 'master' branch has these since the last announcement
40+
in addition to the above.
41+
42+
Alex Riesen (2):
43+
Fix handle leak in sha1_file/unpack_objects if there were damaged object
44+
data
45+
Fix t4030-diff-textconv.sh
46+
47+
Alexander Gavrilov (6):
48+
git-gui: Implement system-wide configuration handling.
49+
git-gui: Fix the after callback execution in rescan.
50+
git-gui: Add a Tools menu for arbitrary commands.
51+
git-gui: Allow Tools request arguments from the user.
52+
git-gui: Implement automatic rescan after Tool execution.
53+
git-gui: Fix the search bar destruction handler.
54+
55+
Alexandre Julliard (9):
56+
git.el: Improve error handling for commits.
57+
git.el: Remove the env parameter in git-call-process and
58+
git-call-process-string.
59+
git.el: Simplify handling of merge heads in the commit log-edit buffer.
60+
git.el: Properly handle merge commits in git-amend-commit.
61+
git.el: Fix git-amend-commit to support amending an initial commit.
62+
git.el: Never clear the status buffer, only update the files.
63+
git.el: Add an insert file command.
64+
git.el: Add possibility to mark files directly in
65+
git-update-status-files.
66+
git.el: Allow to commit even if there are no marked files.
67+
68+
Brandon Casey (1):
69+
repack: only unpack-unreachable if we are deleting redundant packs
70+
71+
Cheng Renquan (1):
72+
git-remote: match usage string with the manual pages
73+
74+
Christian Couder (2):
75+
Documentation: user-manual: add information about "git help" at the
76+
beginning
77+
Documentation: tutorial: add information about "git help" at the
78+
beginning
79+
80+
Giuseppe Bilotta (1):
81+
git-gui: try to provide a window icon under X
82+
83+
Jeff King (3):
84+
define empty tree sha1 as a macro
85+
wt-status: refactor initial commit printing
86+
status: show "-v" diff even for initial commit
87+
88+
Jim Meyering (1):
89+
xdiff-interface.c: remove 10 duplicated lines
90+
91+
Joey Hess (1):
92+
sha1_file: avoid bogus "file exists" error message
93+
94+
Junio C Hamano (1):
95+
builtin-remote.c: plug a small memory leak in
96+
get_one_remote_for_updates()
97+
98+
Linus Torvalds (1):
99+
Fix machine-parseability of 'git log --source'
100+
101+
Marcel Koeppen (1):
102+
t9129-git-svn-i18n-commitencoding: Make compare_svn_head_with()
103+
compatible with OSX sed
104+
105+
Mark Burton (2):
106+
Documentation: rev-list-options.txt: added --branches, --tags &
107+
--remotes.
108+
git-commit.txt - mention that files listed on the command line must be
109+
known to git.
110+
111+
Miklos Vajna (3):
112+
builtin-branch: use strbuf in delete_branches()
113+
builtin-branch: use strbuf in fill_tracking_info()
114+
builtin-branch: use strbuf in rename_branch()
115+
116+
Shawn O. Pearce (1):
117+
Update the po template
118+
119+
Trent Piepho (1):
120+
send-email: Fix Pine address book parsing
121+

0 commit comments

Comments
 (0)