Last WI/WC for Jul 2008
Junio C Hamano committed
Jul 31, 2008 at 16:50 UTC
84ccf7d2270cd52a6433700388ffde352767b8be
2 files changed
+145
-168
whatscooking.txt
+46
-41
@@ -1,5 +1,5 @@
1
-What's cooking in git.git (Jul 2008, issue #10; Sat, 26)
2
---------------------------------------------------------
1
+What's cooking in git.git (Jul 2008, #11; Thu, 31)
2
+--------------------------------------------------
3
4
Here are the topics that have been cooking. Commits prefixed
5
with '-' are only in 'pu' while commits prefixed with '+' are
@@ -17,41 +17,44 @@ to do without regression.
17
18
Tentative schedule, my wishful thinking:
19
20
- - 1.6.0-rc1 (Jul 27)
21
- - 1.6.0-rc2 (Aug 6)
20
+ - 1.6.0-rc2 (Aug 3)
21
- 1.6.0-rc3 (Aug 10)
22
23
----------------------------------------------------------------
24
[New Topics]
25
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
26
+* rs/archive-parse-options (Fri Jul 25 12:41:26 2008 +0200) 1 commit
27
+ + archive: allow --exec and --remote without equal sign
28
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
29
+None of the following is for 1.6.0.
30
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
31
+* mv/merge-custom (Thu Jul 31 00:38:07 2008 +0200) 5 commits
32
+ + builtin-help: always load_command_list() in cmd_help()
33
+ + Add a second testcase for handling invalid strategies in git-merge
34
+ + Add a new test for using a custom merge strategy
35
+ + builtin-merge: allow using a custom strategy
36
+ + builtin-help: make some internal functions available to other
37
+ builtins
38
39
-* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit
40
- + Enable threaded delta search on *BSD and Linux.
39
+* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits
40
+ - git-merge-octopus: use (merge-base A (merge B C D E...)) for
41
+ stepwise merge
42
+ + merge-base-many: add trivial tests based on the documentation
43
+ + documentation: merge-base: explain "git merge-base" with more than
44
+ 2 args
45
+ + merge-base: teach "git merge-base" to drive underlying
46
+ merge_bases_many()
47
42
-----------------------------------------------------------------
43
-[Cooking]
48
+* jc/simplify-merges (Thu Jul 31 01:17:41 2008 -0700) 1 commit
49
+ . revision traversal: show full history with merge simplification
50
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
51
+"log --full-history" is with too much clutter, "log" itself is too cleverer
52
+than some people, and here is the middle level of merge simplification.
53
49
-Running "git mv A B" when you have local changes to A automatically staged
50
-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.
54
+----------------------------------------------------------------
55
+[On Hold and/or Cooking]
56
54
-I think this is of 'next' quality already.
57
+None of the following is for 1.6.0.
58
59
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
60
+ Documentation: Improve documentation for git-imap-send(1)
@@ -65,8 +68,24 @@ Some people seem to prefer having this feature available also with gnutls.
68
Such an enhancement can be done in-tree on top of this series if they are
69
so inclined.
70
68
-----------------------------------------------------------------
69
-[On Hold]
71
+* cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits
72
+ - bisect: only check merge bases when needed
73
+ - bisect: test merge base if good rev is not an ancestor of bad rev
74
+
75
+* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
76
+ + builtin-add.c: optimize -A option and "git add ."
77
+ + builtin-add.c: restructure the code for maintainability
78
+
79
+* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits
80
+ + spawn pager via run_command interface
81
+ + run-command: add pre-exec callback
82
+
83
+This changes the parent-child relationship between the pager and the git
84
+process. We used to make pager the parent which meant that the exit
85
+status from git is lost from the caller.
86
+
87
+* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit
88
+ + Enable threaded delta search on *BSD and Linux.
89
90
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
91
+ merge: remove deprecated summary and diffstat options and config
@@ -91,17 +110,3 @@ timeframe.
110
111
This would be the right thing to do for command line use, but gitk will be
112
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
+99
-127
@@ -1,147 +1,119 @@
1
-What's in git.git (Jul 2008, issue #08; Sat, 26)
1
+What's in git.git (Jul 2008, #09; Thu, 31)
2
3
maint bfce508 (Makefile: fix shell quoting, 2008-07-25)
4
- master b0320ea (git-reset: Let -q hush "locally modified" messages, 2008-07-25)
4
+ master 0fe8c13 (Allow "non-option" revision options in parse_option-enabled commands, 2008-07-31)
5
------------------------------------------------------------------------
6
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.
7
+Some git-gui updates for 1.6.0 are included, and then many minor fixes.
8
+Perhaps -rc2 this weekend.
9
11
-* The 'maint' branch has these fixes since the last announcement.
10
+* The 'master' branch has these since the last announcement.
11
13
-Björn Steinbrink (1):
14
- index-pack.c: correctly initialize appended objects
15
-
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
12
+Abhijit Menon-Sen (5):
13
+ git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core
14
+ Clarify that "git log x.c y.h" lists commits that touch either file
15
+ `git submodule add` now requires a <path>
16
+ Make it clear that push can take multiple refspecs
17
+ Make the DESCRIPTION match <x>... items in the SYNOPSIS
18
23
-Pierre Habouzit (1):
24
- git-checkout: fix command line parsing.
19
+Alex Riesen (1):
20
+ Make use of stat.ctime configurable
21
22
+Alexander Gavrilov (7):
23
+ Fix pre-commit hooks under MinGW/MSYS
24
+ Add options to control the search for copies in blame.
25
+ Kill the blame back-end on window close.
26
+ Add a menu item to invoke full copy detection in blame.
27
+ git-gui: Fix the Remote menu separator.
28
+ git-gui: Preserve scroll position on reshow_diff.
29
+ Support copy and rename detection in fast-export.
30
27
-* The 'master' branch has these since the last announcement
28
- in addition to the above.
31
+Anders Melchiorsen (2):
32
+ Documentation: fix diff.external example
33
+ Advertise the ability to abort a commit
34
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
35
+Björn Steinbrink (1):
36
+ rev-parse: Add support for the ^! and ^@ syntax
37
+
38
+Brian Gernhardt (1):
39
+ Documentation: Remove mentions of git-svnimport.
40
+
41
+Cesar Eduardo Barros (2):
42
+ Documentation/git-submodule.txt: fix doubled word
43
+ Documentation/git-rev-parse.txt: update for new git-describe output
44
+ format
45
+
46
+Christian Couder (2):
47
+ merge-base: die with an error message if not passed a commit ref
48
+ documentation: user-manual: update "using-bisect" section
49
+
50
+Jakub Narebski (1):
51
+ gitweb: More about how gitweb gets 'owner' of repository
52
+
53
+Jeff King (2):
54
+ init: handle empty "template" parameter
55
+ Compact commit template message
56
+
57
+Johannes Schindelin (1):
58
+ Avoid chdir() in list_commands_in_dir()
59
+
60
+Johannes Sixt (2):
61
+ git-gui: Fix "Stage/Unstage Line" with one line of context.
62
+ git-gui: "Stage Line": Treat independent changes in adjacent lines better
63
+
64
+Jonathan Nieder (1):
65
+ t6030 (bisect): work around Mac OS X "ls"
66
+
67
+Junio C Hamano (11):
68
+ make sure parsed wildcard refspec ends with slash
69
+ GIT 1.6.0-rc1
70
+ Allow building without any git installed
71
+ Allow installing in the traditional way
72
+ ls-tree documentation: enhance notes on subdirectory and pathspec
73
+ behaviour
74
+ Documentation: clarify what is shown in "git-ls-files -s" output
75
+ t7001: fix "git mv" test
76
+ Teach gitlinks to ie_modified() and ce_modified_check_fs()
77
+ Fix merge name generation in "merge in C"
78
+ Fix test-parse-options "integer" test
79
+ Teach --find-copies-harder to "git blame"
80
+
81
+Kevin Ballard (1):
82
+ format-patch: Produce better output with --inline or --attach
83
+
84
+Lars Hjemli (3):
85
+ builtin-branch: remove duplicated code
86
+ builtin-branch: factor out merge_filter matching
87
+ builtin-branch: fix -v for --[no-]merged
88
89
Lee Marlow (1):
88
- bash completion: Add long options for 'git rm'
90
+ bash completion: Add completion for 'git help'
91
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
92
+Olivier Marin (1):
93
+ builtin-verify-tag: fix -v option parsing
94
95
-Nikolaj Schumacher (1):
96
- Don't cut off last character of commit descriptions.
95
+Petr Baudis (2):
96
+ git-mv: Remove dead code branch
97
+ git-mv: Keep moved index entries inact
98
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
99
+Pierre Habouzit (1):
100
+ Allow "non-option" revision options in parse_option-enabled commands
101
104
-P. Christeas (1):
105
- svnimport: newer libsvn wants us to ask for the root with "", not "/"
102
+Shawn O. Pearce (3):
103
+ git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk
104
+ fsck: Don't require tmp_obj_ file names are 14 bytes in length
105
+ git-gui: Fix gitk search in $PATH to work on Windows
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
-
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
-
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
-
127
-SZEDER Gábor (2):
128
- checkout: mention '--' in the docs
129
- bash: offer only paths after '--' for 'git checkout'
130
-
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
-
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.
107
+Steffen Prohaska (5):
108
+ Refactor, adding prepare_git_cmd(const char **argv)
109
+ run-command (Windows): Run dashless "git <cmd>"
110
+ git-gui: Correct installation of library to be $prefix/share
111
+ git-gui (Windows): Switch to relative discovery of oguilib
112
+ git-gui (Windows): Change wrapper to execdir 'libexec/git-core'
113
114
Thomas Rast (1):
146
- git-completion.bash: provide completion for 'show-branch'
115
+ bash completion: Add long options for 'git describe'
116
+
117
+Todd Zullinger (1):
118
+ Replace uses of "git-var" with "git var"
119