What's cooking in git/spearce.git (topics)
Subsystems (2)
What's cooking in git.git (topics)
In reply to Junio C HamanoHere are the topics that have been cooking. 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]
* 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 will be 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/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.
* jc/diff-hunk-header (Wed Jan 2 01:50:11 2008 -0800) 2 commits
- diff: do not chomp hunk-header in the middle of a character
- utf8_width(): allow non NUL-terminated input
This is rewritten version of Shibata's patch. We may need this in 1.5.4 to help the real world issue the kernel documentaiton i18n folks are already having.
----------------------------------------------------------------
[Graduated to 'master']
Nothing to see, as we are in -rc freeze.
----------------------------------------------------------------
[Will cook further in 'next' and then merge to 'master' soon]
Nothing to see, as we are in -rc freeze.
----------------------------------------------------------------
[Actively cooking]
Nothing to see, as we are 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.
* 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.
* 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.
----------------------------------------------------------------
[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/pathspec (Thu Sep 13 13:38:19 2007 -0700) 3 commits . pathspec_can_match(): move it from builtin-ls-tree.c to tree.c . ls-tree.c: refactor show_recursive() and rename it. . tree-diff.c: split out a function to match a single pattern.
* 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.
I shouldn't be wasting time arguing and spending a bit more time on 'master' and also on this.
Re: What's cooking in git.git (topics)
Hi,
Quoted 6 lines · Junio C Hamano
* 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.
I do not have any objection against using bf/remote-head to introduce this feature, and will port it to C when it is deemed good enough. After all, we _use_ shell scripting for prototyping things.
Quoted 6 lines
* 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-1Micro-optimization whose real world benefit is not proven. Definitely post 1.5.4.
I did not follow this closely... Would this help the "notes" feature as implemented with refs/notes?
Quoted 6 lines
* jc/diff-pathspec (Sun Nov 25 10:03:48 2007 -0800) 1 commit
- Makingce_path_match()more useful by accepting globsThis 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.
I recently needed something like this, and had to script around the lack of support for this.
Ciao,
Dscho
What will be cooking in git.git post 1.5.4 (topics)
In reply to Junio C HamanoHere 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.
Re: What's cooking in git.git (topics)
In reply to Junio C HamanoQuoted 6 lines · Junio C Hamano
* pr/mergetool (Wed Dec 5 09:19:13 2007 +0200) 1 commit
+ Open external merge tool with original file extensions for all three filesWaiting for Ted's Ack but I think this is safe. Hoping to merge before v1.5.4-rc0.
Nice. I don't think this would break anything. By the way, this would I think also make Emacs (emerge) choose correct major mode for syntax highlighting etc., so it is not only for Meld...
Quoted 9 lines
* jc/spht (Thu Dec 6 00:14:14 2007 -0800) 7 commits
+ Use gitattributes to define per-path whitespace rule
+ core.whitespace: documentation updates.
+ builtin-apply: teachwhitespace_rules
+ builtin-apply: rename "whitespace" variables and fix styles
+ core.whitespace: add test for diff whitespace error highlighting
+ git-diff: complain about >=8 consecutive spaces in initial indent
+ War on whitespace: first, a bit of retreat.
Quoted 4 lines
This teaches apply and diff about the customizable definition of what whitespace breakages are, and the customization can be refined per-path using the attributes mechanism. It would be to nice to have this in v1.5.4.
By the way, is there some helper plumbing scripts can use to check attributes for given file (given pathname), either in working area, or in repository (I am thinking there to use gitattributes for configuring syntax highlighting (extension to syntax) in gitweb); perhaps even in the index.
Quoted 4 lines
* jk/builtin-alias (Fri Nov 30 11:22:58 2007 -0500) 1 commit
+ Support builtin aliasesCute hack.
By the way, beside "git view" alias (with configurable backend, be it gitk, qgit, giggle or gitview) it would be nice to have "git unstash" as an alias to "git stash apply" (it would not matter here that command think of itself as 'git stash' here).
Quoted 9 lines
----------------------------------------------------------------
[On hold]* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
- Move all dashed-form commands to libexecdirI 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.
We would have to change the paragraph in INSTALL about git wrapper (which would be no longer optional, or at least no longer optional in the sense that you can just delete/not install this file), and its conflict with (old) GNU Interactive Tools (the other 'git').
Quoted 8 lines
[Stalled]
* ns/checkout-push-pop (Wed Dec 5 07:04:06 2007 +0900) 1 commit
- git-checkout --push/--popA reasonably cleanly written cute hack, and I do not see this breaking the normal codepath, so I do not mind merging this as long as people find it useful.
That would be nice to have, although as somebody[*1*] said, you usualy know that you should have pushed branch into stack when you want to 'pop'. So it would be nice to have (if possible and easy to implement) also "git checkout --previous" or "git checkout -".
Robin Rosenberg wrote about nice hack to implement "cd -" like behavior:
Quoted 13 lines · Robin Rosenberg
I abuse git bisect for this temporary switcing. It only gives me a one level memory, but otoh the git prompt tells me I'm on a discourse.
[me@lathund GIT (rr/abspath|BISECTING)]$ git checkout master Switched to branch "master"
[me@lathund GIT (master|BISECTING)]$ git checkout HEAD~2
Note: moving to "HEAD~2" which isn't a local branch
If you want to create a new branch from this checkout, you may do so (now or later) by using -b with the checkout command again. Example:
git checkout -b <new_branch_name>
HEAD is now at afcc4f7... Merge branch 'js/prune-expire'
Quoted 4 lines
[me@lathund GIT (afcc4f7...|BISECTING)]$ git bisect reset Previous HEAD position was afcc4f7... Merge branch 'js/prune-expire' Switched to branch "rr/abspath"
[me@lathund GIT (rr/abspath)]$
[*1*] I'm sorry for no attribution
Quoted 2 lines
* jc/pathspec (Thu Sep 13 13:38:19 2007 -0700) 3 commits .
pathspec_can_match(): move it frombuiltin-ls-tree.ctotree.c
What is the status of this thingy, by the way?
Signature · 3 lines
Jakub Narebski Poland ShadeHawk on #git
Re: What's cooking in git.git (topics)
Quoted 7 lines · Jakub Narebski
Junio C Hamano <[email protected]> writes:
...Quoted 5 lines
[On hold]
* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
- Move all dashed-form commands to libexecdir
Quoted 8 lines
Quoted 3 lines
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.
We would have to change the paragraph in INSTALL about git wrapper (which would be no longer optional, or at least no longer optional in the sense that you can just delete/not install this file), and its conflict with (old) GNU Interactive Tools (the other 'git').
Thanks for noticing. Please send in a proposed patch to do so; then we can park it near the tip of this topic, and nobody will forget.
Quoted 9 lines
Quoted 8 lines
[Stalled]
* ns/checkout-push-pop (Wed Dec 5 07:04:06 2007 +0900) 1 commit
- git-checkout --push/--popA reasonably cleanly written cute hack, and I do not see this breaking the normal codepath, so I do not mind merging this as long as people find it useful.
Quoted 5 lines
That would be nice to have, although as somebody[*1*] said, you usualy know that you should have pushed branch into stack when you want to 'pop'. So it would be nice to have (if possible and easy to implement) also "git checkout --previous" or "git checkout -".
...
Perhaps. There are a few issues, though.
* When you were on 'master' and say "co -", you would want to come back to the 'master' branch, whose tip may have advanced since you switched away from (e.g. "git push . experiment:master"), and that is a desired behaviour. When you switch away from a detached HEAD, what would we record? The fact the head was detached and its commit, so next "co -" would come back to that exact commit in a detached state? Or "co -" is meant to say "I was distracted and was away but now let's go back to my normal working state" and should refrain from touching the previous branch information? I tend to think it would be the latter.
* There are a few commands that are not "git checkout" but still switches branches ("rebase that branch on this one" form of rebase and "bisect"). Personally, I think bisect should stop using the branch 'bisect' but instead work on detached HEAD in the longer run, but what would we do about "rebase"?
Quoted 1 line
[*1*] I'm sorry for no attribution
I think this was Matthieu Moy, <[email protected]>,
http://article.gmane.org/gmane.comp.version-control.git/67133
Quoted 4 lines
Quoted 2 lines
* jc/pathspec (Thu Sep 13 13:38:19 2007 -0700) 3 commits .
pathspec_can_match(): move it frombuiltin-ls-tree.ctotree.cWhat is the status of this thingy, by the way?
As the topic group header says, it is [Stalled].