From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: What will be cooking in git.git post 1.5.4 (topics)
Date: Tue, 22 Jan 2008 00:47:44 -0800 [thread overview]
Message-ID: <7vwsq2s0un.fsf_-_@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7vhchsa63t.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Sat, 05 Jan 2008 03:01:42 -0800")
Here are the topics that have been kept out of 'master'.
Commits prefixed with '-' are only in 'pu' while commits
prefixed with '+' are in 'next'. Others commits may be stashed
in 'offcuts'.
The topics list the commits in reverse chronological order.
----------------------------------------------------------------
[New Topics]
* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits
- sha1-lookup: make selection of 'middle' less aggressive
- sha1-lookup: more memory efficient search in sorted list of SHA-1
Micro-optimization whose real world benefit is not proven.
Definitely post 1.5.4.
* lt/in-core-index (Sun Jan 20 15:19:56 2008 +0000) 5 commits
+ Also use unpack_trees() in do_diff_cache()
+ Make run_diff_index() use unpack_trees(), not read_tree()
+ Avoid running lstat(2) on the same cache entry.
+ index: be careful when handling long names
+ Make on-disk index representation separate from in-core one
This is about reducing number of lstat(2) calls during complex
operations. Most likely this will be the first series to be
merged after 1.5.4 final.
----------------------------------------------------------------
[Graduated to 'master']
* jc/diff-hunk-header (Wed Jan 2 01:50:11 2008 -0800) 2 commits
This was to fix a real-world issues.
----------------------------------------------------------------
[Will cook further in 'next' and then merge to 'master' soon]
Nothing to see here. We are still in rc freeze.
----------------------------------------------------------------
[Actively cooking]
Nothing to see here. We are still in rc freeze.
----------------------------------------------------------------
[On hold]
* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
- Move all dashed-form commands to libexecdir
I think this is a sane thing to do in the longer term. Will be in
'next' after v1.5.4. I think "leave porcelain on PATH" might be also a
good thing as a transition measure.
Incidentally, if we do not install dashed form of built-ins anywhere
(which is not this series is about --- this is just moving them out of
user's PATH), "git help -a" will stop showing them. I am not enthused
about removing the hardlinks to built-ins to begin with, but people who
want such a change need to first modify help.c:list_commands() to pick
up builtins without having git-foo hardlinks in gitexecdir. This may
need to happen anyway as mingw fallouts.
* ph/describe-match (Mon Dec 24 12:18:22 2007 +0100) 2 commits
+ git-name-rev: add a --(no-)undefined option.
+ git-describe: Add a --match option to limit considered tags.
* js/reflog-delete (Fri Jan 4 19:11:37 2008 -0600) 2 commits
+ builtin-reflog.c: fix typo that accesses an unset variable
+ Teach "git reflog" a subcommand to delete single entries
I haven't queued Brandon's "git stash drop", as the command name
and the UI is undecided yet, but this series will serve as the
basis of such a feature.
* js/remote (Wed Dec 5 19:02:15 2007 +0000) 4 commits
. Make git-remote a builtin
. Test "git remote show" and "git remote prune"
. parseopt: add flag to stop on first non option
. path-list: add functions to work with unsorted lists
This and Kristian's "git-clone in C" are on hold and will need
to be rebased, post 1.5.4.
* db/send-email-omit-cc (Tue Dec 25 19:56:29 2007 -0800) 1 commit
- git-send-email: Generalize auto-cc recipient mechanism.
New feature which seems to be nice, but has been postponed.
* bf/remote-head (Sun Dec 23 20:52:32 2007 -0500) 1 commit
. git-remote: make add -f guess HEAD, as clone does
New feature which could be used in rewriting git-clone as a thin
wrapper around other commands, but there are conflicting
proposals from Kristian and Dscho, which are post 1.5.4 item.
We'll see how they pan out.
* jc/cr-at-eol (Tue Jan 15 00:59:05 2008 -0800) 1 commit
- core.whitespace: cr-at-eol
People who have CRLF in repository are annoyed that they see ^M
at the end of the line marked as trailing whitespace errors.
This is to configure it away.
----------------------------------------------------------------
[Stalled]
* ab/pserver (Fri Dec 14 04:08:51 2007 +0000) 1 commit
. Authentication support for pserver
This needs careful security audit and a fix to its password
database format. Plaintext in .git/config is not acceptable.
* jc/sys-select (Tue Dec 18 01:52:07 2007 -0800) 1 commit
- Do not include <sys/select.h> on pre- POSIX.1-2001 systems
This was done to help HP-UX port, but it appears that HP-UX
headers do not like to cooperate with usual _POSIX_VERSION rule,
so we probably need to scrap it and instead use manual
configuration instead.
* jc/git-symref (Tue Dec 11 16:42:46 2007 -0800) 1 commit
- PARK: show-symref protocol extension.
This is a demonstration of a possible component in the future direction
for HEAD discovery done by git-clone.
* jk/builtin-alias (Fri Nov 30 11:22:58 2007 -0500) 1 commit
+ Support builtin aliases
Even the original author has slight NAK on this and I tend to agree.
May want to eventurally revert from 'next' but we are not in a hurry
even to do that.
* jc/diff-pathspec (Sun Nov 25 10:03:48 2007 -0800) 1 commit
. Making ce_path_match() more useful by accepting globs
This was to allow "git diff-files -- '*.h'" (currently diff family
knows only the leading directory match and not fileglobs), but was shot
down by Alex. I tend to agree with him.
* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits
- Prepare execv_git_cmd() for removal of builtins from the
filesystem
- git-shell: accept "git foo" form
We do not plan to remove git-foo form completely from the filesystem at
this point, so these are not strictly necessary.
* jc/diff-relative (Thu Dec 6 09:48:32 2007 -0800) 1 commit
. Make "diff" Porcelain output paths as relative to subdirectory.
* jc/cherry-pick (Mon Dec 24 00:51:01 2007 -0800) 4 commits
- PARK: Start using replay-tree merge in cherry-pick
- revert/cherry-pick: start refactoring call to merge_recursive
- expose a helper function peel_to_type().
- merge-recursive: split low-level merge functions out.
Meant to avoid merge_recursive() during cherry-pick and revert,
so that D/F conflicts can be redone right, but I got busy and
this has unfortunately stalled.
* jc/apply-whitespace (Sat Jan 19 01:58:34 2008 -0800) 3 commits
. builtin-apply.c: push match-beginning/end logic down
. builtin-apply.c: restructure "offset" matching
. builtin-apply.c: refactor small part that matches context
When you apply a series of patches with --whitespace=fix, a line
that is introduced in an earlier patch in the series can be
applied while getting its whitespace error fixed, and then it
can appear as a context line, but with its whitespace still
broken, in a later patch. This series is meant to match such a
context line and propagate an earlier whitespace fix forward
without getting unnecessary conflicts, but I haven't made enough
real progress to show to the list yet.
next prev parent reply other threads:[~2008-01-22 8:48 UTC|newest]
Thread overview: 168+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-22 6:32 What's cooking in git/spearce.git (topics) Shawn O. Pearce
2007-10-22 6:59 ` Jeff King
2007-10-22 7:16 ` Jeff King
2007-10-23 2:32 ` Linus Torvalds
2007-10-23 3:48 ` Jeff King
2007-10-22 7:24 ` Pierre Habouzit
2007-10-22 15:27 ` Steffen Prohaska
2007-10-23 1:26 ` Junio C Hamano
2007-10-23 3:34 ` Shawn O. Pearce
2007-10-24 12:51 ` What's cooking in git.git (topics) Junio C Hamano
2007-10-24 13:09 ` David Symonds
2007-10-24 16:08 ` Scott Parish
2007-10-24 18:27 ` Andreas Ericsson
2007-10-25 0:35 ` Scott Parish
2007-11-01 5:41 ` Junio C Hamano
2007-11-01 11:02 ` Jakub Narebski
2007-11-01 20:57 ` Junio C Hamano
2007-11-01 18:33 ` Linus Torvalds
2007-11-01 19:19 ` Geert Bosch
2007-11-01 20:27 ` Junio C Hamano
2007-11-01 20:47 ` Mike Hommey
2007-11-01 21:20 ` Junio C Hamano
2007-11-02 0:32 ` Junio C Hamano
2007-11-01 21:44 ` Pierre Habouzit
2007-11-01 21:17 ` Geert Bosch
2007-11-02 0:00 ` Jonas Fonseca
2007-11-01 21:18 ` Theodore Tso
2007-11-01 21:26 ` Melchior FRANZ
2007-11-01 21:32 ` Johan Herland
2007-11-01 21:51 ` Junio C Hamano
2007-11-01 22:05 ` Linus Torvalds
2007-11-01 22:26 ` Bill Lear
2007-11-01 22:50 ` Junio C Hamano
2007-11-02 2:19 ` Petr Baudis
2007-11-01 21:42 ` Pierre Habouzit
2007-11-02 9:39 ` Andreas Ericsson
2007-11-01 21:57 ` Pierre Habouzit
2007-11-02 0:04 ` Jakub Narebski
2007-11-02 2:23 ` Petr Baudis
2007-11-02 7:25 ` Jakub Narebski
2007-11-02 7:28 ` Jakub Narebski
2007-11-02 8:42 ` Pierre Habouzit
2007-11-02 6:06 ` Miles Bader
2007-11-02 15:13 ` Miles Bader
2007-11-02 9:38 ` Andreas Ericsson
2007-11-02 11:03 ` Johannes Schindelin
2007-11-01 21:41 ` Brian Downing
2007-11-01 21:46 ` Pierre Habouzit
2007-11-02 10:26 ` Wincent Colaiuta
2007-11-04 4:14 ` Junio C Hamano
2007-11-04 9:43 ` Jakub Narebski
2007-11-04 11:38 ` Pierre Habouzit
2007-11-08 8:08 ` Junio C Hamano
2007-11-08 20:44 ` Steffen Prohaska
2007-11-12 7:09 ` Junio C Hamano
2007-11-12 12:21 ` Johannes Schindelin
2007-11-12 12:26 ` Pierre Habouzit
2007-11-12 12:33 ` Johannes Schindelin
2007-11-12 13:11 ` [PATCH] rebase: brown paper bag fix after the detached HEAD patch Johannes Schindelin
2007-11-12 14:53 ` What's cooking in git.git (topics) Pierre Habouzit
2007-11-12 14:27 ` Steffen Prohaska
2007-11-12 15:02 ` Johannes Schindelin
2007-11-18 16:13 ` [PATCH 1/2] push: Add '--matching' option and print warning if it should be used Steffen Prohaska
2007-11-18 16:13 ` [PATCH 2/2] push: Add '--current', which pushes only the current branch Steffen Prohaska
2007-11-19 1:28 ` Junio C Hamano
2007-11-19 6:41 ` Steffen Prohaska
2007-11-19 7:27 ` Junio C Hamano
2007-11-19 7:50 ` Junio C Hamano
2007-11-19 9:27 ` Andreas Ericsson
2007-11-19 8:17 ` Steffen Prohaska
2007-11-19 8:35 ` Junio C Hamano
2007-11-19 9:54 ` Steffen Prohaska
2007-11-19 16:51 ` [PATCH] push: Add "--current", " Steffen Prohaska
2007-11-19 11:17 ` [PATCH 2/2] push: Add '--current', " Jakub Narebski
2007-11-19 19:57 ` Junio C Hamano
2007-11-19 21:04 ` Jakub Narebski
2007-11-19 22:15 ` Junio C Hamano
2007-11-19 22:29 ` Jakub Narebski
2007-11-19 9:24 ` Andreas Ericsson
2007-11-12 15:15 ` [PATCH] git-commit: Add tests for invalid usage of -a/--interactive with paths Björn Steinbrink
2007-11-15 0:18 ` What's cooking in git.git (topics) Junio C Hamano
2007-11-15 0:49 ` Johannes Schindelin
2007-11-15 14:49 ` [PATCH] t7501-commit: Add test for git commit <file> with dirty index Kristian Høgsberg
2007-11-15 15:55 ` Johannes Schindelin
2007-11-15 16:11 ` [PATCH] builtin-commit: fix "git add x y && git commit y" committing x, too Johannes Schindelin
2007-11-15 16:37 ` Johannes Schindelin
2007-11-15 17:01 ` Kristian Høgsberg
2007-11-16 0:43 ` Johannes Schindelin
2007-11-17 8:45 ` Junio C Hamano
2007-11-18 9:18 ` Junio C Hamano
2007-11-17 12:40 ` What's cooking in git.git (topics) Jeff King
2007-11-17 20:51 ` Junio C Hamano
2007-11-17 23:42 ` Alex Riesen
2007-11-18 1:29 ` Junio C Hamano
2007-11-21 9:23 ` Junio C Hamano
2007-11-23 8:48 ` Junio C Hamano
2007-11-23 10:30 ` Jeff King
2007-11-23 13:23 ` Johannes Schindelin
2007-11-24 11:38 ` Jeff King
2007-11-24 15:47 ` Nicolas Pitre
2007-11-24 19:09 ` Junio C Hamano
2007-11-25 21:51 ` J. Bruce Fields
2007-11-25 22:42 ` Junio C Hamano
2007-11-25 23:08 ` J. Bruce Fields
2007-11-26 4:02 ` Nicolas Pitre
2007-11-26 4:15 ` J. Bruce Fields
2007-11-26 4:29 ` Nicolas Pitre
2007-11-26 4:45 ` J. Bruce Fields
2007-11-26 9:03 ` Jakub Narebski
2007-11-26 9:09 ` Andreas Ericsson
2007-11-26 19:11 ` Nicolas Pitre
2007-11-26 19:24 ` David Kastrup
2007-11-26 20:25 ` Nicolas Pitre
2007-11-26 20:40 ` Junio C Hamano
2007-11-26 20:45 ` David Kastrup
2007-11-26 21:09 ` Nicolas Pitre
2007-11-26 21:22 ` David Kastrup
2007-11-26 22:02 ` Nicolas Pitre
2007-11-26 23:05 ` David Kastrup
2007-11-26 23:28 ` Nicolas Pitre
2007-11-26 23:52 ` David Kastrup
2007-11-27 4:05 ` Nicolas Pitre
2007-12-05 21:58 ` Miles Bader
2007-11-26 21:14 ` Jakub Narebski
2007-11-26 21:36 ` Johannes Schindelin
2007-11-26 21:47 ` Nicolas Pitre
2007-11-26 6:15 ` Jan Hudec
2007-11-25 20:27 ` Junio C Hamano
2007-11-25 20:36 ` Jakub Narebski
2007-11-25 20:53 ` J. Bruce Fields
2007-12-01 2:37 ` Junio C Hamano
2007-12-01 8:55 ` Eric Wong
2007-12-02 14:14 ` [PATCH, next version] Add 'git fast-export', the sister of 'git fast-import' Johannes Schindelin
2007-12-02 14:40 ` What's cooking in git.git (topics) Johannes Schindelin
2007-12-04 8:43 ` Junio C Hamano
2007-12-04 9:40 ` Johannes Sixt
2007-12-04 10:08 ` msysGit on FAT32 (was: What's cooking in git.git (topics)) Jakub Narebski
2007-12-04 13:30 ` Johannes Schindelin
2007-12-04 13:48 ` msysGit on FAT32 Johannes Sixt
2007-12-04 14:37 ` Johannes Schindelin
2007-12-04 20:03 ` What's cooking in git.git (topics) Steffen Prohaska
2007-12-05 10:59 ` Junio C Hamano
2007-12-05 11:08 ` Jakub Narebski
2007-12-05 11:10 ` Jakub Narebski
2007-12-06 4:43 ` Jeff King
2007-12-05 11:37 ` [PATCH] Soft aliases: add "less" and minimal documentation Johannes Schindelin
2007-12-05 19:45 ` Junio C Hamano
2007-12-06 4:50 ` Jeff King
2007-12-06 4:32 ` What's cooking in git.git (topics) Jeff King
2007-12-07 9:51 ` Junio C Hamano
2007-12-07 11:11 ` Jakub Narebski
2007-12-07 19:29 ` Junio C Hamano
2007-12-07 21:36 ` Miklos Vajna
2007-12-09 10:27 ` Junio C Hamano
2007-12-13 2:48 ` Junio C Hamano
2007-12-13 3:22 ` Nicolas Pitre
2007-12-13 22:31 ` [PATCH 1/2] xdl_diff: identify call sites Junio C Hamano
2007-12-14 7:03 ` Junio C Hamano
2007-12-13 22:31 ` [PATCH 2/2] xdi_diff: trim common trailing lines Junio C Hamano
2007-12-14 9:06 ` Peter Baumann
2007-12-14 19:15 ` Junio C Hamano
2007-12-17 8:40 ` What's cooking in git.git (topics) Junio C Hamano
2007-12-23 9:20 ` Junio C Hamano
2007-12-31 10:47 ` checkout --push/--pop idea (Re: What's cooking in git.git (topics)) Jan Hudec
2008-01-05 11:01 ` What's cooking in git.git (topics) Junio C Hamano
2008-01-05 16:04 ` Johannes Schindelin
2008-01-22 8:47 ` Junio C Hamano [this message]
2007-12-04 16:18 ` Brian Downing
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vwsq2s0un.fsf_-_@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).