Update whatsin and whatscooking
Junio C Hamano committed
Jul 26, 2008 at 00:43 UTC
8500e03bb74df02fe8a9e86aa9452294ace7b095
2 files changed
+173
-168
whatscooking.txt
+45
-136
@@ -1,4 +1,4 @@
1
-What's cooking in git.git (Jul 2008, issue #09; Sun, 20)
1
+What's cooking in git.git (Jul 2008, issue #10; Sat, 26)
2
--------------------------------------------------------
3
4
Here are the topics that have been cooking. Commits prefixed
@@ -17,15 +17,31 @@ to do without regression.
17
18
Tentative schedule, my wishful thinking:
19
20
- - 1.6.0-rc0 (Jul 20)
21
- - 1.6.0-rc1 (Jul 23)
22
- - 1.6.0-rc2 (Jul 30)
23
- - 1.6.0-rc3 (Aug 6)
24
- - 1.6.0 (Aug 10)
20
+ - 1.6.0-rc1 (Jul 27)
21
+ - 1.6.0-rc2 (Aug 6)
22
+ - 1.6.0-rc3 (Aug 10)
23
24
----------------------------------------------------------------
25
[New Topics]
26
27
+* cc/bisect (Tue Jul 22 08:16:18 2008 +0200) 2 commits
28
+ . bisect: only check merge bases when needed
29
+ . bisect: test merge base if good rev is not an ancestor of bad rev
30
+
31
+* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
32
+ + builtin-add.c: optimize -A option and "git add ."
33
+ + builtin-add.c: restructure the code for maintainability
34
+
35
+* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits
36
+ + spawn pager via run_command interface
37
+ + run-command: add pre-exec callback
38
+
39
+* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit
40
+ + Enable threaded delta search on *BSD and Linux.
41
+
42
+----------------------------------------------------------------
43
+[Cooking]
44
+
45
* pb/sane-mv (Mon Jul 21 02:25:56 2008 +0200) 2 commits
46
- git-mv: Keep moved index entries inact
47
- git-mv: Remove dead code branch
@@ -35,139 +51,19 @@ it while moving it to B, which was a longstanding nonsense. This attempts
51
to fix it. Pasky has other plans to build on a more solidified foundation
52
to enhance the command to work with submodules better on top of this.
53
38
-----------------------------------------------------------------
39
-[Graduated to "master"]
40
-
41
-* ns/am-abort (Wed Jul 16 19:39:10 2008 +0900) 1 commit
42
- + git am --abort
43
-
44
-This one is for Ted; builds on top of the recent "am and rebase leaves
45
-ORIG_HEAD just like reset, merge and pull does" rather nicely.
46
-
47
-* jc/rerere-auto-more (Wed Jul 16 20:25:18 2008 -0700) 1 commit
48
- + rerere.autoupdate: change the message when autoupdate is in effect
49
-
50
-This one is for Ingo.
51
-
52
-This changes the message rerere issues after reusing previous conflict
53
-resolution from "Resolved" to "Staged" when autoupdate option is in
54
-effect.
55
-
56
-It is envisioned that in practice, some auto resolutions are trickier and
57
-iffier than others, and we would want to add a feature to mark individual
58
-resolutions as "this is ok to autoupdate" or "do not autoupdate the result
59
-using this resolution even when rerere.autoupdate is in effect" in the
60
-future. When that happens, these messages will make the distinction
61
-clearer.
62
-
63
-* ap/trackinfo (Wed Jul 16 15:19:27 2008 -0400) 1 commit
64
- + Reword "your branch has diverged..." lines to reduce line length
65
-
66
-* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
67
- + Teach git-merge -X<option> again.
68
- + Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
69
- + builtin-merge.c: use parse_options_step() "incremental parsing"
70
- machinery
71
- + Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
72
-
73
-* jc/merge-theirs (Fri Jul 18 02:43:00 2008 -0700) 6 commits
74
- - Document that merge strategies can now take their own options
75
- + Make "subtree" part more orthogonal to the rest of merge-
76
- recursive.
77
- + Teach git-pull to pass -X<option> to git-merge
78
- + Teach git-merge to pass -X<option> to the backend strategy module
79
- + git-merge-recursive-{ours,theirs}
80
- + git-merge-file --ours, --theirs
81
-
82
-It appears nobody wants "theirs" nor "ours", so I'll soon apply a
83
-wholesale revert for these series to 'next', and then these will be
84
-dropped when we rewind 'next' after 1.6.0 final.
85
-
86
-Please make sure next time somebody asks "ours/theirs" merge on the list
87
-and #git s/he is quickly told that it was unanimously rejected so that
88
-people do not have to waste time rehashing the topic ever again.
89
-
90
-----------------------------------------------------------------
91
-[Stalled/Needs more work]
54
+I think this is of 'next' quality already.
55
56
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
94
- - Documentation: Improve documentation for git-imap-send(1)
95
- - imap-send.c: more style fixes
96
- - imap-send.c: style fixes
97
- - git-imap-send: Support SSL
98
- - git-imap-send: Allow the program to be run from subdirectories of
57
+ + Documentation: Improve documentation for git-imap-send(1)
58
+ + imap-send.c: more style fixes
59
+ + imap-send.c: style fixes
60
+ + git-imap-send: Support SSL
61
+ + git-imap-send: Allow the program to be run from subdirectories of
62
a git tree
63
101
-I said: "Some people seem to prefer having this feature available also
102
-with gnutls. If such a patch materializes soon, that would be good, but
103
-otherwise I'll merge this as-is to 'next'. Such an enhancement can be
104
-done in-tree on top of this series." Anybody?
105
-
106
-* gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit
107
- . cherry: cache patch-ids to avoid repeating work
108
-
109
-The discussion suggested that the value of having the cache itself is
110
-iffy, but I should pick up the updated one and look at it.
111
-
112
-* lw/gitweb (Fri Jul 11 03:11:48 2008 +0200) 3 commits
113
- . gitweb: use new Git::Repo API, and add optional caching
114
- . Add new Git::Repo API
115
- . gitweb: add test suite with Test::WWW::Mechanize::CGI
116
-
117
-* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
118
- . Migrate git-am to use git-sequencer
119
- . Add git-sequencer test suite (t3350)
120
- . Add git-sequencer prototype documentation
121
- . Add git-sequencer shell prototype
122
-
123
-I haven't looked at the updated series yet. I should, but nobody else
124
-seems to be looking at these patches, which is somewhat depressing but
125
-understandable. Summer is slower ;-)
126
-
127
-* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
128
- - [BROKEN wrt shallow clones] Ignore graft during object transfer
129
-
130
-Cloning or fetching from a repository from grafts did not send objects
131
-that are hidden by grafts, but the commits in the resulting repository do
132
-need these to pass fsck. This fixes object transfer to ignore grafts.
133
-
134
-Another fix is needed to git-prune so that it ignores grafts but treats
135
-commits that are mentioned in grafts as reachable.
136
-
137
-* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
138
- - blame: show "previous" information in --porcelain/--incremental
139
- format
140
- - git-blame: refactor code to emit "porcelain format" output
141
-
142
-This is for peeling the line from the blamed version to see what's behind
143
-it, which may or may not help applications like gitweb.
144
-
145
-----------------------------------------------------------------
146
-[Dropped]
147
-
148
-* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
149
- + Teach git-merge -X<option> again.
150
- + Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
151
- + builtin-merge.c: use parse_options_step() "incremental parsing"
152
- machinery
153
- + Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
154
-
155
-* jc/merge-theirs (Fri Jul 18 02:43:00 2008 -0700) 6 commits
156
- - Document that merge strategies can now take their own options
157
- + Make "subtree" part more orthogonal to the rest of merge-
158
- recursive.
159
- + Teach git-pull to pass -X<option> to git-merge
160
- + Teach git-merge to pass -X<option> to the backend strategy module
161
- + git-merge-recursive-{ours,theirs}
162
- + git-merge-file --ours, --theirs
163
-
164
-It appears nobody wants "theirs" nor "ours", so I'll soon apply a
165
-wholesale revert for these series to 'next', and then these will be
166
-dropped when we rewind 'next' after 1.6.0 final.
167
-
168
-Please make sure next time somebody asks "ours/theirs" merge on the list
169
-and #git s/he is quickly told that it was unanimously rejected so that
170
-people do not have to waste time rehashing the topic ever again.
64
+Some people seem to prefer having this feature available also with gnutls.
65
+Such an enhancement can be done in-tree on top of this series if they are
66
+so inclined.
67
68
----------------------------------------------------------------
69
[On Hold]
@@ -190,9 +86,22 @@ This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
86
timeframe.
87
88
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
193
- - diff: enable "too large a rename" warning when -M/-C is explicitly
89
+ . diff: enable "too large a rename" warning when -M/-C is explicitly
90
asked for
91
92
This would be the right thing to do for command line use, but gitk will be
93
hit due to tcl/tk's limitation, so I am holding this back for now.
94
95
+----------------------------------------------------------------
96
+[Dropped]
97
+
98
+There are a handful topics that used to be in 'pu' but tentatively dropped
99
+for now.
100
+
101
+*^ cc/bisect (Tue Jul 22 08:16:18 2008 +0200) 2 commits
102
+*^ gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit
103
+*^ jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
104
+*^ sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
105
+
106
+I still hold onto their tips and intend to update them with newer versions
107
+and/or merge them back to 'pu' when I have time, but not right now.
whatsin.txt
+128
-32
@@ -1,51 +1,147 @@
1
-What's in git.git (Jul 2008, issue #07; Sun, 20)
1
+What's in git.git (Jul 2008, issue #08; Sat, 26)
2
3
- maint 2d9c572 (fix usage string for git grep, 2008-07-20)
4
- master 93310a4 (Merge branch 'ap/trackinfo', 2008-07-20)
3
+ maint bfce508 (Makefile: fix shell quoting, 2008-07-25)
4
+ master b0320ea (git-reset: Let -q hush "locally modified" messages, 2008-07-25)
5
------------------------------------------------------------------------
6
7
-As announced in a separate message, the tip of master was tagged as
8
-1.6.0-rc0; for people who neglected futureproofing themselves so far, it
9
-would really be a good time to seriously consider doing so.
7
+There are quite a bunch of changes to 'master' but they are mostly fix-ups
8
+to the new codepaths introduced recently; iow, exactly the kind of patches
9
+we would want to see before and during the -rc period.
10
11
* The 'maint' branch has these fixes since the last announcement.
12
13
-Jonathan Nieder (1):
14
- fix usage string for git grep
13
+Björn Steinbrink (1):
14
+ index-pack.c: correctly initialize appended objects
15
16
-Junio C Hamano (1):
17
- refresh-index: fix bitmask assignment
16
+Junio C Hamano (2):
17
+ tests: propagate $(TAR) down from the toplevel Makefile
18
+ Makefile: fix shell quoting
19
+
20
+Peter Valdemar Mørch (1):
21
+ send-email: find body-encoding correctly
22
+
23
+Pierre Habouzit (1):
24
+ git-checkout: fix command line parsing.
25
26
27
* The 'master' branch has these since the last announcement
28
in addition to the above.
29
23
-Avery Pennarun (1):
24
- Reword "your branch has diverged..." lines to reduce line length
30
+Alex Riesen (1):
31
+ Allow pager of diff command be enabled/disabled
32
+
33
+Brad King (1):
34
+ git-svn: teach dcommit about svn auto-props
35
+
36
+Brandon Casey (7):
37
+ t/: Replace diff [-u|-U0] with test_cmp to allow compilation with old
38
+ diff
39
+ t4116-apply-reverse.sh: use $TAR rather than tar
40
+ t3200,t7201: replace '!' with test_must_fail
41
+ t7502-commit.sh: rearrange test to make more portable
42
+ t/t4202-log.sh: add newline at end of file
43
+ Teach fsck and prune about the new location of temporary objects
44
+ perl/Makefile: update NO_PERL_MAKEMAKER section
45
+
46
+Daniel Barkalow (1):
47
+ In perforce, RCS keywords are case-sensitive
48
+
49
+Johannes Schindelin (8):
50
+ Rename .git/rebase to .git/rebase-apply
51
+ Rename path_list to string_list
52
+ Fix two leftovers from path_list->string_list
53
+ Ignore dirty submodule states in "git pull --rebase"
54
+ Add test to show that show-branch misses out the 8th column
55
+ sort_in_topological_order(): avoid setting a commit flag
56
+ builtin-commit: Two trivial style-cleanups
57
+ git daemon: avoid waking up too often
58
+
59
+Johannes Sixt (10):
60
+ rebase -i: When an 'edit' stops, mention the commit
61
+ Makefile: Do not install a copy of 'git' in $(gitexecdir)
62
+ Makefile: Normalize $(bindir) and $(gitexecdir) before comparing
63
+ Record the command invocation path early
64
+ Fix relative built-in paths to be relative to the command invocation
65
+ Allow the built-in exec path to be relative to the command invocation
66
+ path
67
+ Allow add_path() to add non-existent directories to the path
68
+ Windows: Make $(gitexecdir) relative
69
+ Windows: Make sure argv[0] has a path
70
+ Windows: Do not compile git-shell
71
+
72
+Jonathan Nieder (2):
73
+ git-diff(1): "--c" -> "--cc" typo fix
74
+ document that git-tag can tag more than heads
75
+
76
+Junio C Hamano (9):
77
+ Update my e-mail address
78
+ Revert "make git-status use a pager"
79
+ tests: do not rely on external "patch"
80
+ stash save: fix parameter handling
81
+ builtin-branch.c: remove unused code in append_ref() callback function
82
+ builtin-branch.c: optimize --merged and --no-merged
83
+ Documentation: clarify diff --cc
84
+ ignore non-existent refs in dwim_log()
85
+ Documentation: clarify how to disable elements in core.whitespace
86
+
87
+Lee Marlow (1):
88
+ bash completion: Add long options for 'git rm'
89
+
90
+Miklos Vajna (2):
91
+ builtin-merge: give a proper error message for invalid strategies in
92
+ config
93
+ t7601: extend the 'merge picks up the best result' test
94
+
95
+Nikolaj Schumacher (1):
96
+ Don't cut off last character of commit descriptions.
97
+
98
+Olivier Marin (4):
99
+ git-am: remove dash from help message
100
+ parse-options: fix segmentation fault when a required value is missing
101
+ git am --skip: clean the index while preserving local changes
102
+ update test case to protect am --skip behaviour
103
+
104
+P. Christeas (1):
105
+ svnimport: newer libsvn wants us to ask for the root with "", not "/"
106
+
107
+Petr Baudis (2):
108
+ git-filter-branch.sh: Allow running in bare repositories
109
+ Documentation/git-filter-branch: teach "rm" instead of "update-index
110
+ --remove"
111
+
112
+Philippe Bruhat (1):
113
+ mailinfo: better parse email adresses containg parentheses
114
26
-Dmitry Potapov (1):
27
- git-svn: fix git svn info to work without arguments
115
+Pierre Habouzit (3):
116
+ builtin-merge: add missing structure initialization
117
+ git-submodule: move ill placed shift.
118
+ git-checkout: improve error messages, detect ambiguities.
119
29
-Junio C Hamano (8):
30
- rerere.autoupdate: change the message when autoupdate is in effect
31
- builtin-add.c: restructure the code for maintainability
32
- git-add --all: add all files
33
- git-add --all: tests
34
- git-add --all: documentation
35
- Link shell with compat layer functions
36
- Move read_in_full() and write_in_full() to wrapper.c
37
- "needs update" considered harmful
120
+René Scharfe (5):
121
+ archive: add write_archive()
122
+ archive: move parameter parsing code to archive.c
123
+ archive: define MAX_ARGS where it's needed
124
+ archive: declare struct archiver where it's needed
125
+ archive: allow --exec and --remote without equal sign
126
39
-Lars Noschinski (1):
40
- cvsserver: Add testsuite for packed refs
127
+SZEDER Gábor (2):
128
+ checkout: mention '--' in the docs
129
+ bash: offer only paths after '--' for 'git checkout'
130
42
-Michele Ballabio (2):
43
- builtin-merge.c: Fix option parsing
44
- builtin-push.c: Cleanup - use OPT_BIT() and remove some variables
131
+Stephan Beyer (7):
132
+ git-am: Add colon before the subject that is printed out as being applied
133
+ am --abort: Add to bash-completion and mention in git-rerere
134
+ documentation
135
+ Make non-static functions, that may be static, static
136
+ Move launch_editor() from builtin-tag.c to editor.c
137
+ editor.c: Libify launch_editor()
138
+ git-am: Mention --abort in usage string part of OPTIONS_SPEC
139
+ git-reset: Let -q hush "locally modified" messages
140
46
-Miklos Vajna (1):
47
- Teach 'git merge' that some merge strategies no longer exist
141
+Steve Haslam (2):
142
+ Propagate -u/--upload-pack option of "git clone" to transport.
143
+ Remove references to git-fetch-pack from "git clone" documentation.
144
49
-Nanako Shiraishi (1):
50
- git am --abort
145
+Thomas Rast (1):
146
+ git-completion.bash: provide completion for 'show-branch'
147