mirror of
https://github.com/git/git.git
synced 2026-03-06 18:24:25 +01:00
Merge in "What's cooking" history
The one-file-per-issue format is not an optimal way to maintain these documents in a self-respecting version control system. Granted, they do not "diff" very well, but that is something we can improve by defining a custom diff driver for them. "What's in" are just a glorified "git shortlog --no-merged" without any additional comments, and I am very tempted to drop them. I haven't issued them for quite some time, and nobody seems to have noticed.
This commit is contained in:
Junio C Hamano
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
||||
whats-cooking.txt diff=whatscooking
|
||||
17
README.cooking
Normal file
17
README.cooking
Normal file
@@ -0,0 +1,17 @@
|
||||
The compare-cooking.perl script is meant to help viewing the differences
|
||||
between periodical "What's cooking" messages, and can be used as an
|
||||
external diff driver by:
|
||||
|
||||
$ git config diff.whatscooking.command ./compare-cooking.perl
|
||||
|
||||
to produce this section in your .git/config
|
||||
|
||||
[diff "whatscooking"]
|
||||
command = ./compare-cooking.perl
|
||||
|
||||
You can use e.g.
|
||||
|
||||
$ git log -p --ext-diff whats-cooking.txt
|
||||
$ git show --ext-diff whats-cooking.txt
|
||||
|
||||
to review the history.
|
||||
@@ -81,6 +81,10 @@ Resurrected from "Ejected" category.
|
||||
- run-command: convert simple callsites to use_shell
|
||||
- run-command: add "use shell" option
|
||||
|
||||
Xref: news.gmane.org gmane.comp.version-control.git:136128
|
||||
* check t0021: drop one to t4030;
|
||||
* reorder and move t0021 up, immediately after run-command: optimize
|
||||
|
||||
* mm/config-path (2009-12-30) 1 commit
|
||||
(merged to 'next' on 2010-01-03 at 9c0e81a)
|
||||
+ builtin-config: add --path option doing ~ and ~user expansion.
|
||||
@@ -1,306 +0,0 @@
|
||||
What's cooking in git.git (Jun 2008, issue #01; Sat, 21)
|
||||
--------------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order.
|
||||
|
||||
It already is beginning to become clear what 1.6.0 will look like. What's
|
||||
already in 'next' all are well intentioned (I do not guarantee they are
|
||||
already bug-free --- that is what cooking them in 'next' is for) and are
|
||||
good set of feature enhancements. But bigger changes will be:
|
||||
|
||||
* MinGW will be in.
|
||||
|
||||
* /usr/bin/git-cat-file is no more. The bulk of the git commands will
|
||||
move to /usr/libexec/git-core/ or somesuch.
|
||||
|
||||
* git-merge will be rewritten in C.
|
||||
|
||||
Currently tip of 'pu' is broken and does not pass tests, as j6t/mingw has
|
||||
interaction with dr/ceiling and jc/merge-theirs has interaction with
|
||||
mv/merge-in-c.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/merge-theirs (Fri Jun 20 00:17:59 2008 -0700) 2 commits
|
||||
- git-merge-recursive-{ours,theirs}
|
||||
- git-merge-file --ours, --theirs
|
||||
|
||||
Punting a merge by discarding your own work in conflicting parts but still
|
||||
salvaging the parts that are cleanly automerged. It is likely that this
|
||||
will result in nonsense mishmash, but somehow often people want this, so
|
||||
here they are. The interface to the backends may need to change, though.
|
||||
|
||||
* lt/racy-empty (Tue Jun 10 10:44:43 2008 -0700) 1 commit
|
||||
+ racy-git: an empty blob has a fixed object name
|
||||
|
||||
* ph/mergetool (Mon Jun 16 17:33:41 2008 -0600) 1 commit
|
||||
+ Remove the use of '--' in merge program invocation
|
||||
|
||||
* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 38 commits
|
||||
- compat/pread.c: Add a forward declaration to fix a warning
|
||||
- Windows: Fix ntohl() related warnings about printf formatting
|
||||
- Windows: TMP and TEMP environment variables specify a temporary
|
||||
directory.
|
||||
- Windows: Make 'git help -a' work.
|
||||
- Windows: Work around an oddity when a pipe with no reader is
|
||||
written to.
|
||||
- Windows: Make the pager work.
|
||||
- When installing, be prepared that template_dir may be relative.
|
||||
- Windows: Use a relative default template_dir and ETC_GITCONFIG
|
||||
- Windows: Compute the fallback for exec_path from the program
|
||||
invocation.
|
||||
- Turn builtin_exec_path into a function.
|
||||
- Windows: Use a customized struct stat that also has the st_blocks
|
||||
member.
|
||||
- Windows: Add a custom implementation for utime().
|
||||
- Windows: Add a new lstat and fstat implementation based on Win32
|
||||
API.
|
||||
- Windows: Implement a custom spawnve().
|
||||
- Windows: Implement wrappers for gethostbyname(), socket(), and
|
||||
connect().
|
||||
- Windows: Work around incompatible sort and find.
|
||||
- Windows: Implement asynchronous functions as threads.
|
||||
- Windows: Disambiguate DOS style paths from SSH URLs.
|
||||
- Windows: A rudimentary poll() emulation.
|
||||
- Windows: Change the name of hook scripts to make them not
|
||||
executable.
|
||||
- Windows: Implement start_command().
|
||||
- Windows: A pipe() replacement whose ends are not inherited to
|
||||
children.
|
||||
- Windows: Wrap execve so that shell scripts can be invoked.
|
||||
- Windows: Implement setitimer() and sigaction().
|
||||
- Windows: Fix PRIuMAX definition.
|
||||
- Windows: Implement gettimeofday().
|
||||
- Windows: Handle absolute paths in
|
||||
safe_create_leading_directories().
|
||||
- Windows: Treat Windows style path names.
|
||||
- setup.c: Prepare for Windows directory separators.
|
||||
- Windows: Work around misbehaved rename().
|
||||
- Windows: always chmod(, 0666) before unlink().
|
||||
- Windows: A minimal implemention of getpwuid().
|
||||
- Windows: Implement a wrapper of the open() function.
|
||||
- Windows: Strip ".exe" from the program name.
|
||||
- Windows: Use the Windows style PATH separator ';'.
|
||||
- Add target architecture MinGW.
|
||||
- Compile some programs only conditionally.
|
||||
- Add compat/regex.[ch] and compat/fnmatch.[ch].
|
||||
|
||||
No explanation is necessary ;-).
|
||||
|
||||
* sn/static (Thu Jun 19 08:21:11 2008 +0900) 2 commits
|
||||
+ config.c: make git_env_bool() static
|
||||
+ environment.c: remove unused function
|
||||
|
||||
* lt/config-fsync (Wed Jun 18 15:18:44 2008 -0700) 4 commits
|
||||
+ Add config option to enable 'fsync()' of object files
|
||||
+ Split up default "i18n" and "branch" config parsing into helper
|
||||
routines
|
||||
+ Split up default "user" config parsing into helper routine
|
||||
+ Split up default "core" config parsing into helper routine
|
||||
|
||||
* lw/gitweb (Thu Jun 19 22:03:21 2008 +0200) 1 commit
|
||||
+ gitweb: standarize HTTP status codes
|
||||
|
||||
* mv/merge-in-c (Fri Jun 20 01:22:36 2008 +0200) 11 commits
|
||||
- Add new test to ensure git-merge handles more than 25 refs.
|
||||
- Build in merge
|
||||
- Introduce filter_independent() in commit.c
|
||||
- Introduce get_octopus_merge_bases() in commit.c
|
||||
- git-fmt-merge-msg: make it usable from other builtins
|
||||
- Move read_cache_unmerged() to read-cache.c
|
||||
- parseopt: add a new PARSE_OPT_ARGV0_IS_AN_OPTION option
|
||||
- Add new test to ensure git-merge handles pull.twohead and
|
||||
pull.octopus
|
||||
- Move parse-options's skip_prefix() to git-compat-util.h
|
||||
- Move commit_list_count() to commit.c
|
||||
- Move split_cmdline() to alias.c
|
||||
|
||||
* jc/maint-combine-diff-pre-context (Wed Jun 18 23:59:41 2008 -0700) 1 commit
|
||||
+ diff -c/--cc: do not include uninteresting deletion before leading
|
||||
context
|
||||
|
||||
* lt/maint-gitdir-relative (Thu Jun 19 12:34:06 2008 -0700) 1 commit
|
||||
+ Make git_dir a path relative to work_tree in setup_work_tree()
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
|
||||
+ Move all dashed-form commands to libexecdir
|
||||
|
||||
Scheduled for 1.6.0.
|
||||
|
||||
* 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, but git-shell may need to be updated.
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits
|
||||
+ Eliminate an unnecessary chdir("..")
|
||||
+ Add support for GIT_CEILING_DIRECTORIES
|
||||
+ Fold test-absolute-path into test-path-utils
|
||||
+ Implement normalize_absolute_path
|
||||
|
||||
* jn/web (Tue Jun 10 19:21:44 2008 +0200) 2 commits
|
||||
+ gitweb: Separate generating 'sort by' table header
|
||||
+ gitweb: Separate filling list of projects info
|
||||
|
||||
* rs/archive-ignore (Sun Jun 8 18:42:33 2008 +0200) 1 commit
|
||||
+ Teach new attribute 'export-ignore' to git-archive
|
||||
|
||||
* rg/gitweb (Fri Jun 6 09:53:32 2008 +0200) 1 commit
|
||||
+ gitweb: remove git_blame and rename git_blame2 to git_blame
|
||||
|
||||
* kh/update-ref (Tue Jun 3 01:34:53 2008 +0200) 2 commits
|
||||
+ Make old sha1 optional with git update-ref -d
|
||||
+ Clean up builtin-update-ref's option parsing
|
||||
|
||||
* mo/status-untracked (Thu Jun 5 14:47:50 2008 +0200) 3 commits
|
||||
+ Add configuration option for default untracked files mode
|
||||
+ Add argument 'no' commit/status option -u|--untracked-files
|
||||
+ Add an optional <mode> argument to commit/status -u|--untracked-
|
||||
files option
|
||||
|
||||
* sr/tests (Sun Jun 8 16:04:35 2008 +0200) 3 commits
|
||||
+ Hook up the result aggregation in the test makefile.
|
||||
+ A simple script to parse the results from the testcases
|
||||
+ Modify test-lib.sh to output stats to t/test-results/*
|
||||
|
||||
* jh/clone-packed-refs (Sun Jun 15 16:06:16 2008 +0200) 4 commits
|
||||
+ Teach "git clone" to pack refs
|
||||
+ Prepare testsuite for a "git clone" that packs refs
|
||||
+ Move pack_refs() and friends into libgit
|
||||
+ Incorporate fetched packs in future object traversal
|
||||
|
||||
This is useful when cloning from a repository with insanely large number
|
||||
of refs.
|
||||
|
||||
* jc/reflog-expire (Sun Jun 15 23:48:46 2008 -0700) 1 commit
|
||||
- Per-ref reflog expiry configuration
|
||||
|
||||
Perhaps a good foundation for optionally unexpirable stash. As 1.6.0 will
|
||||
be a good time to make backward incompatible changes, we might make expiry
|
||||
period of stash 'never' in new repositories. Needs a concensus.
|
||||
|
||||
* lw/perlish (Thu Jun 19 22:32:49 2008 +0200) 2 commits
|
||||
+ Git.pm: add test suite
|
||||
+ t/test-lib.sh: add test_external and test_external_without_stderr
|
||||
|
||||
Beginning of regression tests for Perl part of the system.
|
||||
|
||||
* jk/test (Sat Jun 14 03:28:07 2008 -0400) 5 commits
|
||||
+ enable whitespace checking of test scripts
|
||||
+ avoid trailing whitespace in zero-change diffstat lines
|
||||
+ avoid whitespace on empty line in automatic usage message
|
||||
+ mask necessary whitespace policy violations in test scripts
|
||||
+ fix whitespace violations in test scripts
|
||||
|
||||
Tightens whitespace rules for t/*.sh scripts.
|
||||
|
||||
* pb/fast-export (Wed Jun 11 13:17:04 2008 +0200) 1 commit
|
||||
+ builtin-fast-export: Add importing and exporting of revision marks
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
Nothing today but expect many small ones to come out of 'next' this
|
||||
weekend.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
+ git-blame --reverse
|
||||
+ builtin-blame.c: allow more than 16 parents
|
||||
+ builtin-blame.c: move prepare_final() into a separate function.
|
||||
+ rev-list --children
|
||||
+ revision traversal: --children option
|
||||
|
||||
The blame that finds where each line in the original lines moved to. This
|
||||
may help a GSoC project that wants to gather statistical overview of the
|
||||
history. The final presentation may need tweaking (see the log message of
|
||||
the commit ""git-blame --reverse" on the series).
|
||||
|
||||
The tip two commits are for peeling to see what's behind the blamed
|
||||
commit, which we should be able to separate out into an independent topic
|
||||
from the rest.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
Kicked back to 'pu' for now.
|
||||
|
||||
* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits
|
||||
- Use perl instead of tac
|
||||
- Fix t3404 assumption that `wc -l` does not use whitespace.
|
||||
- rebase -i: Use : in expr command instead of match.
|
||||
- rebase -i: update the implementation of 'mark' command
|
||||
- Add option --preserve-tags
|
||||
- Teach rebase interactive the tag command
|
||||
- Add option --first-parent
|
||||
- Do rebase with preserve merges with advanced TODO list
|
||||
- Select all lines with fake-editor
|
||||
- Unify the length of $SHORT* and the commits in the TODO list
|
||||
- Teach rebase interactive the merge command
|
||||
- Move redo merge code in a function
|
||||
- Teach rebase interactive the reset command
|
||||
- Teach rebase interactive the mark command
|
||||
- Move cleanup code into it's own function
|
||||
- Don't append default merge message to -m message
|
||||
- fake-editor: output TODO list if unchanged
|
||||
|
||||
It is very likely that this whole thing will be reverted from 'next' and
|
||||
be replaced with the new sequenser series during 1.6.0 cycle.
|
||||
|
||||
* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits
|
||||
- Introduce fast forward option only
|
||||
- Head reduction before selecting merge strategy
|
||||
- Restructure git-merge.sh
|
||||
- Introduce -ff=<fast forward option>
|
||||
- New merge tests
|
||||
- Documentation for joining more than two histories
|
||||
|
||||
This will interfere with Miklos's rewrite of merge to C.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits
|
||||
- WIP: rethink replay merge
|
||||
- Start using replay-tree merge in cherry-pick
|
||||
- revert/cherry-pick: start refactoring call to merge_recursive
|
||||
|
||||
This is meant to improve cherry-pick's behaviour when renames are
|
||||
involved, by not using merge-recursive (whose d/f conflict resolution is
|
||||
quite broken), but unfortunately has stalled for some time now.
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
Just my toy at this moment.
|
||||
|
||||
@@ -1,329 +0,0 @@
|
||||
What's cooking in git.git (Jun 2008, issue #02; Mon, 23)
|
||||
--------------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order.
|
||||
|
||||
It already is beginning to become clear what 1.6.0 will look like. What's
|
||||
already in 'next' all are well intentioned (I do not guarantee they are
|
||||
already bug-free --- that is what cooking them in 'next' is for) and are
|
||||
good set of feature enhancements. But bigger changes will be:
|
||||
|
||||
* MinGW will be in.
|
||||
|
||||
* /usr/bin/git-cat-file is no more. The bulk of the git commands will
|
||||
move to /usr/libexec/git-core/ or somesuch.
|
||||
|
||||
* git-merge will be rewritten in C.
|
||||
|
||||
Currently tip of 'pu' is broken and does not pass tests, as j6t/mingw has
|
||||
interaction with dr/ceiling and jc/merge-theirs has interaction with
|
||||
mv/merge-in-c.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits
|
||||
- rerere.autoupdate
|
||||
- t4200: fix rerere test
|
||||
- rerere: remove dubious "tail_optimization"
|
||||
- git-rerere: detect unparsable conflicts
|
||||
- rerere: rerere_created_at() and has_resolution() abstraction
|
||||
|
||||
* sb/rebase (Sun Jun 22 01:55:50 2008 +0200) 2 commits
|
||||
+ t3404: stricter tests for git-rebase--interactive
|
||||
+ api-builtin.txt: update and fix typo
|
||||
|
||||
* sb/maint-rebase (Sun Jun 22 16:07:02 2008 +0200) 1 commit
|
||||
+ git-rebase.sh: Add check if rebase is in progress
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to master soon]
|
||||
|
||||
* lw/gitweb (Thu Jun 19 22:03:21 2008 +0200) 1 commit
|
||||
+ gitweb: standarize HTTP status codes
|
||||
|
||||
* lt/config-fsync (Wed Jun 18 15:18:44 2008 -0700) 4 commits
|
||||
+ Add config option to enable 'fsync()' of object files
|
||||
+ Split up default "i18n" and "branch" config parsing into helper
|
||||
routines
|
||||
+ Split up default "user" config parsing into helper routine
|
||||
+ Split up default "core" config parsing into helper routine
|
||||
|
||||
* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
|
||||
+ Move all dashed-form commands to libexecdir
|
||||
|
||||
Scheduled for 1.6.0.
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
* sr/tests (Sun Jun 8 16:04:35 2008 +0200) 3 commits
|
||||
+ Hook up the result aggregation in the test makefile.
|
||||
+ A simple script to parse the results from the testcases
|
||||
+ Modify test-lib.sh to output stats to t/test-results/*
|
||||
|
||||
* jh/clone-packed-refs (Sun Jun 15 16:06:16 2008 +0200) 4 commits
|
||||
+ Teach "git clone" to pack refs
|
||||
+ Prepare testsuite for a "git clone" that packs refs
|
||||
+ Move pack_refs() and friends into libgit
|
||||
+ Incorporate fetched packs in future object traversal
|
||||
|
||||
This is useful when cloning from a repository with insanely large number
|
||||
of refs.
|
||||
|
||||
* lw/perlish (Thu Jun 19 22:32:49 2008 +0200) 2 commits
|
||||
+ Git.pm: add test suite
|
||||
+ t/test-lib.sh: add test_external and test_external_without_stderr
|
||||
|
||||
Beginning of regression tests for Perl part of the system.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* mv/merge-in-c (Sat Jun 21 19:15:35 2008 +0200) 14 commits
|
||||
- Add new test case to ensure git-merge reduces octopus parents when
|
||||
possible
|
||||
- Add new test case to ensure git-merge filters for independent
|
||||
parents
|
||||
- Build in merge
|
||||
- Introduce reduce_heads()
|
||||
- Introduce get_merge_bases_many()
|
||||
- Add new test to ensure git-merge handles more than 25 refs.
|
||||
- Introduce get_octopus_merge_bases() in commit.c
|
||||
- git-fmt-merge-msg: make it usable from other builtins
|
||||
- Move read_cache_unmerged() to read-cache.c
|
||||
- parseopt: add a new PARSE_OPT_ARGV0_IS_AN_OPTION option
|
||||
- Add new test to ensure git-merge handles pull.twohead and
|
||||
pull.octopus
|
||||
- Move parse-options's skip_prefix() to git-compat-util.h
|
||||
- Move commit_list_count() to commit.c
|
||||
- Move split_cmdline() to alias.c
|
||||
|
||||
* 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, but git-shell may need to be updated.
|
||||
|
||||
* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits
|
||||
+ Eliminate an unnecessary chdir("..")
|
||||
+ Add support for GIT_CEILING_DIRECTORIES
|
||||
+ Fold test-absolute-path into test-path-utils
|
||||
+ Implement normalize_absolute_path
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* rs/archive-ignore (Sun Jun 8 18:42:33 2008 +0200) 1 commit
|
||||
+ Teach new attribute 'export-ignore' to git-archive
|
||||
|
||||
* lt/racy-empty (Tue Jun 10 10:44:43 2008 -0700) 1 commit
|
||||
+ racy-git: an empty blob has a fixed object name
|
||||
|
||||
* sn/static (Thu Jun 19 08:21:11 2008 +0900) 2 commits
|
||||
+ config.c: make git_env_bool() static
|
||||
+ environment.c: remove unused function
|
||||
|
||||
* jc/maint-combine-diff-pre-context (Wed Jun 18 23:59:41 2008 -0700) 1 commit
|
||||
+ diff -c/--cc: do not include uninteresting deletion before leading
|
||||
context
|
||||
|
||||
* lt/maint-gitdir-relative (Thu Jun 19 12:34:06 2008 -0700) 1 commit
|
||||
+ Make git_dir a path relative to work_tree in setup_work_tree()
|
||||
|
||||
* jn/web (Tue Jun 10 19:21:44 2008 +0200) 2 commits
|
||||
+ gitweb: Separate generating 'sort by' table header
|
||||
+ gitweb: Separate filling list of projects info
|
||||
|
||||
* rg/gitweb (Fri Jun 6 09:53:32 2008 +0200) 1 commit
|
||||
+ gitweb: remove git_blame and rename git_blame2 to git_blame
|
||||
|
||||
* kh/update-ref (Tue Jun 3 01:34:53 2008 +0200) 2 commits
|
||||
+ Make old sha1 optional with git update-ref -d
|
||||
+ Clean up builtin-update-ref's option parsing
|
||||
|
||||
* mo/status-untracked (Thu Jun 5 14:47:50 2008 +0200) 3 commits
|
||||
+ Add configuration option for default untracked files mode
|
||||
+ Add argument 'no' commit/status option -u|--untracked-files
|
||||
+ Add an optional <mode> argument to commit/status -u|--untracked-
|
||||
files option
|
||||
|
||||
* jk/test (Sat Jun 14 03:28:07 2008 -0400) 5 commits
|
||||
+ enable whitespace checking of test scripts
|
||||
+ avoid trailing whitespace in zero-change diffstat lines
|
||||
+ avoid whitespace on empty line in automatic usage message
|
||||
+ mask necessary whitespace policy violations in test scripts
|
||||
+ fix whitespace violations in test scripts
|
||||
|
||||
Tightens whitespace rules for t/*.sh scripts.
|
||||
|
||||
* pb/fast-export (Wed Jun 11 13:17:04 2008 +0200) 1 commit
|
||||
+ builtin-fast-export: Add importing and exporting of revision marks
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* ph/mergetool (Mon Jun 16 17:33:41 2008 -0600) 1 commit
|
||||
+ Remove the use of '--' in merge program invocation
|
||||
|
||||
Waiting for success reports from people who use various backends.
|
||||
|
||||
* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 38 commits
|
||||
- compat/pread.c: Add a forward declaration to fix a warning
|
||||
- Windows: Fix ntohl() related warnings about printf formatting
|
||||
- Windows: TMP and TEMP environment variables specify a temporary
|
||||
directory.
|
||||
- Windows: Make 'git help -a' work.
|
||||
- Windows: Work around an oddity when a pipe with no reader is
|
||||
written to.
|
||||
- Windows: Make the pager work.
|
||||
- When installing, be prepared that template_dir may be relative.
|
||||
- Windows: Use a relative default template_dir and ETC_GITCONFIG
|
||||
- Windows: Compute the fallback for exec_path from the program
|
||||
invocation.
|
||||
- Turn builtin_exec_path into a function.
|
||||
- Windows: Use a customized struct stat that also has the st_blocks
|
||||
member.
|
||||
- Windows: Add a custom implementation for utime().
|
||||
- Windows: Add a new lstat and fstat implementation based on Win32
|
||||
API.
|
||||
- Windows: Implement a custom spawnve().
|
||||
- Windows: Implement wrappers for gethostbyname(), socket(), and
|
||||
connect().
|
||||
- Windows: Work around incompatible sort and find.
|
||||
- Windows: Implement asynchronous functions as threads.
|
||||
- Windows: Disambiguate DOS style paths from SSH URLs.
|
||||
- Windows: A rudimentary poll() emulation.
|
||||
- Windows: Change the name of hook scripts to make them not
|
||||
executable.
|
||||
- Windows: Implement start_command().
|
||||
- Windows: A pipe() replacement whose ends are not inherited to
|
||||
children.
|
||||
- Windows: Wrap execve so that shell scripts can be invoked.
|
||||
- Windows: Implement setitimer() and sigaction().
|
||||
- Windows: Fix PRIuMAX definition.
|
||||
- Windows: Implement gettimeofday().
|
||||
- Windows: Handle absolute paths in
|
||||
safe_create_leading_directories().
|
||||
- Windows: Treat Windows style path names.
|
||||
- setup.c: Prepare for Windows directory separators.
|
||||
- Windows: Work around misbehaved rename().
|
||||
- Windows: always chmod(, 0666) before unlink().
|
||||
- Windows: A minimal implemention of getpwuid().
|
||||
- Windows: Implement a wrapper of the open() function.
|
||||
- Windows: Strip ".exe" from the program name.
|
||||
- Windows: Use the Windows style PATH separator ';'.
|
||||
- Add target architecture MinGW.
|
||||
- Compile some programs only conditionally.
|
||||
- Add compat/regex.[ch] and compat/fnmatch.[ch].
|
||||
|
||||
No explanation is necessary ;-). The series is probably 'next' worthy
|
||||
as-is.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled/Needs more work]
|
||||
|
||||
* jc/reflog-expire (Sun Jun 15 23:48:46 2008 -0700) 1 commit
|
||||
- Per-ref reflog expiry configuration
|
||||
|
||||
Perhaps a good foundation for optionally unexpirable stash. As 1.6.0 will
|
||||
be a good time to make backward incompatible changes, we might make expiry
|
||||
period of stash 'never' in new repositories. Needs a concensus.
|
||||
|
||||
* jc/merge-theirs (Fri Jun 20 00:17:59 2008 -0700) 2 commits
|
||||
- git-merge-recursive-{ours,theirs}
|
||||
- git-merge-file --ours, --theirs
|
||||
|
||||
Punting a merge by discarding your own work in conflicting parts but still
|
||||
salvaging the parts that are cleanly automerged. It is likely that this
|
||||
will result in nonsense mishmash, but somehow often people want this, so
|
||||
here they are. The interface to the backends may need to change, though.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
+ git-blame --reverse
|
||||
+ builtin-blame.c: allow more than 16 parents
|
||||
+ builtin-blame.c: move prepare_final() into a separate function.
|
||||
+ rev-list --children
|
||||
+ revision traversal: --children option
|
||||
|
||||
The blame that finds where each line in the original lines moved to. This
|
||||
may help a GSoC project that wants to gather statistical overview of the
|
||||
history. The final presentation may need tweaking (see the log message of
|
||||
the commit ""git-blame --reverse" on the series).
|
||||
|
||||
The tip two commits are for peeling to see what's behind the blamed
|
||||
commit, which we should be able to separate out into an independent topic
|
||||
from the rest.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Dropped for now]
|
||||
|
||||
* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits
|
||||
. Introduce fast forward option only
|
||||
. Head reduction before selecting merge strategy
|
||||
. Restructure git-merge.sh
|
||||
. Introduce -ff=<fast forward option>
|
||||
. New merge tests
|
||||
. Documentation for joining more than two histories
|
||||
|
||||
This will interfere with Miklos's rewrite of merge to C.
|
||||
|
||||
* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits
|
||||
. Use perl instead of tac
|
||||
. Fix t3404 assumption that `wc -l` does not use whitespace.
|
||||
. rebase -i: Use : in expr command instead of match.
|
||||
. rebase -i: update the implementation of 'mark' command
|
||||
. Add option --preserve-tags
|
||||
. Teach rebase interactive the tag command
|
||||
. Add option --first-parent
|
||||
. Do rebase with preserve merges with advanced TODO list
|
||||
. Select all lines with fake-editor
|
||||
. Unify the length of $SHORT* and the commits in the TODO list
|
||||
. Teach rebase interactive the merge command
|
||||
. Move redo merge code in a function
|
||||
. Teach rebase interactive the reset command
|
||||
. Teach rebase interactive the mark command
|
||||
. Move cleanup code into it's own function
|
||||
. Don't append default merge message to -m message
|
||||
. fake-editor: output TODO list if unchanged
|
||||
|
||||
* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits
|
||||
. WIP: rethink replay merge
|
||||
. Start using replay-tree merge in cherry-pick
|
||||
. revert/cherry-pick: start refactoring call to merge_recursive
|
||||
|
||||
This is meant to improve cherry-pick's behaviour when renames are
|
||||
involved, by not using merge-recursive (whose d/f conflict resolution is
|
||||
quite broken), but unfortunately has stalled for some time now.
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
Just my toy at this moment.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
. "git push": tellme-more protocol extension
|
||||
|
||||
@@ -1,295 +0,0 @@
|
||||
What's cooking in git.git (Jun 2008, issue #03; Wed, 25)
|
||||
--------------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order.
|
||||
|
||||
It already is beginning to become clear what 1.6.0 will look like. What's
|
||||
already in 'next' all are well intentioned (I do not guarantee they are
|
||||
already bug-free --- that is what cooking them in 'next' is for) and are
|
||||
good set of feature enhancements. But bigger changes will be:
|
||||
|
||||
* MinGW will be in.
|
||||
|
||||
* /usr/bin/git-cat-file is no more. The bulk of the git commands will
|
||||
move to /usr/libexec/git-core/ or somesuch.
|
||||
|
||||
* git-merge will be rewritten in C.
|
||||
|
||||
* default pack and idx versions will be updated as scheduled for some
|
||||
time ago.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits
|
||||
- Migrate git-blame to parse-option partially.
|
||||
- parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
|
||||
- parse-opt: fake short strings for callers to believe in.
|
||||
- parse-opt: do not pring errors on unknown options, return -2
|
||||
intead.
|
||||
- parse-opt: create parse_options_step.
|
||||
- parse-opt: Export a non NORETURN usage dumper.
|
||||
- parse-opt: have parse_options_{start,end}.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to master soon]
|
||||
|
||||
* lw/gitweb (Thu Jun 19 22:03:21 2008 +0200) 1 commit
|
||||
+ gitweb: standarize HTTP status codes
|
||||
|
||||
* lt/config-fsync (Wed Jun 18 15:18:44 2008 -0700) 4 commits
|
||||
+ Add config option to enable 'fsync()' of object files
|
||||
+ Split up default "i18n" and "branch" config parsing into helper
|
||||
routines
|
||||
+ Split up default "user" config parsing into helper routine
|
||||
+ Split up default "core" config parsing into helper routine
|
||||
|
||||
* nd/dashless (Tue Jun 24 19:58:11 2008 -0700) 2 commits
|
||||
+ Keep some git-* programs in $(bindir)
|
||||
+ Move all dashed-form commands to libexecdir
|
||||
|
||||
Scheduled for 1.6.0. We'll leave server-side programs in $(bindir)
|
||||
so that ssh clients can ask for "git-program" and find them on the $PATH.
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
* sr/tests (Sun Jun 8 16:04:35 2008 +0200) 3 commits
|
||||
+ Hook up the result aggregation in the test makefile.
|
||||
+ A simple script to parse the results from the testcases
|
||||
+ Modify test-lib.sh to output stats to t/test-results/*
|
||||
|
||||
* jh/clone-packed-refs (Sun Jun 15 16:06:16 2008 +0200) 4 commits
|
||||
+ Teach "git clone" to pack refs
|
||||
+ Prepare testsuite for a "git clone" that packs refs
|
||||
+ Move pack_refs() and friends into libgit
|
||||
+ Incorporate fetched packs in future object traversal
|
||||
|
||||
This is useful when cloning from a repository with insanely large number
|
||||
of refs.
|
||||
|
||||
* lw/perlish (Thu Jun 19 22:32:49 2008 +0200) 2 commits
|
||||
+ Git.pm: add test suite
|
||||
+ t/test-lib.sh: add test_external and test_external_without_stderr
|
||||
|
||||
Beginning of regression tests for Perl part of the system.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* mv/merge-in-c (Sat Jun 21 19:15:35 2008 +0200) 12 commits
|
||||
- Add new test case to ensure git-merge reduces octopus parents when
|
||||
possible
|
||||
- Build in merge
|
||||
- Introduce reduce_heads()
|
||||
- Introduce get_merge_bases_many()
|
||||
- Add new test to ensure git-merge handles more than 25 refs.
|
||||
- Introduce get_octopus_merge_bases() in commit.c
|
||||
- git-fmt-merge-msg: make it usable from other builtins
|
||||
- Move read_cache_unmerged() to read-cache.c
|
||||
- Add new test to ensure git-merge handles pull.twohead and
|
||||
pull.octopus
|
||||
- Move parse-options's skip_prefix() to git-compat-util.h
|
||||
- Move commit_list_count() to commit.c
|
||||
- Move split_cmdline() to alias.c
|
||||
|
||||
I dropped the change to parseopt in this series and fixed up the caller.
|
||||
|
||||
* 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, but git-shell may need to be updated.
|
||||
|
||||
* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits
|
||||
+ Eliminate an unnecessary chdir("..")
|
||||
+ Add support for GIT_CEILING_DIRECTORIES
|
||||
+ Fold test-absolute-path into test-path-utils
|
||||
+ Implement normalize_absolute_path
|
||||
|
||||
* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits
|
||||
- rerere.autoupdate
|
||||
- t4200: fix rerere test
|
||||
- rerere: remove dubious "tail_optimization"
|
||||
- git-rerere: detect unparsable conflicts
|
||||
- rerere: rerere_created_at() and has_resolution() abstraction
|
||||
|
||||
* sb/rebase (Sun Jun 22 01:55:50 2008 +0200) 2 commits
|
||||
+ t3404: stricter tests for git-rebase--interactive
|
||||
+ api-builtin.txt: update and fix typo
|
||||
|
||||
* sb/maint-rebase (Sun Jun 22 16:07:02 2008 +0200) 1 commit
|
||||
+ git-rebase.sh: Add check if rebase is in progress
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* ph/mergetool (Mon Jun 16 17:33:41 2008 -0600) 1 commit
|
||||
+ Remove the use of '--' in merge program invocation
|
||||
|
||||
Waiting for success reports from people who use various backends.
|
||||
|
||||
* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 39 commits
|
||||
- compat/pread.c: Add a forward declaration to fix a warning
|
||||
- Windows: Fix ntohl() related warnings about printf formatting
|
||||
- Windows: TMP and TEMP environment variables specify a temporary
|
||||
directory.
|
||||
- Windows: Make 'git help -a' work.
|
||||
- Windows: Work around an oddity when a pipe with no reader is
|
||||
written to.
|
||||
- Windows: Make the pager work.
|
||||
- When installing, be prepared that template_dir may be relative.
|
||||
- Windows: Use a relative default template_dir and ETC_GITCONFIG
|
||||
- Windows: Compute the fallback for exec_path from the program
|
||||
invocation.
|
||||
- Turn builtin_exec_path into a function.
|
||||
- Windows: Use a customized struct stat that also has the st_blocks
|
||||
member.
|
||||
- Windows: Add a custom implementation for utime().
|
||||
- Windows: Add a new lstat and fstat implementation based on Win32
|
||||
API.
|
||||
- Windows: Implement a custom spawnve().
|
||||
- Windows: Implement wrappers for gethostbyname(), socket(), and
|
||||
connect().
|
||||
- Windows: Work around incompatible sort and find.
|
||||
- Windows: Implement asynchronous functions as threads.
|
||||
- Windows: Disambiguate DOS style paths from SSH URLs.
|
||||
- Windows: A rudimentary poll() emulation.
|
||||
- Windows: Change the name of hook scripts to make them not
|
||||
executable.
|
||||
- Windows: Implement start_command().
|
||||
- Windows: A pipe() replacement whose ends are not inherited to
|
||||
children.
|
||||
- Windows: Wrap execve so that shell scripts can be invoked.
|
||||
- Windows: Implement setitimer() and sigaction().
|
||||
- Windows: Fix PRIuMAX definition.
|
||||
- Windows: Implement gettimeofday().
|
||||
- Make my_mktime() public and rename it to tm_to_time_t()
|
||||
- Windows: Work around misbehaved rename().
|
||||
- Windows: always chmod(, 0666) before unlink().
|
||||
- Windows: A minimal implemention of getpwuid().
|
||||
- Windows: Implement a wrapper of the open() function.
|
||||
- Windows: Strip ".exe" from the program name.
|
||||
- Windows: Handle absolute paths in
|
||||
safe_create_leading_directories().
|
||||
- Windows: Treat Windows style path names.
|
||||
- setup.c: Prepare for Windows directory separators.
|
||||
- Windows: Use the Windows style PATH separator ';'.
|
||||
- Add target architecture MinGW.
|
||||
- Compile some programs only conditionally.
|
||||
- Add compat/regex.[ch] and compat/fnmatch.[ch].
|
||||
|
||||
No explanation is necessary ;-). The series is probably 'next' worthy
|
||||
as-is, except that template renaming hack won't be needed anymore.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled/Needs more work]
|
||||
|
||||
* jc/reflog-expire (Sun Jun 15 23:48:46 2008 -0700) 1 commit
|
||||
- Per-ref reflog expiry configuration
|
||||
|
||||
Perhaps a good foundation for optionally unexpirable stash. As 1.6.0 will
|
||||
be a good time to make backward incompatible changes, we might make expiry
|
||||
period of stash 'never' in new repositories. Needs a concensus.
|
||||
|
||||
* jc/merge-theirs (Fri Jun 20 00:17:59 2008 -0700) 2 commits
|
||||
- git-merge-recursive-{ours,theirs}
|
||||
- git-merge-file --ours, --theirs
|
||||
|
||||
Punting a merge by discarding your own work in conflicting parts but still
|
||||
salvaging the parts that are cleanly automerged. It is likely that this
|
||||
will result in nonsense mishmash, but somehow often people want this, so
|
||||
here they are. The interface to the backends may need to change, though.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
+ git-blame --reverse
|
||||
+ builtin-blame.c: allow more than 16 parents
|
||||
+ builtin-blame.c: move prepare_final() into a separate function.
|
||||
+ rev-list --children
|
||||
+ revision traversal: --children option
|
||||
|
||||
The blame that finds where each line in the original lines moved to. This
|
||||
may help a GSoC project that wants to gather statistical overview of the
|
||||
history. The final presentation may need tweaking (see the log message of
|
||||
the commit ""git-blame --reverse" on the series).
|
||||
|
||||
The tip two commits are for peeling to see what's behind the blamed
|
||||
commit, which we should be able to separate out into an independent topic
|
||||
from the rest.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Dropped for now]
|
||||
|
||||
* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits
|
||||
. Introduce fast forward option only
|
||||
. Head reduction before selecting merge strategy
|
||||
. Restructure git-merge.sh
|
||||
. Introduce -ff=<fast forward option>
|
||||
. New merge tests
|
||||
. Documentation for joining more than two histories
|
||||
|
||||
This will interfere with Miklos's rewrite of merge to C.
|
||||
|
||||
* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits
|
||||
. Use perl instead of tac
|
||||
. Fix t3404 assumption that `wc -l` does not use whitespace.
|
||||
. rebase -i: Use : in expr command instead of match.
|
||||
. rebase -i: update the implementation of 'mark' command
|
||||
. Add option --preserve-tags
|
||||
. Teach rebase interactive the tag command
|
||||
. Add option --first-parent
|
||||
. Do rebase with preserve merges with advanced TODO list
|
||||
. Select all lines with fake-editor
|
||||
. Unify the length of $SHORT* and the commits in the TODO list
|
||||
. Teach rebase interactive the merge command
|
||||
. Move redo merge code in a function
|
||||
. Teach rebase interactive the reset command
|
||||
. Teach rebase interactive the mark command
|
||||
. Move cleanup code into it's own function
|
||||
. Don't append default merge message to -m message
|
||||
. fake-editor: output TODO list if unchanged
|
||||
|
||||
* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits
|
||||
. WIP: rethink replay merge
|
||||
. Start using replay-tree merge in cherry-pick
|
||||
. revert/cherry-pick: start refactoring call to merge_recursive
|
||||
|
||||
This is meant to improve cherry-pick's behaviour when renames are
|
||||
involved, by not using merge-recursive (whose d/f conflict resolution is
|
||||
quite broken), but unfortunately has stalled for some time now.
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
Just my toy at this moment.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
. "git push": tellme-more protocol extension
|
||||
|
||||
@@ -1,339 +0,0 @@
|
||||
What's cooking in git.git (Jun 2008, issue #04; Mon, 30)
|
||||
--------------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be applied to the maintenance series have "maint-" in their
|
||||
names.
|
||||
|
||||
It already is beginning to become clear what 1.6.0 will look like. What's
|
||||
already in 'next' all are well intentioned (I do not guarantee they are
|
||||
already bug-free --- that is what cooking them in 'next' is for) and are
|
||||
good set of feature enhancements. Bigger changes will be:
|
||||
|
||||
* MinGW will be in.
|
||||
|
||||
* With the default Makefile settings, most of the programs will be
|
||||
installed outside your $PATH, except for "git", "gitk", "git-gui" and
|
||||
some server side programs that need to be accessible for technical
|
||||
reasons. Invoking a git subcommand as "git-xyzzy" from the command
|
||||
line has been deprecated since early 2006 (and officially announced in
|
||||
1.5.4 release notes); use of them from your scripts after adding
|
||||
output from "git --exec-path" to the $PATH will still be supported in
|
||||
1.6.0, but users are again strongly encouraged to adjust their
|
||||
scripts to use "git xyzzy" form, as we will stop installing
|
||||
"git-xyzzy" hardlinks for built-in commands in later releases.
|
||||
|
||||
* git-merge will be rewritten in C.
|
||||
|
||||
* default pack and idx versions will be updated as scheduled for some
|
||||
time ago.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to master soon]
|
||||
|
||||
* nd/dashless (Tue Jun 24 19:58:11 2008 -0700) 2 commits
|
||||
+ Keep some git-* programs in $(bindir)
|
||||
+ Move all dashed-form commands to libexecdir
|
||||
|
||||
Scheduled for 1.6.0. We'll leave server-side programs in $(bindir) so
|
||||
that ssh clients can ask for "git-program" and find them on the $PATH.
|
||||
Next major release after 1.6.0 would most likely remove the hardlinks to
|
||||
built-in commands, but not yet.
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 4 commits
|
||||
+ Revert "Make clients ask for "git program" over ssh and local
|
||||
transport"
|
||||
+ Make clients ask for "git program" over ssh and local transport
|
||||
+ Prepare execv_git_cmd() for removal of builtins from the
|
||||
filesystem
|
||||
+ git-shell: accept "git foo" form
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* jk/maint-fetch-ref-hier (Fri Jun 27 00:01:41 2008 -0400) 2 commits
|
||||
+ fetch: give a hint to the user when local refs fail to update
|
||||
+ fetch: report local storage errors in status table
|
||||
|
||||
When the remote used to have "foo" branch but now has "foo/bar", fetch
|
||||
refuses to delete the existing remote tracking branch "foo" to create a
|
||||
new remote tracking branch "foo/bar", but the error message was
|
||||
confusing.
|
||||
|
||||
* jc/maint-reset (Wed Jun 25 18:16:36 2008 -0700) 1 commit
|
||||
+ Allow "git-reset path" when unambiguous
|
||||
|
||||
We used to require "git-reset -- path" even when there is no ambiguity
|
||||
(i.e. path cannot be mistaken as a valid tree-ish and it is a filename in
|
||||
the work tree).
|
||||
|
||||
* js/maint-clone-insteadof (Fri Jun 27 13:55:23 2008 +0100) 2 commits
|
||||
+ clone: respect the settings in $HOME/.gitconfig and /etc/gitconfig
|
||||
+ clone: respect url.insteadOf setting in global configs
|
||||
|
||||
"git clone" did not honor "url.InsteadOf" in $HOME/.gitconfig. I think
|
||||
Daniel's "Let's get rid of internal use of GIT_CONFIG" makes sense (even
|
||||
though it feels very scary), and it would make the solution much simpler,
|
||||
but it came late and it is already past my bedtime, so...
|
||||
|
||||
* tr/send-email-ssl (Thu Jun 26 23:03:21 2008 +0200) 2 commits
|
||||
+ git-send-email: prevent undefined variable warnings if no
|
||||
encryption is set
|
||||
+ git-send-email: add support for TLS via Net::SMTP::SSL
|
||||
|
||||
* kb/send-email-fifo (Wed Jun 25 15:44:40 2008 -0700) 1 commit
|
||||
+ git-send-email: Accept fifos as well as files
|
||||
|
||||
Two minor send-email feature enhancements for 1.6.0.
|
||||
|
||||
* jc/checkdiff (Sun Jun 29 16:49:06 2008 -0400) 7 commits
|
||||
+ Fix t4017-diff-retval for white-space from wc
|
||||
+ Update sample pre-commit hook to use "diff --check"
|
||||
+ diff --check: detect leftover conflict markers
|
||||
+ Teach "diff --check" about new blank lines at end
|
||||
+ checkdiff: pass diff_options to the callback
|
||||
+ check_and_emit_line(): rename and refactor
|
||||
+ diff --check: explain why we do not care whether old side is
|
||||
binary
|
||||
|
||||
Allows us to replace the sample pre-commit hook that was not aware of the
|
||||
line termination convention per path nor newer whitespace breakage rules.
|
||||
|
||||
* np/pack-default (Wed Jun 25 00:25:53 2008 -0400) 2 commits
|
||||
+ pack.indexversion config option now defaults to 2
|
||||
+ repack.usedeltabaseoffset config option now defaults to "true"
|
||||
|
||||
Updates the default value for pack.indexversion to 2 and use delta-base
|
||||
offset encoding of the packfiles by default.
|
||||
|
||||
* js/apply-recount (Fri Jun 27 18:43:09 2008 +0100) 1 commit
|
||||
+ Allow git-apply to recount the lines in a hunk (AKA recountdiff)
|
||||
|
||||
A good ingredient for implementing "apply --edit".
|
||||
|
||||
* dz/apply-again (Fri Jun 27 14:39:12 2008 -0400) 1 commit
|
||||
+ git-apply: handle a patch that touches the same path more than
|
||||
once better
|
||||
|
||||
Allows us to feed a patch that touches the same path more than once.
|
||||
|
||||
* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits
|
||||
- Make default expiration period of reflog used for stash infinite
|
||||
- Per-ref reflog expiry configuration
|
||||
|
||||
As 1.6.0 will be a good time to make backward incompatible changes, the
|
||||
tip commit makes the default expiry period of stash 'never', unless you
|
||||
configure them to expire explicitly using gc.refs/stash.* variables.
|
||||
Needs consensus, but I am guessing that enough people would want stash
|
||||
that does not expire.
|
||||
|
||||
* jc/merge-theirs (Sat Jun 28 17:28:22 2008 -0700) 3 commits
|
||||
+ Teach git-merge to pass -X<option> to the backend strategy module
|
||||
+ git-merge-recursive-{ours,theirs}
|
||||
+ git-merge-file --ours, --theirs
|
||||
|
||||
Punting a merge by discarding your own work in conflicting parts but still
|
||||
salvaging the parts that are cleanly automerged. It is likely that this
|
||||
will result in nonsense mishmash, but somehow often people want this, so
|
||||
here they are. The interface to the backends is updated so that you can
|
||||
say "git merge -Xours -s recursive other" now.
|
||||
|
||||
* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 38 commits
|
||||
+ compat/pread.c: Add a forward declaration to fix a warning
|
||||
+ Windows: Fix ntohl() related warnings about printf formatting
|
||||
+ Windows: TMP and TEMP environment variables specify a temporary
|
||||
directory.
|
||||
+ Windows: Make 'git help -a' work.
|
||||
+ Windows: Work around an oddity when a pipe with no reader is
|
||||
written to.
|
||||
+ Windows: Make the pager work.
|
||||
+ When installing, be prepared that template_dir may be relative.
|
||||
+ Windows: Use a relative default template_dir and ETC_GITCONFIG
|
||||
+ Windows: Compute the fallback for exec_path from the program
|
||||
invocation.
|
||||
+ Turn builtin_exec_path into a function.
|
||||
+ Windows: Use a customized struct stat that also has the st_blocks
|
||||
member.
|
||||
+ Windows: Add a custom implementation for utime().
|
||||
+ Windows: Add a new lstat and fstat implementation based on Win32
|
||||
API.
|
||||
+ Windows: Implement a custom spawnve().
|
||||
+ Windows: Implement wrappers for gethostbyname(), socket(), and
|
||||
connect().
|
||||
+ Windows: Work around incompatible sort and find.
|
||||
+ Windows: Implement asynchronous functions as threads.
|
||||
+ Windows: Disambiguate DOS style paths from SSH URLs.
|
||||
+ Windows: A rudimentary poll() emulation.
|
||||
+ Windows: Implement start_command().
|
||||
+ Windows: A pipe() replacement whose ends are not inherited to
|
||||
children.
|
||||
+ Windows: Wrap execve so that shell scripts can be invoked.
|
||||
+ Windows: Implement setitimer() and sigaction().
|
||||
+ Windows: Fix PRIuMAX definition.
|
||||
+ Windows: Implement gettimeofday().
|
||||
+ Make my_mktime() public and rename it to tm_to_time_t()
|
||||
+ Windows: Work around misbehaved rename().
|
||||
+ Windows: always chmod(, 0666) before unlink().
|
||||
+ Windows: A minimal implemention of getpwuid().
|
||||
+ Windows: Implement a wrapper of the open() function.
|
||||
+ Windows: Strip ".exe" from the program name.
|
||||
+ Windows: Handle absolute paths in
|
||||
safe_create_leading_directories().
|
||||
+ Windows: Treat Windows style path names.
|
||||
+ setup.c: Prepare for Windows directory separators.
|
||||
+ Windows: Use the Windows style PATH separator ';'.
|
||||
+ Add target architecture MinGW.
|
||||
+ Compile some programs only conditionally.
|
||||
+ Add compat/regex.[ch] and compat/fnmatch.[ch].
|
||||
|
||||
No explanation necessary ;-)
|
||||
|
||||
* mv/merge-in-c (Mon Jun 30 03:39:58 2008 +0200) 13 commits
|
||||
- Build in merge
|
||||
- Add new test case to ensure git-merge prepends the custom merge
|
||||
message
|
||||
- Add new test case to ensure git-merge reduces octopus parents when
|
||||
possible
|
||||
- Introduce reduce_heads()
|
||||
- Introduce get_merge_bases_many()
|
||||
- Add new test to ensure git-merge handles more than 25 refs.
|
||||
- Introduce get_octopus_merge_bases() in commit.c
|
||||
- git-fmt-merge-msg: make it usable from other builtins
|
||||
- Move read_cache_unmerged() to read-cache.c
|
||||
- Add new test to ensure git-merge handles pull.twohead and
|
||||
pull.octopus
|
||||
- Move parse-options's skip_prefix() to git-compat-util.h
|
||||
- Move commit_list_count() to commit.c
|
||||
- Move split_cmdline() to alias.c
|
||||
|
||||
The last one is still in flux.
|
||||
|
||||
* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits
|
||||
+ Eliminate an unnecessary chdir("..")
|
||||
+ Add support for GIT_CEILING_DIRECTORIES
|
||||
+ Fold test-absolute-path into test-path-utils
|
||||
+ Implement normalize_absolute_path
|
||||
|
||||
* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits
|
||||
+ rerere.autoupdate
|
||||
+ t4200: fix rerere test
|
||||
+ rerere: remove dubious "tail_optimization"
|
||||
+ git-rerere: detect unparsable conflicts
|
||||
+ rerere: rerere_created_at() and has_resolution() abstraction
|
||||
|
||||
A new configuration will allow paths that have been resolved cleanly by
|
||||
rerere to be updated in the index automatically.
|
||||
|
||||
* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits
|
||||
- Migrate git-blame to parse-option partially.
|
||||
- parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
|
||||
- parse-opt: fake short strings for callers to believe in.
|
||||
- parse-opt: do not pring errors on unknown options, return -2
|
||||
intead.
|
||||
- parse-opt: create parse_options_step.
|
||||
- parse-opt: Export a non NORETURN usage dumper.
|
||||
- parse-opt: have parse_options_{start,end}.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* ph/mergetool (Mon Jun 16 17:33:41 2008 -0600) 1 commit
|
||||
+ Remove the use of '--' in merge program invocation
|
||||
|
||||
Waiting for success reports from people who use various backends.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled/Needs more work]
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
+ git-blame --reverse
|
||||
+ builtin-blame.c: allow more than 16 parents
|
||||
+ builtin-blame.c: move prepare_final() into a separate function.
|
||||
+ rev-list --children
|
||||
+ revision traversal: --children option
|
||||
|
||||
The blame that finds where each line in the original lines moved to. This
|
||||
may help a GSoC project that wants to gather statistical overview of the
|
||||
history. The final presentation may need tweaking (see the log message of
|
||||
the commit ""git-blame --reverse" on the series).
|
||||
|
||||
The tip two commits are for peeling to see what's behind the blamed
|
||||
commit, which we should be able to separate out into an independent topic
|
||||
from the rest.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Dropped for now]
|
||||
|
||||
* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits
|
||||
. Introduce fast forward option only
|
||||
. Head reduction before selecting merge strategy
|
||||
. Restructure git-merge.sh
|
||||
. Introduce -ff=<fast forward option>
|
||||
. New merge tests
|
||||
. Documentation for joining more than two histories
|
||||
|
||||
This will interfere with Miklos's rewrite of merge to C.
|
||||
|
||||
* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits
|
||||
. Use perl instead of tac
|
||||
. Fix t3404 assumption that `wc -l` does not use whitespace.
|
||||
. rebase -i: Use : in expr command instead of match.
|
||||
. rebase -i: update the implementation of 'mark' command
|
||||
. Add option --preserve-tags
|
||||
. Teach rebase interactive the tag command
|
||||
. Add option --first-parent
|
||||
. Do rebase with preserve merges with advanced TODO list
|
||||
. Select all lines with fake-editor
|
||||
. Unify the length of $SHORT* and the commits in the TODO list
|
||||
. Teach rebase interactive the merge command
|
||||
. Move redo merge code in a function
|
||||
. Teach rebase interactive the reset command
|
||||
. Teach rebase interactive the mark command
|
||||
. Move cleanup code into it's own function
|
||||
. Don't append default merge message to -m message
|
||||
. fake-editor: output TODO list if unchanged
|
||||
|
||||
* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits
|
||||
. WIP: rethink replay merge
|
||||
. Start using replay-tree merge in cherry-pick
|
||||
. revert/cherry-pick: start refactoring call to merge_recursive
|
||||
|
||||
This is meant to improve cherry-pick's behaviour when renames are
|
||||
involved, by not using merge-recursive (whose d/f conflict resolution is
|
||||
quite broken), but unfortunately has stalled for some time now.
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
Just my toy at this moment.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
. "git push": tellme-more protocol extension
|
||||
|
||||
@@ -1,415 +0,0 @@
|
||||
What's cooking in git.git (Jul 2008, issue #01; Tue, 01)
|
||||
--------------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be applied to the maintenance series have "maint-" in their
|
||||
names.
|
||||
|
||||
It already is beginning to become clear what 1.6.0 will look like. Wha=
|
||||
t's
|
||||
already in 'next' all are well intentioned (I do not guarantee they are
|
||||
already bug-free --- that is what cooking them in 'next' is for) and ar=
|
||||
e
|
||||
good set of feature enhancements. Bigger changes will be:
|
||||
|
||||
* MinGW will be in.
|
||||
|
||||
* With the default Makefile settings, most of the programs will be
|
||||
installed outside your $PATH, except for "git", "gitk", "git-gui" an=
|
||||
d
|
||||
some server side programs that need to be accessible for technical
|
||||
reasons. Invoking a git subcommand as "git-xyzzy" from the command
|
||||
line has been deprecated since early 2006 (and officially announced =
|
||||
in
|
||||
1.5.4 release notes); use of them from your scripts after adding
|
||||
output from "git --exec-path" to the $PATH will still be supported i=
|
||||
n
|
||||
1.6.0, but users are again strongly encouraged to adjust their
|
||||
scripts to use "git xyzzy" form, as we will stop installing
|
||||
"git-xyzzy" hardlinks for built-in commands in later releases.
|
||||
|
||||
* git-merge will be rewritten in C.
|
||||
|
||||
* default pack and idx versions will be updated as scheduled for some
|
||||
time ago.
|
||||
|
||||
* GIT_CONFIG, which was only documented as affecting "git config", but
|
||||
actually affected all git commands, now only affects "git config".
|
||||
GIT_LOCAL_CONFIG, also only documented as affecting "git config" and
|
||||
not different from GIT_CONFIG in a useful way, is removed.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* js/import-zip (Mon Jun 30 19:50:44 2008 +0100) 1 commit
|
||||
+ Add another fast-import example, this time for .zip files
|
||||
|
||||
* js/apply-root (Tue Jul 1 00:44:47 2008 +0100) 1 commit
|
||||
+ Teach "git apply" to prepend a prefix with "--root=3D<root>"
|
||||
|
||||
* db/no-git-config (Mon Jun 30 03:37:47 2008 -0400) 1 commit
|
||||
+ Only use GIT_CONFIG in "git config", not other programs
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to master soon]
|
||||
|
||||
* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 38 commits
|
||||
+ compat/pread.c: Add a forward declaration to fix a warning
|
||||
+ Windows: Fix ntohl() related warnings about printf formatting
|
||||
+ Windows: TMP and TEMP environment variables specify a temporary
|
||||
directory.
|
||||
+ Windows: Make 'git help -a' work.
|
||||
+ Windows: Work around an oddity when a pipe with no reader is
|
||||
written to.
|
||||
+ Windows: Make the pager work.
|
||||
+ When installing, be prepared that template_dir may be relative.
|
||||
+ Windows: Use a relative default template_dir and ETC_GITCONFIG
|
||||
+ Windows: Compute the fallback for exec_path from the program
|
||||
invocation.
|
||||
+ Turn builtin_exec_path into a function.
|
||||
+ Windows: Use a customized struct stat that also has the st_blocks
|
||||
member.
|
||||
+ Windows: Add a custom implementation for utime().
|
||||
+ Windows: Add a new lstat and fstat implementation based on Win32
|
||||
API.
|
||||
+ Windows: Implement a custom spawnve().
|
||||
+ Windows: Implement wrappers for gethostbyname(), socket(), and
|
||||
connect().
|
||||
+ Windows: Work around incompatible sort and find.
|
||||
+ Windows: Implement asynchronous functions as threads.
|
||||
+ Windows: Disambiguate DOS style paths from SSH URLs.
|
||||
+ Windows: A rudimentary poll() emulation.
|
||||
+ Windows: Implement start_command().
|
||||
+ Windows: A pipe() replacement whose ends are not inherited to
|
||||
children.
|
||||
+ Windows: Wrap execve so that shell scripts can be invoked.
|
||||
+ Windows: Implement setitimer() and sigaction().
|
||||
+ Windows: Fix PRIuMAX definition.
|
||||
+ Windows: Implement gettimeofday().
|
||||
+ Make my_mktime() public and rename it to tm_to_time_t()
|
||||
+ Windows: Work around misbehaved rename().
|
||||
+ Windows: always chmod(, 0666) before unlink().
|
||||
+ Windows: A minimal implemention of getpwuid().
|
||||
+ Windows: Implement a wrapper of the open() function.
|
||||
+ Windows: Strip ".exe" from the program name.
|
||||
+ Windows: Handle absolute paths in
|
||||
safe_create_leading_directories().
|
||||
+ Windows: Treat Windows style path names.
|
||||
+ setup.c: Prepare for Windows directory separators.
|
||||
+ Windows: Use the Windows style PATH separator ';'.
|
||||
+ Add target architecture MinGW.
|
||||
+ Compile some programs only conditionally.
|
||||
+ Add compat/regex.[ch] and compat/fnmatch.[ch].
|
||||
|
||||
No explanation necessary ;-)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits
|
||||
- Make default expiration period of reflog used for stash infinite
|
||||
- Per-ref reflog expiry configuration
|
||||
|
||||
As 1.6.0 will be a good time to make backward incompatible changes, the
|
||||
tip commit makes the default expiry period of stash 'never', unless you
|
||||
configure them to expire explicitly using gc.refs/stash.* variables.
|
||||
Needs consensus, but I am guessing that enough people would want stash
|
||||
that does not expire.
|
||||
|
||||
We may want to change the commit topology used to represent a stash, as
|
||||
proposed in $gmane/85055 by Nana earlier.
|
||||
|
||||
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 4 commits
|
||||
- Make "subtree" part more orthogonal to the rest of merge-
|
||||
recursive.
|
||||
+ Teach git-merge to pass -X<option> to the backend strategy module
|
||||
+ git-merge-recursive-{ours,theirs}
|
||||
+ git-merge-file --ours, --theirs
|
||||
|
||||
Punting a merge by discarding your own work in conflicting parts but st=
|
||||
ill
|
||||
salvaging the parts that are cleanly automerged. It is likely that thi=
|
||||
s
|
||||
will result in nonsense mishmash, but somehow often people want this, s=
|
||||
o
|
||||
here they are. The interface to the backends is updated so that you ca=
|
||||
n
|
||||
say "git merge -Xours -Xsubtree=3Dfoo/bar/baz -s recursive other" now.
|
||||
|
||||
* mv/merge-in-c (Tue Jul 1 04:37:50 2008 +0200) 14 commits
|
||||
- Build in merge
|
||||
- git-commit-tree: make it usable from other builtins
|
||||
- Add new test case to ensure git-merge prepends the custom merge
|
||||
message
|
||||
- Add new test case to ensure git-merge reduces octopus parents when
|
||||
possible
|
||||
- Introduce reduce_heads()
|
||||
- Introduce get_merge_bases_many()
|
||||
- Add new test to ensure git-merge handles more than 25 refs.
|
||||
- Introduce get_octopus_merge_bases() in commit.c
|
||||
- git-fmt-merge-msg: make it usable from other builtins
|
||||
- Move read_cache_unmerged() to read-cache.c
|
||||
- Add new test to ensure git-merge handles pull.twohead and
|
||||
pull.octopus
|
||||
- Move parse-options's skip_prefix() to git-compat-util.h
|
||||
- Move commit_list_count() to commit.c
|
||||
- Move split_cmdline() to alias.c
|
||||
|
||||
I think this is getting there. Will be in 'next' soon.
|
||||
|
||||
* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits
|
||||
+ Eliminate an unnecessary chdir("..")
|
||||
+ Add support for GIT_CEILING_DIRECTORIES
|
||||
+ Fold test-absolute-path into test-path-utils
|
||||
+ Implement normalize_absolute_path
|
||||
|
||||
* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits
|
||||
+ rerere.autoupdate
|
||||
+ t4200: fix rerere test
|
||||
+ rerere: remove dubious "tail_optimization"
|
||||
+ git-rerere: detect unparsable conflicts
|
||||
+ rerere: rerere_created_at() and has_resolution() abstraction
|
||||
|
||||
A new configuration will allow paths that have been resolved cleanly by
|
||||
rerere to be updated in the index automatically.
|
||||
|
||||
* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits
|
||||
- Migrate git-blame to parse-option partially.
|
||||
- parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
|
||||
- parse-opt: fake short strings for callers to believe in.
|
||||
- parse-opt: do not print errors on unknown options, return -2
|
||||
intead.
|
||||
- parse-opt: create parse_options_step.
|
||||
- parse-opt: Export a non NORETURN usage dumper.
|
||||
- parse-opt: have parse_options_{start,end}.
|
||||
|
||||
I recall Pierre said something about cleaning up the last one when he
|
||||
finds time, but other than that vague recollection, I lost track of thi=
|
||||
s
|
||||
series. I am tempted to fork a few topics off of the pen=C3=BAltimo on=
|
||||
e to
|
||||
convert a few more commands as examples and merge the result to 'next'.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* ph/mergetool (Mon Jun 16 17:33:41 2008 -0600) 1 commit
|
||||
+ Remove the use of '--' in merge program invocation
|
||||
|
||||
I got tired of waiting for success reports from people who use various
|
||||
backends. We will hear breakages if this breaks things anyway, and if =
|
||||
it
|
||||
does, it is a fairly simple single patch to revert.
|
||||
|
||||
* nd/dashless (Tue Jun 24 19:58:11 2008 -0700) 2 commits
|
||||
+ Keep some git-* programs in $(bindir)
|
||||
+ Move all dashed-form commands to libexecdir
|
||||
|
||||
We'll leave server-side programs in $(bindir) so that ssh clients can a=
|
||||
sk
|
||||
for "git-program" and find them on the $PATH. Next major release after
|
||||
1.6.0 would most likely remove the hardlinks to built-in commands, but =
|
||||
not
|
||||
yet.
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
|
||||
+ Prepare execv_git_cmd() for removal of builtins from the
|
||||
filesystem
|
||||
+ git-shell: accept "git foo" form
|
||||
|
||||
The botched "client asks 'git foo'" is not included. It will be long
|
||||
after everybody runs 1.6.0.
|
||||
|
||||
* jk/maint-fetch-ref-hier (Fri Jun 27 00:01:41 2008 -0400) 2 commits
|
||||
+ fetch: give a hint to the user when local refs fail to update
|
||||
+ fetch: report local storage errors in status table
|
||||
|
||||
When the remote used to have "foo" branch but now has "foo/bar", fetch
|
||||
refuses to delete the existing remote tracking branch "foo" to create a
|
||||
new remote tracking branch "foo/bar", but the error message was
|
||||
confusing.
|
||||
|
||||
Need to backmerge to 'maint' after a while.
|
||||
|
||||
* jc/maint-reset (Wed Jun 25 18:16:36 2008 -0700) 1 commit
|
||||
+ Allow "git-reset path" when unambiguous
|
||||
|
||||
We used to require "git-reset -- path" even when there is no ambiguity
|
||||
(i.e. path cannot be mistaken as a valid tree-ish and it is a filename =
|
||||
in
|
||||
the work tree).
|
||||
|
||||
Need to backmerge to 'maint' after a while.
|
||||
|
||||
* js/maint-clone-insteadof (Fri Jun 27 13:55:23 2008 +0100) 2 commits
|
||||
+ clone: respect the settings in $HOME/.gitconfig and /etc/gitconfig
|
||||
+ clone: respect url.insteadOf setting in global configs
|
||||
|
||||
"git clone" did not honor "url.InsteadOf" in $HOME/.gitconfig. I think
|
||||
Daniel's "Let's get rid of internal use of GIT_CONFIG" makes sense (eve=
|
||||
n
|
||||
though it feels very scary), and it would make the solution much simple=
|
||||
r,
|
||||
but these two are independently good fix for now. I'll queue GIT_CONFI=
|
||||
G
|
||||
one in 'next' and when it graduates the unsetenv() solution in these wi=
|
||||
ll
|
||||
become no-op.
|
||||
|
||||
* tr/send-email-ssl (Thu Jun 26 23:03:21 2008 +0200) 2 commits
|
||||
+ git-send-email: prevent undefined variable warnings if no
|
||||
encryption is set
|
||||
+ git-send-email: add support for TLS via Net::SMTP::SSL
|
||||
|
||||
* kb/send-email-fifo (Wed Jun 25 15:44:40 2008 -0700) 1 commit
|
||||
+ git-send-email: Accept fifos as well as files
|
||||
|
||||
Two minor send-email feature enhancements.
|
||||
|
||||
* jc/checkdiff (Sun Jun 29 16:49:06 2008 -0400) 7 commits
|
||||
+ Fix t4017-diff-retval for white-space from wc
|
||||
+ Update sample pre-commit hook to use "diff --check"
|
||||
+ diff --check: detect leftover conflict markers
|
||||
+ Teach "diff --check" about new blank lines at end
|
||||
+ checkdiff: pass diff_options to the callback
|
||||
+ check_and_emit_line(): rename and refactor
|
||||
+ diff --check: explain why we do not care whether old side is
|
||||
binary
|
||||
|
||||
Allows us to replace the sample pre-commit hook that was not aware of t=
|
||||
he
|
||||
line termination convention per path nor newer whitespace breakage rule=
|
||||
s.
|
||||
|
||||
* np/pack-default (Wed Jun 25 00:25:53 2008 -0400) 2 commits
|
||||
+ pack.indexversion config option now defaults to 2
|
||||
+ repack.usedeltabaseoffset config option now defaults to "true"
|
||||
|
||||
Updates the default value for pack.indexversion to 2 and use delta-base
|
||||
offset encoding of the packfiles by default.
|
||||
|
||||
* js/apply-recount (Fri Jun 27 18:43:09 2008 +0100) 1 commit
|
||||
+ Allow git-apply to recount the lines in a hunk (AKA recountdiff)
|
||||
|
||||
A good ingredient for implementing "apply --edit".
|
||||
|
||||
* dz/apply-again (Fri Jun 27 14:39:12 2008 -0400) 1 commit
|
||||
+ git-apply: handle a patch that touches the same path more than
|
||||
once better
|
||||
|
||||
Allows us to feed a patch that touches the same path more than once.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns =
|
||||
out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet.
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
|
||||
+ Revert "Make clients ask for "git program" over ssh and local
|
||||
transport"
|
||||
+ Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will=
|
||||
be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled/Needs more work]
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
+ git-blame --reverse
|
||||
+ builtin-blame.c: allow more than 16 parents
|
||||
+ builtin-blame.c: move prepare_final() into a separate function.
|
||||
+ rev-list --children
|
||||
+ revision traversal: --children option
|
||||
|
||||
The blame that finds where each line in the original lines moved to. T=
|
||||
his
|
||||
may help a GSoC project that wants to gather statistical overview of th=
|
||||
e
|
||||
history. The final presentation may need tweaking (see the log message=
|
||||
of
|
||||
the commit ""git-blame --reverse" on the series).
|
||||
|
||||
The tip two commits are for peeling to see what's behind the blamed
|
||||
commit, which we should be able to separate out into an independent top=
|
||||
ic
|
||||
from the rest.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Dropped for now]
|
||||
|
||||
* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits
|
||||
. Introduce fast forward option only
|
||||
. Head reduction before selecting merge strategy
|
||||
. Restructure git-merge.sh
|
||||
. Introduce -ff=3D<fast forward option>
|
||||
. New merge tests
|
||||
. Documentation for joining more than two histories
|
||||
|
||||
This will interfere with Miklos's rewrite of merge to C.
|
||||
|
||||
* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits
|
||||
. Use perl instead of tac
|
||||
. Fix t3404 assumption that `wc -l` does not use whitespace.
|
||||
. rebase -i: Use : in expr command instead of match.
|
||||
. rebase -i: update the implementation of 'mark' command
|
||||
. Add option --preserve-tags
|
||||
. Teach rebase interactive the tag command
|
||||
. Add option --first-parent
|
||||
. Do rebase with preserve merges with advanced TODO list
|
||||
. Select all lines with fake-editor
|
||||
. Unify the length of $SHORT* and the commits in the TODO list
|
||||
. Teach rebase interactive the merge command
|
||||
. Move redo merge code in a function
|
||||
. Teach rebase interactive the reset command
|
||||
. Teach rebase interactive the mark command
|
||||
. Move cleanup code into it's own function
|
||||
. Don't append default merge message to -m message
|
||||
. fake-editor: output TODO list if unchanged
|
||||
|
||||
* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits
|
||||
. WIP: rethink replay merge
|
||||
. Start using replay-tree merge in cherry-pick
|
||||
. revert/cherry-pick: start refactoring call to merge_recursive
|
||||
|
||||
This is meant to improve cherry-pick's behaviour when renames are
|
||||
involved, by not using merge-recursive (whose d/f conflict resolution i=
|
||||
s
|
||||
quite broken), but unfortunately has stalled for some time now.
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
Just my toy at this moment.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
. "git push": tellme-more protocol extension
|
||||
|
||||
@@ -1,329 +0,0 @@
|
||||
What's cooking in git.git (Jul 2008, issue #02; Sun, 06)
|
||||
--------------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be applied to the maintenance series have "maint-" in their
|
||||
names.
|
||||
|
||||
It already is beginning to become clear what 1.6.0 will look like. Wha=
|
||||
t's
|
||||
already in 'next' all are well intentioned (I do not guarantee they are
|
||||
already bug-free --- that is what cooking them in 'next' is for) and ar=
|
||||
e
|
||||
good set of feature enhancements. Bigger changes will be:
|
||||
|
||||
* Port for MinGW.
|
||||
|
||||
* With the default Makefile settings, most of the programs will be
|
||||
installed outside your $PATH, except for "git", "gitk", "git-gui" an=
|
||||
d
|
||||
some server side programs that need to be accessible for technical
|
||||
reasons. Invoking a git subcommand as "git-xyzzy" from the command
|
||||
line has been deprecated since early 2006 (and officially announced =
|
||||
in
|
||||
1.5.4 release notes); use of them from your scripts after adding
|
||||
output from "git --exec-path" to the $PATH will still be supported i=
|
||||
n
|
||||
1.6.0, but users are again strongly encouraged to adjust their
|
||||
scripts to use "git xyzzy" form, as we will stop installing
|
||||
"git-xyzzy" hardlinks for built-in commands in later releases.
|
||||
|
||||
* git-merge will be rewritten in C.
|
||||
|
||||
* default pack and idx versions will be updated as scheduled for some
|
||||
time ago.
|
||||
|
||||
* GIT_CONFIG, which was only documented as affecting "git config", but
|
||||
actually affected all git commands, now only affects "git config".
|
||||
GIT_LOCAL_CONFIG, also only documented as affecting "git config" and
|
||||
not different from GIT_CONFIG in a useful way, is removed.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* js/maint-daemon-syslog (Thu Jul 3 16:27:24 2008 +0100) 1 commit
|
||||
- [PARKED improvement suggested not rolled in] git daemon: avoid
|
||||
calling syslog() from a signal handler
|
||||
|
||||
This will eventually appear in 'maint'; currently parked on 'pu', thoug=
|
||||
h.
|
||||
|
||||
* jc/report-tracking (Sun Jul 6 02:54:56 2008 -0700) 5 commits
|
||||
- branch -r -v: do not spit out garbage
|
||||
+ stat_tracking_info(): clear object flags used during counting
|
||||
+ git-branch -v: show the remote tracking statistics
|
||||
+ git-status: show the remote tracking statistics
|
||||
+ Refactor "tracking statistics" code used by "git checkout"
|
||||
|
||||
Makes the "your branch is ahead of the tracked one by N commits" logic =
|
||||
and
|
||||
messages available to other commands; status and branch are updated.
|
||||
|
||||
* sg/stash-k-i (Fri Jun 27 16:37:15 2008 +0200) 1 commit
|
||||
- stash: introduce 'stash save --keep-index' option
|
||||
|
||||
One weakness of our "partial commit" workflow support used to be that t=
|
||||
he
|
||||
user can incrementally build what is to be committed in the index but t=
|
||||
hat
|
||||
state cannot be tested as a whole in the working tree. This allows you=
|
||||
to
|
||||
temporarily stash the remaining changes in the working tree so that the
|
||||
index state before running "stash save --keep-index" can be seen in the
|
||||
working tree to be tested and then committed. A recommended workflow t=
|
||||
o
|
||||
use after that commit is made needs to be documented (and support needs=
|
||||
to
|
||||
be added if necessary).
|
||||
|
||||
* tr/add-i-e (Thu Jul 3 00:00:00 2008 +0200) 3 commits
|
||||
+ git-add--interactive: manual hunk editing mode
|
||||
+ git-add--interactive: remove hunk coalescing
|
||||
+ git-add--interactive: replace hunk recounting with apply --recount
|
||||
|
||||
Adds 'e/dit' action to interactive add command.
|
||||
|
||||
* am/stash-branch (Thu Jul 3 11:46:05 2008 +0530) 1 commit
|
||||
+ Implement "git stash branch <newbranch> <stash>"
|
||||
|
||||
Creates a new branch out of the stashed state, after returning from the
|
||||
interrupt that forced you to create the stash in the first place.
|
||||
|
||||
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
|
||||
- Ignore graft during object transfer [broken wrt shallow clones]
|
||||
|
||||
Cloning or fetching from a repository from grafts did not send objects
|
||||
that are hidden by grafts, but the commits in the resulting repository =
|
||||
do
|
||||
need these to pass fsck. This fixes object transfer to ignore grafts.
|
||||
|
||||
Another fix is needed to git-prune so that it ignores grafts but treats
|
||||
commits that are mentioned in grafts as reachable.
|
||||
|
||||
* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit
|
||||
- Allow per-command pager config
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to master soon]
|
||||
|
||||
* js/import-zip (Mon Jun 30 19:50:44 2008 +0100) 1 commit
|
||||
+ Add another fast-import example, this time for .zip files
|
||||
|
||||
* js/apply-root (Wed Jul 2 15:28:22 2008 -0700) 2 commits
|
||||
+ apply --root: thinkofix.
|
||||
+ Teach "git apply" to prepend a prefix with "--root=3D<root>"
|
||||
|
||||
* db/no-git-config (Mon Jun 30 03:37:47 2008 -0400) 1 commit
|
||||
+ Only use GIT_CONFIG in "git config", not other programs
|
||||
|
||||
* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits
|
||||
+ Make default expiration period of reflog used for stash infinite
|
||||
+ Per-ref reflog expiry configuration
|
||||
|
||||
As 1.6.0 will be a good time to make backward incompatible changes, the
|
||||
tip commit makes the default expiry period of stash 'never', unless you
|
||||
configure them to expire explicitly using gc.refs/stash.* variables.
|
||||
Needs consensus, but I am guessing that enough people would want stash
|
||||
that does not expire.
|
||||
|
||||
* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits
|
||||
+ Eliminate an unnecessary chdir("..")
|
||||
+ Add support for GIT_CEILING_DIRECTORIES
|
||||
+ Fold test-absolute-path into test-path-utils
|
||||
+ Implement normalize_absolute_path
|
||||
|
||||
This still feels "because we can", not "because we need to", but it cam=
|
||||
e
|
||||
from somebody who had the need to, and I do not think it hurts people
|
||||
without the environment variable set.
|
||||
|
||||
* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits
|
||||
+ rerere.autoupdate
|
||||
+ t4200: fix rerere test
|
||||
+ rerere: remove dubious "tail_optimization"
|
||||
+ git-rerere: detect unparsable conflicts
|
||||
+ rerere: rerere_created_at() and has_resolution() abstraction
|
||||
|
||||
A new configuration will allow paths that have been resolved cleanly by
|
||||
rerere to be updated in the index automatically.
|
||||
|
||||
To me, this is "because we can", but was something requested by Ingo, s=
|
||||
o
|
||||
presumably some people may feel it useful in their workflow.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* mv/merge-in-c (Tue Jul 1 04:37:50 2008 +0200) 15 commits
|
||||
- [REJECT -- over-abuse of path-list] Build in merge
|
||||
+ Fix t7601-merge-pull-config.sh on AIX
|
||||
+ git-commit-tree: make it usable from other builtins
|
||||
+ Add new test case to ensure git-merge prepends the custom merge
|
||||
message
|
||||
+ Add new test case to ensure git-merge reduces octopus parents when
|
||||
possible
|
||||
+ Introduce reduce_heads()
|
||||
+ Introduce get_merge_bases_many()
|
||||
+ Add new test to ensure git-merge handles more than 25 refs.
|
||||
+ Introduce get_octopus_merge_bases() in commit.c
|
||||
+ git-fmt-merge-msg: make it usable from other builtins
|
||||
+ Move read_cache_unmerged() to read-cache.c
|
||||
+ Add new test to ensure git-merge handles pull.twohead and
|
||||
pull.octopus
|
||||
+ Move parse-options's skip_prefix() to git-compat-util.h
|
||||
+ Move commit_list_count() to commit.c
|
||||
+ Move split_cmdline() to alias.c
|
||||
|
||||
The last one is still not quite there, I am afraid.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 38 commits
|
||||
+ compat/pread.c: Add a forward declaration to fix a warning
|
||||
+ Windows: Fix ntohl() related warnings about printf formatting
|
||||
+ Windows: TMP and TEMP environment variables specify a temporary
|
||||
directory.
|
||||
+ Windows: Make 'git help -a' work.
|
||||
+ Windows: Work around an oddity when a pipe with no reader is
|
||||
written to.
|
||||
+ Windows: Make the pager work.
|
||||
+ When installing, be prepared that template_dir may be relative.
|
||||
+ Windows: Use a relative default template_dir and ETC_GITCONFIG
|
||||
+ Windows: Compute the fallback for exec_path from the program
|
||||
invocation.
|
||||
+ Turn builtin_exec_path into a function.
|
||||
+ Windows: Use a customized struct stat that also has the st_blocks
|
||||
member.
|
||||
+ Windows: Add a custom implementation for utime().
|
||||
+ Windows: Add a new lstat and fstat implementation based on Win32
|
||||
API.
|
||||
+ Windows: Implement a custom spawnve().
|
||||
+ Windows: Implement wrappers for gethostbyname(), socket(), and
|
||||
connect().
|
||||
+ Windows: Work around incompatible sort and find.
|
||||
+ Windows: Implement asynchronous functions as threads.
|
||||
+ Windows: Disambiguate DOS style paths from SSH URLs.
|
||||
+ Windows: A rudimentary poll() emulation.
|
||||
+ Windows: Implement start_command().
|
||||
+ Windows: A pipe() replacement whose ends are not inherited to
|
||||
children.
|
||||
+ Windows: Wrap execve so that shell scripts can be invoked.
|
||||
+ Windows: Implement setitimer() and sigaction().
|
||||
+ Windows: Fix PRIuMAX definition.
|
||||
+ Windows: Implement gettimeofday().
|
||||
+ Make my_mktime() public and rename it to tm_to_time_t()
|
||||
+ Windows: Work around misbehaved rename().
|
||||
+ Windows: always chmod(, 0666) before unlink().
|
||||
+ Windows: A minimal implemention of getpwuid().
|
||||
+ Windows: Implement a wrapper of the open() function.
|
||||
+ Windows: Strip ".exe" from the program name.
|
||||
+ Windows: Handle absolute paths in
|
||||
safe_create_leading_directories().
|
||||
+ Windows: Treat Windows style path names.
|
||||
+ setup.c: Prepare for Windows directory separators.
|
||||
+ Windows: Use the Windows style PATH separator ';'.
|
||||
+ Add target architecture MinGW.
|
||||
+ Compile some programs only conditionally.
|
||||
+ Add compat/regex.[ch] and compat/fnmatch.[ch].
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns =
|
||||
out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perha=
|
||||
ps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
|
||||
+ Revert "Make clients ask for "git program" over ssh and local
|
||||
transport"
|
||||
+ Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will=
|
||||
be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled/Needs more work]
|
||||
|
||||
* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits
|
||||
- Migrate git-blame to parse-option partially.
|
||||
+ parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
|
||||
+ parse-opt: fake short strings for callers to believe in.
|
||||
+ parse-opt: do not print errors on unknown options, return -2
|
||||
intead.
|
||||
+ parse-opt: create parse_options_step.
|
||||
+ parse-opt: Export a non NORETURN usage dumper.
|
||||
+ parse-opt: have parse_options_{start,end}.
|
||||
|
||||
I recall Pierre said something about cleaning up the last one when he
|
||||
finds time, but other than that vague recollection, I lost track of thi=
|
||||
s
|
||||
series. I am tempted to fork a few topics off of the pen=C3=BAltimo on=
|
||||
e to
|
||||
convert a few more commands as examples and merge the result to 'next'.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
+ git-blame --reverse
|
||||
+ builtin-blame.c: allow more than 16 parents
|
||||
+ builtin-blame.c: move prepare_final() into a separate function.
|
||||
+ rev-list --children
|
||||
+ revision traversal: --children option
|
||||
|
||||
The blame that finds where each line in the original lines moved to. T=
|
||||
his
|
||||
may help a GSoC project that wants to gather statistical overview of th=
|
||||
e
|
||||
history. The final presentation may need tweaking (see the log message=
|
||||
of
|
||||
the commit ""git-blame --reverse" on the series).
|
||||
|
||||
The tip two commits are for peeling to see what's behind the blamed
|
||||
commit, which we should be able to separate out into an independent top=
|
||||
ic
|
||||
from the rest.
|
||||
|
||||
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
|
||||
+ Make "subtree" part more orthogonal to the rest of merge-
|
||||
recursive.
|
||||
+ Teach git-pull to pass -X<option> to git-merge
|
||||
+ Teach git-merge to pass -X<option> to the backend strategy module
|
||||
+ git-merge-recursive-{ours,theirs}
|
||||
+ git-merge-file --ours, --theirs
|
||||
|
||||
Punting a merge by discarding your own work in conflicting parts but st=
|
||||
ill
|
||||
salvaging the parts that are cleanly automerged. It is likely that thi=
|
||||
s
|
||||
will result in nonsense mishmash, but somehow often people want this, s=
|
||||
o
|
||||
here they are. The interface to the backends is updated so that you ca=
|
||||
n
|
||||
say "git merge -Xours -Xsubtree=3Dfoo/bar/baz -s recursive other" now.
|
||||
|
||||
The -X<option> part may change, Dscho mentions that a single-letter -X
|
||||
that take stuck option is against syntax rules, and I think he's right.
|
||||
|
||||
This is more "because we can", not "because we need to".
|
||||
|
||||
@@ -1,283 +0,0 @@
|
||||
What's cooking in git.git (Jul 2008, issue #03; Mon, 07)
|
||||
--------------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be applied to the maintenance series have "maint-" in their
|
||||
names.
|
||||
|
||||
It already is beginning to become clear what 1.6.0 will look like. Wha=
|
||||
t's
|
||||
already in 'next' all are well intentioned (I do not guarantee they are
|
||||
already bug-free --- that is what cooking them in 'next' is for) and ar=
|
||||
e
|
||||
good set of feature enhancements. Bigger changes will be:
|
||||
|
||||
* Port for MinGW.
|
||||
|
||||
* With the default Makefile settings, most of the programs will be
|
||||
installed outside your $PATH, except for "git", "gitk", "git-gui" an=
|
||||
d
|
||||
some server side programs that need to be accessible for technical
|
||||
reasons. Invoking a git subcommand as "git-xyzzy" from the command
|
||||
line has been deprecated since early 2006 (and officially announced =
|
||||
in
|
||||
1.5.4 release notes); use of them from your scripts after adding
|
||||
output from "git --exec-path" to the $PATH will still be supported i=
|
||||
n
|
||||
1.6.0, but users are again strongly encouraged to adjust their
|
||||
scripts to use "git xyzzy" form, as we will stop installing
|
||||
"git-xyzzy" hardlinks for built-in commands in later releases.
|
||||
|
||||
* git-merge will be rewritten in C.
|
||||
|
||||
* default pack and idx versions will be updated as scheduled for some
|
||||
time ago.
|
||||
|
||||
* GIT_CONFIG, which was only documented as affecting "git config", but
|
||||
actually affected all git commands, now only affects "git config".
|
||||
GIT_LOCAL_CONFIG, also only documented as affecting "git config" and
|
||||
not different from GIT_CONFIG in a useful way, is removed.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/rebase-orig-head (Mon Jul 7 00:16:38 2008 -0700) 1 commit
|
||||
+ Teach "am" and "rebase" to mark the original position with
|
||||
ORIG_HEAD
|
||||
|
||||
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
|
||||
. Migrate git-am to use git-sequencer
|
||||
. Add git-sequencer test suite (t3350)
|
||||
. Add git-sequencer prototype documentation
|
||||
. Add git-sequencer shell prototype
|
||||
|
||||
* js/pick-root (Fri Jul 4 16:19:52 2008 +0100) 1 commit
|
||||
+ Allow cherry-picking root commits
|
||||
|
||||
* ab/bundle (Sat Jul 5 17:26:40 2008 -0400) 1 commit
|
||||
+ Teach git-bundle to read revision arguments from stdin like git-
|
||||
rev-list.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to master soon]
|
||||
|
||||
* js/apply-root (Sun Jul 6 18:36:01 2008 -0700) 3 commits
|
||||
+ git-apply --directory: make --root more similar to GNU diff
|
||||
+ apply --root: thinkofix.
|
||||
+ Teach "git apply" to prepend a prefix with "--root=3D<root>"
|
||||
|
||||
* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits
|
||||
+ Make default expiration period of reflog used for stash infinite
|
||||
+ Per-ref reflog expiry configuration
|
||||
|
||||
As 1.6.0 will be a good time to make backward incompatible changes, the
|
||||
tip commit makes the default expiry period of stash 'never', unless you
|
||||
configure them to expire explicitly using gc.refs/stash.* variables.
|
||||
Needs consensus, but I am guessing that enough people would want stash
|
||||
that does not expire.
|
||||
|
||||
* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit
|
||||
+ Allow per-command pager config
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* sg/stash-k-i (Fri Jun 27 16:37:15 2008 +0200) 1 commit
|
||||
+ stash: introduce 'stash save --keep-index' option
|
||||
|
||||
One weakness of our "partial commit" workflow support used to be that t=
|
||||
he
|
||||
user can incrementally build what is to be committed in the index but t=
|
||||
hat
|
||||
state cannot be tested as a whole in the working tree. This allows you=
|
||||
to
|
||||
temporarily stash the remaining changes in the working tree so that the
|
||||
index state before running "stash save --keep-index" can be seen in the
|
||||
working tree to be tested and then committed.
|
||||
|
||||
* am/stash-branch (Mon Jul 7 02:50:10 2008 +0530) 2 commits
|
||||
+ Add a test for "git stash branch"
|
||||
+ Implement "git stash branch <newbranch> <stash>"
|
||||
|
||||
Creates a new branch out of the stashed state, after returning from the
|
||||
interrupt that forced you to create the stash in the first place.
|
||||
|
||||
* tr/add-i-e (Thu Jul 3 00:00:00 2008 +0200) 3 commits
|
||||
+ git-add--interactive: manual hunk editing mode
|
||||
+ git-add--interactive: remove hunk coalescing
|
||||
+ git-add--interactive: replace hunk recounting with apply --recount
|
||||
|
||||
Adds 'e/dit' action to interactive add command.
|
||||
|
||||
* jc/report-tracking (Sun Jul 6 02:54:56 2008 -0700) 5 commits
|
||||
+ branch -r -v: do not spit out garbage
|
||||
+ stat_tracking_info(): clear object flags used during counting
|
||||
+ git-branch -v: show the remote tracking statistics
|
||||
+ git-status: show the remote tracking statistics
|
||||
+ Refactor "tracking statistics" code used by "git checkout"
|
||||
|
||||
Makes the "your branch is ahead of the tracked one by N commits" logic =
|
||||
and
|
||||
messages available to other commands; status and branch are updated.
|
||||
|
||||
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
|
||||
+ Make "subtree" part more orthogonal to the rest of merge-
|
||||
recursive.
|
||||
+ Teach git-pull to pass -X<option> to git-merge
|
||||
+ Teach git-merge to pass -X<option> to the backend strategy module
|
||||
+ git-merge-recursive-{ours,theirs}
|
||||
+ git-merge-file --ours, --theirs
|
||||
|
||||
Punting a merge by discarding your own work in conflicting parts but st=
|
||||
ill
|
||||
salvaging the parts that are cleanly automerged. It is likely that thi=
|
||||
s
|
||||
will result in nonsense mishmash, but somehow often people want this, s=
|
||||
o
|
||||
here they are. The interface to the backends is updated so that you ca=
|
||||
n
|
||||
say "git merge -Xours -Xsubtree=3Dfoo/bar/baz -s recursive other" now.
|
||||
|
||||
The -X<option> part may change, Dscho mentions that a single-letter -X
|
||||
that take stuck option is against syntax rules, and I think he's right.
|
||||
|
||||
This is more "because we can", not "because we need to".
|
||||
|
||||
* mv/merge-in-c (Mon Jul 7 19:24:20 2008 +0200) 15 commits
|
||||
- Build in merge
|
||||
+ Fix t7601-merge-pull-config.sh on AIX
|
||||
+ git-commit-tree: make it usable from other builtins
|
||||
+ Add new test case to ensure git-merge prepends the custom merge
|
||||
message
|
||||
+ Add new test case to ensure git-merge reduces octopus parents when
|
||||
possible
|
||||
+ Introduce reduce_heads()
|
||||
+ Introduce get_merge_bases_many()
|
||||
+ Add new test to ensure git-merge handles more than 25 refs.
|
||||
+ Introduce get_octopus_merge_bases() in commit.c
|
||||
+ git-fmt-merge-msg: make it usable from other builtins
|
||||
+ Move read_cache_unmerged() to read-cache.c
|
||||
+ Add new test to ensure git-merge handles pull.twohead and
|
||||
pull.octopus
|
||||
+ Move parse-options's skip_prefix() to git-compat-util.h
|
||||
+ Move commit_list_count() to commit.c
|
||||
+ Move split_cmdline() to alias.c
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* js/import-zip (Mon Jun 30 19:50:44 2008 +0100) 1 commit
|
||||
+ Add another fast-import example, this time for .zip files
|
||||
|
||||
* db/no-git-config (Mon Jun 30 03:37:47 2008 -0400) 1 commit
|
||||
+ Only use GIT_CONFIG in "git config", not other programs
|
||||
|
||||
* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits
|
||||
+ Eliminate an unnecessary chdir("..")
|
||||
+ Add support for GIT_CEILING_DIRECTORIES
|
||||
+ Fold test-absolute-path into test-path-utils
|
||||
+ Implement normalize_absolute_path
|
||||
|
||||
* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits
|
||||
+ rerere.autoupdate
|
||||
+ t4200: fix rerere test
|
||||
+ rerere: remove dubious "tail_optimization"
|
||||
+ git-rerere: detect unparsable conflicts
|
||||
+ rerere: rerere_created_at() and has_resolution() abstraction
|
||||
|
||||
A new configuration will allow paths that have been resolved cleanly by
|
||||
rerere to be updated in the index automatically.
|
||||
|
||||
* js/maint-daemon-syslog (Thu Jul 3 16:27:24 2008 +0100) 1 commit
|
||||
+ git daemon: avoid calling syslog() from a signal handler
|
||||
|
||||
Meant for 'maint' as well.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns =
|
||||
out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perha=
|
||||
ps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
|
||||
+ Revert "Make clients ask for "git program" over ssh and local
|
||||
transport"
|
||||
+ Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will=
|
||||
be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled/Needs more work]
|
||||
|
||||
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
|
||||
- [BROKEN wrt shallow clones] Ignore graft during object transfer
|
||||
|
||||
Cloning or fetching from a repository from grafts did not send objects
|
||||
that are hidden by grafts, but the commits in the resulting repository =
|
||||
do
|
||||
need these to pass fsck. This fixes object transfer to ignore grafts.
|
||||
|
||||
Another fix is needed to git-prune so that it ignores grafts but treats
|
||||
commits that are mentioned in grafts as reachable.
|
||||
|
||||
* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits
|
||||
- Migrate git-blame to parse-option partially.
|
||||
+ parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
|
||||
+ parse-opt: fake short strings for callers to believe in.
|
||||
+ parse-opt: do not print errors on unknown options, return -2
|
||||
intead.
|
||||
+ parse-opt: create parse_options_step.
|
||||
+ parse-opt: Export a non NORETURN usage dumper.
|
||||
+ parse-opt: have parse_options_{start,end}.
|
||||
|
||||
I recall Pierre said something about cleaning up the last one when he
|
||||
finds time, but other than that vague recollection, I lost track of thi=
|
||||
s
|
||||
series. I am tempted to fork a few topics off of the pen=C3=BAltimo on=
|
||||
e to
|
||||
convert a few more commands as examples and merge the result to 'next'.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
+ git-blame --reverse
|
||||
+ builtin-blame.c: allow more than 16 parents
|
||||
+ builtin-blame.c: move prepare_final() into a separate function.
|
||||
+ rev-list --children
|
||||
+ revision traversal: --children option
|
||||
|
||||
The blame that finds where each line in the original lines moved to. T=
|
||||
his
|
||||
may help a GSoC project that wants to gather statistical overview of th=
|
||||
e
|
||||
history. The final presentation may need tweaking (see the log message=
|
||||
of
|
||||
the commit ""git-blame --reverse" on the series).
|
||||
|
||||
The tip two commits are for peeling to see what's behind the blamed
|
||||
commit, which we should be able to separate out into an independent top=
|
||||
ic
|
||||
from the rest.
|
||||
|
||||
@@ -1,268 +0,0 @@
|
||||
What's cooking in git.git (Jul 2008, issue #04; Wed, 09)
|
||||
--------------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be applied to the maintenance series have "maint-" in their
|
||||
names.
|
||||
|
||||
It already is beginning to become clear what 1.6.0 will look like. What's
|
||||
already in 'next' all are well intentioned (I do not guarantee they are
|
||||
already bug-free --- that is what cooking them in 'next' is for) and are
|
||||
good set of feature enhancements. Bigger changes will be:
|
||||
|
||||
* Port for MinGW.
|
||||
|
||||
* With the default Makefile settings, most of the programs will be
|
||||
installed outside your $PATH, except for "git", "gitk", "git-gui" and
|
||||
some server side programs that need to be accessible for technical
|
||||
reasons. Invoking a git subcommand as "git-xyzzy" from the command
|
||||
line has been deprecated since early 2006 (and officially announced in
|
||||
1.5.4 release notes); use of them from your scripts after adding
|
||||
output from "git --exec-path" to the $PATH will still be supported in
|
||||
1.6.0, but users are again strongly encouraged to adjust their
|
||||
scripts to use "git xyzzy" form, as we will stop installing
|
||||
"git-xyzzy" hardlinks for built-in commands in later releases.
|
||||
|
||||
* git-merge will be rewritten in C.
|
||||
|
||||
* default pack and idx versions will be updated as scheduled for some
|
||||
time ago.
|
||||
|
||||
* GIT_CONFIG, which was only documented as affecting "git config", but
|
||||
actually affected all git commands, now only affects "git config".
|
||||
GIT_LOCAL_CONFIG, also only documented as affecting "git config" and
|
||||
not different from GIT_CONFIG in a useful way, is removed.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
|
||||
+ Teach git-merge -X<option> again.
|
||||
+ Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
|
||||
+ builtin-merge.c: use parse_options_step() "incremental parsing"
|
||||
machinery
|
||||
+ Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
|
||||
|
||||
I've described what this is in a separate message.
|
||||
|
||||
* jc/branch-merged (Tue Jul 8 17:55:47 2008 -0700) 3 commits
|
||||
+ branch --merged/--no-merged: allow specifying arbitrary commit
|
||||
+ branch --contains: default to HEAD
|
||||
+ parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
|
||||
|
||||
This builds on top of the parse-options enhancement series that
|
||||
has been cooking in 'next' for some time.
|
||||
|
||||
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
|
||||
+ Documentation: Improve documentation for git-imap-send(1)
|
||||
+ imap-send.c: more style fixes
|
||||
+ imap-send.c: style fixes
|
||||
+ git-imap-send: Support SSL
|
||||
+ git-imap-send: Allow the program to be run from subdirectories of
|
||||
a git tree
|
||||
|
||||
* om/rerere-careful (Mon Jul 7 14:42:48 2008 +0200) 1 commit
|
||||
+ builtin-rerere: more carefully find conflict markers
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to master soon]
|
||||
|
||||
* js/pick-root (Fri Jul 4 16:19:52 2008 +0100) 1 commit
|
||||
+ Allow cherry-picking root commits
|
||||
|
||||
* ab/bundle (Sat Jul 5 17:26:40 2008 -0400) 1 commit
|
||||
+ Teach git-bundle to read revision arguments from stdin like git-
|
||||
rev-list.
|
||||
|
||||
* sg/stash-k-i (Tue Jul 8 00:40:56 2008 -0700) 2 commits
|
||||
+ Documentation: tweak use case in "git stash save --keep-index"
|
||||
+ stash: introduce 'stash save --keep-index' option
|
||||
|
||||
One weakness of our "partial commit" workflow support used to be that the
|
||||
user can incrementally build what is to be committed in the index but that
|
||||
state cannot be tested as a whole in the working tree. This allows you to
|
||||
temporarily stash the remaining changes in the working tree so that the
|
||||
index state before running "stash save --keep-index" can be seen in the
|
||||
working tree to be tested and then committed.
|
||||
|
||||
* am/stash-branch (Mon Jul 7 02:50:10 2008 +0530) 2 commits
|
||||
+ Add a test for "git stash branch"
|
||||
+ Implement "git stash branch <newbranch> <stash>"
|
||||
|
||||
Creates a new branch out of the stashed state, after returning from the
|
||||
interrupt that forced you to create the stash in the first place.
|
||||
|
||||
* tr/add-i-e (Thu Jul 3 00:00:00 2008 +0200) 3 commits
|
||||
+ git-add--interactive: manual hunk editing mode
|
||||
+ git-add--interactive: remove hunk coalescing
|
||||
+ git-add--interactive: replace hunk recounting with apply --recount
|
||||
|
||||
Adds 'e/dit' action to interactive add command.
|
||||
|
||||
* jc/report-tracking (Sun Jul 6 02:54:56 2008 -0700) 5 commits
|
||||
+ branch -r -v: do not spit out garbage
|
||||
+ stat_tracking_info(): clear object flags used during counting
|
||||
+ git-branch -v: show the remote tracking statistics
|
||||
+ git-status: show the remote tracking statistics
|
||||
+ Refactor "tracking statistics" code used by "git checkout"
|
||||
|
||||
Makes the "your branch is ahead of the tracked one by N commits" logic and
|
||||
messages available to other commands; status and branch are updated.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* jc/rebase-orig-head (Tue Jul 8 00:12:22 2008 -0400) 2 commits
|
||||
+ Documentation: mention ORIG_HEAD in am, merge, and rebase
|
||||
+ Teach "am" and "rebase" to mark the original position with
|
||||
ORIG_HEAD
|
||||
|
||||
* ph/parseopt-step-blame (Wed Jul 9 23:38:34 2008 +0200) 18 commits
|
||||
+ revisions: refactor handle_revision_opt into parse_revision_opt.
|
||||
+ git-shortlog: migrate to parse-options partially.
|
||||
+ git-blame: fix lapsus
|
||||
+ git-blame: migrate to incremental parse-option [2/2]
|
||||
+ git-blame: migrate to incremental parse-option [1/2]
|
||||
+ revisions: split handle_revision_opt() from setup_revisions()
|
||||
+ Merge branch 'jc/blame' (early part) into HEAD
|
||||
+ parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
|
||||
+ parse-opt: fake short strings for callers to believe in.
|
||||
+ parse-opt: do not print errors on unknown options, return -2
|
||||
intead.
|
||||
+ parse-opt: create parse_options_step.
|
||||
+ parse-opt: Export a non NORETURN usage dumper.
|
||||
+ parse-opt: have parse_options_{start,end}.
|
||||
+ git-blame --reverse
|
||||
+ builtin-blame.c: allow more than 16 parents
|
||||
+ builtin-blame.c: move prepare_final() into a separate function.
|
||||
+ rev-list --children
|
||||
+ revision traversal: --children option
|
||||
|
||||
Became active again ;-) This probably is ready for 'master' already,
|
||||
except for the last two which I only looked at the patch and have not
|
||||
used heavily in production yet.
|
||||
|
||||
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
|
||||
+ Make "subtree" part more orthogonal to the rest of merge-
|
||||
recursive.
|
||||
+ Teach git-pull to pass -X<option> to git-merge
|
||||
+ Teach git-merge to pass -X<option> to the backend strategy module
|
||||
+ git-merge-recursive-{ours,theirs}
|
||||
+ git-merge-file --ours, --theirs
|
||||
|
||||
Punting a merge by discarding your own work in conflicting parts but still
|
||||
salvaging the parts that are cleanly automerged. It is likely that this
|
||||
will result in nonsense mishmash, but somehow often people want this, so
|
||||
here they are. The interface to the backends is updated so that you can
|
||||
say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
|
||||
|
||||
* mv/merge-in-c (Mon Jul 7 19:24:20 2008 +0200) 15 commits
|
||||
+ Build in merge
|
||||
+ Fix t7601-merge-pull-config.sh on AIX
|
||||
+ git-commit-tree: make it usable from other builtins
|
||||
+ Add new test case to ensure git-merge prepends the custom merge
|
||||
message
|
||||
+ Add new test case to ensure git-merge reduces octopus parents when
|
||||
possible
|
||||
+ Introduce reduce_heads()
|
||||
+ Introduce get_merge_bases_many()
|
||||
+ Add new test to ensure git-merge handles more than 25 refs.
|
||||
+ Introduce get_octopus_merge_bases() in commit.c
|
||||
+ git-fmt-merge-msg: make it usable from other builtins
|
||||
+ Move read_cache_unmerged() to read-cache.c
|
||||
+ Add new test to ensure git-merge handles pull.twohead and
|
||||
pull.octopus
|
||||
+ Move parse-options's skip_prefix() to git-compat-util.h
|
||||
+ Move commit_list_count() to commit.c
|
||||
+ Move split_cmdline() to alias.c
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* js/apply-root (Sun Jul 6 18:36:01 2008 -0700) 3 commits
|
||||
+ git-apply --directory: make --root more similar to GNU diff
|
||||
+ apply --root: thinkofix.
|
||||
+ Teach "git apply" to prepend a prefix with "--root=<root>"
|
||||
|
||||
* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits
|
||||
+ Make default expiration period of reflog used for stash infinite
|
||||
+ Per-ref reflog expiry configuration
|
||||
|
||||
As 1.6.0 will be a good time to make backward incompatible changes, the
|
||||
tip commit makes the default expiry period of stash 'never', unless you
|
||||
configure them to expire explicitly using gc.refs/stash.* variables.
|
||||
Needs consensus, but I am guessing that enough people would want stash
|
||||
that does not expire.
|
||||
|
||||
* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit
|
||||
+ Allow per-command pager config
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
|
||||
+ Revert "Make clients ask for "git program" over ssh and local
|
||||
transport"
|
||||
+ Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled/Needs more work]
|
||||
|
||||
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
|
||||
. Migrate git-am to use git-sequencer
|
||||
. Add git-sequencer test suite (t3350)
|
||||
. Add git-sequencer prototype documentation
|
||||
. Add git-sequencer shell prototype
|
||||
|
||||
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
|
||||
- [BROKEN wrt shallow clones] Ignore graft during object transfer
|
||||
|
||||
Cloning or fetching from a repository from grafts did not send objects
|
||||
that are hidden by grafts, but the commits in the resulting repository do
|
||||
need these to pass fsck. This fixes object transfer to ignore grafts.
|
||||
|
||||
Another fix is needed to git-prune so that it ignores grafts but treats
|
||||
commits that are mentioned in grafts as reachable.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
+ git-blame --reverse
|
||||
+ builtin-blame.c: allow more than 16 parents
|
||||
+ builtin-blame.c: move prepare_final() into a separate function.
|
||||
+ rev-list --children
|
||||
+ revision traversal: --children option
|
||||
|
||||
The blame that finds where each line in the original lines moved to. This
|
||||
may help a GSoC project that wants to gather statistical overview of the
|
||||
history. The final presentation may need tweaking (see the log message of
|
||||
the commit ""git-blame --reverse" on the series).
|
||||
|
||||
The tip two commits are for peeling to see what's behind the blamed
|
||||
commit, which we should be able to separate out into an independent topic
|
||||
from the rest.
|
||||
|
||||
@@ -1,303 +0,0 @@
|
||||
What's cooking in git.git (Jul 2008, issue #05; Sun, 13)
|
||||
--------------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
I think most of the important stuff is already in 'next'. Let's start
|
||||
talking about closing the merge window for 1.6.0.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* sb/dashless (Sun Jul 13 15:36:15 2008 +0200) 3 commits
|
||||
- Make usage strings dash-less
|
||||
- t/: Use "test_must_fail git" instead of "! git"
|
||||
- t/test-lib.sh: exit with small negagive int is ok with
|
||||
test_must_fail
|
||||
|
||||
* mv/dashless (Fri Jul 11 02:12:06 2008 +0200) 4 commits
|
||||
- make remove-dashes: apply to scripts and programs as well, not
|
||||
just to builtins
|
||||
- git-bisect: use dash-less form on git bisect log
|
||||
- t1007-hash-object.sh: use quotes for the test description
|
||||
- t0001-init.sh: change confusing directory name
|
||||
|
||||
* sp/maint-bash-completion-optim (Mon Jul 14 00:22:03 2008 +0000) 1 commit
|
||||
+ bash completion: Append space after file names have been completed
|
||||
|
||||
Early parts are already merged to 'master' and need to be merged down to
|
||||
maint as well, as this is about a "performance bug" that has been with us
|
||||
almost forever.
|
||||
|
||||
* ag/rewrite_one (Sat Jul 12 22:00:57 2008 +0400) 1 commit
|
||||
+ Fix quadratic performance in rewrite_one.
|
||||
|
||||
* sp/win (Fri Jul 11 18:52:42 2008 +0200) 3 commits
|
||||
+ We need to check for msys as well as Windows in add--interactive.
|
||||
+ Convert CR/LF to LF in tag signatures
|
||||
+ Fixed text file auto-detection: treat EOF character 032 at the end
|
||||
of file as printable
|
||||
|
||||
* js/merge-rr (Sat Jul 12 15:56:19 2008 +0100) 2 commits
|
||||
+ Move MERGE_RR from .git/rr-cache/ into .git/
|
||||
+ builtin-rerere: more carefully find conflict markers
|
||||
|
||||
* sb/rerere-lib (Wed Jul 9 14:58:57 2008 +0200) 2 commits
|
||||
+ rerere: Separate libgit and builtin functions
|
||||
+ builtin-rerere: more carefully find conflict markers
|
||||
|
||||
* ls/mailinfo (Sun Jul 13 20:30:12 2008 +0200) 3 commits
|
||||
- git-mailinfo: use strbuf's instead of fixed buffers
|
||||
- Add some useful functions for strbuf manipulation.
|
||||
- Make some strbuf_*() struct strbuf arguments const.
|
||||
|
||||
* gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit
|
||||
- cherry: cache patch-ids to avoid repeating work
|
||||
|
||||
This does not seem to pass tests even on its own.
|
||||
|
||||
* js/maint-pretty-mailmap (Sat Jul 12 00:28:18 2008 +0100) 1 commit
|
||||
+ Add pretty format %aN which gives the author name, respecting
|
||||
.mailmap
|
||||
|
||||
* js/more-win (Sun Jul 13 22:31:23 2008 +0200) 6 commits
|
||||
- Allow add_path() to add non-existent directories to the path
|
||||
- Allow the built-in exec path to be relative to the command
|
||||
invocation path
|
||||
- Fix relative built-in paths to be relative to the command
|
||||
invocation
|
||||
+ help (Windows): Display HTML in default browser using Windows'
|
||||
shell API
|
||||
+ help.c: Add support for htmldir relative to git_exec_path()
|
||||
+ Move code interpreting path relative to exec-dir to new function
|
||||
system_path()
|
||||
|
||||
The earlier parts are obvious; Dscho seemed to have some comments on the
|
||||
later ones that are in 'pu'.
|
||||
|
||||
* lw/gitweb (Fri Jul 11 03:11:48 2008 +0200) 3 commits
|
||||
- gitweb: use new Git::Repo API, and add optional caching
|
||||
- Add new Git::Repo API
|
||||
- gitweb: add test suite with Test::WWW::Mechanize::CGI
|
||||
|
||||
This does not pass t9710, at least for me X-<.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to master soon]
|
||||
|
||||
* jc/rebase-orig-head (Tue Jul 8 00:12:22 2008 -0400) 2 commits
|
||||
+ Documentation: mention ORIG_HEAD in am, merge, and rebase
|
||||
+ Teach "am" and "rebase" to mark the original position with
|
||||
ORIG_HEAD
|
||||
|
||||
* jc/branch-merged (Tue Jul 8 17:55:47 2008 -0700) 3 commits
|
||||
+ branch --merged/--no-merged: allow specifying arbitrary commit
|
||||
+ branch --contains: default to HEAD
|
||||
+ parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
|
||||
|
||||
This builds on top of the parse-options enhancement series that
|
||||
has been cooking in 'next' for some time.
|
||||
|
||||
* om/rerere-careful (Mon Jul 7 14:42:48 2008 +0200) 1 commit
|
||||
+ builtin-rerere: more carefully find conflict markers
|
||||
|
||||
* ls/maint-mailinfo-patch-label (Thu Jul 10 23:41:33 2008 +0200) 1 commit
|
||||
+ git-mailinfo: Fix getting the subject from the in-body [PATCH]
|
||||
line
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
|
||||
+ Teach git-merge -X<option> again.
|
||||
+ Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
|
||||
+ builtin-merge.c: use parse_options_step() "incremental parsing"
|
||||
machinery
|
||||
+ Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
|
||||
|
||||
I've described what this is in a separate message.
|
||||
|
||||
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
|
||||
- Documentation: Improve documentation for git-imap-send(1)
|
||||
- imap-send.c: more style fixes
|
||||
- imap-send.c: style fixes
|
||||
- git-imap-send: Support SSL
|
||||
- git-imap-send: Allow the program to be run from subdirectories of
|
||||
a git tree
|
||||
|
||||
Some people seem to prefer having this feature available also with gnutls.
|
||||
If such a patch materializes soon, that would be good, but otherwise I'll
|
||||
merge this as-is to 'next'. Such an enhancement can be done in-tree on
|
||||
top of this series.
|
||||
|
||||
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
|
||||
+ Make "subtree" part more orthogonal to the rest of merge-
|
||||
recursive.
|
||||
+ Teach git-pull to pass -X<option> to git-merge
|
||||
+ Teach git-merge to pass -X<option> to the backend strategy module
|
||||
+ git-merge-recursive-{ours,theirs}
|
||||
+ git-merge-file --ours, --theirs
|
||||
|
||||
Punting a merge by discarding your own work in conflicting parts but still
|
||||
salvaging the parts that are cleanly automerged. It is likely that this
|
||||
will result in nonsense mishmash, but somehow often people want this, so
|
||||
here they are. The interface to the backends is updated so that you can
|
||||
say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
|
||||
|
||||
* mv/merge-in-c (Sun Jul 13 08:13:55 2008 +0000) 19 commits
|
||||
+ reduce_heads(): thinkofix
|
||||
+ Add a new test for git-merge-resolve
|
||||
+ t6021: add a new test for git-merge-resolve
|
||||
+ Teach merge.log to "git-merge" again
|
||||
+ Build in merge
|
||||
+ Fix t7601-merge-pull-config.sh on AIX
|
||||
+ git-commit-tree: make it usable from other builtins
|
||||
+ Add new test case to ensure git-merge prepends the custom merge
|
||||
message
|
||||
+ Add new test case to ensure git-merge reduces octopus parents when
|
||||
possible
|
||||
+ Introduce reduce_heads()
|
||||
+ Introduce get_merge_bases_many()
|
||||
+ Add new test to ensure git-merge handles more than 25 refs.
|
||||
+ Introduce get_octopus_merge_bases() in commit.c
|
||||
+ git-fmt-merge-msg: make it usable from other builtins
|
||||
+ Move read_cache_unmerged() to read-cache.c
|
||||
+ Add new test to ensure git-merge handles pull.twohead and
|
||||
pull.octopus
|
||||
+ Move parse-options's skip_prefix() to git-compat-util.h
|
||||
+ Move commit_list_count() to commit.c
|
||||
+ Move split_cmdline() to alias.c
|
||||
|
||||
Sverre seems to have a yet another fixup on top of this that came late and
|
||||
I haven't looked at.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* js/pick-root (Fri Jul 4 16:19:52 2008 +0100) 1 commit
|
||||
+ Allow cherry-picking root commits
|
||||
|
||||
* ab/bundle (Sat Jul 5 17:26:40 2008 -0400) 1 commit
|
||||
+ Teach git-bundle to read revision arguments from stdin like git-
|
||||
rev-list.
|
||||
|
||||
* sg/stash-k-i (Tue Jul 8 00:40:56 2008 -0700) 2 commits
|
||||
+ Documentation: tweak use case in "git stash save --keep-index"
|
||||
+ stash: introduce 'stash save --keep-index' option
|
||||
|
||||
One weakness of our "partial commit" workflow support used to be that the
|
||||
user can incrementally build what is to be committed in the index but that
|
||||
state cannot be tested as a whole in the working tree. This allows you to
|
||||
temporarily stash the remaining changes in the working tree so that the
|
||||
index state before running "stash save --keep-index" can be seen in the
|
||||
working tree to be tested and then committed.
|
||||
|
||||
* am/stash-branch (Mon Jul 7 02:50:10 2008 +0530) 2 commits
|
||||
+ Add a test for "git stash branch"
|
||||
+ Implement "git stash branch <newbranch> <stash>"
|
||||
|
||||
Creates a new branch out of the stashed state, after returning from the
|
||||
interrupt that forced you to create the stash in the first place.
|
||||
|
||||
* tr/add-i-e (Thu Jul 3 00:00:00 2008 +0200) 3 commits
|
||||
+ git-add--interactive: manual hunk editing mode
|
||||
+ git-add--interactive: remove hunk coalescing
|
||||
+ git-add--interactive: replace hunk recounting with apply --recount
|
||||
|
||||
Adds 'e/dit' action to interactive add command.
|
||||
|
||||
* jc/report-tracking (Sun Jul 6 02:54:56 2008 -0700) 5 commits
|
||||
+ branch -r -v: do not spit out garbage
|
||||
+ stat_tracking_info(): clear object flags used during counting
|
||||
+ git-branch -v: show the remote tracking statistics
|
||||
+ git-status: show the remote tracking statistics
|
||||
+ Refactor "tracking statistics" code used by "git checkout"
|
||||
|
||||
Makes the "your branch is ahead of the tracked one by N commits" logic and
|
||||
messages available to other commands; status and branch are updated.
|
||||
|
||||
* ph/parseopt-step-blame (Wed Jul 9 23:38:34 2008 +0200) 18 commits
|
||||
+ revisions: refactor handle_revision_opt into parse_revision_opt.
|
||||
+ git-shortlog: migrate to parse-options partially.
|
||||
+ git-blame: fix lapsus
|
||||
+ git-blame: migrate to incremental parse-option [2/2]
|
||||
+ git-blame: migrate to incremental parse-option [1/2]
|
||||
+ revisions: split handle_revision_opt() from setup_revisions()
|
||||
+ Merge branch 'jc/blame' (early part) into HEAD
|
||||
+ parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
|
||||
+ parse-opt: fake short strings for callers to believe in.
|
||||
+ parse-opt: do not print errors on unknown options, return -2
|
||||
intead.
|
||||
+ parse-opt: create parse_options_step.
|
||||
+ parse-opt: Export a non NORETURN usage dumper.
|
||||
+ parse-opt: have parse_options_{start,end}.
|
||||
+ git-blame --reverse
|
||||
+ builtin-blame.c: allow more than 16 parents
|
||||
+ builtin-blame.c: move prepare_final() into a separate function.
|
||||
+ rev-list --children
|
||||
+ revision traversal: --children option
|
||||
|
||||
Became active again ;-) This probably is ready for 'master' already,
|
||||
except for the last two which I only looked at the patch and have not
|
||||
used heavily in production yet.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
|
||||
+ Revert "Make clients ask for "git program" over ssh and local
|
||||
transport"
|
||||
+ Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled/Needs more work]
|
||||
|
||||
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
|
||||
. Migrate git-am to use git-sequencer
|
||||
. Add git-sequencer test suite (t3350)
|
||||
. Add git-sequencer prototype documentation
|
||||
. Add git-sequencer shell prototype
|
||||
|
||||
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
|
||||
- [BROKEN wrt shallow clones] Ignore graft during object transfer
|
||||
|
||||
Cloning or fetching from a repository from grafts did not send objects
|
||||
that are hidden by grafts, but the commits in the resulting repository do
|
||||
need these to pass fsck. This fixes object transfer to ignore grafts.
|
||||
|
||||
Another fix is needed to git-prune so that it ignores grafts but treats
|
||||
commits that are mentioned in grafts as reachable.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This is for peeling to see what's behind the blamed commit, which may or
|
||||
may not help applications like gitweb.
|
||||
|
||||
|
||||
@@ -1,244 +0,0 @@
|
||||
What's cooking in git.git (Jul 2008, issue #06; Tue, 15)
|
||||
--------------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
It so happens that the topics clearly separated between the ones that are
|
||||
obviously ready for 1.6.0 and the others that aren't yet as of tonight.
|
||||
It seems that it is a good time to draw that line and tag -rc0 tomorrow,
|
||||
after merging the remaining topics in 'next'.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
I could apply these directly to master, but I am just playing it safe.
|
||||
|
||||
* sp/maint-index-pack (Tue Jul 15 04:45:34 2008 +0000) 4 commits
|
||||
+ index-pack: Honor core.deltaBaseCacheLimit when resolving deltas
|
||||
+ index-pack: Track the object_entry that creates each base_data
|
||||
+ index-pack: Chain the struct base_data on the stack for traversal
|
||||
+ index-pack: Refactor base arguments of resolve_delta into a struct
|
||||
|
||||
* rs/rebase-checkout-not-so-quiet (Mon Jul 14 14:05:35 2008 -0700) 1 commit
|
||||
+ git-rebase: report checkout failure
|
||||
|
||||
* ag/blame (Wed Jul 16 02:00:58 2008 +0400) 2 commits
|
||||
+ Do not try to detect move/copy for entries below threshold.
|
||||
+ Avoid rescanning unchanged entries in search for copies.
|
||||
|
||||
This gives a drastic performance improvement to "git-blame -C -C" with
|
||||
quite straightforward and obvious code change.
|
||||
|
||||
* rs/archive (Mon Jul 14 21:22:05 2008 +0200) 6 commits
|
||||
+ archive: remove extra arguments parsing code
|
||||
+ archive: unify file attribute handling
|
||||
+ archive: centralize archive entry writing
|
||||
+ archive: add baselen member to struct archiver_args
|
||||
+ add context pointer to read_tree_recursive()
|
||||
+ archive: remove args member from struct archiver
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to master soon]
|
||||
|
||||
* sb/dashless (Sun Jul 13 15:36:15 2008 +0200) 3 commits
|
||||
+ Make usage strings dash-less
|
||||
+ t/: Use "test_must_fail git" instead of "! git"
|
||||
+ t/test-lib.sh: exit with small negagive int is ok with
|
||||
test_must_fail
|
||||
|
||||
* mv/dashless (Fri Jul 11 02:12:06 2008 +0200) 4 commits
|
||||
+ make remove-dashes: apply to scripts and programs as well, not
|
||||
just to builtins
|
||||
+ git-bisect: use dash-less form on git bisect log
|
||||
+ t1007-hash-object.sh: use quotes for the test description
|
||||
+ t0001-init.sh: change confusing directory name
|
||||
|
||||
* ls/mailinfo (Sun Jul 13 20:30:12 2008 +0200) 3 commits
|
||||
+ git-mailinfo: use strbuf's instead of fixed buffers
|
||||
+ Add some useful functions for strbuf manipulation.
|
||||
+ Make some strbuf_*() struct strbuf arguments const.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* sp/maint-bash-completion-optim (Mon Jul 14 00:22:03 2008 +0000) 1 commit
|
||||
+ bash completion: Append space after file names have been completed
|
||||
|
||||
Early parts were already merged to 'master' and need to be merged down to
|
||||
maint as well, as this is about a "performance bug" that has been with us
|
||||
almost forever.
|
||||
|
||||
* ag/rewrite_one (Sat Jul 12 22:00:57 2008 +0400) 1 commit
|
||||
+ Fix quadratic performance in rewrite_one.
|
||||
|
||||
* sp/win (Fri Jul 11 18:52:42 2008 +0200) 3 commits
|
||||
+ We need to check for msys as well as Windows in add--interactive.
|
||||
+ Convert CR/LF to LF in tag signatures
|
||||
+ Fixed text file auto-detection: treat EOF character 032 at the end
|
||||
of file as printable
|
||||
|
||||
* js/merge-rr (Sat Jul 12 15:56:19 2008 +0100) 2 commits
|
||||
+ Move MERGE_RR from .git/rr-cache/ into .git/
|
||||
+ builtin-rerere: more carefully find conflict markers
|
||||
|
||||
* sb/rerere-lib (Wed Jul 9 14:58:57 2008 +0200) 2 commits
|
||||
+ rerere: Separate libgit and builtin functions
|
||||
+ builtin-rerere: more carefully find conflict markers
|
||||
|
||||
* js/maint-pretty-mailmap (Sat Jul 12 00:28:18 2008 +0100) 1 commit
|
||||
+ Add pretty format %aN which gives the author name, respecting
|
||||
.mailmap
|
||||
|
||||
* js/more-win (Sun Jul 13 22:31:23 2008 +0200) 3 commits
|
||||
+ help (Windows): Display HTML in default browser using Windows'
|
||||
shell API
|
||||
+ help.c: Add support for htmldir relative to git_exec_path()
|
||||
+ Move code interpreting path relative to exec-dir to new function
|
||||
system_path()
|
||||
|
||||
* jc/rebase-orig-head (Tue Jul 8 00:12:22 2008 -0400) 2 commits
|
||||
+ Documentation: mention ORIG_HEAD in am, merge, and rebase
|
||||
+ Teach "am" and "rebase" to mark the original position with
|
||||
ORIG_HEAD
|
||||
|
||||
* jc/branch-merged (Tue Jul 8 17:55:47 2008 -0700) 3 commits
|
||||
+ branch --merged/--no-merged: allow specifying arbitrary commit
|
||||
+ branch --contains: default to HEAD
|
||||
+ parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
|
||||
|
||||
* om/rerere-careful (Mon Jul 7 14:42:48 2008 +0200) 1 commit
|
||||
+ builtin-rerere: more carefully find conflict markers
|
||||
|
||||
* ls/maint-mailinfo-patch-label (Thu Jul 10 23:41:33 2008 +0200) 1 commit
|
||||
+ git-mailinfo: Fix getting the subject from the in-body [PATCH]
|
||||
line
|
||||
|
||||
* mv/merge-in-c (Mon Jul 14 00:09:41 2008 -0700) 20 commits
|
||||
+ reduce_heads(): protect from duplicate input
|
||||
+ reduce_heads(): thinkofix
|
||||
+ Add a new test for git-merge-resolve
|
||||
+ t6021: add a new test for git-merge-resolve
|
||||
+ Teach merge.log to "git-merge" again
|
||||
+ Build in merge
|
||||
+ Fix t7601-merge-pull-config.sh on AIX
|
||||
+ git-commit-tree: make it usable from other builtins
|
||||
+ Add new test case to ensure git-merge prepends the custom merge
|
||||
message
|
||||
+ Add new test case to ensure git-merge reduces octopus parents when
|
||||
possible
|
||||
+ Introduce reduce_heads()
|
||||
+ Introduce get_merge_bases_many()
|
||||
+ Add new test to ensure git-merge handles more than 25 refs.
|
||||
+ Introduce get_octopus_merge_bases() in commit.c
|
||||
+ git-fmt-merge-msg: make it usable from other builtins
|
||||
+ Move read_cache_unmerged() to read-cache.c
|
||||
+ Add new test to ensure git-merge handles pull.twohead and
|
||||
pull.octopus
|
||||
+ Move parse-options's skip_prefix() to git-compat-util.h
|
||||
+ Move commit_list_count() to commit.c
|
||||
+ Move split_cmdline() to alias.c
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
|
||||
- Documentation: Improve documentation for git-imap-send(1)
|
||||
- imap-send.c: more style fixes
|
||||
- imap-send.c: style fixes
|
||||
- git-imap-send: Support SSL
|
||||
- git-imap-send: Allow the program to be run from subdirectories of
|
||||
a git tree
|
||||
|
||||
Some people seem to prefer having this feature available also with gnutls.
|
||||
If such a patch materializes soon, that would be good, but otherwise I'll
|
||||
merge this as-is to 'next'. Such an enhancement can be done in-tree on
|
||||
top of this series.
|
||||
|
||||
* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
|
||||
+ Teach git-merge -X<option> again.
|
||||
+ Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
|
||||
+ builtin-merge.c: use parse_options_step() "incremental parsing"
|
||||
machinery
|
||||
+ Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
|
||||
|
||||
This needs to be merged to master iff/when merge-theirs gets merged,
|
||||
but I do not think this series is widely supported, so both are on hold.
|
||||
|
||||
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
|
||||
+ Make "subtree" part more orthogonal to the rest of merge-
|
||||
recursive.
|
||||
+ Teach git-pull to pass -X<option> to git-merge
|
||||
+ Teach git-merge to pass -X<option> to the backend strategy module
|
||||
+ git-merge-recursive-{ours,theirs}
|
||||
+ git-merge-file --ours, --theirs
|
||||
|
||||
Punting a merge by discarding your own work in conflicting parts but still
|
||||
salvaging the parts that are cleanly automerged. It is likely that this
|
||||
will result in nonsense mishmash, but somehow often people want this, so
|
||||
here they are. The interface to the backends is updated so that you can
|
||||
say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
|
||||
+ Revert "Make clients ask for "git program" over ssh and local
|
||||
transport"
|
||||
+ Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled/Needs more work]
|
||||
|
||||
* gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit
|
||||
. cherry: cache patch-ids to avoid repeating work
|
||||
|
||||
* lw/gitweb (Fri Jul 11 03:11:48 2008 +0200) 3 commits
|
||||
. gitweb: use new Git::Repo API, and add optional caching
|
||||
. Add new Git::Repo API
|
||||
. gitweb: add test suite with Test::WWW::Mechanize::CGI
|
||||
|
||||
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
|
||||
. Migrate git-am to use git-sequencer
|
||||
. Add git-sequencer test suite (t3350)
|
||||
. Add git-sequencer prototype documentation
|
||||
. Add git-sequencer shell prototype
|
||||
|
||||
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
|
||||
- [BROKEN wrt shallow clones] Ignore graft during object transfer
|
||||
|
||||
Cloning or fetching from a repository from grafts did not send objects
|
||||
that are hidden by grafts, but the commits in the resulting repository do
|
||||
need these to pass fsck. This fixes object transfer to ignore grafts.
|
||||
|
||||
Another fix is needed to git-prune so that it ignores grafts but treats
|
||||
commits that are mentioned in grafts as reachable.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This is for peeling to see what's behind the blamed commit, which may or
|
||||
may not help applications like gitweb.
|
||||
|
||||
@@ -1,233 +0,0 @@
|
||||
What's cooking in git.git (Jul 2008, issue #07; Thu, 17)
|
||||
--------------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
Right now 'next' is very thin. After today's new topics, perhaps except
|
||||
for the submodule stuff by Pasky, are merged to 'master', we will have the
|
||||
1.6.0-rc0, and from there the usual pre-release freeze begins.
|
||||
|
||||
Due to increased activity level from people including GSoC students, I
|
||||
expect 'next' to stay somewhat more active than previous rounds during the
|
||||
1.6.0-rc cycle. The request for people who usually follow 'next' is the
|
||||
same as usual, though. After -rc1 is tagged, please run 'master' for your
|
||||
daily git use instead, in order to make sure 'master' does what it claims
|
||||
to do without regression.
|
||||
|
||||
Tentative schedule, my wishful thinking:
|
||||
|
||||
- 1.6.0-rc0 (Jul 20)
|
||||
- 1.6.0-rc1 (Jul 23)
|
||||
- 1.6.0-rc2 (Jul 30)
|
||||
- 1.6.0-rc3 (Aug 6)
|
||||
- 1.6.0 (Aug 10)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/rerere-auto-more (Wed Jul 16 20:25:18 2008 -0700) 1 commit
|
||||
- rerere.autoupdate: change the message when autoupdate is in effect
|
||||
|
||||
This one is for Ingo.
|
||||
|
||||
This changes the message rerere issues after reusing previous conflict
|
||||
resolution from "Resolved" to "Staged" when autoupdate option is in
|
||||
effect.
|
||||
|
||||
It is envisioned that in practice, some auto resolutions are trickier and
|
||||
iffier than others, and we would want to add a feature to mark individual
|
||||
resolutions as "this is ok to autoupdate" or "do not autoupdate the result
|
||||
using this resolution even when rerere.autoupdate is in effect" in the
|
||||
future. When that happens, these messages will make the distinction
|
||||
clearer.
|
||||
|
||||
* ap/trackinfo (Wed Jul 16 15:19:27 2008 -0400) 1 commit
|
||||
- Reword "your branch has diverged..." lines to reduce line length
|
||||
|
||||
You saw the exchange on the list. Queued is my "make it shorter and make
|
||||
sure variable parts are closer to left edge of the screen" version but
|
||||
better alternatives are welcome. I suspect not many people would care too
|
||||
much about details, as long as the message fits and does not waste screen
|
||||
real estate.
|
||||
|
||||
* ns/am-abort (Wed Jul 16 19:39:10 2008 +0900) 1 commit
|
||||
- git am --abort
|
||||
|
||||
This one is for Ted; builds on top of the recent "am and rebase leaves
|
||||
ORIG_HEAD just like reset, merge and pull does" rather nicely.
|
||||
|
||||
* pb/submodule (Wed Jul 16 21:11:40 2008 +0200) 7 commits
|
||||
- t7403: Submodule git mv, git rm testsuite
|
||||
- git rm: Support for removing submodules
|
||||
- git mv: Support moving submodules
|
||||
- submodule.*: Introduce simple C interface for submodule lookup by
|
||||
path
|
||||
- git submodule add: Fix naming clash handling
|
||||
- t7400: Add short "git submodule add" testsuite
|
||||
- git-mv: Remove dead code branch
|
||||
|
||||
Long overdue usability improvement series for submodule. Very much
|
||||
welcomed. It would be nice to have some submodule improvements in 1.6.0.
|
||||
Realistically speaking, however, I predict that it would take us a few
|
||||
more rounds to hit 'next' with this, and it will not be in 'master' when
|
||||
1.6.0 ships.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* sp/maint-index-pack (Tue Jul 15 04:45:34 2008 +0000) 4 commits
|
||||
+ index-pack: Honor core.deltaBaseCacheLimit when resolving deltas
|
||||
+ index-pack: Track the object_entry that creates each base_data
|
||||
+ index-pack: Chain the struct base_data on the stack for traversal
|
||||
+ index-pack: Refactor base arguments of resolve_delta into a struct
|
||||
|
||||
* rs/rebase-checkout-not-so-quiet (Mon Jul 14 14:05:35 2008 -0700) 1 commit
|
||||
+ git-rebase: report checkout failure
|
||||
|
||||
* ag/blame (Wed Jul 16 02:00:58 2008 +0400) 2 commits
|
||||
+ Do not try to detect move/copy for entries below threshold.
|
||||
+ Avoid rescanning unchanged entries in search for copies.
|
||||
|
||||
This gives a drastic performance improvement to "git-blame -C -C" with
|
||||
quite straightforward and obvious code change.
|
||||
|
||||
* rs/archive (Mon Jul 14 21:22:05 2008 +0200) 6 commits
|
||||
+ archive: remove extra arguments parsing code
|
||||
+ archive: unify file attribute handling
|
||||
+ archive: centralize archive entry writing
|
||||
+ archive: add baselen member to struct archiver_args
|
||||
+ add context pointer to read_tree_recursive()
|
||||
+ archive: remove args member from struct archiver
|
||||
|
||||
* sb/dashless (Sun Jul 13 15:36:15 2008 +0200) 3 commits
|
||||
+ Make usage strings dash-less
|
||||
+ t/: Use "test_must_fail git" instead of "! git"
|
||||
+ t/test-lib.sh: exit with small negagive int is ok with
|
||||
test_must_fail
|
||||
|
||||
* mv/dashless (Fri Jul 11 02:12:06 2008 +0200) 4 commits
|
||||
+ make remove-dashes: apply to scripts and programs as well, not
|
||||
just to builtins
|
||||
+ git-bisect: use dash-less form on git bisect log
|
||||
+ t1007-hash-object.sh: use quotes for the test description
|
||||
+ t0001-init.sh: change confusing directory name
|
||||
|
||||
* ls/mailinfo (Sun Jul 13 20:30:12 2008 +0200) 3 commits
|
||||
+ git-mailinfo: use strbuf's instead of fixed buffers
|
||||
+ Add some useful functions for strbuf manipulation.
|
||||
+ Make some strbuf_*() struct strbuf arguments const.
|
||||
|
||||
This actually had a tiny regression I did not discover until I merged it
|
||||
to 'master', where a fixup has already been applied.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
|
||||
- Documentation: Improve documentation for git-imap-send(1)
|
||||
- imap-send.c: more style fixes
|
||||
- imap-send.c: style fixes
|
||||
- git-imap-send: Support SSL
|
||||
- git-imap-send: Allow the program to be run from subdirectories of
|
||||
a git tree
|
||||
|
||||
I said: "Some people seem to prefer having this feature available also
|
||||
with gnutls. If such a patch materializes soon, that would be good, but
|
||||
otherwise I'll merge this as-is to 'next'. Such an enhancement can be
|
||||
done in-tree on top of this series." Anybody?
|
||||
|
||||
* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
|
||||
+ Teach git-merge -X<option> again.
|
||||
+ Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
|
||||
+ builtin-merge.c: use parse_options_step() "incremental parsing"
|
||||
machinery
|
||||
+ Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
|
||||
|
||||
This needs to be merged to master iff/when merge-theirs gets merged,
|
||||
but I do not think this series is widely supported, so both are on hold.
|
||||
|
||||
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
|
||||
+ Make "subtree" part more orthogonal to the rest of merge-
|
||||
recursive.
|
||||
+ Teach git-pull to pass -X<option> to git-merge
|
||||
+ Teach git-merge to pass -X<option> to the backend strategy module
|
||||
+ git-merge-recursive-{ours,theirs}
|
||||
+ git-merge-file --ours, --theirs
|
||||
|
||||
Punting a merge by discarding your own work in conflicting parts but still
|
||||
salvaging the parts that are cleanly automerged. It is likely that this
|
||||
will result in nonsense mishmash, but somehow often people want this, so
|
||||
here they are. The interface to the backends is updated so that you can
|
||||
say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
|
||||
+ Revert "Make clients ask for "git program" over ssh and local
|
||||
transport"
|
||||
+ Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled/Needs more work]
|
||||
|
||||
* gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit
|
||||
. cherry: cache patch-ids to avoid repeating work
|
||||
|
||||
The discussion suggested that the value of having the cache itself is
|
||||
iffy, but I should pick up the updated one and look at it.
|
||||
|
||||
* lw/gitweb (Fri Jul 11 03:11:48 2008 +0200) 3 commits
|
||||
. gitweb: use new Git::Repo API, and add optional caching
|
||||
. Add new Git::Repo API
|
||||
. gitweb: add test suite with Test::WWW::Mechanize::CGI
|
||||
|
||||
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
|
||||
. Migrate git-am to use git-sequencer
|
||||
. Add git-sequencer test suite (t3350)
|
||||
. Add git-sequencer prototype documentation
|
||||
. Add git-sequencer shell prototype
|
||||
|
||||
I haven't looked at the updated series yet. I should, but nobody else
|
||||
seems to be looking at these patches, which is somewhat depressing but
|
||||
understandable. Summer is slower ;-)
|
||||
|
||||
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
|
||||
- [BROKEN wrt shallow clones] Ignore graft during object transfer
|
||||
|
||||
Cloning or fetching from a repository from grafts did not send objects
|
||||
that are hidden by grafts, but the commits in the resulting repository do
|
||||
need these to pass fsck. This fixes object transfer to ignore grafts.
|
||||
|
||||
Another fix is needed to git-prune so that it ignores grafts but treats
|
||||
commits that are mentioned in grafts as reachable.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This is for peeling the line from the blamed version to see what's behind
|
||||
it, which may or may not help applications like gitweb.
|
||||
|
||||
@@ -1,180 +0,0 @@
|
||||
What's cooking in git.git (Jul 2008, issue #08; Sat, 19)
|
||||
--------------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
Due to increased activity level from people including GSoC students, I
|
||||
expect 'next' to stay somewhat more active than previous rounds during the
|
||||
1.6.0-rc cycle. The request for people who usually follow 'next' is the
|
||||
same as usual, though. After -rc1 is tagged, please run 'master' for your
|
||||
daily git use instead, in order to make sure 'master' does what it claims
|
||||
to do without regression.
|
||||
|
||||
Tentative schedule, my wishful thinking:
|
||||
|
||||
- 1.6.0-rc0 (Jul 20)
|
||||
- 1.6.0-rc1 (Jul 23)
|
||||
- 1.6.0-rc2 (Jul 30)
|
||||
- 1.6.0-rc3 (Aug 6)
|
||||
- 1.6.0 (Aug 10)
|
||||
|
||||
No real activity on 'next', as I was busy tending bugfixes and pushing out
|
||||
v1.5.6.4 today.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* ns/am-abort (Wed Jul 16 19:39:10 2008 +0900) 1 commit
|
||||
+ git am --abort
|
||||
|
||||
This one is for Ted; builds on top of the recent "am and rebase leaves
|
||||
ORIG_HEAD just like reset, merge and pull does" rather nicely.
|
||||
|
||||
* jc/rerere-auto-more (Wed Jul 16 20:25:18 2008 -0700) 1 commit
|
||||
+ rerere.autoupdate: change the message when autoupdate is in effect
|
||||
|
||||
This one is for Ingo.
|
||||
|
||||
This changes the message rerere issues after reusing previous conflict
|
||||
resolution from "Resolved" to "Staged" when autoupdate option is in
|
||||
effect.
|
||||
|
||||
It is envisioned that in practice, some auto resolutions are trickier and
|
||||
iffier than others, and we would want to add a feature to mark individual
|
||||
resolutions as "this is ok to autoupdate" or "do not autoupdate the result
|
||||
using this resolution even when rerere.autoupdate is in effect" in the
|
||||
future. When that happens, these messages will make the distinction
|
||||
clearer.
|
||||
|
||||
* ap/trackinfo (Wed Jul 16 15:19:27 2008 -0400) 1 commit
|
||||
+ Reword "your branch has diverged..." lines to reduce line length
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled/Needs more work]
|
||||
|
||||
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
|
||||
- Documentation: Improve documentation for git-imap-send(1)
|
||||
- imap-send.c: more style fixes
|
||||
- imap-send.c: style fixes
|
||||
- git-imap-send: Support SSL
|
||||
- git-imap-send: Allow the program to be run from subdirectories of
|
||||
a git tree
|
||||
|
||||
I said: "Some people seem to prefer having this feature available also
|
||||
with gnutls. If such a patch materializes soon, that would be good, but
|
||||
otherwise I'll merge this as-is to 'next'. Such an enhancement can be
|
||||
done in-tree on top of this series." Anybody?
|
||||
|
||||
* gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit
|
||||
. cherry: cache patch-ids to avoid repeating work
|
||||
|
||||
The discussion suggested that the value of having the cache itself is
|
||||
iffy, but I should pick up the updated one and look at it.
|
||||
|
||||
* lw/gitweb (Fri Jul 11 03:11:48 2008 +0200) 3 commits
|
||||
. gitweb: use new Git::Repo API, and add optional caching
|
||||
. Add new Git::Repo API
|
||||
. gitweb: add test suite with Test::WWW::Mechanize::CGI
|
||||
|
||||
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
|
||||
. Migrate git-am to use git-sequencer
|
||||
. Add git-sequencer test suite (t3350)
|
||||
. Add git-sequencer prototype documentation
|
||||
. Add git-sequencer shell prototype
|
||||
|
||||
I haven't looked at the updated series yet. I should, but nobody else
|
||||
seems to be looking at these patches, which is somewhat depressing but
|
||||
understandable. Summer is slower ;-)
|
||||
|
||||
* pb/submodule (Wed Jul 16 21:11:40 2008 +0200) 7 commits
|
||||
. t7403: Submodule git mv, git rm testsuite
|
||||
. git rm: Support for removing submodules
|
||||
. git mv: Support moving submodules
|
||||
. submodule.*: Introduce simple C interface for submodule lookup by
|
||||
path
|
||||
. git submodule add: Fix naming clash handling
|
||||
. t7400: Add short "git submodule add" testsuite
|
||||
. git-mv: Remove dead code branch
|
||||
|
||||
Long overdue usability improvement series for submodule. Very much
|
||||
welcomed. It would be nice to have some submodule improvements in 1.6.0,
|
||||
but it would take us a few more rounds to hit 'next' with this, and it
|
||||
will not be in 'master' when 1.6.0 ships.
|
||||
|
||||
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
|
||||
- [BROKEN wrt shallow clones] Ignore graft during object transfer
|
||||
|
||||
Cloning or fetching from a repository from grafts did not send objects
|
||||
that are hidden by grafts, but the commits in the resulting repository do
|
||||
need these to pass fsck. This fixes object transfer to ignore grafts.
|
||||
|
||||
Another fix is needed to git-prune so that it ignores grafts but treats
|
||||
commits that are mentioned in grafts as reachable.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This is for peeling the line from the blamed version to see what's behind
|
||||
it, which may or may not help applications like gitweb.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will drop]
|
||||
|
||||
* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
|
||||
+ Teach git-merge -X<option> again.
|
||||
+ Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
|
||||
+ builtin-merge.c: use parse_options_step() "incremental parsing"
|
||||
machinery
|
||||
+ Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
|
||||
|
||||
* jc/merge-theirs (Fri Jul 18 02:43:00 2008 -0700) 6 commits
|
||||
- Document that merge strategies can now take their own options
|
||||
+ Make "subtree" part more orthogonal to the rest of merge-
|
||||
recursive.
|
||||
+ Teach git-pull to pass -X<option> to git-merge
|
||||
+ Teach git-merge to pass -X<option> to the backend strategy module
|
||||
+ git-merge-recursive-{ours,theirs}
|
||||
+ git-merge-file --ours, --theirs
|
||||
|
||||
It appears nobody wants "theirs" nor "ours", so I'll soon apply a
|
||||
wholesale revert for these series to 'next', and then these will be
|
||||
dropped when we rewind 'next' after 1.6.0 final.
|
||||
|
||||
Please make sure next time somebody asks "ours/theirs" merge on the list
|
||||
and #git s/he is quickly told that it was unanimously rejected so that
|
||||
people do not have to waste time rehashing the topic ever again.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
|
||||
+ Revert "Make clients ask for "git program" over ssh and local
|
||||
transport"
|
||||
+ Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
@@ -1,198 +0,0 @@
|
||||
What's cooking in git.git (Jul 2008, issue #09; Sun, 20)
|
||||
--------------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
Due to increased activity level from people including GSoC students, I
|
||||
expect 'next' to stay somewhat more active than previous rounds during the
|
||||
1.6.0-rc cycle. The request for people who usually follow 'next' is the
|
||||
same as usual, though. After -rc1 is tagged, please run 'master' for your
|
||||
daily git use instead, in order to make sure 'master' does what it claims
|
||||
to do without regression.
|
||||
|
||||
Tentative schedule, my wishful thinking:
|
||||
|
||||
- 1.6.0-rc0 (Jul 20)
|
||||
- 1.6.0-rc1 (Jul 23)
|
||||
- 1.6.0-rc2 (Jul 30)
|
||||
- 1.6.0-rc3 (Aug 6)
|
||||
- 1.6.0 (Aug 10)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* pb/sane-mv (Mon Jul 21 02:25:56 2008 +0200) 2 commits
|
||||
- git-mv: Keep moved index entries inact
|
||||
- git-mv: Remove dead code branch
|
||||
|
||||
Running "git mv A B" when you have local changes to A automatically staged
|
||||
it while moving it to B, which was a longstanding nonsense. This attempts
|
||||
to fix it. Pasky has other plans to build on a more solidified foundation
|
||||
to enhance the command to work with submodules better on top of this.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* ns/am-abort (Wed Jul 16 19:39:10 2008 +0900) 1 commit
|
||||
+ git am --abort
|
||||
|
||||
This one is for Ted; builds on top of the recent "am and rebase leaves
|
||||
ORIG_HEAD just like reset, merge and pull does" rather nicely.
|
||||
|
||||
* jc/rerere-auto-more (Wed Jul 16 20:25:18 2008 -0700) 1 commit
|
||||
+ rerere.autoupdate: change the message when autoupdate is in effect
|
||||
|
||||
This one is for Ingo.
|
||||
|
||||
This changes the message rerere issues after reusing previous conflict
|
||||
resolution from "Resolved" to "Staged" when autoupdate option is in
|
||||
effect.
|
||||
|
||||
It is envisioned that in practice, some auto resolutions are trickier and
|
||||
iffier than others, and we would want to add a feature to mark individual
|
||||
resolutions as "this is ok to autoupdate" or "do not autoupdate the result
|
||||
using this resolution even when rerere.autoupdate is in effect" in the
|
||||
future. When that happens, these messages will make the distinction
|
||||
clearer.
|
||||
|
||||
* ap/trackinfo (Wed Jul 16 15:19:27 2008 -0400) 1 commit
|
||||
+ Reword "your branch has diverged..." lines to reduce line length
|
||||
|
||||
* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
|
||||
+ Teach git-merge -X<option> again.
|
||||
+ Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
|
||||
+ builtin-merge.c: use parse_options_step() "incremental parsing"
|
||||
machinery
|
||||
+ Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
|
||||
|
||||
* jc/merge-theirs (Fri Jul 18 02:43:00 2008 -0700) 6 commits
|
||||
- Document that merge strategies can now take their own options
|
||||
+ Make "subtree" part more orthogonal to the rest of merge-
|
||||
recursive.
|
||||
+ Teach git-pull to pass -X<option> to git-merge
|
||||
+ Teach git-merge to pass -X<option> to the backend strategy module
|
||||
+ git-merge-recursive-{ours,theirs}
|
||||
+ git-merge-file --ours, --theirs
|
||||
|
||||
It appears nobody wants "theirs" nor "ours", so I'll soon apply a
|
||||
wholesale revert for these series to 'next', and then these will be
|
||||
dropped when we rewind 'next' after 1.6.0 final.
|
||||
|
||||
Please make sure next time somebody asks "ours/theirs" merge on the list
|
||||
and #git s/he is quickly told that it was unanimously rejected so that
|
||||
people do not have to waste time rehashing the topic ever again.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled/Needs more work]
|
||||
|
||||
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
|
||||
- Documentation: Improve documentation for git-imap-send(1)
|
||||
- imap-send.c: more style fixes
|
||||
- imap-send.c: style fixes
|
||||
- git-imap-send: Support SSL
|
||||
- git-imap-send: Allow the program to be run from subdirectories of
|
||||
a git tree
|
||||
|
||||
I said: "Some people seem to prefer having this feature available also
|
||||
with gnutls. If such a patch materializes soon, that would be good, but
|
||||
otherwise I'll merge this as-is to 'next'. Such an enhancement can be
|
||||
done in-tree on top of this series." Anybody?
|
||||
|
||||
* gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit
|
||||
. cherry: cache patch-ids to avoid repeating work
|
||||
|
||||
The discussion suggested that the value of having the cache itself is
|
||||
iffy, but I should pick up the updated one and look at it.
|
||||
|
||||
* lw/gitweb (Fri Jul 11 03:11:48 2008 +0200) 3 commits
|
||||
. gitweb: use new Git::Repo API, and add optional caching
|
||||
. Add new Git::Repo API
|
||||
. gitweb: add test suite with Test::WWW::Mechanize::CGI
|
||||
|
||||
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
|
||||
. Migrate git-am to use git-sequencer
|
||||
. Add git-sequencer test suite (t3350)
|
||||
. Add git-sequencer prototype documentation
|
||||
. Add git-sequencer shell prototype
|
||||
|
||||
I haven't looked at the updated series yet. I should, but nobody else
|
||||
seems to be looking at these patches, which is somewhat depressing but
|
||||
understandable. Summer is slower ;-)
|
||||
|
||||
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
|
||||
- [BROKEN wrt shallow clones] Ignore graft during object transfer
|
||||
|
||||
Cloning or fetching from a repository from grafts did not send objects
|
||||
that are hidden by grafts, but the commits in the resulting repository do
|
||||
need these to pass fsck. This fixes object transfer to ignore grafts.
|
||||
|
||||
Another fix is needed to git-prune so that it ignores grafts but treats
|
||||
commits that are mentioned in grafts as reachable.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This is for peeling the line from the blamed version to see what's behind
|
||||
it, which may or may not help applications like gitweb.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Dropped]
|
||||
|
||||
* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
|
||||
+ Teach git-merge -X<option> again.
|
||||
+ Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
|
||||
+ builtin-merge.c: use parse_options_step() "incremental parsing"
|
||||
machinery
|
||||
+ Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
|
||||
|
||||
* jc/merge-theirs (Fri Jul 18 02:43:00 2008 -0700) 6 commits
|
||||
- Document that merge strategies can now take their own options
|
||||
+ Make "subtree" part more orthogonal to the rest of merge-
|
||||
recursive.
|
||||
+ Teach git-pull to pass -X<option> to git-merge
|
||||
+ Teach git-merge to pass -X<option> to the backend strategy module
|
||||
+ git-merge-recursive-{ours,theirs}
|
||||
+ git-merge-file --ours, --theirs
|
||||
|
||||
It appears nobody wants "theirs" nor "ours", so I'll soon apply a
|
||||
wholesale revert for these series to 'next', and then these will be
|
||||
dropped when we rewind 'next' after 1.6.0 final.
|
||||
|
||||
Please make sure next time somebody asks "ours/theirs" merge on the list
|
||||
and #git s/he is quickly told that it was unanimously rejected so that
|
||||
people do not have to waste time rehashing the topic ever again.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
|
||||
+ Revert "Make clients ask for "git program" over ssh and local
|
||||
transport"
|
||||
+ Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
@@ -1,112 +0,0 @@
|
||||
What's cooking in git.git (Jul 2008, #11; Thu, 31)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
Due to increased activity level from people including GSoC students, I
|
||||
expect 'next' to stay somewhat more active than previous rounds during the
|
||||
1.6.0-rc cycle. The request for people who usually follow 'next' is the
|
||||
same as usual, though. After -rc1 is tagged, please run 'master' for your
|
||||
daily git use instead, in order to make sure 'master' does what it claims
|
||||
to do without regression.
|
||||
|
||||
Tentative schedule, my wishful thinking:
|
||||
|
||||
- 1.6.0-rc2 (Aug 3)
|
||||
- 1.6.0-rc3 (Aug 10)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* rs/archive-parse-options (Fri Jul 25 12:41:26 2008 +0200) 1 commit
|
||||
+ archive: allow --exec and --remote without equal sign
|
||||
|
||||
None of the following is for 1.6.0.
|
||||
|
||||
* mv/merge-custom (Thu Jul 31 00:38:07 2008 +0200) 5 commits
|
||||
+ builtin-help: always load_command_list() in cmd_help()
|
||||
+ Add a second testcase for handling invalid strategies in git-merge
|
||||
+ Add a new test for using a custom merge strategy
|
||||
+ builtin-merge: allow using a custom strategy
|
||||
+ builtin-help: make some internal functions available to other
|
||||
builtins
|
||||
|
||||
* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits
|
||||
- git-merge-octopus: use (merge-base A (merge B C D E...)) for
|
||||
stepwise merge
|
||||
+ merge-base-many: add trivial tests based on the documentation
|
||||
+ documentation: merge-base: explain "git merge-base" with more than
|
||||
2 args
|
||||
+ merge-base: teach "git merge-base" to drive underlying
|
||||
merge_bases_many()
|
||||
|
||||
* jc/simplify-merges (Thu Jul 31 01:17:41 2008 -0700) 1 commit
|
||||
. revision traversal: show full history with merge simplification
|
||||
|
||||
"log --full-history" is with too much clutter, "log" itself is too cleverer
|
||||
than some people, and here is the middle level of merge simplification.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold and/or Cooking]
|
||||
|
||||
None of the following is for 1.6.0.
|
||||
|
||||
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
|
||||
+ Documentation: Improve documentation for git-imap-send(1)
|
||||
+ imap-send.c: more style fixes
|
||||
+ imap-send.c: style fixes
|
||||
+ git-imap-send: Support SSL
|
||||
+ git-imap-send: Allow the program to be run from subdirectories of
|
||||
a git tree
|
||||
|
||||
Some people seem to prefer having this feature available also with gnutls.
|
||||
Such an enhancement can be done in-tree on top of this series if they are
|
||||
so inclined.
|
||||
|
||||
* cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits
|
||||
- bisect: only check merge bases when needed
|
||||
- bisect: test merge base if good rev is not an ancestor of bad rev
|
||||
|
||||
* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
|
||||
+ builtin-add.c: optimize -A option and "git add ."
|
||||
+ builtin-add.c: restructure the code for maintainability
|
||||
|
||||
* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits
|
||||
+ spawn pager via run_command interface
|
||||
+ run-command: add pre-exec callback
|
||||
|
||||
This changes the parent-child relationship between the pager and the git
|
||||
process. We used to make pager the parent which meant that the exit
|
||||
status from git is lost from the caller.
|
||||
|
||||
* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit
|
||||
+ Enable threaded delta search on *BSD and Linux.
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
|
||||
+ Revert "Make clients ask for "git program" over ssh and local
|
||||
transport"
|
||||
+ Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
. diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
@@ -1,149 +0,0 @@
|
||||
What's cooking in git.git (Aug 2008, #01; Tue, 05)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
Due to increased activity level from people including GSoC students, I
|
||||
expect 'next' to stay somewhat more active than previous rounds during the
|
||||
1.6.0-rc cycle. The request for people who usually follow 'next' is the
|
||||
same as usual, though. After -rc1 is tagged, please run 'master' for your
|
||||
daily git use instead, in order to make sure 'master' does what it claims
|
||||
to do without regression.
|
||||
|
||||
Tentative schedule, my wishful thinking:
|
||||
|
||||
- 1.6.0-rc2 (Aug 6)
|
||||
- 1.6.0-rc3 (Aug 10)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/post-simplify (Sun Aug 3 17:47:16 2008 -0700) 3 commits
|
||||
+ Topo-sort before --simplify-merges
|
||||
+ revision traversal: show full history with merge simplification
|
||||
+ revision.c: whitespace fix
|
||||
|
||||
"log --full-history" is with too much clutter, "log" itself is too cleverer
|
||||
than some people, and here is the middle level of merge simplification.
|
||||
|
||||
* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits
|
||||
- [do not merge -- original version] Add Git-aware CGI for Git-aware
|
||||
smart HTTP transport
|
||||
- Add backdoor options to receive-pack for use in Git-aware CGI
|
||||
|
||||
The "magic" detection protocol was revised to use POST to info/refs; the
|
||||
top one queued is from before that discussion.
|
||||
|
||||
* jc/add-stop-at-symlink (Mon Aug 4 00:52:37 2008 -0700) 2 commits
|
||||
- add: refuse to add working tree items beyond symlinks
|
||||
- update-index: refuse to add working tree items beyond symlinks
|
||||
|
||||
The performance impact of this needs to be discussed in a separate
|
||||
thread.
|
||||
|
||||
* dp/hash-literally (Sun Aug 3 18:36:22 2008 +0400) 6 commits
|
||||
+ add --no-filters option to git hash-object
|
||||
+ add --path option to git hash-object
|
||||
+ use parse_options() in git hash-object
|
||||
+ correct usage help string for git-hash-object
|
||||
+ correct argument checking test for git hash-object
|
||||
+ teach index_fd to work with pipes
|
||||
|
||||
Gives a bit more flexibility to hash-objects by allowing us to lie about
|
||||
the path the contents comes from.
|
||||
|
||||
* jn/svn-log (Sun Aug 3 14:07:21 2008 +0200) 1 commit
|
||||
- git-svn: --clean-changelog=<style> to sanitize messages
|
||||
|
||||
Eric firmly rejected this one so I won't be merging this to 'next' but
|
||||
this was an interesting firestarter for discussion nevertheless.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold and/or Cooking]
|
||||
|
||||
* rs/archive-parse-options (Fri Jul 25 12:41:26 2008 +0200) 1 commit
|
||||
+ archive: allow --exec and --remote without equal sign
|
||||
|
||||
None of the following is for 1.6.0.
|
||||
|
||||
* mv/merge-custom (Sat Aug 2 10:08:38 2008 +0200) 6 commits
|
||||
+ Builtin git-help.
|
||||
+ builtin-help: always load_command_list() in cmd_help()
|
||||
+ Add a second testcase for handling invalid strategies in git-merge
|
||||
+ Add a new test for using a custom merge strategy
|
||||
+ builtin-merge: allow using a custom strategy
|
||||
+ builtin-help: make some internal functions available to other
|
||||
builtins
|
||||
|
||||
* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits
|
||||
- git-merge-octopus: use (merge-base A (merge B C D E...)) for
|
||||
stepwise merge
|
||||
+ merge-base-many: add trivial tests based on the documentation
|
||||
+ documentation: merge-base: explain "git merge-base" with more than
|
||||
2 args
|
||||
+ merge-base: teach "git merge-base" to drive underlying
|
||||
merge_bases_many()
|
||||
|
||||
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
|
||||
+ Documentation: Improve documentation for git-imap-send(1)
|
||||
+ imap-send.c: more style fixes
|
||||
+ imap-send.c: style fixes
|
||||
+ git-imap-send: Support SSL
|
||||
+ git-imap-send: Allow the program to be run from subdirectories of
|
||||
a git tree
|
||||
|
||||
Some people seem to prefer having this feature available also with gnutls.
|
||||
Such an enhancement can be done in-tree on top of this series if they are
|
||||
so inclined.
|
||||
|
||||
* cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits
|
||||
- bisect: only check merge bases when needed
|
||||
- bisect: test merge base if good rev is not an ancestor of bad rev
|
||||
|
||||
The first one alone does not pass its self-test but combined together they
|
||||
seem to. It does not build confidence as the latter one is supposed to be
|
||||
an optimization only.
|
||||
|
||||
* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
|
||||
+ builtin-add.c: optimize -A option and "git add ."
|
||||
+ builtin-add.c: restructure the code for maintainability
|
||||
|
||||
* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits
|
||||
+ spawn pager via run_command interface
|
||||
+ run-command: add pre-exec callback
|
||||
|
||||
This changes the parent-child relationship between the pager and the git
|
||||
process. We used to make pager the parent which meant that the exit
|
||||
status from git is lost from the caller.
|
||||
|
||||
* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit
|
||||
+ Enable threaded delta search on *BSD and Linux.
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
|
||||
+ Revert "Make clients ask for "git program" over ssh and local
|
||||
transport"
|
||||
+ Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
. diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
@@ -1,159 +0,0 @@
|
||||
Subject: What's cooking in git.git (Aug 2008, #02; Mon, 11)
|
||||
X-master-at: 10d9d887ecdc81197162d7bbe5dfc0d028498fd6
|
||||
X-next-at: 3cb9d94cdc74f3137599446af9f5442b7ae1ab27
|
||||
|
||||
What's cooking in git.git (Aug 2008, #02; Mon, 11)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit
|
||||
- tests: use $TEST_DIRECTORY to refer to the t/ directory
|
||||
|
||||
* kh/diff-tree (Sun Aug 10 18:13:04 2008 +0200) 4 commits
|
||||
+ Add test for diff-tree --stdin with two trees
|
||||
+ Teach git diff-tree --stdin to diff trees
|
||||
+ diff-tree: Note that the commit ID is printed with --stdin
|
||||
+ Refactoring: Split up diff_tree_stdin
|
||||
|
||||
* js/parallel-test (Fri Aug 8 13:08:37 2008 +0200) 3 commits
|
||||
+ Enable parallel tests
|
||||
+ tests: Clarify dependencies between tests, 'aggregate-results' and
|
||||
'clean'
|
||||
+ t9700: remove useless check
|
||||
|
||||
* xx/post-1.6.0 (Sun Aug 10 19:10:04 2008 -0400) 3 commits
|
||||
+ git-submodule - Add 'foreach' subcommand
|
||||
+ builtin-reflog: Allow reflog expire to name partial ref
|
||||
+ git-am: ignore --binary option
|
||||
|
||||
Some collection of patches to queue for post-1.6.0 development.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* rs/archive-parse-options (Fri Jul 25 12:41:26 2008 +0200) 1 commit
|
||||
+ archive: allow --exec and --remote without equal sign
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold and/or Cooking]
|
||||
|
||||
* jc/post-simplify (Sun Aug 3 17:47:16 2008 -0700) 3 commits
|
||||
+ Topo-sort before --simplify-merges
|
||||
+ revision traversal: show full history with merge simplification
|
||||
+ revision.c: whitespace fix
|
||||
|
||||
"log --full-history" is with too much clutter, "log" itself is too cleverer
|
||||
than some people, and here is the middle level of merge simplification.
|
||||
|
||||
* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits
|
||||
- [do not merge -- original version] Add Git-aware CGI for Git-aware
|
||||
smart HTTP transport
|
||||
- Add backdoor options to receive-pack for use in Git-aware CGI
|
||||
|
||||
The "magic" detection protocol was revised to use POST to info/refs; the
|
||||
top one queued is from before that discussion.
|
||||
|
||||
* jc/add-stop-at-symlink (Mon Aug 4 00:52:37 2008 -0700) 2 commits
|
||||
+ add: refuse to add working tree items beyond symlinks
|
||||
+ update-index: refuse to add working tree items beyond symlinks
|
||||
|
||||
Fix for a longstanding bug that allows "git add" and "git update-index" to
|
||||
add a path "a/b" to the index when "a" is a symbolic link. We would need
|
||||
a similar fix for the case where "a" is a submodule.
|
||||
|
||||
* dp/hash-literally (Sun Aug 3 18:36:22 2008 +0400) 6 commits
|
||||
+ add --no-filters option to git hash-object
|
||||
+ add --path option to git hash-object
|
||||
+ use parse_options() in git hash-object
|
||||
+ correct usage help string for git-hash-object
|
||||
+ correct argument checking test for git hash-object
|
||||
+ teach index_fd to work with pipes
|
||||
|
||||
Gives a bit more flexibility to hash-objects by allowing us to lie about
|
||||
the path the contents comes from.
|
||||
|
||||
* mv/merge-custom (Sat Aug 2 10:08:38 2008 +0200) 6 commits
|
||||
+ Builtin git-help.
|
||||
+ builtin-help: always load_command_list() in cmd_help()
|
||||
+ Add a second testcase for handling invalid strategies in git-merge
|
||||
+ Add a new test for using a custom merge strategy
|
||||
+ builtin-merge: allow using a custom strategy
|
||||
+ builtin-help: make some internal functions available to other
|
||||
builtins
|
||||
|
||||
* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits
|
||||
- git-merge-octopus: use (merge-base A (merge B C D E...)) for
|
||||
stepwise merge
|
||||
+ merge-base-many: add trivial tests based on the documentation
|
||||
+ documentation: merge-base: explain "git merge-base" with more than
|
||||
2 args
|
||||
+ merge-base: teach "git merge-base" to drive underlying
|
||||
merge_bases_many()
|
||||
|
||||
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
|
||||
+ Documentation: Improve documentation for git-imap-send(1)
|
||||
+ imap-send.c: more style fixes
|
||||
+ imap-send.c: style fixes
|
||||
+ git-imap-send: Support SSL
|
||||
+ git-imap-send: Allow the program to be run from subdirectories of
|
||||
a git tree
|
||||
|
||||
Some people seem to prefer having this feature available also with gnutls.
|
||||
Such an enhancement can be done in-tree on top of this series if they are
|
||||
so inclined.
|
||||
|
||||
* cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits
|
||||
- bisect: only check merge bases when needed
|
||||
- bisect: test merge base if good rev is not an ancestor of bad rev
|
||||
|
||||
The first one alone does not pass its self-test but combined together they
|
||||
seem to. It does not build confidence as the latter one is supposed to be
|
||||
an optimization only.
|
||||
|
||||
* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
|
||||
+ builtin-add.c: optimize -A option and "git add ."
|
||||
+ builtin-add.c: restructure the code for maintainability
|
||||
|
||||
* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits
|
||||
+ spawn pager via run_command interface
|
||||
+ run-command: add pre-exec callback
|
||||
|
||||
This changes the parent-child relationship between the pager and the git
|
||||
process. We used to make pager the parent which meant that the exit
|
||||
status from git is lost from the caller.
|
||||
|
||||
* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit
|
||||
+ Enable threaded delta search on *BSD and Linux.
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
|
||||
+ Revert "Make clients ask for "git program" over ssh and local
|
||||
transport"
|
||||
+ Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
@@ -1,223 +0,0 @@
|
||||
Subject: What's cooking in git.git (Aug 2008, #03; Thu, 14)
|
||||
X-master-at: a0653d550524a0263d36fde6a8cf98941dd057ab
|
||||
X-next-at: 8dd0c03fb2b8807ef71d5e807e65818dbd05a118
|
||||
|
||||
What's cooking in git.git (Aug 2008, #03; Thu, 14)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* ak/p4 (Sun Aug 10 19:26:35 2008 +0100) 12 commits
|
||||
+ Put in the two other configuration elements found in the source
|
||||
+ Put some documentation in about the parameters that have been
|
||||
added
|
||||
+ Move git-p4.syncFromOrigin into a configuration parameters section
|
||||
+ Consistently use 'git-p4' for the configuration entries
|
||||
+ If the user has configured various parameters, use them.
|
||||
+ Switch to using 'p4_build_cmd'
|
||||
+ If we are in verbose mode, output what we are about to run (or
|
||||
return)
|
||||
+ Add a single command that will be used to construct the 'p4'
|
||||
command
|
||||
+ Utilise the new 'p4_system' function.
|
||||
+ Have a command that specifically invokes 'p4' (via system)
|
||||
+ Utilise the new 'p4_read_pipe_lines' command
|
||||
+ Create a specific version of the read_pipe_lines command for p4
|
||||
invocations
|
||||
|
||||
Warmly received by the primary contributor of git-p4; I do not mind
|
||||
merging this before 1.6.0.
|
||||
|
||||
* mv/merge-recursive (Tue Aug 12 22:14:00 2008 +0200) 3 commits
|
||||
- Make builtin-revert.c use merge_recursive_generic()
|
||||
- merge-recursive.c: Add more generic merge_recursive_generic()
|
||||
- Split out merge_recursive() to merge-recursive.c
|
||||
|
||||
I do not think builtlin-revert should use "recursive", but these patches
|
||||
give a good starting point to separate the bulk of the "rename-aware
|
||||
three-way merge" into library form.
|
||||
|
||||
* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 1 commit
|
||||
+ Documentation: rev-list-options: move --simplify-merges
|
||||
documentation
|
||||
|
||||
* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
|
||||
+ pack-objects: Allow missing base objects when creating thin packs
|
||||
|
||||
* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 4 commits
|
||||
- filter-branch: use --simplify-merges
|
||||
- Merge branch 'jc/post-simplify' into tr/filter-branch
|
||||
- filter-branch: fix ref rewriting with --subdirectory-filter
|
||||
- filter-branch: Extend test to show rewriting bug
|
||||
|
||||
* js/checkout-dwim-local (Sat Aug 9 16:00:12 2008 +0200) 1 commit
|
||||
+ checkout --track: make up a sensible branch name if '-b' was
|
||||
omitted
|
||||
|
||||
I like this low-impact usability enhancement; will most likely be in
|
||||
master soon after 1.6.0.
|
||||
|
||||
* bd/diff-strbuf (Wed Aug 13 23:18:22 2008 -0700) 3 commits
|
||||
+ xdiff-interface: hide the whole "xdiff_emit_state" business from
|
||||
the caller
|
||||
+ Use strbuf for struct xdiff_emit_state's remainder
|
||||
+ Make xdi_diff_outf interface for running xdiff_outf diffs
|
||||
|
||||
Gives measurable performance improvement to textual diff generation. For
|
||||
improving "blame" performance, it might be more effective to hook directly
|
||||
to lower level of xdiff machinery so that we do not even have to generate
|
||||
patch only to discard after reading "@@ -l,k +m,n @@" lines, but that
|
||||
would be a separate topic.
|
||||
|
||||
* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
|
||||
+ Make cherry-pick use rerere for conflict resolution.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold and/or Cooking]
|
||||
|
||||
* jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit
|
||||
- tests: use $TEST_DIRECTORY to refer to the t/ directory
|
||||
|
||||
* kh/diff-tree (Sun Aug 10 18:13:04 2008 +0200) 4 commits
|
||||
+ Add test for diff-tree --stdin with two trees
|
||||
+ Teach git diff-tree --stdin to diff trees
|
||||
+ diff-tree: Note that the commit ID is printed with --stdin
|
||||
+ Refactoring: Split up diff_tree_stdin
|
||||
|
||||
* js/parallel-test (Fri Aug 8 13:08:37 2008 +0200) 3 commits
|
||||
+ Enable parallel tests
|
||||
+ tests: Clarify dependencies between tests, 'aggregate-results' and
|
||||
'clean'
|
||||
+ t9700: remove useless check
|
||||
|
||||
* xx/post-1.6.0 (Mon Aug 11 21:45:52 2008 -0400) 7 commits
|
||||
+ git-submodule foreach - Include output and clarify usage.
|
||||
+ Fix commit_tree() buffer leak
|
||||
+ Teach git log --exit-code to return an appropriate exit code
|
||||
+ Teach git log --check to return an appropriate exit code
|
||||
+ git-submodule - Add 'foreach' subcommand
|
||||
+ builtin-reflog: Allow reflog expire to name partial ref
|
||||
+ git-am: ignore --binary option
|
||||
|
||||
Random collection of patches to queue for post-1.6.0 development.
|
||||
|
||||
* jc/post-simplify (Sun Aug 3 17:47:16 2008 -0700) 3 commits
|
||||
+ Topo-sort before --simplify-merges
|
||||
+ revision traversal: show full history with merge simplification
|
||||
+ revision.c: whitespace fix
|
||||
|
||||
"log --full-history" is with too much clutter, "log" itself is too cleverer
|
||||
than some people, and here is the middle level of merge simplification.
|
||||
|
||||
* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits
|
||||
- [do not merge -- original version] Add Git-aware CGI for Git-aware
|
||||
smart HTTP transport
|
||||
- Add backdoor options to receive-pack for use in Git-aware CGI
|
||||
|
||||
The "magic" detection protocol was revised to use POST to info/refs; the
|
||||
top one queued is from before that discussion.
|
||||
|
||||
* jc/add-stop-at-symlink (Mon Aug 4 00:52:37 2008 -0700) 2 commits
|
||||
+ add: refuse to add working tree items beyond symlinks
|
||||
+ update-index: refuse to add working tree items beyond symlinks
|
||||
|
||||
Fix for a longstanding bug that allows "git add" and "git update-index" to
|
||||
add a path "a/b" to the index when "a" is a symbolic link. We would need
|
||||
a similar fix for the case where "a" is a submodule.
|
||||
|
||||
* dp/hash-literally (Sun Aug 3 18:36:22 2008 +0400) 6 commits
|
||||
+ add --no-filters option to git hash-object
|
||||
+ add --path option to git hash-object
|
||||
+ use parse_options() in git hash-object
|
||||
+ correct usage help string for git-hash-object
|
||||
+ correct argument checking test for git hash-object
|
||||
+ teach index_fd to work with pipes
|
||||
|
||||
Gives a bit more flexibility to hash-objects by allowing us to lie about
|
||||
the path the contents comes from.
|
||||
|
||||
* mv/merge-custom (Wed Aug 13 23:32:43 2008 +0200) 7 commits
|
||||
+ Update .gitignore to ignore git-help
|
||||
+ Builtin git-help.
|
||||
+ builtin-help: always load_command_list() in cmd_help()
|
||||
+ Add a second testcase for handling invalid strategies in git-merge
|
||||
+ Add a new test for using a custom merge strategy
|
||||
+ builtin-merge: allow using a custom strategy
|
||||
+ builtin-help: make some internal functions available to other
|
||||
builtins
|
||||
|
||||
* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits
|
||||
+ git-merge-octopus: use (merge-base A (merge B C D E...)) for
|
||||
stepwise merge
|
||||
+ merge-base-many: add trivial tests based on the documentation
|
||||
+ documentation: merge-base: explain "git merge-base" with more than
|
||||
2 args
|
||||
+ merge-base: teach "git merge-base" to drive underlying
|
||||
merge_bases_many()
|
||||
|
||||
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
|
||||
+ Documentation: Improve documentation for git-imap-send(1)
|
||||
+ imap-send.c: more style fixes
|
||||
+ imap-send.c: style fixes
|
||||
+ git-imap-send: Support SSL
|
||||
+ git-imap-send: Allow the program to be run from subdirectories of
|
||||
a git tree
|
||||
|
||||
Some people seem to prefer having this feature available also with gnutls.
|
||||
Such an enhancement can be done in-tree on top of this series if they are
|
||||
so inclined.
|
||||
|
||||
* cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits
|
||||
- bisect: only check merge bases when needed
|
||||
- bisect: test merge base if good rev is not an ancestor of bad rev
|
||||
|
||||
The first one alone does not pass its self-test but combined together they
|
||||
seem to. It does not build confidence as the latter one is supposed to be
|
||||
an optimization only.
|
||||
|
||||
* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
|
||||
+ builtin-add.c: optimize -A option and "git add ."
|
||||
+ builtin-add.c: restructure the code for maintainability
|
||||
|
||||
* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits
|
||||
+ spawn pager via run_command interface
|
||||
+ run-command: add pre-exec callback
|
||||
|
||||
This changes the parent-child relationship between the pager and the git
|
||||
process. We used to make pager the parent which meant that the exit
|
||||
status from git is lost from the caller.
|
||||
|
||||
* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit
|
||||
+ Enable threaded delta search on *BSD and Linux.
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
|
||||
+ Revert "Make clients ask for "git program" over ssh and local
|
||||
transport"
|
||||
+ Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
@@ -1,261 +0,0 @@
|
||||
Subject: What's cooking in git.git (Aug 2008, #04; Sun, 17)
|
||||
X-master-at: 053fd0c1c3da20474c4ff175c56ea4c1d6eeda11
|
||||
X-next-at: d4dfb3b89c69c0c009978a2948b4f87dee11a648
|
||||
|
||||
What's cooking in git.git (Aug 2008, #04; Sun, 17)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
|
||||
- configure: auto detect dynamic library path switches
|
||||
- Makefile: Allow CC_LD_DYNPATH to be overriden
|
||||
|
||||
* jc/index-extended-flags (Sat Aug 16 23:02:08 2008 -0700) 1 commit
|
||||
+ index: future proof for "extended" index entries
|
||||
|
||||
* mz/push-verbose (Sat Aug 16 19:58:32 2008 +0200) 1 commit
|
||||
+ Make push more verbose about illegal combination of options
|
||||
|
||||
* mg/count-objects (Fri Aug 15 00:20:20 2008 -0400) 1 commit
|
||||
+ count-objects: Add total pack size to verbose output
|
||||
|
||||
This one is without the human readable bits.
|
||||
|
||||
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
|
||||
- date/time: do not get confused by fractional seconds
|
||||
|
||||
Linus hints further enhancements as "the right way", so let's see if
|
||||
somebody else steps up and tries it before merging this to 'next'.
|
||||
|
||||
* sb/daemon (Thu Aug 14 20:02:20 2008 +0200) 4 commits
|
||||
- git-daemon: rewrite kindergarden, new option --max-connections
|
||||
- git-daemon: Simplify dead-children reaping logic
|
||||
- git-daemon: use LOG_PID, simplify logging code
|
||||
- git-daemon: call logerror() instead of error()
|
||||
|
||||
Can somebody who actually runs the daemon standalone comment on this one?
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold and/or Cooking]
|
||||
|
||||
* ak/p4 (Thu Aug 14 23:40:39 2008 +0100) 14 commits
|
||||
+ Utilise our new p4_read_pipe and p4_write_pipe wrappers
|
||||
+ Add p4 read_pipe and write_pipe wrappers
|
||||
+ Put in the two other configuration elements found in the source
|
||||
+ Put some documentation in about the parameters that have been
|
||||
added
|
||||
+ Move git-p4.syncFromOrigin into a configuration parameters section
|
||||
+ Consistently use 'git-p4' for the configuration entries
|
||||
+ If the user has configured various parameters, use them.
|
||||
+ Switch to using 'p4_build_cmd'
|
||||
+ If we are in verbose mode, output what we are about to run (or
|
||||
return)
|
||||
+ Add a single command that will be used to construct the 'p4'
|
||||
command
|
||||
+ Utilise the new 'p4_system' function.
|
||||
+ Have a command that specifically invokes 'p4' (via system)
|
||||
+ Utilise the new 'p4_read_pipe_lines' command
|
||||
+ Create a specific version of the read_pipe_lines command for p4
|
||||
invocations
|
||||
|
||||
Warmly received by the primary contributor of git-p4; I do not mind
|
||||
merging this before 1.6.0 (final call for "Yays").
|
||||
|
||||
* mv/merge-recursive (Tue Aug 12 22:14:00 2008 +0200) 3 commits
|
||||
- Make builtin-revert.c use merge_recursive_generic()
|
||||
- merge-recursive.c: Add more generic merge_recursive_generic()
|
||||
- Split out merge_recursive() to merge-recursive.c
|
||||
|
||||
I do not think builtlin-revert should use "recursive", but these patches
|
||||
give a good starting point to separate the bulk of the "rename-aware
|
||||
three-way merge" into library form.
|
||||
|
||||
* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 1 commit
|
||||
+ Documentation: rev-list-options: move --simplify-merges
|
||||
documentation
|
||||
|
||||
* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
|
||||
+ pack-objects: Allow missing base objects when creating thin packs
|
||||
|
||||
* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 4 commits
|
||||
+ filter-branch: use --simplify-merges
|
||||
+ Merge branch 'jc/post-simplify' into tr/filter-branch
|
||||
+ filter-branch: fix ref rewriting with --subdirectory-filter
|
||||
+ filter-branch: Extend test to show rewriting bug
|
||||
|
||||
* js/checkout-dwim-local (Sat Aug 9 16:00:12 2008 +0200) 1 commit
|
||||
+ checkout --track: make up a sensible branch name if '-b' was
|
||||
omitted
|
||||
|
||||
I like this low-impact usability enhancement; will most likely be in
|
||||
master soon after 1.6.0, but not before.
|
||||
|
||||
* bd/diff-strbuf (Wed Aug 13 23:18:22 2008 -0700) 3 commits
|
||||
+ xdiff-interface: hide the whole "xdiff_emit_state" business from
|
||||
the caller
|
||||
+ Use strbuf for struct xdiff_emit_state's remainder
|
||||
+ Make xdi_diff_outf interface for running xdiff_outf diffs
|
||||
|
||||
Gives measurable performance improvement to textual diff generation. For
|
||||
improving "blame" performance, it might be more effective to hook directly
|
||||
to lower level of xdiff machinery so that we do not even have to generate
|
||||
patch only to discard after reading "@@ -l,k +m,n @@" lines, but that
|
||||
would be a separate topic.
|
||||
|
||||
* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
|
||||
+ Make cherry-pick use rerere for conflict resolution.
|
||||
|
||||
* jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit
|
||||
+ tests: use $TEST_DIRECTORY to refer to the t/ directory
|
||||
|
||||
* kh/diff-tree (Sun Aug 10 18:13:04 2008 +0200) 4 commits
|
||||
+ Add test for diff-tree --stdin with two trees
|
||||
+ Teach git diff-tree --stdin to diff trees
|
||||
+ diff-tree: Note that the commit ID is printed with --stdin
|
||||
+ Refactoring: Split up diff_tree_stdin
|
||||
|
||||
* js/parallel-test (Fri Aug 8 13:08:37 2008 +0200) 3 commits
|
||||
+ Enable parallel tests
|
||||
+ tests: Clarify dependencies between tests, 'aggregate-results' and
|
||||
'clean'
|
||||
+ t9700: remove useless check
|
||||
|
||||
* xx/post-1.6.0 (Mon Aug 11 21:45:52 2008 -0400) 7 commits
|
||||
+ git-submodule foreach - Include output and clarify usage.
|
||||
+ Fix commit_tree() buffer leak
|
||||
+ Teach git log --exit-code to return an appropriate exit code
|
||||
+ Teach git log --check to return an appropriate exit code
|
||||
+ git-submodule - Add 'foreach' subcommand
|
||||
+ builtin-reflog: Allow reflog expire to name partial ref
|
||||
+ git-am: ignore --binary option
|
||||
|
||||
Random collection of patches to queue for post-1.6.0 development.
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 7 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
- revision --simplify-merges: make it a no-op without pathspec
|
||||
+ revision --simplify-merges: use decoration instead of commit->util
|
||||
field
|
||||
+ Topo-sort before --simplify-merges
|
||||
+ revision traversal: show full history with merge simplification
|
||||
+ revision.c: whitespace fix
|
||||
|
||||
"log --full-history" is with too much clutter, "log" itself is too cleverer
|
||||
than some people, and here is the middle level of merge simplification.
|
||||
|
||||
I started making this incremental but the progress is not so great.
|
||||
|
||||
* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits
|
||||
- [do not merge -- original version] Add Git-aware CGI for Git-aware
|
||||
smart HTTP transport
|
||||
- Add backdoor options to receive-pack for use in Git-aware CGI
|
||||
|
||||
The "magic" detection protocol was revised to use POST to info/refs; the
|
||||
top one queued is from before that discussion.
|
||||
|
||||
* jc/add-stop-at-symlink (Mon Aug 4 00:52:37 2008 -0700) 2 commits
|
||||
+ add: refuse to add working tree items beyond symlinks
|
||||
+ update-index: refuse to add working tree items beyond symlinks
|
||||
|
||||
Fix for a longstanding bug that allows "git add" and "git update-index" to
|
||||
add a path "a/b" to the index when "a" is a symbolic link. We would need
|
||||
a similar fix for the case where "a" is a submodule.
|
||||
|
||||
* dp/hash-literally (Sun Aug 3 18:36:22 2008 +0400) 6 commits
|
||||
+ add --no-filters option to git hash-object
|
||||
+ add --path option to git hash-object
|
||||
+ use parse_options() in git hash-object
|
||||
+ correct usage help string for git-hash-object
|
||||
+ correct argument checking test for git hash-object
|
||||
+ teach index_fd to work with pipes
|
||||
|
||||
Gives a bit more flexibility to hash-objects by allowing us to lie about
|
||||
the path the contents comes from.
|
||||
|
||||
* mv/merge-custom (Wed Aug 13 23:32:43 2008 +0200) 7 commits
|
||||
+ Update .gitignore to ignore git-help
|
||||
+ Builtin git-help.
|
||||
+ builtin-help: always load_command_list() in cmd_help()
|
||||
+ Add a second testcase for handling invalid strategies in git-merge
|
||||
+ Add a new test for using a custom merge strategy
|
||||
+ builtin-merge: allow using a custom strategy
|
||||
+ builtin-help: make some internal functions available to other
|
||||
builtins
|
||||
|
||||
* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits
|
||||
+ git-merge-octopus: use (merge-base A (merge B C D E...)) for
|
||||
stepwise merge
|
||||
+ merge-base-many: add trivial tests based on the documentation
|
||||
+ documentation: merge-base: explain "git merge-base" with more than
|
||||
2 args
|
||||
+ merge-base: teach "git merge-base" to drive underlying
|
||||
merge_bases_many()
|
||||
|
||||
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
|
||||
+ Documentation: Improve documentation for git-imap-send(1)
|
||||
+ imap-send.c: more style fixes
|
||||
+ imap-send.c: style fixes
|
||||
+ git-imap-send: Support SSL
|
||||
+ git-imap-send: Allow the program to be run from subdirectories of
|
||||
a git tree
|
||||
|
||||
Some people seem to prefer having this feature available also with gnutls.
|
||||
Such an enhancement can be done in-tree on top of this series if they are
|
||||
so inclined.
|
||||
|
||||
* cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits
|
||||
- bisect: only check merge bases when needed
|
||||
- bisect: test merge base if good rev is not an ancestor of bad rev
|
||||
|
||||
The first one alone does not pass its self-test but combined together they
|
||||
seem to. It does not build confidence as the latter one is supposed to be
|
||||
an optimization only.
|
||||
|
||||
* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
|
||||
+ builtin-add.c: optimize -A option and "git add ."
|
||||
+ builtin-add.c: restructure the code for maintainability
|
||||
|
||||
* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits
|
||||
+ spawn pager via run_command interface
|
||||
+ run-command: add pre-exec callback
|
||||
|
||||
This changes the parent-child relationship between the pager and the git
|
||||
process. We used to make pager the parent which meant that the exit
|
||||
status from git is lost from the caller.
|
||||
|
||||
* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit
|
||||
+ Enable threaded delta search on *BSD and Linux.
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
|
||||
+ Revert "Make clients ask for "git program" over ssh and local
|
||||
transport"
|
||||
+ Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
@@ -1,320 +0,0 @@
|
||||
Subject: What's cooking in git.git (Aug 2008, #05; Tue, 19)
|
||||
X-master-at: c6670b348cb19c74a6d7f6943df4871eb0d8295f
|
||||
X-next-at: 2fad1ef69ea50e7d9a61a65603ad04bcc079ac0e
|
||||
|
||||
What's cooking in git.git (Aug 2008, #05; Tue, 19)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
Tonight's 'pu' does not pass tests because test vectors have not been
|
||||
adjusted for the changes brought in by the jc/diff-prefix topic.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* js/mingw-stat (Mon Aug 18 22:01:06 2008 +0200) 2 commits
|
||||
- Revert "Windows: Use a customized struct stat that also has the
|
||||
st_blocks member."
|
||||
- compat: introduce on_disk_bytes()
|
||||
|
||||
This gets rid of use of st_blocks member (which is XSI but not POSIX
|
||||
proper), which was originally prompted by recent Haiku port but it turns
|
||||
out MinGW has the same issue as well. Queued on 'pu' just to have a
|
||||
chance to make sure I munged the version j6t sent me correctly before
|
||||
merging it upwards.
|
||||
|
||||
* ml/submodule-foreach (Sun Aug 10 19:10:04 2008 -0400) 1 commit
|
||||
+ git-submodule - Add 'foreach' subcommand
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* pm/log-exit-code (Mon Aug 11 08:46:25 2008 +0200) 2 commits
|
||||
+ Teach git log --exit-code to return an appropriate exit code
|
||||
+ Teach git log --check to return an appropriate exit code
|
||||
|
||||
* sb/commit-tree-minileak (Tue Aug 12 00:35:11 2008 +0200) 1 commit
|
||||
+ Fix commit_tree() buffer leak
|
||||
|
||||
* pb/reflog-dwim (Sun Aug 10 22:22:21 2008 +0200) 1 commit
|
||||
+ builtin-reflog: Allow reflog expire to name partial ref
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
|
||||
- WIP: start teaching the --whitespace=fix to merge machinery
|
||||
|
||||
* lw/gitweb (Mon Aug 18 21:39:49 2008 +0200) 3 commits
|
||||
- gitweb: use new Git::Repo API, and add optional caching
|
||||
- add new Perl API: Git::Repo, Git::Commit, Git::Tag, and
|
||||
Git::RepoRoot
|
||||
- gitweb: add test suite with Test::WWW::Mechanize::CGI
|
||||
|
||||
* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
|
||||
- diff: vary default prefix depending on what are compared
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* ak/p4 (Thu Aug 14 23:40:39 2008 +0100) 14 commits
|
||||
+ Utilise our new p4_read_pipe and p4_write_pipe wrappers
|
||||
+ Add p4 read_pipe and write_pipe wrappers
|
||||
+ Put in the two other configuration elements found in the source
|
||||
+ Put some documentation in about the parameters that have been
|
||||
added
|
||||
+ Move git-p4.syncFromOrigin into a configuration parameters section
|
||||
+ Consistently use 'git-p4' for the configuration entries
|
||||
+ If the user has configured various parameters, use them.
|
||||
+ Switch to using 'p4_build_cmd'
|
||||
+ If we are in verbose mode, output what we are about to run (or
|
||||
return)
|
||||
+ Add a single command that will be used to construct the 'p4'
|
||||
command
|
||||
+ Utilise the new 'p4_system' function.
|
||||
+ Have a command that specifically invokes 'p4' (via system)
|
||||
+ Utilise the new 'p4_read_pipe_lines' command
|
||||
+ Create a specific version of the read_pipe_lines command for p4
|
||||
invocations
|
||||
|
||||
Warmly received by the primary contributors of git-p4; this was merged as
|
||||
part of 1.6.0.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to master soon]
|
||||
|
||||
* js/checkout-dwim-local (Sat Aug 9 16:00:12 2008 +0200) 1 commit
|
||||
+ checkout --track: make up a sensible branch name if '-b' was
|
||||
omitted
|
||||
|
||||
* bd/diff-strbuf (Wed Aug 13 23:18:22 2008 -0700) 3 commits
|
||||
+ xdiff-interface: hide the whole "xdiff_emit_state" business from
|
||||
the caller
|
||||
+ Use strbuf for struct xdiff_emit_state's remainder
|
||||
+ Make xdi_diff_outf interface for running xdiff_outf diffs
|
||||
|
||||
Gives measurable performance improvement to textual diff generation. For
|
||||
improving "blame" performance, it might be more effective to hook directly
|
||||
to lower level of xdiff machinery so that we do not even have to generate
|
||||
patch only to discard after reading "@@ -l,k +m,n @@" lines, but that
|
||||
would be a separate topic.
|
||||
|
||||
* jc/add-stop-at-symlink (Mon Aug 4 00:52:37 2008 -0700) 2 commits
|
||||
+ add: refuse to add working tree items beyond symlinks
|
||||
+ update-index: refuse to add working tree items beyond symlinks
|
||||
|
||||
Fix for a longstanding bug that allows "git add" and "git update-index" to
|
||||
add a path "a/b" to the index when "a" is a symbolic link. We would need
|
||||
a similar fix for the case where "a" is a submodule.
|
||||
|
||||
* dp/hash-literally (Sun Aug 3 18:36:22 2008 +0400) 6 commits
|
||||
+ add --no-filters option to git hash-object
|
||||
+ add --path option to git hash-object
|
||||
+ use parse_options() in git hash-object
|
||||
+ correct usage help string for git-hash-object
|
||||
+ correct argument checking test for git hash-object
|
||||
+ teach index_fd to work with pipes
|
||||
|
||||
Gives a bit more flexibility to hash-objects by allowing us to lie about
|
||||
the path the contents comes from.
|
||||
|
||||
* mv/merge-custom (Wed Aug 13 23:32:43 2008 +0200) 7 commits
|
||||
+ Update .gitignore to ignore git-help
|
||||
+ Builtin git-help.
|
||||
+ builtin-help: always load_command_list() in cmd_help()
|
||||
+ Add a second testcase for handling invalid strategies in git-merge
|
||||
+ Add a new test for using a custom merge strategy
|
||||
+ builtin-merge: allow using a custom strategy
|
||||
+ builtin-help: make some internal functions available to other
|
||||
builtins
|
||||
|
||||
* kh/diff-tree (Sun Aug 10 18:13:04 2008 +0200) 4 commits
|
||||
+ Add test for diff-tree --stdin with two trees
|
||||
+ Teach git diff-tree --stdin to diff trees
|
||||
+ diff-tree: Note that the commit ID is printed with --stdin
|
||||
+ Refactoring: Split up diff_tree_stdin
|
||||
|
||||
* mg/count-objects (Fri Aug 15 00:20:20 2008 -0400) 1 commit
|
||||
+ count-objects: Add total pack size to verbose output
|
||||
|
||||
This one is without the human readable bits.
|
||||
|
||||
* mz/push-verbose (Sat Aug 16 19:58:32 2008 +0200) 1 commit
|
||||
+ Make push more verbose about illegal combination of options
|
||||
|
||||
* jc/index-extended-flags (Sat Aug 16 23:02:08 2008 -0700) 1 commit
|
||||
+ index: future proof for "extended" index entries
|
||||
|
||||
* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits
|
||||
+ git-merge-octopus: use (merge-base A (merge B C D E...)) for
|
||||
stepwise merge
|
||||
+ merge-base-many: add trivial tests based on the documentation
|
||||
+ documentation: merge-base: explain "git merge-base" with more than
|
||||
2 args
|
||||
+ merge-base: teach "git merge-base" to drive underlying
|
||||
merge_bases_many()
|
||||
|
||||
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
|
||||
+ Documentation: Improve documentation for git-imap-send(1)
|
||||
+ imap-send.c: more style fixes
|
||||
+ imap-send.c: style fixes
|
||||
+ git-imap-send: Support SSL
|
||||
+ git-imap-send: Allow the program to be run from subdirectories of
|
||||
a git tree
|
||||
|
||||
Some people seem to prefer having this feature available also with gnutls.
|
||||
Such an enhancement can be done in-tree on top of this series if they are
|
||||
so inclined.
|
||||
|
||||
* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
|
||||
+ builtin-add.c: optimize -A option and "git add ."
|
||||
+ builtin-add.c: restructure the code for maintainability
|
||||
|
||||
* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits
|
||||
+ spawn pager via run_command interface
|
||||
+ run-command: add pre-exec callback
|
||||
|
||||
This changes the parent-child relationship between the pager and the git
|
||||
process. We used to make pager the parent which meant that the exit
|
||||
status from git is lost from the caller.
|
||||
|
||||
* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit
|
||||
+ Enable threaded delta search on *BSD and Linux.
|
||||
|
||||
* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
|
||||
+ Make cherry-pick use rerere for conflict resolution.
|
||||
|
||||
* js/parallel-test (Mon Aug 18 12:25:40 2008 -0400) 4 commits
|
||||
+ Update t/.gitignore to ignore all trash directories
|
||||
+ Enable parallel tests
|
||||
+ tests: Clarify dependencies between tests, 'aggregate-results' and
|
||||
'clean'
|
||||
+ t9700: remove useless check
|
||||
|
||||
* jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit
|
||||
+ tests: use $TEST_DIRECTORY to refer to the t/ directory
|
||||
|
||||
This does not actually move "t/test directory" any deeper, but fixes test
|
||||
scripts that assume they run immediately below "t/" to use TEST_DIRECTORY
|
||||
variable.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
|
||||
+ pack-objects: Allow missing base objects when creating thin packs
|
||||
|
||||
* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 3 commits
|
||||
+ filter-branch: use --simplify-merges
|
||||
+ filter-branch: fix ref rewriting with --subdirectory-filter
|
||||
+ filter-branch: Extend test to show rewriting bug
|
||||
|
||||
Fixes a longstanding filter branch bug.
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 8 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
- revision --simplify-merges: make it a no-op without pathspec
|
||||
+ revision --simplify-merges: do not leave commits unprocessed
|
||||
+ revision --simplify-merges: use decoration instead of commit->util
|
||||
field
|
||||
+ Topo-sort before --simplify-merges
|
||||
+ revision traversal: show full history with merge simplification
|
||||
+ revision.c: whitespace fix
|
||||
|
||||
"log --full-history" is with too much clutter, "log" itself is too cleverer
|
||||
than some people, and here is the middle level of merge simplification.
|
||||
|
||||
I started making this incremental but the progress is not so great.
|
||||
|
||||
* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 1 commit
|
||||
+ Documentation: rev-list-options: move --simplify-merges
|
||||
documentation
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
|
||||
- date/time: do not get confused by fractional seconds
|
||||
|
||||
Linus hints further enhancements as "the right way", so let's see if
|
||||
somebody else steps up and tries it before merging this to 'next'.
|
||||
|
||||
* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
|
||||
- configure: auto detect dynamic library path switches
|
||||
- Makefile: Allow CC_LD_DYNPATH to be overriden
|
||||
|
||||
Needs success reports from people who do use user-defined dynamic library
|
||||
path when they build their "git" before this series can go anywhere.
|
||||
|
||||
* sb/daemon (Thu Aug 14 20:02:20 2008 +0200) 4 commits
|
||||
- git-daemon: rewrite kindergarden, new option --max-connections
|
||||
- git-daemon: Simplify dead-children reaping logic
|
||||
- git-daemon: use LOG_PID, simplify logging code
|
||||
- git-daemon: call logerror() instead of error()
|
||||
|
||||
Can somebody who actually runs the daemon standalone comment on this one?
|
||||
|
||||
* mv/merge-recursive (Tue Aug 12 22:14:00 2008 +0200) 3 commits
|
||||
- Make builtin-revert.c use merge_recursive_generic()
|
||||
- merge-recursive.c: Add more generic merge_recursive_generic()
|
||||
- Split out merge_recursive() to merge-recursive.c
|
||||
|
||||
I do not think builtlin-revert should use "recursive", but these patches
|
||||
give a good starting point to separate the bulk of the "rename-aware
|
||||
three-way merge" into library form.
|
||||
|
||||
* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits
|
||||
- [do not merge -- original version] Add Git-aware CGI for Git-aware
|
||||
smart HTTP transport
|
||||
- Add backdoor options to receive-pack for use in Git-aware CGI
|
||||
|
||||
The "magic" detection protocol was revised to use POST to info/refs; the
|
||||
top one queued is from before that discussion.
|
||||
|
||||
* cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits
|
||||
- bisect: only check merge bases when needed
|
||||
- bisect: test merge base if good rev is not an ancestor of bad rev
|
||||
|
||||
The first one alone does not pass its self-test but combined together they
|
||||
seem to. It does not build confidence as the latter one is supposed to be
|
||||
an optimization only. Resend of fixed-up series is needed.
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Wed Jun 25 15:55:11 2008 -0700) 1 commit
|
||||
- Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
@@ -1,335 +0,0 @@
|
||||
Subject: What's cooking in git.git (Aug 2008, #06; Wed, 20)
|
||||
X-master-at: ea3594e04184475226109a21e71c539ff5f139fd
|
||||
X-next-at: c5a00f7ff5becd929d3e3b3e900d0983cd6083af
|
||||
|
||||
What's cooking in git.git (Aug 2008, #06; Wed, 20)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
Today's 'pu' does not pass tests for me; it seems my box does not like new
|
||||
tests for gitweb somehow.
|
||||
|
||||
By the way, here is a list of issues without any corresponding topic
|
||||
branches yet:
|
||||
|
||||
* Windows relocatable install
|
||||
|
||||
Steffen Prohaska ($gmane/92605), Johannes Sixt.
|
||||
|
||||
* Haiku port
|
||||
|
||||
Andreas Färber ($gmane/92582)
|
||||
|
||||
* ksh "trap foo EXIT" triggers on function return, loses exit status
|
||||
|
||||
Brandon Casey ($gmane/92873)
|
||||
|
||||
* document webdav debugging tip with davfs2
|
||||
|
||||
Giovanni Funchal ($gmane/92745)
|
||||
|
||||
* update "rebase -i" documentation with examples
|
||||
|
||||
Eric Hanchrow ($gmane/92669)
|
||||
|
||||
* pre-push hook
|
||||
|
||||
Scott Chacon ($gmane/92900, $gmane/92936)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/no-slim-shell (Tue Aug 19 18:05:43 2008 -0700) 2 commits
|
||||
+ Build-in "git-shell"
|
||||
+ shell: do not play duplicated definition games to shrink the
|
||||
executable
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled -- Needs Updates]
|
||||
|
||||
I've moved the "Stalled" section up so that it grabs more attention from
|
||||
people.
|
||||
|
||||
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
|
||||
- date/time: do not get confused by fractional seconds
|
||||
|
||||
Linus hints further enhancements as "the right way", so let's see if
|
||||
somebody else steps up and tries it before merging this to 'next'.
|
||||
|
||||
* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits
|
||||
- [do not merge -- original version] Add Git-aware CGI for Git-aware
|
||||
smart HTTP transport
|
||||
- Add backdoor options to receive-pack for use in Git-aware CGI
|
||||
|
||||
The "magic" detection protocol was revised to use POST to info/refs; the
|
||||
top one queued is from before that discussion.
|
||||
|
||||
* cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits
|
||||
- bisect: only check merge bases when needed
|
||||
- bisect: test merge base if good rev is not an ancestor of bad rev
|
||||
|
||||
The first one alone does not pass its self-test but combined together they
|
||||
seem to. It does not build confidence as the latter one is supposed to be
|
||||
an optimization only. Resend of fixed-up series is needed.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
|
||||
- configure: auto detect dynamic library path switches
|
||||
- Makefile: Allow CC_LD_DYNPATH to be overriden
|
||||
|
||||
Needs success reports from people who do use user-defined dynamic library
|
||||
path when they build their "git" before this series can go anywhere.
|
||||
|
||||
* sb/daemon (Thu Aug 14 20:02:20 2008 +0200) 4 commits
|
||||
- git-daemon: rewrite kindergarden, new option --max-connections
|
||||
- git-daemon: Simplify dead-children reaping logic
|
||||
- git-daemon: use LOG_PID, simplify logging code
|
||||
- git-daemon: call logerror() instead of error()
|
||||
|
||||
Can somebody who actually runs the daemon standalone comment on this one?
|
||||
|
||||
* mv/merge-recursive (Tue Aug 12 22:14:00 2008 +0200) 3 commits
|
||||
- Make builtin-revert.c use merge_recursive_generic()
|
||||
- merge-recursive.c: Add more generic merge_recursive_generic()
|
||||
- Split out merge_recursive() to merge-recursive.c
|
||||
|
||||
Miklos will be working on updates.
|
||||
|
||||
* lw/gitweb (Mon Aug 18 21:39:49 2008 +0200) 3 commits
|
||||
- gitweb: use new Git::Repo API, and add optional caching
|
||||
- add new Perl API: Git::Repo, Git::Commit, Git::Tag, and
|
||||
Git::RepoRoot
|
||||
- gitweb: add test suite with Test::WWW::Mechanize::CGI
|
||||
|
||||
* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
|
||||
- diff: vary default prefix depending on what are compared
|
||||
|
||||
* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
|
||||
+ pack-objects: Allow missing base objects when creating thin packs
|
||||
|
||||
* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 3 commits
|
||||
+ filter-branch: use --simplify-merges
|
||||
+ filter-branch: fix ref rewriting with --subdirectory-filter
|
||||
+ filter-branch: Extend test to show rewriting bug
|
||||
|
||||
Fixes a longstanding filter branch bug. Success stories?
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 8 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
- revision --simplify-merges: make it a no-op without pathspec
|
||||
+ revision --simplify-merges: do not leave commits unprocessed
|
||||
+ revision --simplify-merges: use decoration instead of commit->util
|
||||
field
|
||||
+ Topo-sort before --simplify-merges
|
||||
+ revision traversal: show full history with merge simplification
|
||||
+ revision.c: whitespace fix
|
||||
|
||||
"log --full-history" is with too much clutter, "log" itself is too cleverer
|
||||
than some people, and here is the middle level of merge simplification.
|
||||
|
||||
I started making this incremental but the progress is not so great.
|
||||
|
||||
* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 1 commit
|
||||
+ Documentation: rev-list-options: move --simplify-merges
|
||||
documentation
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to master soon]
|
||||
|
||||
* ml/submodule-foreach (Sun Aug 10 19:10:04 2008 -0400) 1 commit
|
||||
+ git-submodule - Add 'foreach' subcommand
|
||||
|
||||
* pm/log-exit-code (Mon Aug 11 08:46:25 2008 +0200) 2 commits
|
||||
+ Teach git log --exit-code to return an appropriate exit code
|
||||
+ Teach git log --check to return an appropriate exit code
|
||||
|
||||
* sb/commit-tree-minileak (Tue Aug 12 00:35:11 2008 +0200) 1 commit
|
||||
+ Fix commit_tree() buffer leak
|
||||
|
||||
* pb/reflog-dwim (Sun Aug 10 22:22:21 2008 +0200) 1 commit
|
||||
+ builtin-reflog: Allow reflog expire to name partial ref
|
||||
|
||||
* jc/add-stop-at-symlink (Mon Aug 4 00:52:37 2008 -0700) 2 commits
|
||||
+ add: refuse to add working tree items beyond symlinks
|
||||
+ update-index: refuse to add working tree items beyond symlinks
|
||||
|
||||
Fix for a longstanding bug that allows "git add" and "git update-index" to
|
||||
add a path "a/b" to the index when "a" is a symbolic link. We would need
|
||||
a similar fix for the case where "a" is a submodule.
|
||||
|
||||
* mv/merge-custom (Wed Aug 13 23:32:43 2008 +0200) 7 commits
|
||||
+ Update .gitignore to ignore git-help
|
||||
+ Builtin git-help.
|
||||
+ builtin-help: always load_command_list() in cmd_help()
|
||||
+ Add a second testcase for handling invalid strategies in git-merge
|
||||
+ Add a new test for using a custom merge strategy
|
||||
+ builtin-merge: allow using a custom strategy
|
||||
+ builtin-help: make some internal functions available to other
|
||||
builtins
|
||||
|
||||
* kh/diff-tree (Sun Aug 10 18:13:04 2008 +0200) 4 commits
|
||||
+ Add test for diff-tree --stdin with two trees
|
||||
+ Teach git diff-tree --stdin to diff trees
|
||||
+ diff-tree: Note that the commit ID is printed with --stdin
|
||||
+ Refactoring: Split up diff_tree_stdin
|
||||
|
||||
* mg/count-objects (Fri Aug 15 00:20:20 2008 -0400) 1 commit
|
||||
+ count-objects: Add total pack size to verbose output
|
||||
|
||||
This one is without the human readable bits.
|
||||
|
||||
* mz/push-verbose (Sat Aug 16 19:58:32 2008 +0200) 1 commit
|
||||
+ Make push more verbose about illegal combination of options
|
||||
|
||||
* jc/index-extended-flags (Sat Aug 16 23:02:08 2008 -0700) 1 commit
|
||||
+ index: future proof for "extended" index entries
|
||||
|
||||
* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits
|
||||
+ git-merge-octopus: use (merge-base A (merge B C D E...)) for
|
||||
stepwise merge
|
||||
+ merge-base-many: add trivial tests based on the documentation
|
||||
+ documentation: merge-base: explain "git merge-base" with more than
|
||||
2 args
|
||||
+ merge-base: teach "git merge-base" to drive underlying
|
||||
merge_bases_many()
|
||||
|
||||
* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
|
||||
+ builtin-add.c: optimize -A option and "git add ."
|
||||
+ builtin-add.c: restructure the code for maintainability
|
||||
|
||||
* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
|
||||
+ Make cherry-pick use rerere for conflict resolution.
|
||||
|
||||
* js/parallel-test (Mon Aug 18 12:25:40 2008 -0400) 4 commits
|
||||
+ Update t/.gitignore to ignore all trash directories
|
||||
+ Enable parallel tests
|
||||
+ tests: Clarify dependencies between tests, 'aggregate-results' and
|
||||
'clean'
|
||||
+ t9700: remove useless check
|
||||
|
||||
* jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit
|
||||
+ tests: use $TEST_DIRECTORY to refer to the t/ directory
|
||||
|
||||
This does not actually move "t/test directory" any deeper, but fixes test
|
||||
scripts that assume they run immediately below "t/" to use TEST_DIRECTORY
|
||||
variable.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
|
||||
- WIP: start teaching the --whitespace=fix to merge machinery
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Wed Jun 25 15:55:11 2008 -0700) 1 commit
|
||||
- Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* js/mingw-stat (Mon Aug 18 22:01:06 2008 +0200) 2 commits
|
||||
+ Revert "Windows: Use a customized struct stat that also has the
|
||||
st_blocks member."
|
||||
+ compat: introduce on_disk_bytes()
|
||||
|
||||
This gets rid of use of st_blocks member (which is XSI but not POSIX
|
||||
proper), which was originally prompted by recent Haiku port but it turns
|
||||
out MinGW has the same issue as well. Queued on 'pu' just to have a
|
||||
chance to make sure I munged the version j6t sent me correctly before
|
||||
merging it upwards.
|
||||
|
||||
* js/checkout-dwim-local (Sat Aug 9 16:00:12 2008 +0200) 1 commit
|
||||
+ checkout --track: make up a sensible branch name if '-b' was
|
||||
omitted
|
||||
|
||||
Alex has update to dwim "checkout --track remotes/origin/hack" as well.
|
||||
|
||||
* bd/diff-strbuf (Wed Aug 13 23:18:22 2008 -0700) 3 commits
|
||||
+ xdiff-interface: hide the whole "xdiff_emit_state" business from
|
||||
the caller
|
||||
+ Use strbuf for struct xdiff_emit_state's remainder
|
||||
+ Make xdi_diff_outf interface for running xdiff_outf diffs
|
||||
|
||||
Gives measurable performance improvement to textual diff generation. For
|
||||
improving "blame" performance, it might be more effective to hook directly
|
||||
to lower level of xdiff machinery so that we do not even have to generate
|
||||
patch only to discard after reading "@@ -l,k +m,n @@" lines, but that
|
||||
would be a separate topic.
|
||||
|
||||
* dp/hash-literally (Sun Aug 3 18:36:22 2008 +0400) 6 commits
|
||||
+ add --no-filters option to git hash-object
|
||||
+ add --path option to git hash-object
|
||||
+ use parse_options() in git hash-object
|
||||
+ correct usage help string for git-hash-object
|
||||
+ correct argument checking test for git hash-object
|
||||
+ teach index_fd to work with pipes
|
||||
|
||||
Gives a bit more flexibility to hash-objects by allowing us to lie about
|
||||
the path the contents comes from.
|
||||
|
||||
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
|
||||
+ Documentation: Improve documentation for git-imap-send(1)
|
||||
+ imap-send.c: more style fixes
|
||||
+ imap-send.c: style fixes
|
||||
+ git-imap-send: Support SSL
|
||||
+ git-imap-send: Allow the program to be run from subdirectories of
|
||||
a git tree
|
||||
|
||||
Some people seem to prefer having this feature available also with gnutls.
|
||||
Such an enhancement can be done in-tree on top of this series if they are
|
||||
so inclined.
|
||||
|
||||
* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits
|
||||
+ spawn pager via run_command interface
|
||||
+ run-command: add pre-exec callback
|
||||
|
||||
This changes the parent-child relationship between the pager and the git
|
||||
process. We used to make pager the parent which meant that the exit
|
||||
status from git is lost from the caller.
|
||||
|
||||
* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit
|
||||
+ Enable threaded delta search on *BSD and Linux.
|
||||
@@ -1,396 +0,0 @@
|
||||
Subject: What's cooking in git.git (Aug 2008, #07; Sat, 23)
|
||||
X-master-at: d6096f17d2d5d9ccb453aabf8edc6ee238b166fc
|
||||
X-next-at: d789cd45cd80390e3cf86de6c43600007d4b59ac
|
||||
|
||||
What's cooking in git.git (Aug 2008, #07; Sat, 23)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
Here is a list of issues/topics we saw on the mailing list but haven't
|
||||
resulted in anything queuable in 'pu' yet. They need further work by
|
||||
interested parties:
|
||||
|
||||
* Windows relocatable install
|
||||
|
||||
Steffen Prohaska ($gmane/92605), Johannes Sixt.
|
||||
|
||||
* Haiku port
|
||||
|
||||
Andreas Färber ($gmane/92582)
|
||||
|
||||
* ksh "trap foo EXIT" triggers on function return, loses exit status
|
||||
|
||||
Brandon Casey ($gmane/92873)
|
||||
|
||||
* document webdav debugging tip with davfs2
|
||||
|
||||
Giovanni Funchal ($gmane/92745)
|
||||
|
||||
* update "rebase -i" documentation with examples
|
||||
|
||||
Eric Hanchrow ($gmane/92669)
|
||||
|
||||
* pre-push hook
|
||||
|
||||
Scott Chacon ($gmane/92900, $gmane/92936)
|
||||
|
||||
* "git commit --author=nickname" expanding nickname from somewhere
|
||||
|
||||
Michael J Gruber ($gmane/93274)
|
||||
|
||||
* Handling (possibly $HOME-) relative paths in config files
|
||||
|
||||
Karl Chen ($gmane/93250)
|
||||
|
||||
* "submodule sync"
|
||||
|
||||
David Aguilar ($gmane/93265)
|
||||
|
||||
* "rev-list --bisect --first-parent"
|
||||
|
||||
Avery Pennarun, me ($gmane/93420)
|
||||
|
||||
* "apply --include"
|
||||
|
||||
Joe Perches ($gmane/93505)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
. Use xdiff caching to improve git blame performance
|
||||
. Allow xdiff machinery to cache hash results for a file
|
||||
. Always initialize xpparam_t to 0
|
||||
. Bypass textual patch generation and parsing in git blame
|
||||
. Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
Réne had a good comments on how the callback is structured.
|
||||
|
||||
* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
|
||||
- discard_cache: reset lazy name_hash bit
|
||||
|
||||
I spotted this by accident while working on something unrelated.
|
||||
|
||||
When a program calls discard_cache() to read the index again, we do not
|
||||
properly re-initialize the name_hash structure that is used by the case
|
||||
insensitivitly logic. This _might_ improve issues people may be having on
|
||||
case insensitive filesystems. I dunno.
|
||||
|
||||
* mv/maint-merge-fix (Sat Aug 23 12:56:57 2008 -0700) 1 commit
|
||||
+ merge: fix numerus bugs around "trivial merge" area
|
||||
|
||||
* ml/submodule (Thu Aug 21 19:54:01 2008 -0400) 2 commits
|
||||
+ git-submodule.sh - Remove trailing / from URL if found
|
||||
+ git-submodule.sh - Remove trailing / from URL if found
|
||||
|
||||
Soon to be in 'master', I guess.
|
||||
|
||||
* np/verify-pack (Fri Aug 22 15:45:53 2008 -0400) 1 commit
|
||||
+ discard revindex data when pack list changes
|
||||
|
||||
* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 3 commits
|
||||
- git-add --intent-to-add (-N)
|
||||
- cached_object: learn empty blob
|
||||
- sha1_object_info(): pay attention to cached objects
|
||||
|
||||
Teaches "git add" to record only the intent to add a path later.
|
||||
I think this is better done without the hardcoded empty blob object.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled -- Needs Action to Proceed (or to be dropped)]
|
||||
|
||||
* sb/daemon (Thu Aug 14 20:02:20 2008 +0200) 4 commits
|
||||
- git-daemon: rewrite kindergarden, new option --max-connections
|
||||
- git-daemon: Simplify dead-children reaping logic
|
||||
- git-daemon: use LOG_PID, simplify logging code
|
||||
- git-daemon: call logerror() instead of error()
|
||||
|
||||
Can somebody who actually runs the daemon standalone comment on this one?
|
||||
|
||||
* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
|
||||
- configure: auto detect dynamic library path switches
|
||||
- Makefile: Allow CC_LD_DYNPATH to be overriden
|
||||
|
||||
Needs success reports from people who do use user-defined dynamic library
|
||||
path when they build their "git" before this series can go anywhere.
|
||||
|
||||
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
|
||||
- date/time: do not get confused by fractional seconds
|
||||
|
||||
Linus hints further enhancements as "the right way", so let's see if
|
||||
somebody else steps up and tries it before merging this to 'next'.
|
||||
|
||||
* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits
|
||||
- [do not merge -- original version] Add Git-aware CGI for Git-aware
|
||||
smart HTTP transport
|
||||
- Add backdoor options to receive-pack for use in Git-aware CGI
|
||||
|
||||
The "magic" detection protocol was revised to use POST to info/refs; the
|
||||
top one queued is from before that discussion.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* cc/bisect (Fri Aug 22 05:52:29 2008 +0200) 2 commits
|
||||
- bisect: only check merge bases when needed
|
||||
- bisect: test merge base if good rev is not an ancestor of bad rev
|
||||
|
||||
* mv/merge-recursive (Tue Aug 12 22:14:00 2008 +0200) 3 commits
|
||||
. Make builtin-revert.c use merge_recursive_generic()
|
||||
. merge-recursive.c: Add more generic merge_recursive_generic()
|
||||
. Split out merge_recursive() to merge-recursive.c
|
||||
|
||||
Miklos will be working on updates based on comments.
|
||||
|
||||
* lw/gitweb (Mon Aug 18 21:39:49 2008 +0200) 3 commits
|
||||
. gitweb: use new Git::Repo API, and add optional caching
|
||||
. add new Perl API: Git::Repo, Git::Commit, Git::Tag, and
|
||||
Git::RepoRoot
|
||||
. gitweb: add test suite with Test::WWW::Mechanize::CGI
|
||||
|
||||
Tentatively dropped as its tests do not seem to pass and I have no time to
|
||||
look at them.
|
||||
|
||||
* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
|
||||
- diff: vary default prefix depending on what are compared
|
||||
|
||||
As some people may have noticed, I've been running with this one when
|
||||
sending out "How about this" patches to the discussion threads.
|
||||
|
||||
* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
|
||||
+ pack-objects: Allow missing base objects when creating thin packs
|
||||
|
||||
* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 3 commits
|
||||
+ filter-branch: use --simplify-merges
|
||||
+ filter-branch: fix ref rewriting with --subdirectory-filter
|
||||
+ filter-branch: Extend test to show rewriting bug
|
||||
|
||||
Fixes a longstanding filter branch bug. Success stories?
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 8 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
- revision --simplify-merges: make it a no-op without pathspec
|
||||
+ revision --simplify-merges: do not leave commits unprocessed
|
||||
+ revision --simplify-merges: use decoration instead of commit->util
|
||||
field
|
||||
+ Topo-sort before --simplify-merges
|
||||
+ revision traversal: show full history with merge simplification
|
||||
+ revision.c: whitespace fix
|
||||
|
||||
"log --full-history" is with too much clutter, "log" itself is too cleverer
|
||||
than some people, and here is the middle level of merge simplification.
|
||||
|
||||
I started making this incremental but the progress is not so great.
|
||||
|
||||
* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 1 commit
|
||||
+ Documentation: rev-list-options: move --simplify-merges
|
||||
documentation
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to master soon]
|
||||
|
||||
* jc/no-slim-shell (Tue Aug 19 18:05:43 2008 -0700) 2 commits
|
||||
+ Build-in "git-shell"
|
||||
+ shell: do not play duplicated definition games to shrink the
|
||||
executable
|
||||
|
||||
* mv/merge-custom (Sat Aug 23 19:23:22 2008 -0700) 9 commits
|
||||
+ t7606: fix custom merge test
|
||||
+ Fix "git-merge -s bogo" help text
|
||||
+ Update .gitignore to ignore git-help
|
||||
+ Builtin git-help.
|
||||
+ builtin-help: always load_command_list() in cmd_help()
|
||||
+ Add a second testcase for handling invalid strategies in git-merge
|
||||
+ Add a new test for using a custom merge strategy
|
||||
+ builtin-merge: allow using a custom strategy
|
||||
+ builtin-help: make some internal functions available to other
|
||||
builtins
|
||||
|
||||
The one at the tip fixes a test that assumed git-merge has a broken
|
||||
"trivial merge" implementation.
|
||||
|
||||
* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
|
||||
+ builtin-add.c: optimize -A option and "git add ."
|
||||
+ builtin-add.c: restructure the code for maintainability
|
||||
|
||||
* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
|
||||
+ Make cherry-pick use rerere for conflict resolution.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
|
||||
- WIP: start teaching the --whitespace=fix to merge machinery
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0.
|
||||
|
||||
* jc/dashless (Wed Jun 25 15:55:11 2008 -0700) 1 commit
|
||||
- Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
|
||||
timeframe.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* ml/submodule-foreach (Sun Aug 10 19:10:04 2008 -0400) 1 commit
|
||||
+ git-submodule - Add 'foreach' subcommand
|
||||
|
||||
* pm/log-exit-code (Mon Aug 11 08:46:25 2008 +0200) 2 commits
|
||||
+ Teach git log --exit-code to return an appropriate exit code
|
||||
+ Teach git log --check to return an appropriate exit code
|
||||
|
||||
* sb/commit-tree-minileak (Tue Aug 12 00:35:11 2008 +0200) 1 commit
|
||||
+ Fix commit_tree() buffer leak
|
||||
|
||||
* pb/reflog-dwim (Sun Aug 10 22:22:21 2008 +0200) 1 commit
|
||||
+ builtin-reflog: Allow reflog expire to name partial ref
|
||||
|
||||
* jc/add-stop-at-symlink (Mon Aug 4 00:52:37 2008 -0700) 2 commits
|
||||
+ add: refuse to add working tree items beyond symlinks
|
||||
+ update-index: refuse to add working tree items beyond symlinks
|
||||
|
||||
Fix for a longstanding bug that allows "git add" and "git update-index" to
|
||||
add a path "a/b" to the index when "a" is a symbolic link. We would need
|
||||
a similar fix for the case where "a" is a submodule.
|
||||
|
||||
* kh/diff-tree (Sun Aug 10 18:13:04 2008 +0200) 4 commits
|
||||
+ Add test for diff-tree --stdin with two trees
|
||||
+ Teach git diff-tree --stdin to diff trees
|
||||
+ diff-tree: Note that the commit ID is printed with --stdin
|
||||
+ Refactoring: Split up diff_tree_stdin
|
||||
|
||||
* mg/count-objects (Fri Aug 15 00:20:20 2008 -0400) 1 commit
|
||||
+ count-objects: Add total pack size to verbose output
|
||||
|
||||
This one is without the human readable bits.
|
||||
|
||||
* mz/push-verbose (Sat Aug 16 19:58:32 2008 +0200) 1 commit
|
||||
+ Make push more verbose about illegal combination of options
|
||||
|
||||
* jc/index-extended-flags (Sat Aug 16 23:02:08 2008 -0700) 1 commit
|
||||
+ index: future proof for "extended" index entries
|
||||
|
||||
* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits
|
||||
+ git-merge-octopus: use (merge-base A (merge B C D E...)) for
|
||||
stepwise merge
|
||||
+ merge-base-many: add trivial tests based on the documentation
|
||||
+ documentation: merge-base: explain "git merge-base" with more than
|
||||
2 args
|
||||
+ merge-base: teach "git merge-base" to drive underlying
|
||||
merge_bases_many()
|
||||
|
||||
* js/parallel-test (Mon Aug 18 12:25:40 2008 -0400) 4 commits
|
||||
+ Update t/.gitignore to ignore all trash directories
|
||||
+ Enable parallel tests
|
||||
+ tests: Clarify dependencies between tests, 'aggregate-results' and
|
||||
'clean'
|
||||
+ t9700: remove useless check
|
||||
|
||||
* jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit
|
||||
+ tests: use $TEST_DIRECTORY to refer to the t/ directory
|
||||
|
||||
This does not actually move "t/test directory" any deeper, but fixes test
|
||||
scripts that assume they run immediately below "t/" to use TEST_DIRECTORY
|
||||
variable.
|
||||
|
||||
* js/mingw-stat (Mon Aug 18 22:01:06 2008 +0200) 2 commits
|
||||
+ Revert "Windows: Use a customized struct stat that also has the
|
||||
st_blocks member."
|
||||
+ compat: introduce on_disk_bytes()
|
||||
|
||||
This gets rid of use of st_blocks member (which is XSI but not POSIX
|
||||
proper), which was originally prompted by recent Haiku port but it turns
|
||||
out MinGW has the same issue as well. Queued on 'pu' just to have a
|
||||
chance to make sure I munged the version j6t sent me correctly before
|
||||
merging it upwards.
|
||||
|
||||
* js/checkout-dwim-local (Sat Aug 9 16:00:12 2008 +0200) 1 commit
|
||||
+ checkout --track: make up a sensible branch name if '-b' was
|
||||
omitted
|
||||
|
||||
Alex has update to dwim "checkout --track remotes/origin/hack" as well.
|
||||
|
||||
* bd/diff-strbuf (Wed Aug 13 23:18:22 2008 -0700) 3 commits
|
||||
+ xdiff-interface: hide the whole "xdiff_emit_state" business from
|
||||
the caller
|
||||
+ Use strbuf for struct xdiff_emit_state's remainder
|
||||
+ Make xdi_diff_outf interface for running xdiff_outf diffs
|
||||
|
||||
Gives measurable performance improvement to textual diff generation. For
|
||||
improving "blame" performance, it might be more effective to hook directly
|
||||
to lower level of xdiff machinery so that we do not even have to generate
|
||||
patch only to discard after reading "@@ -l,k +m,n @@" lines, but that
|
||||
would be a separate topic.
|
||||
|
||||
* dp/hash-literally (Sun Aug 3 18:36:22 2008 +0400) 6 commits
|
||||
+ add --no-filters option to git hash-object
|
||||
+ add --path option to git hash-object
|
||||
+ use parse_options() in git hash-object
|
||||
+ correct usage help string for git-hash-object
|
||||
+ correct argument checking test for git hash-object
|
||||
+ teach index_fd to work with pipes
|
||||
|
||||
Gives a bit more flexibility to hash-objects by allowing us to lie about
|
||||
the path the contents comes from.
|
||||
|
||||
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
|
||||
+ Documentation: Improve documentation for git-imap-send(1)
|
||||
+ imap-send.c: more style fixes
|
||||
+ imap-send.c: style fixes
|
||||
+ git-imap-send: Support SSL
|
||||
+ git-imap-send: Allow the program to be run from subdirectories of
|
||||
a git tree
|
||||
|
||||
Some people seem to prefer having this feature available also with gnutls.
|
||||
Such an enhancement can be done in-tree on top of this series if they are
|
||||
so inclined.
|
||||
|
||||
* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits
|
||||
+ spawn pager via run_command interface
|
||||
+ run-command: add pre-exec callback
|
||||
|
||||
This changes the parent-child relationship between the pager and the git
|
||||
process. We used to make pager the parent which meant that the exit
|
||||
status from git is lost from the caller.
|
||||
|
||||
* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit
|
||||
+ Enable threaded delta search on *BSD and Linux.
|
||||
@@ -1,219 +0,0 @@
|
||||
Subject: What's cooking in git.git (Aug 2008, #08; Wed, 27)
|
||||
X-master-at: a1184d85e8752658f02746982822f43f32316803
|
||||
X-next-at: 9f25cb4fbeed4ff00c19fe462492a5ee6dfb82b3
|
||||
|
||||
What's cooking in git.git (Aug 2008, #08; Wed, 27)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits
|
||||
- Teach git.el to mark/unmark files by regexp
|
||||
- git.el: Diff only file at point by default
|
||||
|
||||
With my limited elisp expertise I did not see anything obviously wrong
|
||||
with these two patches from David Kågedal and David Christensen.
|
||||
|
||||
* tl/p4 (Thu Aug 28 00:36:12 2008 +0200) 1 commit
|
||||
- git-p4: Fix checkout bug when using --import-local.
|
||||
|
||||
A fix forked from 'maint' waiting for an Ack.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled -- Needs Action to Proceed (or to be dropped)]
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
. Use xdiff caching to improve git blame performance
|
||||
. Allow xdiff machinery to cache hash results for a file
|
||||
. Always initialize xpparam_t to 0
|
||||
. Bypass textual patch generation and parsing in git blame
|
||||
. Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
Réne had good comments on how the callback should be structured.
|
||||
|
||||
* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
|
||||
- discard_cache: reset lazy name_hash bit
|
||||
|
||||
I spotted this by accident while working on something unrelated.
|
||||
|
||||
When a program calls discard_cache() to read the index again, we do not
|
||||
properly re-initialize the name_hash structure that is used by the case
|
||||
insensitivitly logic. This _might_ improve issues people may be having on
|
||||
case insensitive filesystems. I dunno.
|
||||
|
||||
* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
|
||||
- configure: auto detect dynamic library path switches
|
||||
- Makefile: Allow CC_LD_DYNPATH to be overriden
|
||||
|
||||
Needs success reports from people who do use user-defined dynamic library
|
||||
path when they build their "git" before this series can go anywhere.
|
||||
|
||||
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
|
||||
- date/time: do not get confused by fractional seconds
|
||||
|
||||
Linus hints further enhancements as "the right way", so let's see if
|
||||
somebody else steps up and tries it before merging this to 'next'.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* sb/daemon (Sun Aug 24 13:27:10 2008 -0700) 5 commits
|
||||
+ daemon.c: minor style fixup
|
||||
+ git-daemon: rewrite kindergarden, new option --max-connections
|
||||
+ git-daemon: Simplify dead-children reaping logic
|
||||
+ git-daemon: use LOG_PID, simplify logging code
|
||||
+ git-daemon: call logerror() instead of error()
|
||||
|
||||
I re-reviewed the changes and they look quite sane. Hopefully be moved to
|
||||
'master' soonish.
|
||||
|
||||
* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 3 commits
|
||||
- git-add --intent-to-add (-N)
|
||||
- cached_object: learn empty blob
|
||||
- sha1_object_info(): pay attention to cached objects
|
||||
|
||||
Teaches "git add" to record only the intent to add a path later.
|
||||
I think this is better done without the hardcoded empty blob object.
|
||||
|
||||
* cc/bisect (Fri Aug 22 05:52:29 2008 +0200) 2 commits
|
||||
+ bisect: only check merge bases when needed
|
||||
+ bisect: test merge base if good rev is not an ancestor of bad rev
|
||||
|
||||
* mv/merge-recursive (Mon Aug 25 16:25:57 2008 +0200) 3 commits
|
||||
- merge-recursive: introduce merge_options
|
||||
- merge-recursive.c: Add more generic merge_recursive_generic()
|
||||
- Split out merge_recursive() to merge-recursive.c
|
||||
|
||||
Miklos's update; will move to 'next' shortly after reading it again.
|
||||
|
||||
* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
|
||||
- diff: vary default prefix depending on what are compared
|
||||
|
||||
As some people may have noticed, I've been running with this one when
|
||||
sending out "How about this" patches to the discussion threads.
|
||||
|
||||
* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
|
||||
+ pack-objects: Allow missing base objects when creating thin packs
|
||||
|
||||
* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 7 commits
|
||||
+ filter-branch: use --simplify-merges
|
||||
+ filter-branch: fix ref rewriting with --subdirectory-filter
|
||||
+ filter-branch: Extend test to show rewriting bug
|
||||
|
||||
Fixes a longstanding filter branch bug. Success stories?
|
||||
Later parts depends on the earlier part of "--simplify-merges"
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 8 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
- revision --simplify-merges: make it a no-op without pathspec
|
||||
+ revision --simplify-merges: do not leave commits unprocessed
|
||||
+ revision --simplify-merges: use decoration instead of commit->util
|
||||
field
|
||||
+ Topo-sort before --simplify-merges
|
||||
+ revision traversal: show full history with merge simplification
|
||||
+ revision.c: whitespace fix
|
||||
|
||||
"log --full-history" is with too much clutter, "log" itself is too cleverer
|
||||
than some people, and here is the middle level of merge simplification.
|
||||
|
||||
I started making this incremental but the progress is not so great.
|
||||
|
||||
* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 5 commits
|
||||
+ Documentation: rev-list-options: move --simplify-merges
|
||||
documentation
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
|
||||
- WIP: start teaching the --whitespace=fix to merge machinery
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0, but with the loud whining about moving git-foo out of $PATH we
|
||||
have been hearing, it might not be a bad idea to drop this.
|
||||
|
||||
* jc/dashless (Wed Jun 25 15:55:11 2008 -0700) 1 commit
|
||||
. Make clients ask for "git program" over ssh and local transport
|
||||
|
||||
And this is now dropped.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* mv/maint-merge-fix (Sat Aug 23 12:56:57 2008 -0700) 1 commit
|
||||
+ merge: fix numerus bugs around "trivial merge" area
|
||||
|
||||
* ml/submodule (Thu Aug 21 19:54:01 2008 -0400) 2 commits
|
||||
+ git-submodule.sh - Remove trailing / from URL if found
|
||||
+ git-submodule.sh - Remove trailing / from URL if found
|
||||
|
||||
Soon to be in 'master', I guess.
|
||||
|
||||
* np/verify-pack (Fri Aug 22 15:45:53 2008 -0400) 1 commit
|
||||
+ discard revindex data when pack list changes
|
||||
|
||||
* jc/no-slim-shell (Tue Aug 19 18:05:43 2008 -0700) 2 commits
|
||||
+ Build-in "git-shell"
|
||||
+ shell: do not play duplicated definition games to shrink the
|
||||
executable
|
||||
|
||||
* mv/merge-custom (Sat Aug 23 19:23:22 2008 -0700) 9 commits
|
||||
+ t7606: fix custom merge test
|
||||
+ Fix "git-merge -s bogo" help text
|
||||
+ Update .gitignore to ignore git-help
|
||||
+ Builtin git-help.
|
||||
+ builtin-help: always load_command_list() in cmd_help()
|
||||
+ Add a second testcase for handling invalid strategies in git-merge
|
||||
+ Add a new test for using a custom merge strategy
|
||||
+ builtin-merge: allow using a custom strategy
|
||||
+ builtin-help: make some internal functions available to other
|
||||
builtins
|
||||
|
||||
The one at the tip fixes a test that assumed git-merge has a broken
|
||||
"trivial merge" implementation.
|
||||
|
||||
* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
|
||||
+ builtin-add.c: optimize -A option and "git add ."
|
||||
+ builtin-add.c: restructure the code for maintainability
|
||||
|
||||
* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
|
||||
+ Make cherry-pick use rerere for conflict resolution.
|
||||
@@ -1,242 +0,0 @@
|
||||
Subject: What's cooking in git.git (Aug 2008, #09; Sun, 31)
|
||||
X-master-at: 7f314565fe20e324e8db1a7c233e43ca4e3683f0
|
||||
X-next-at: 007e493846da7bb03b026e90ac0af8bdea9d0d0c
|
||||
|
||||
What's cooking in git.git (Aug 2008, #09; Sun, 31)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
Most of them are expected to spend only short amount of time on 'next'
|
||||
before graduating to 'master'.
|
||||
|
||||
* jc/maint-checkout-fix (Fri Aug 29 13:40:36 2008 -0700) 1 commit
|
||||
+ checkout: do not check out unmerged higher stages randomly
|
||||
|
||||
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
|
||||
- git-am: Pass the --directory option through to git-apply
|
||||
|
||||
* np/safer-pack (Fri Aug 29 16:08:02 2008 -0400) 5 commits
|
||||
+ fixup_pack_header_footer(): use nicely aligned buffer sizes
|
||||
+ index-pack: use fixup_pack_header_footer()'s validation mode
|
||||
+ pack-objects: use fixup_pack_header_footer()'s validation mode
|
||||
+ improve reliability of fixup_pack_header_footer()
|
||||
+ pack-objects: improve returned information from write_one()
|
||||
|
||||
* jc/hide-cr-in-diff-from-less (Wed Aug 27 19:48:01 2008 -0700) 1 commit
|
||||
+ diff: Help "less" hide ^M from the output
|
||||
|
||||
* jc/better-conflict-resolution (Sun Aug 31 20:36:32 2008 -0700) 15 commits
|
||||
. git-merge documentation: describe how conflict is presented
|
||||
. checkout --conflict=<style>: recreate merge in a non-default style
|
||||
+ checkout -m: recreate merge when checking out of unmerged index
|
||||
+ Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-
|
||||
resolution'
|
||||
+ git-merge-recursive: learn to honor merge.conflictstyle
|
||||
+ merge.conflictstyle: choose between "merge" and "diff3 -m" styles
|
||||
+ rerere: understand "diff3 -m" style conflicts with the original
|
||||
+ rerere.c: use symbolic constants to keep track of parsing states
|
||||
+ xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or
|
||||
less
|
||||
+ xmerge.c: minimum readability fixups
|
||||
+ xdiff-merge: optionally show conflicts in "diff3 -m" style
|
||||
+ xdl_fill_merge_buffer(): separate out a too deeply nested function
|
||||
+ checkout --ours/--theirs: allow checking out one side of a
|
||||
conflicting merge
|
||||
+ checkout -f: allow ignoring unmerged paths when checking out of
|
||||
the index
|
||||
+ checkout: do not check out unmerged higher stages randomly
|
||||
|
||||
* tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 5 commits
|
||||
+ t6013: replace use of 'tac' with equivalent Perl
|
||||
+ rev-list: fix --reverse interaction with --parents
|
||||
+ Topo-sort before --simplify-merges
|
||||
+ revision traversal: show full history with merge simplification
|
||||
+ revision.c: whitespace fix
|
||||
|
||||
* rf/man-env (Fri Aug 29 17:00:43 2008 +0200) 1 commit
|
||||
+ builtin-help: fallback to GIT_MAN_VIEWER before man
|
||||
|
||||
* ar/autospell (Sun Aug 31 15:54:58 2008 +0200) 2 commits
|
||||
+ Add help.autocorrect to enable/disable autocorrecting
|
||||
+ git wrapper: DWIM mistyped commands
|
||||
|
||||
* ho/dashless (Sun Aug 31 09:39:19 2008 -0700) 2 commits
|
||||
+ 'git foo' program identifies itself without dash in die() messages
|
||||
+ Start conforming code to "git subcmd" style
|
||||
|
||||
* jc/author-nickname (Tue Aug 26 23:13:13 2008 -0700) 1 commit
|
||||
+ git commit --author=$name: look $name up in existing commits
|
||||
|
||||
* dp/pid-uintmax (Sun Aug 31 14:09:39 2008 +0200) 1 commit
|
||||
+ cast pid_t's to uintmax_t to improve portability
|
||||
|
||||
* nd/worktree (Sat Aug 30 16:15:32 2008 +0700) 5 commits
|
||||
- setup_git_directory(): fix move to worktree toplevel directory
|
||||
- update-index: fix worktree setup
|
||||
+ read-tree: setup worktree if merge is required
|
||||
+ grep: fix worktree setup
|
||||
+ diff*: fix worktree setup
|
||||
|
||||
The last two fail test suite.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled -- Needs Action to Proceed (or to be dropped)]
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
- Use xdiff caching to improve git blame performance
|
||||
- Allow xdiff machinery to cache hash results for a file
|
||||
- Always initialize xpparam_t to 0
|
||||
- Bypass textual patch generation and parsing in git blame
|
||||
- Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
Réne had good comments on how the callback should be structured.
|
||||
|
||||
* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
|
||||
- configure: auto detect dynamic library path switches
|
||||
- Makefile: Allow CC_LD_DYNPATH to be overriden
|
||||
|
||||
Needs success reports from people who do use user-defined dynamic library
|
||||
path when they build their "git" before this series can go anywhere.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will be merged to "master" soon]
|
||||
|
||||
* tr/filter-branch (Sun Aug 31 10:41:01 2008 -0700) 14 commits
|
||||
+ Merge branch 'tr/rev-list-docs' into tr/filter-branch
|
||||
+ Merge branch 'jc/post-simplify' (early part) into tr/filter-branch
|
||||
+ revision --simplify-merges: make it a no-op without pathspec
|
||||
+ revision --simplify-merges: do not leave commits unprocessed
|
||||
+ revision --simplify-merges: use decoration instead of commit->util
|
||||
field
|
||||
+ Documentation: rev-list-options: move --simplify-merges
|
||||
documentation
|
||||
+ Merge branch 'jc/post-simplify' into tr/rev-list-docs
|
||||
+ filter-branch: use --simplify-merges
|
||||
+ Merge branch 'jc/post-simplify' into tr/filter-branch
|
||||
+ filter-branch: fix ref rewriting with --subdirectory-filter
|
||||
+ filter-branch: Extend test to show rewriting bug
|
||||
+ Topo-sort before --simplify-merges
|
||||
+ revision traversal: show full history with merge simplification
|
||||
+ revision.c: whitespace fix
|
||||
|
||||
This now merges up all (and only) the necessary pieces from the
|
||||
post-simplify topic and the documentation updates, ready to be merged to
|
||||
"master".
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
|
||||
+ date/time: do not get confused by fractional seconds
|
||||
|
||||
* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
|
||||
+ discard_cache: reset lazy name_hash bit
|
||||
|
||||
I spotted this by accident while working on something unrelated.
|
||||
|
||||
When a program calls discard_cache() to read the index again, we do not
|
||||
properly re-initialize the name_hash structure that is used by the case
|
||||
insensitivitly logic. This _might_ improve issues people may be having on
|
||||
case insensitive filesystems. I dunno.
|
||||
|
||||
* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
|
||||
+ git-add --intent-to-add (-N)
|
||||
|
||||
Teaches "git add" to record only the intent to add a path later.
|
||||
I rerolled this without the fake empty blob object.
|
||||
|
||||
* cc/bisect (Fri Aug 22 05:52:29 2008 +0200) 2 commits
|
||||
+ bisect: only check merge bases when needed
|
||||
+ bisect: test merge base if good rev is not an ancestor of bad rev
|
||||
|
||||
* mv/merge-recursive (Thu Aug 28 15:43:00 2008 +0200) 4 commits
|
||||
- builtin-merge: avoid run_command_v_opt() for recursive and subtree
|
||||
- merge-recursive: introduce merge_options
|
||||
- merge-recursive.c: Add more generic merge_recursive_generic()
|
||||
- Split out merge_recursive() to merge-recursive.c
|
||||
|
||||
* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
|
||||
+ diff: vary default prefix depending on what are compared
|
||||
|
||||
As some people may have noticed, I've been running with this one when
|
||||
sending out "How about this" patches to the discussion threads.
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
I started making this incremental but the progress is not so great.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits
|
||||
- Teach git.el to mark/unmark files by regexp
|
||||
- git.el: Diff only file at point by default
|
||||
|
||||
These are still queued but Alexandre had improvement requests so these
|
||||
will likely be dropped.
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
The one at second from the tip needs reworking.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
|
||||
- WIP: start teaching the --whitespace=fix to merge machinery
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0, but with the loud whining about moving git-foo out of $PATH we
|
||||
have been hearing, it might not be a bad idea to drop this.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* tl/p4 (Thu Aug 28 00:36:12 2008 +0200) 1 commit
|
||||
+ git-p4: Fix checkout bug when using --import-local.
|
||||
|
||||
* sb/daemon (Sun Aug 24 13:27:10 2008 -0700) 5 commits
|
||||
+ daemon.c: minor style fixup
|
||||
+ git-daemon: rewrite kindergarden, new option --max-connections
|
||||
+ git-daemon: Simplify dead-children reaping logic
|
||||
+ git-daemon: use LOG_PID, simplify logging code
|
||||
+ git-daemon: call logerror() instead of error()
|
||||
|
||||
* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
|
||||
+ pack-objects: Allow missing base objects when creating thin packs
|
||||
@@ -1,322 +0,0 @@
|
||||
Subject: What's cooking in git.git (Sep 2008, #01; Sat, 06)
|
||||
X-master-at: ec3a4ba519c0012d58584d23f407c302e7b80eb6
|
||||
X-next-at: d2470dbfc97c972e54913e3d3c622118526c9cc2
|
||||
|
||||
What's cooking in git.git (Sep 2008, #01; Sat, 06)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* np/pack (Tue Sep 2 10:22:22 2008 -0400) 4 commits
|
||||
+ t5300: improve SHA1 collision test
|
||||
+ pack-objects: don't include missing preferred base objects
|
||||
+ sha1write: don't copy full sized buffers
|
||||
+ Merge branch 'np/maint-safer-pack' into np/pack
|
||||
|
||||
* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
|
||||
+ diff --dirstat-by-file: count changed files, not lines
|
||||
|
||||
* bw/shortref (Fri Sep 5 23:16:23 2008 +0200) 1 commit
|
||||
- for-each-ref: `:short` format for `refname`
|
||||
|
||||
* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
|
||||
+ safe_create_leading_directories(): make it about "leading"
|
||||
directories
|
||||
|
||||
* jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit
|
||||
+ daemon.c: avoid setlinebuf()
|
||||
|
||||
* jc/maint-diff-quiet (Mon Sep 1 23:20:26 2008 -0700) 2 commits
|
||||
+ diff --quiet: make it synonym to --exit-code >/dev/null
|
||||
+ diff Porcelain: do not disable auto index refreshing on -C -C
|
||||
|
||||
* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
|
||||
- git-apply:--include=pathspec
|
||||
|
||||
* rs/decorate (Thu Sep 4 23:40:03 2008 +0200) 3 commits
|
||||
+ add '%d' pretty format specifier to show decoration
|
||||
+ move load_ref_decorations() to log-tree.c and export it
|
||||
+ log: add load_ref_decorations()
|
||||
|
||||
* pb/commit-where (Fri Sep 5 19:13:05 2008 +0200) 1 commit
|
||||
- Builtin-commit: show on which branch a commit was added
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* np/safer-pack (Fri Aug 29 16:08:02 2008 -0400) 5 commits
|
||||
+ fixup_pack_header_footer(): use nicely aligned buffer sizes
|
||||
+ index-pack: use fixup_pack_header_footer()'s validation mode
|
||||
+ pack-objects: use fixup_pack_header_footer()'s validation mode
|
||||
+ improve reliability of fixup_pack_header_footer()
|
||||
+ pack-objects: improve returned information from write_one()
|
||||
|
||||
* rf/man-env (Fri Aug 29 17:00:43 2008 +0200) 1 commit
|
||||
+ builtin-help: fallback to GIT_MAN_VIEWER before man
|
||||
|
||||
* ho/dashless (Sun Aug 31 09:39:19 2008 -0700) 2 commits
|
||||
+ 'git foo' program identifies itself without dash in die() messages
|
||||
+ Start conforming code to "git subcmd" style
|
||||
|
||||
* jc/author-nickname (Tue Aug 26 23:13:13 2008 -0700) 1 commit
|
||||
+ git commit --author=$name: look $name up in existing commits
|
||||
|
||||
* dp/pid-uintmax (Sun Aug 31 14:09:39 2008 +0200) 1 commit
|
||||
+ cast pid_t's to uintmax_t to improve portability
|
||||
|
||||
* nd/worktree (Sat Aug 30 16:15:32 2008 +0700) 5 commits
|
||||
- setup_git_directory(): fix move to worktree toplevel directory
|
||||
- update-index: fix worktree setup
|
||||
+ read-tree: setup worktree if merge is required
|
||||
+ grep: fix worktree setup
|
||||
+ diff*: fix worktree setup
|
||||
|
||||
The last two fail test suite.
|
||||
|
||||
* tr/filter-branch (Sun Aug 31 10:41:01 2008 -0700) 14 commits
|
||||
+ Merge branch 'tr/rev-list-docs' into tr/filter-branch
|
||||
+ Merge branch 'jc/post-simplify' (early part) into tr/filter-branch
|
||||
+ revision --simplify-merges: make it a no-op without pathspec
|
||||
+ revision --simplify-merges: do not leave commits unprocessed
|
||||
+ revision --simplify-merges: use decoration instead of commit->util
|
||||
field
|
||||
+ Documentation: rev-list-options: move --simplify-merges
|
||||
documentation
|
||||
+ Merge branch 'jc/post-simplify' into tr/rev-list-docs
|
||||
+ filter-branch: use --simplify-merges
|
||||
+ Merge branch 'jc/post-simplify' into tr/filter-branch
|
||||
+ filter-branch: fix ref rewriting with --subdirectory-filter
|
||||
+ filter-branch: Extend test to show rewriting bug
|
||||
+ Topo-sort before --simplify-merges
|
||||
+ revision traversal: show full history with merge simplification
|
||||
+ revision.c: whitespace fix
|
||||
|
||||
This now merges up all (and only) the necessary pieces from the
|
||||
post-simplify topic and the documentation updates, ready to be merged to
|
||||
"master".
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled -- Needs Action to Proceed (or to be dropped)]
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
- Use xdiff caching to improve git blame performance
|
||||
- Allow xdiff machinery to cache hash results for a file
|
||||
- Always initialize xpparam_t to 0
|
||||
- Bypass textual patch generation and parsing in git blame
|
||||
- Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
Réne had good comments on how the callback should be structured.
|
||||
|
||||
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
|
||||
- git-am: Pass the --directory option through to git-apply
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will be merged to "master" soon]
|
||||
|
||||
* jc/hide-cr-in-diff-from-less (Wed Aug 27 19:48:01 2008 -0700) 1 commit
|
||||
+ diff: Help "less" hide ^M from the output
|
||||
|
||||
* jc/maint-checkout-fix (Fri Aug 29 13:40:36 2008 -0700) 1 commit
|
||||
+ checkout: do not check out unmerged higher stages randomly
|
||||
|
||||
This is the same one as the bottom of "better conflict resolution" series;
|
||||
it is a bugfix meant to be applied on 'maint'.
|
||||
|
||||
* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
|
||||
+ configure: auto detect dynamic library path switches
|
||||
+ Makefile: Allow CC_LD_DYNPATH to be overriden
|
||||
|
||||
I decided to push this forward; it might break minority configurations,
|
||||
but it appears nobody pays attention until it actually hurts, so let's see
|
||||
what happens when this hits 'master'.
|
||||
|
||||
* ar/autospell (Sun Aug 31 15:54:58 2008 +0200) 2 commits
|
||||
+ Add help.autocorrect to enable/disable autocorrecting
|
||||
+ git wrapper: DWIM mistyped commands
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 2 commits
|
||||
+ t6013: replace use of 'tac' with equivalent Perl
|
||||
+ rev-list: fix --reverse interaction with --parents
|
||||
|
||||
* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 16 commits
|
||||
+ Fix AsciiDoc errors in merge documentation
|
||||
+ git-merge documentation: describe how conflict is presented
|
||||
+ checkout --conflict=<style>: recreate merge in a non-default style
|
||||
+ checkout -m: recreate merge when checking out of unmerged index
|
||||
+ Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-
|
||||
resolution'
|
||||
+ git-merge-recursive: learn to honor merge.conflictstyle
|
||||
+ merge.conflictstyle: choose between "merge" and "diff3 -m" styles
|
||||
+ rerere: understand "diff3 -m" style conflicts with the original
|
||||
+ rerere.c: use symbolic constants to keep track of parsing states
|
||||
+ xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or
|
||||
less
|
||||
+ xmerge.c: minimum readability fixups
|
||||
+ xdiff-merge: optionally show conflicts in "diff3 -m" style
|
||||
+ xdl_fill_merge_buffer(): separate out a too deeply nested function
|
||||
+ checkout --ours/--theirs: allow checking out one side of a
|
||||
conflicting merge
|
||||
+ checkout -f: allow ignoring unmerged paths when checking out of
|
||||
the index
|
||||
+ checkout: do not check out unmerged higher stages randomly
|
||||
|
||||
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
|
||||
+ date/time: do not get confused by fractional seconds
|
||||
|
||||
* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
|
||||
+ discard_cache: reset lazy name_hash bit
|
||||
|
||||
I spotted this by accident while working on something unrelated.
|
||||
|
||||
When a program calls discard_cache() to read the index again, we do not
|
||||
properly re-initialize the name_hash structure that is used by the case
|
||||
insensitivitly logic. This _might_ improve issues people may be having on
|
||||
case insensitive filesystems. I dunno.
|
||||
|
||||
* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
|
||||
+ git-add --intent-to-add (-N)
|
||||
|
||||
Teaches "git add" to record only the intent to add a path later.
|
||||
I rerolled this without the fake empty blob object.
|
||||
|
||||
* cc/bisect (Sat Sep 6 07:27:03 2008 +0200) 3 commits
|
||||
+ bisect: remove "checkout_done" variable used when checking merge
|
||||
bases
|
||||
+ bisect: only check merge bases when needed
|
||||
+ bisect: test merge base if good rev is not an ancestor of bad rev
|
||||
|
||||
* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
|
||||
+ builtin-merge: release the lockfile in try_merge_strategy()
|
||||
+ merge-recursive: get rid of virtual_id
|
||||
+ merge-recursive: move current_{file,directory}_set to struct
|
||||
merge_options
|
||||
+ merge-recursive: move the global obuf to struct merge_options
|
||||
+ merge-recursive: get rid of the index_only global variable
|
||||
+ merge-recursive: move call_depth to struct merge_options
|
||||
+ cherry-pick/revert: make direct internal call to merge_tree()
|
||||
+ builtin-merge: avoid run_command_v_opt() for recursive and subtree
|
||||
+ merge-recursive: introduce merge_options
|
||||
+ merge-recursive.c: Add more generic merge_recursive_generic()
|
||||
+ Split out merge_recursive() to merge-recursive.c
|
||||
|
||||
* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
|
||||
+ diff: vary default prefix depending on what are compared
|
||||
|
||||
As some people may have noticed, I've been running with this one when
|
||||
sending out "How about this" patches to the discussion threads.
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
I started making this incremental but the progress is not so great.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits
|
||||
- Teach git.el to mark/unmark files by regexp
|
||||
- git.el: Diff only file at point by default
|
||||
|
||||
These are still queued but Alexandre had improvement requests so these
|
||||
will likely be dropped.
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
The one at second from the tip needs reworking.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
|
||||
- WIP: start teaching the --whitespace=fix to merge machinery
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0, but with the loud whining about moving git-foo out of $PATH we
|
||||
have been hearing, it might not be a bad idea to drop this.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* np/safer-pack (Fri Aug 29 16:08:02 2008 -0400) 5 commits
|
||||
+ fixup_pack_header_footer(): use nicely aligned buffer sizes
|
||||
+ index-pack: use fixup_pack_header_footer()'s validation mode
|
||||
+ pack-objects: use fixup_pack_header_footer()'s validation mode
|
||||
+ improve reliability of fixup_pack_header_footer()
|
||||
+ pack-objects: improve returned information from write_one()
|
||||
|
||||
* rf/man-env (Fri Aug 29 17:00:43 2008 +0200) 1 commit
|
||||
+ builtin-help: fallback to GIT_MAN_VIEWER before man
|
||||
|
||||
* ho/dashless (Sun Aug 31 09:39:19 2008 -0700) 2 commits
|
||||
+ 'git foo' program identifies itself without dash in die() messages
|
||||
+ Start conforming code to "git subcmd" style
|
||||
|
||||
* jc/author-nickname (Tue Aug 26 23:13:13 2008 -0700) 1 commit
|
||||
+ git commit --author=$name: look $name up in existing commits
|
||||
|
||||
* dp/pid-uintmax (Sun Aug 31 14:09:39 2008 +0200) 1 commit
|
||||
+ cast pid_t's to uintmax_t to improve portability
|
||||
|
||||
* nd/worktree (Sat Aug 30 16:15:32 2008 +0700) 5 commits
|
||||
- setup_git_directory(): fix move to worktree toplevel directory
|
||||
- update-index: fix worktree setup
|
||||
+ read-tree: setup worktree if merge is required
|
||||
+ grep: fix worktree setup
|
||||
+ diff*: fix worktree setup
|
||||
|
||||
The last two fail test suite.
|
||||
|
||||
* tr/filter-branch (Sun Aug 31 10:41:01 2008 -0700) 14 commits
|
||||
+ Merge branch 'tr/rev-list-docs' into tr/filter-branch
|
||||
+ Merge branch 'jc/post-simplify' (early part) into tr/filter-branch
|
||||
+ revision --simplify-merges: make it a no-op without pathspec
|
||||
+ revision --simplify-merges: do not leave commits unprocessed
|
||||
+ revision --simplify-merges: use decoration instead of commit->util
|
||||
field
|
||||
+ Documentation: rev-list-options: move --simplify-merges
|
||||
documentation
|
||||
+ Merge branch 'jc/post-simplify' into tr/rev-list-docs
|
||||
+ filter-branch: use --simplify-merges
|
||||
+ Merge branch 'jc/post-simplify' into tr/filter-branch
|
||||
+ filter-branch: fix ref rewriting with --subdirectory-filter
|
||||
+ filter-branch: Extend test to show rewriting bug
|
||||
+ Topo-sort before --simplify-merges
|
||||
+ revision traversal: show full history with merge simplification
|
||||
+ revision.c: whitespace fix
|
||||
@@ -1,262 +0,0 @@
|
||||
Subject: What's cooking in git.git (Sep 2008, #02; Wed, 10)
|
||||
X-master-at: ede4caf6e3204f9d63758d6410d0f124b0caab32
|
||||
X-next-at: c8d31b67b3f0e13f6b8ad782dadc6e8a8bc06bbb
|
||||
|
||||
What's cooking in git.git (Sep 2008, #02; Wed, 10)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
Many 'maint' material to go through the usual 'next' to 'master' to
|
||||
'maint' cycle..
|
||||
|
||||
* mh/maint-honor-no-ssl-verify (Thu Feb 21 15:10:37 2008 -0800) 1 commit
|
||||
+ Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
|
||||
|
||||
* dp/maint-rebase-fix (Tue Sep 9 16:05:26 2008 +0400) 2 commits
|
||||
+ git-rebase--interactive: auto amend only edited commit
|
||||
+ git-rebase-interactive: do not squash commits on abort
|
||||
|
||||
* jc/maint-checkout-keep-remove (Sun Sep 7 19:49:25 2008 -0700) 1 commit
|
||||
+ checkout: do not lose staged removal
|
||||
|
||||
* jc/maint-template-permbits (Thu Aug 21 19:31:50 2008 -0500) 1 commit
|
||||
+ Fix permission bits on sources checked out with an overtight umask
|
||||
|
||||
* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits
|
||||
- wt-status: Teach how to discard changes in the working directory
|
||||
- wt-status: Split header generation into three functions
|
||||
|
||||
This is what I commented as "making status output even chattier", but
|
||||
parked here to see what people think.
|
||||
|
||||
* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
|
||||
- t7603: add new testcases to ensure builtin-commit uses
|
||||
reduce_heads()
|
||||
- builtin-commit: use commit_tree()
|
||||
- commit_tree(): add a new author parameter
|
||||
|
||||
* pb/autocorrect-wrapper (Wed Sep 10 14:44:20 2008 -0700) 2 commits
|
||||
- Fixup -- waiting for response
|
||||
- git wrapper: also uses aliases to suggest mistyped commands
|
||||
|
||||
* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits
|
||||
- push: receiver end advertises refs from alternate repositories
|
||||
- push: prepare sender to receive extended ref information from the
|
||||
receiver
|
||||
- receive-pack: make it a builtin
|
||||
- is_directory(): a generic helper function
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* jc/hide-cr-in-diff-from-less (Wed Aug 27 19:48:01 2008 -0700) 1 commit
|
||||
+ diff: Help "less" hide ^M from the output
|
||||
|
||||
* jc/maint-checkout-fix (Fri Aug 29 13:40:36 2008 -0700) 1 commit
|
||||
+ checkout: do not check out unmerged higher stages randomly
|
||||
|
||||
This is the same one as the bottom of "better conflict resolution" series.
|
||||
|
||||
* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
|
||||
+ configure: auto detect dynamic library path switches
|
||||
+ Makefile: Allow CC_LD_DYNPATH to be overriden
|
||||
|
||||
I decided to push this forward; it might break minority configurations,
|
||||
but it appears nobody pays attention until it actually hurts, so let's see
|
||||
what happens when this hits 'master'.
|
||||
|
||||
* ar/autospell (Sun Aug 31 15:54:58 2008 +0200) 2 commits
|
||||
+ Add help.autocorrect to enable/disable autocorrecting
|
||||
+ git wrapper: DWIM mistyped commands
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled -- Needs Action to Proceed (or to be dropped)]
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
- Use xdiff caching to improve git blame performance
|
||||
- Allow xdiff machinery to cache hash results for a file
|
||||
- Always initialize xpparam_t to 0
|
||||
- Bypass textual patch generation and parsing in git blame
|
||||
- Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
Réne had good comments on how the callback should be structured.
|
||||
|
||||
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
|
||||
- git-am: Pass the --directory option through to git-apply
|
||||
|
||||
I think this is still buggy and drops the option when am stops with
|
||||
conflicts.
|
||||
|
||||
* dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits
|
||||
- Teach git.el to mark/unmark files by regexp
|
||||
- git.el: Diff only file at point by default
|
||||
|
||||
These are still queued but Alexandre had improvement requests so these
|
||||
will likely be dropped.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will be merged to "master" soon]
|
||||
|
||||
* np/pack (Tue Sep 2 10:22:22 2008 -0400) 4 commits
|
||||
+ t5300: improve SHA1 collision test
|
||||
+ pack-objects: don't include missing preferred base objects
|
||||
+ sha1write: don't copy full sized buffers
|
||||
+ Merge branch 'np/maint-safer-pack' into np/pack
|
||||
|
||||
* bw/shortref (Fri Sep 5 23:16:23 2008 +0200) 1 commit
|
||||
+ for-each-ref: `:short` format for `refname`
|
||||
|
||||
* rs/decorate (Thu Sep 4 23:40:03 2008 +0200) 3 commits
|
||||
+ add '%d' pretty format specifier to show decoration
|
||||
+ move load_ref_decorations() to log-tree.c and export it
|
||||
+ log: add load_ref_decorations()
|
||||
|
||||
* tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 2 commits
|
||||
+ t6013: replace use of 'tac' with equivalent Perl
|
||||
+ rev-list: fix --reverse interaction with --parents
|
||||
|
||||
* cc/bisect (Sat Sep 6 07:27:03 2008 +0200) 3 commits
|
||||
+ bisect: remove "checkout_done" variable used when checking merge
|
||||
bases
|
||||
+ bisect: only check merge bases when needed
|
||||
+ bisect: test merge base if good rev is not an ancestor of bad rev
|
||||
|
||||
* jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit
|
||||
+ daemon.c: avoid setlinebuf()
|
||||
|
||||
* jc/maint-diff-quiet (Mon Sep 1 23:20:26 2008 -0700) 2 commits
|
||||
+ diff --quiet: make it synonym to --exit-code >/dev/null
|
||||
+ diff Porcelain: do not disable auto index refreshing on -C -C
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
|
||||
+ diff --dirstat-by-file: count changed files, not lines
|
||||
|
||||
* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
|
||||
+ safe_create_leading_directories(): make it about "leading"
|
||||
directories
|
||||
|
||||
* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
|
||||
- git-apply:--include=pathspec
|
||||
|
||||
* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit
|
||||
+ builtin-commit.c: show on which branch a commit was added
|
||||
|
||||
* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 15 commits
|
||||
+ Fix AsciiDoc errors in merge documentation
|
||||
+ git-merge documentation: describe how conflict is presented
|
||||
+ checkout --conflict=<style>: recreate merge in a non-default style
|
||||
+ checkout -m: recreate merge when checking out of unmerged index
|
||||
+ Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-
|
||||
resolution'
|
||||
+ git-merge-recursive: learn to honor merge.conflictstyle
|
||||
+ merge.conflictstyle: choose between "merge" and "diff3 -m" styles
|
||||
+ rerere: understand "diff3 -m" style conflicts with the original
|
||||
+ rerere.c: use symbolic constants to keep track of parsing states
|
||||
+ xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or
|
||||
less
|
||||
+ xmerge.c: minimum readability fixups
|
||||
+ xdiff-merge: optionally show conflicts in "diff3 -m" style
|
||||
+ xdl_fill_merge_buffer(): separate out a too deeply nested function
|
||||
+ checkout --ours/--theirs: allow checking out one side of a
|
||||
conflicting merge
|
||||
+ checkout -f: allow ignoring unmerged paths when checking out of
|
||||
the index
|
||||
|
||||
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
|
||||
+ date/time: do not get confused by fractional seconds
|
||||
|
||||
* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
|
||||
+ discard_cache: reset lazy name_hash bit
|
||||
|
||||
I spotted this by accident while working on something unrelated.
|
||||
|
||||
When a program calls discard_cache() to read the index again, we do not
|
||||
properly re-initialize the name_hash structure that is used by the case
|
||||
insensitivitly logic. This _might_ improve issues people may be having on
|
||||
case insensitive filesystems. I dunno.
|
||||
|
||||
* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
|
||||
+ git-add --intent-to-add (-N)
|
||||
|
||||
Teaches "git add" to record only the intent to add a path later.
|
||||
I rerolled this without the fake empty blob object.
|
||||
|
||||
* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
|
||||
+ builtin-merge: release the lockfile in try_merge_strategy()
|
||||
+ merge-recursive: get rid of virtual_id
|
||||
+ merge-recursive: move current_{file,directory}_set to struct
|
||||
merge_options
|
||||
+ merge-recursive: move the global obuf to struct merge_options
|
||||
+ merge-recursive: get rid of the index_only global variable
|
||||
+ merge-recursive: move call_depth to struct merge_options
|
||||
+ cherry-pick/revert: make direct internal call to merge_tree()
|
||||
+ builtin-merge: avoid run_command_v_opt() for recursive and subtree
|
||||
+ merge-recursive: introduce merge_options
|
||||
+ merge-recursive.c: Add more generic merge_recursive_generic()
|
||||
+ Split out merge_recursive() to merge-recursive.c
|
||||
|
||||
* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
|
||||
+ diff: vary default prefix depending on what are compared
|
||||
|
||||
As some people may have noticed, I've been running with this one when
|
||||
sending out "How about this" patches to the discussion threads.
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
I started making this incremental but the progress is not so great.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
The one at second from the tip needs reworking.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
|
||||
- WIP: start teaching the --whitespace=fix to merge machinery
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0, but with the loud whining about moving git-foo out of $PATH we
|
||||
have been hearing, it might not be a bad idea to drop this.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
@@ -1,262 +0,0 @@
|
||||
Subject: What's cooking in git.git (Sep 2008, #03; Fri, 19)
|
||||
X-master-at: 3791f77c28f233df121da2f83abf7eefc7b49b69
|
||||
X-next-at: 724951a306cebd5ce76602b9a0394df74ce52174
|
||||
|
||||
What's cooking in git.git (Sep 2008, #03; Fri, 19)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
By the way, I'll be on vacation from Sep 24 til Oct 08, but e-mail based
|
||||
proposal/review/discussion/improvement cycle and the distributed nature of
|
||||
git mean that it shouldn't keep the participants from further working on
|
||||
the system. Hopefully when I come back I'll see a much improved git ;-).
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* mg/maint-remote-fix (Thu Sep 18 18:11:02 2008 +0200) 1 commit
|
||||
- make "git remote" report multiple URLs
|
||||
|
||||
Still with a minor nit but I think this is an improvement.
|
||||
|
||||
* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
|
||||
- t7400: Add short "git submodule add" testsuite
|
||||
|
||||
Waiting for a reroll.
|
||||
|
||||
* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
|
||||
+ Documentation: Refer to git-rebase(1) to warn against rewriting
|
||||
+ Documentation: new upstream rebase recovery section in git-rebase
|
||||
|
||||
I think the last one on "recommended practice" needs discussion. I do not
|
||||
think it describes _the_ recommended workflow, although I think (1) what
|
||||
is recommended in the draft does make sense within its own scope, and (2)
|
||||
it may be impossible to come up with _the_ recommended workflow anyway.
|
||||
|
||||
* bc/maint-diff-hunk-header-fix (Thu Sep 18 17:44:33 2008 -0500) 3 commits
|
||||
+ diff.*.xfuncname which uses "extended" regex's for hunk header
|
||||
selection
|
||||
+ diff.c: associate a flag with each pattern and use it for
|
||||
compiling regex
|
||||
+ diff.c: return pattern entry pointer rather than just the hunk
|
||||
header pattern
|
||||
|
||||
* bc/master-diff-hunk-header-fix (Thu Sep 18 20:32:50 2008 -0700) 4 commits
|
||||
+ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
|
||||
hunk-header-fix
|
||||
+ diff.*.xfuncname which uses "extended" regex's for hunk header
|
||||
selection
|
||||
+ diff.c: associate a flag with each pattern and use it for
|
||||
compiling regex
|
||||
+ diff.c: return pattern entry pointer rather than just the hunk
|
||||
header pattern
|
||||
|
||||
I've commented on these two branches in a separate message.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* mh/maint-honor-no-ssl-verify (Thu Feb 21 15:10:37 2008 -0800) 1 commit
|
||||
+ Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
|
||||
|
||||
* dp/maint-rebase-fix (Tue Sep 9 16:05:26 2008 +0400) 2 commits
|
||||
+ git-rebase--interactive: auto amend only edited commit
|
||||
+ git-rebase-interactive: do not squash commits on abort
|
||||
|
||||
* jc/maint-checkout-keep-remove (Sun Sep 7 19:49:25 2008 -0700) 1 commit
|
||||
+ checkout: do not lose staged removal
|
||||
|
||||
* jc/maint-template-permbits (Thu Aug 21 19:31:50 2008 -0500) 1 commit
|
||||
+ Fix permission bits on sources checked out with an overtight umask
|
||||
|
||||
* np/pack (Tue Sep 2 10:22:22 2008 -0400) 4 commits
|
||||
+ t5300: improve SHA1 collision test
|
||||
+ pack-objects: don't include missing preferred base objects
|
||||
+ sha1write: don't copy full sized buffers
|
||||
+ Merge branch 'np/maint-safer-pack' into np/pack
|
||||
|
||||
* bw/shortref (Fri Sep 5 23:16:23 2008 +0200) 1 commit
|
||||
+ for-each-ref: `:short` format for `refname`
|
||||
|
||||
* rs/decorate (Thu Sep 4 23:40:03 2008 +0200) 3 commits
|
||||
+ add '%d' pretty format specifier to show decoration
|
||||
+ move load_ref_decorations() to log-tree.c and export it
|
||||
+ log: add load_ref_decorations()
|
||||
|
||||
* tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 2 commits
|
||||
+ t6013: replace use of 'tac' with equivalent Perl
|
||||
+ rev-list: fix --reverse interaction with --parents
|
||||
|
||||
* cc/bisect (Sat Sep 6 07:27:03 2008 +0200) 3 commits
|
||||
+ bisect: remove "checkout_done" variable used when checking merge
|
||||
bases
|
||||
+ bisect: only check merge bases when needed
|
||||
+ bisect: test merge base if good rev is not an ancestor of bad rev
|
||||
|
||||
* jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit
|
||||
+ daemon.c: avoid setlinebuf()
|
||||
|
||||
* jc/maint-diff-quiet (Mon Sep 1 23:20:26 2008 -0700) 2 commits
|
||||
+ diff --quiet: make it synonym to --exit-code >/dev/null
|
||||
+ diff Porcelain: do not disable auto index refreshing on -C -C
|
||||
|
||||
* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
|
||||
+ discard_cache: reset lazy name_hash bit
|
||||
|
||||
* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
|
||||
+ diff: vary default prefix depending on what are compared
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled -- Needs Action to Proceed (or to be dropped)]
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
- Use xdiff caching to improve git blame performance
|
||||
- Allow xdiff machinery to cache hash results for a file
|
||||
- Always initialize xpparam_t to 0
|
||||
- Bypass textual patch generation and parsing in git blame
|
||||
- Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
Réne had good comments on how the callback should be structured.
|
||||
|
||||
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
|
||||
- git-am: Pass the --directory option through to git-apply
|
||||
|
||||
I think this is still buggy and drops the option when am stops with
|
||||
conflicts.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will be merged to "master" soon]
|
||||
|
||||
* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
|
||||
+ builtin-merge: release the lockfile in try_merge_strategy()
|
||||
+ merge-recursive: get rid of virtual_id
|
||||
+ merge-recursive: move current_{file,directory}_set to struct
|
||||
merge_options
|
||||
+ merge-recursive: move the global obuf to struct merge_options
|
||||
+ merge-recursive: get rid of the index_only global variable
|
||||
+ merge-recursive: move call_depth to struct merge_options
|
||||
+ cherry-pick/revert: make direct internal call to merge_tree()
|
||||
+ builtin-merge: avoid run_command_v_opt() for recursive and subtree
|
||||
+ merge-recursive: introduce merge_options
|
||||
+ merge-recursive.c: Add more generic merge_recursive_generic()
|
||||
+ Split out merge_recursive() to merge-recursive.c
|
||||
|
||||
* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
|
||||
+ diff --dirstat-by-file: count changed files, not lines
|
||||
|
||||
* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
|
||||
+ safe_create_leading_directories(): make it about "leading"
|
||||
directories
|
||||
|
||||
* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
|
||||
+ git-apply:--include=pathspec
|
||||
|
||||
* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
|
||||
+ t7603: add new testcases to ensure builtin-commit uses
|
||||
reduce_heads()
|
||||
+ builtin-commit: use commit_tree()
|
||||
+ commit_tree(): add a new author parameter
|
||||
|
||||
* pb/autocorrect-wrapper (Wed Sep 10 17:54:28 2008 +0200) 1 commit
|
||||
+ git wrapper: also use aliases to correct mistyped commands
|
||||
|
||||
* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit
|
||||
+ builtin-commit.c: show on which branch a commit was added
|
||||
|
||||
* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 15 commits
|
||||
+ Fix AsciiDoc errors in merge documentation
|
||||
+ git-merge documentation: describe how conflict is presented
|
||||
+ checkout --conflict=<style>: recreate merge in a non-default style
|
||||
+ checkout -m: recreate merge when checking out of unmerged index
|
||||
+ Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-
|
||||
resolution'
|
||||
+ git-merge-recursive: learn to honor merge.conflictstyle
|
||||
+ merge.conflictstyle: choose between "merge" and "diff3 -m" styles
|
||||
+ rerere: understand "diff3 -m" style conflicts with the original
|
||||
+ rerere.c: use symbolic constants to keep track of parsing states
|
||||
+ xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or
|
||||
less
|
||||
+ xmerge.c: minimum readability fixups
|
||||
+ xdiff-merge: optionally show conflicts in "diff3 -m" style
|
||||
+ xdl_fill_merge_buffer(): separate out a too deeply nested function
|
||||
+ checkout --ours/--theirs: allow checking out one side of a
|
||||
conflicting merge
|
||||
+ checkout -f: allow ignoring unmerged paths when checking out of
|
||||
the index
|
||||
|
||||
* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits
|
||||
+ push: receiver end advertises refs from alternate repositories
|
||||
+ push: prepare sender to receive extended ref information from the
|
||||
receiver
|
||||
+ receive-pack: make it a builtin
|
||||
+ is_directory(): a generic helper function
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits
|
||||
+ wt-status: Teach how to discard changes in the working directory
|
||||
+ wt-status: Split header generation into three functions
|
||||
|
||||
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
|
||||
+ date/time: do not get confused by fractional seconds
|
||||
|
||||
* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
|
||||
+ git-add --intent-to-add (-N)
|
||||
|
||||
Teaches "git add" to record only the intent to add a path later.
|
||||
I rerolled this without the fake empty blob object.
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
I started making this incremental but the progress is not so great.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
The one at second from the tip needs reworking.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
|
||||
- WIP: start teaching the --whitespace=fix to merge machinery
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0, but with the loud whining about moving git-foo out of $PATH we
|
||||
have been hearing, it might not be a bad idea to drop this.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
@@ -1,266 +0,0 @@
|
||||
Subject: What's cooking in git.git (Sep 2008, #04; Mon, 22)
|
||||
X-master-at: c76dc9592d1c770212d50ee7a7028a74f472f23b
|
||||
X-next-at: 7f0eb98a28d41e28f6a7b72e118d72de01bab1a7
|
||||
|
||||
What's cooking in git.git (Sep 2008, #04; Mon, 22)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
I'll be on vacation til Oct 08; proposal/review/discussion/improvement
|
||||
cycle based on e-mails and the distributed nature of git mean that it
|
||||
shouldn't keep the participants from further improving the system. I've
|
||||
asked Shawn to look after in-flight patches during the time, so hopefully
|
||||
when I come back I'll see a much better git ;-).
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* nd/narrow (Sun Sep 14 20:07:59 2008 +0700) 9 commits
|
||||
- grep: skip files that have not been checked out
|
||||
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
- Prevent diff machinery from examining worktree outside narrow
|
||||
checkout
|
||||
- Add tests for updating no-checkout entries in index
|
||||
- ls-files: add --narrow-checkout option to "will checkout" entries
|
||||
- update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
- Introduce CE_NO_CHECKOUT bit
|
||||
- Extend index to save more flags
|
||||
|
||||
This is an early half of the earlier series (I haven't had chance to look
|
||||
at the updated series yet), and should be replaced with the updated one
|
||||
posted recently.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled -- Needs Action to Proceed (or to be dropped)]
|
||||
|
||||
* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
|
||||
- t7400: Add short "git submodule add" testsuite
|
||||
|
||||
Waiting for a reroll.
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
- Use xdiff caching to improve git blame performance
|
||||
- Allow xdiff machinery to cache hash results for a file
|
||||
- Always initialize xpparam_t to 0
|
||||
- Bypass textual patch generation and parsing in git blame
|
||||
- Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
Réne had good comments on how the callback should be structured.
|
||||
|
||||
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
|
||||
- git-am: Pass the --directory option through to git-apply
|
||||
|
||||
I think this is still buggy and drops the option when am stops with
|
||||
conflicts.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will be merged to 'master/maint' soon]
|
||||
|
||||
* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
|
||||
+ builtin-merge: release the lockfile in try_merge_strategy()
|
||||
+ merge-recursive: get rid of virtual_id
|
||||
+ merge-recursive: move current_{file,directory}_set to struct
|
||||
merge_options
|
||||
+ merge-recursive: move the global obuf to struct merge_options
|
||||
+ merge-recursive: get rid of the index_only global variable
|
||||
+ merge-recursive: move call_depth to struct merge_options
|
||||
+ cherry-pick/revert: make direct internal call to merge_tree()
|
||||
+ builtin-merge: avoid run_command_v_opt() for recursive and subtree
|
||||
+ merge-recursive: introduce merge_options
|
||||
+ merge-recursive.c: Add more generic merge_recursive_generic()
|
||||
+ Split out merge_recursive() to merge-recursive.c
|
||||
|
||||
(Tip at 4271666)
|
||||
|
||||
* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
|
||||
+ diff --dirstat-by-file: count changed files, not lines
|
||||
|
||||
(Tip at fd33777)
|
||||
|
||||
* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
|
||||
+ safe_create_leading_directories(): make it about "leading"
|
||||
directories
|
||||
|
||||
(Tip at 5f0bdf5)
|
||||
|
||||
* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
|
||||
+ git-apply:--include=pathspec
|
||||
|
||||
(Tip at 6ecb1ee)
|
||||
|
||||
* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
|
||||
+ t7603: add new testcases to ensure builtin-commit uses
|
||||
reduce_heads()
|
||||
+ builtin-commit: use commit_tree()
|
||||
+ commit_tree(): add a new author parameter
|
||||
|
||||
(Tip at 7a172b0)
|
||||
|
||||
* pb/autocorrect-wrapper (Wed Sep 10 17:54:28 2008 +0200) 1 commit
|
||||
+ git wrapper: also use aliases to correct mistyped commands
|
||||
|
||||
(Tip at 746c221)
|
||||
|
||||
* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 15 commits
|
||||
+ Fix AsciiDoc errors in merge documentation
|
||||
+ git-merge documentation: describe how conflict is presented
|
||||
+ checkout --conflict=<style>: recreate merge in a non-default style
|
||||
+ checkout -m: recreate merge when checking out of unmerged index
|
||||
+ Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-
|
||||
resolution'
|
||||
+ git-merge-recursive: learn to honor merge.conflictstyle
|
||||
+ merge.conflictstyle: choose between "merge" and "diff3 -m" styles
|
||||
+ rerere: understand "diff3 -m" style conflicts with the original
|
||||
+ rerere.c: use symbolic constants to keep track of parsing states
|
||||
+ xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or
|
||||
less
|
||||
+ xmerge.c: minimum readability fixups
|
||||
+ xdiff-merge: optionally show conflicts in "diff3 -m" style
|
||||
+ xdl_fill_merge_buffer(): separate out a too deeply nested function
|
||||
+ checkout --ours/--theirs: allow checking out one side of a
|
||||
conflicting merge
|
||||
+ checkout -f: allow ignoring unmerged paths when checking out of
|
||||
the index
|
||||
|
||||
(Tip at 3407a7a)
|
||||
|
||||
* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits
|
||||
+ push: receiver end advertises refs from alternate repositories
|
||||
+ push: prepare sender to receive extended ref information from the
|
||||
receiver
|
||||
+ receive-pack: make it a builtin
|
||||
+ is_directory(): a generic helper function
|
||||
|
||||
(Tip at d79796b)
|
||||
|
||||
* bc/master-diff-hunk-header-fix (Sat Sep 20 18:36:22 2008 -0700) 10 commits
|
||||
+ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
|
||||
hunk-header-fix
|
||||
+ diff hunk pattern: fix misconverted "\{" tex macro introducers
|
||||
+ diff: fix "multiple regexp" semantics to find hunk header comment
|
||||
+ diff: use extended regexp to find hunk headers
|
||||
+ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
|
||||
hunk-header-fix
|
||||
+ diff: use extended regexp to find hunk headers
|
||||
+ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
|
||||
hunk-header-fix
|
||||
+ diff.*.xfuncname which uses "extended" regex's for hunk header
|
||||
selection
|
||||
+ diff.c: associate a flag with each pattern and use it for
|
||||
compiling regex
|
||||
+ diff.c: return pattern entry pointer rather than just the hunk
|
||||
header pattern
|
||||
|
||||
(Tip at 92bb978)
|
||||
|
||||
* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits
|
||||
+ wt-status: Teach how to discard changes in the working directory
|
||||
+ wt-status: Split header generation into three functions
|
||||
|
||||
(Tip at 4d6e4c4)
|
||||
|
||||
I think the above are all ready for 'master'.
|
||||
|
||||
* mg/maint-remote-fix (Mon Sep 22 10:57:51 2008 +0200) 1 commit
|
||||
+ make "git remote" report multiple URLs
|
||||
|
||||
(Tip at 7d20e21)
|
||||
|
||||
* bc/maint-diff-hunk-header-fix (Sat Sep 20 15:30:12 2008 -0700) 5 commits
|
||||
+ diff hunk pattern: fix misconverted "\{" tex macro introducers
|
||||
+ diff: use extended regexp to find hunk headers
|
||||
+ diff.*.xfuncname which uses "extended" regex's for hunk header
|
||||
selection
|
||||
+ diff.c: associate a flag with each pattern and use it for
|
||||
compiling regex
|
||||
+ diff.c: return pattern entry pointer rather than just the hunk
|
||||
header pattern
|
||||
|
||||
(Tip at 96d1a8e)
|
||||
|
||||
The above two are ready for 'maint'.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
|
||||
+ Documentation: Refer to git-rebase(1) to warn against rewriting
|
||||
+ Documentation: new upstream rebase recovery section in git-rebase
|
||||
|
||||
My impression from the last round of discusson on the third patch in this
|
||||
series (not queued here) was that as long as we do not present it as "One
|
||||
True Workflow", the description was a good starting point, possibly others
|
||||
to add other recommended flows later.
|
||||
|
||||
* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit
|
||||
+ builtin-commit.c: show on which branch a commit was added
|
||||
|
||||
Tentatively kicked back to "still cooking" status after Jeff voiced his
|
||||
annoyance. I personally do not like making this multi-line as Jeff
|
||||
suggested as an alternative (the message already is too verbose to my
|
||||
taste).
|
||||
|
||||
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
|
||||
+ date/time: do not get confused by fractional seconds
|
||||
|
||||
* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
|
||||
+ git-add --intent-to-add (-N)
|
||||
|
||||
Teaches "git add" to record only the intent to add a path later.
|
||||
I rerolled this without the fake empty blob object.
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
I started making this incremental but the progress is not so great.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
The one at second from the tip needs reworking.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
|
||||
- WIP: start teaching the --whitespace=fix to merge machinery
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns out
|
||||
that the synonyms to the ones this one deletes are fairly new invention
|
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
|
||||
in 1.7.0, but with the loud whining about moving git-foo out of $PATH we
|
||||
have been hearing, it might not be a bad idea to drop this.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use, but gitk will be
|
||||
hit due to tcl/tk's limitation, so I am holding this back for now.
|
||||
@@ -1,341 +0,0 @@
|
||||
Subject: What's cooking in git.git (Sep 2008, #05; Mon, 29)
|
||||
X-master-at: 9800c0df412869c7949935b61581b9361fc49bd1
|
||||
X-next-at: 37dbc802cfed9d39ff15dfd333bdd2e74ca9f458
|
||||
|
||||
What's cooking in git.git (Sep 2008, #05; Mon, 29)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
If I have dropped anything recently its not because I don't want
|
||||
to apply it, it just slipped through the cracks. Please feel free
|
||||
to give me a gentle prod (and a patch resend or a pointer to the
|
||||
series on gmane). Thanks.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* gb/gitweb-pathinfo (Mon Sep 29 17:26:57 2008 +0200) 4 commits
|
||||
- gitweb: generate parent..current URLs
|
||||
- gitweb: parse parent..current syntax from pathinfo
|
||||
- gitweb: generate project/action/hash URLs
|
||||
- gitweb: parse project/action/hash_base:filename PATH_INFO
|
||||
|
||||
This series just came in today. I haven't had a chance to look at
|
||||
it beyond stashing in `pu`.
|
||||
|
||||
* mw/sendemail (Mon Sep 29 12:41:06 2008 -0500) 8 commits
|
||||
- send-email: signedoffcc -> signedoffbycc, but handle both
|
||||
- Docs: send-email: Create logical groupings for man text
|
||||
- Docs: send-email: Remove unnecessary config variable description
|
||||
- Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to
|
||||
- send-email: change --no-validate to boolean --[no-]validate
|
||||
- Docs: send-email: Man page option ordering
|
||||
- Docs: send-email usage text much sexier
|
||||
- Docs: send-email's usage text and man page mention same options
|
||||
|
||||
This series has already gone through 3 iterations before I could
|
||||
start to carry it in-tree. I haven't had a chance to read it yet
|
||||
myself, so its sitting around in `pu` for futher review.
|
||||
|
||||
* pb/gitweb (Thu Sep 25 18:48:48 2008 +0200) 2 commits
|
||||
- gitweb: Sort the list of forks on the summary page by age
|
||||
- gitweb: Clean-up sorting of project list
|
||||
|
||||
I forgot to look at this series today. I meant to review and try
|
||||
to merge it to `next` before publishing. Will do that tomorrow.
|
||||
|
||||
* ae/preservemerge (Tue Sep 23 22:58:20 2008 +0200) 3 commits
|
||||
- git pull: Support --preserve-merges as a flag to rebase
|
||||
- git rebase: Support non-interactive merge-preserving rebase
|
||||
- Prepare for non-interactive merge-preserving rebase
|
||||
|
||||
Andreas says there's some issues in here. I'm waiting for a respin
|
||||
on the series before I look at it futher.
|
||||
|
||||
* mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit
|
||||
- make prune report removed objects on -v
|
||||
|
||||
Just came in today. Looks sane. I'll drop it onto `next` tomorrow.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
|
||||
+ builtin-merge: release the lockfile in try_merge_strategy()
|
||||
+ merge-recursive: get rid of virtual_id
|
||||
+ merge-recursive: move current_{file,directory}_set to struct
|
||||
merge_options
|
||||
+ merge-recursive: move the global obuf to struct merge_options
|
||||
+ merge-recursive: get rid of the index_only global variable
|
||||
+ merge-recursive: move call_depth to struct merge_options
|
||||
+ cherry-pick/revert: make direct internal call to merge_tree()
|
||||
+ builtin-merge: avoid run_command_v_opt() for recursive and subtree
|
||||
+ merge-recursive: introduce merge_options
|
||||
+ merge-recursive.c: Add more generic merge_recursive_generic()
|
||||
+ Split out merge_recursive() to merge-recursive.c
|
||||
|
||||
(Tip at 4271666)
|
||||
|
||||
* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
|
||||
+ diff --dirstat-by-file: count changed files, not lines
|
||||
|
||||
(Tip at fd33777)
|
||||
|
||||
* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
|
||||
+ safe_create_leading_directories(): make it about "leading"
|
||||
directories
|
||||
|
||||
(Tip at 5f0bdf5)
|
||||
|
||||
* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
|
||||
+ git-apply:--include=pathspec
|
||||
|
||||
(Tip at 6ecb1ee)
|
||||
|
||||
* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
|
||||
+ t7603: add new testcases to ensure builtin-commit uses
|
||||
reduce_heads()
|
||||
+ builtin-commit: use commit_tree()
|
||||
+ commit_tree(): add a new author parameter
|
||||
|
||||
(Tip at 7a172b0)
|
||||
|
||||
* pb/autocorrect-wrapper (Wed Sep 10 17:54:28 2008 +0200) 1 commit
|
||||
+ git wrapper: also use aliases to correct mistyped commands
|
||||
|
||||
(Tip at 746c221)
|
||||
|
||||
* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 15 commits
|
||||
+ Fix AsciiDoc errors in merge documentation
|
||||
+ git-merge documentation: describe how conflict is presented
|
||||
+ checkout --conflict=<style>: recreate merge in a non-default style
|
||||
+ checkout -m: recreate merge when checking out of unmerged index
|
||||
+ Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-
|
||||
resolution'
|
||||
+ git-merge-recursive: learn to honor merge.conflictstyle
|
||||
+ merge.conflictstyle: choose between "merge" and "diff3 -m" styles
|
||||
+ rerere: understand "diff3 -m" style conflicts with the original
|
||||
+ rerere.c: use symbolic constants to keep track of parsing states
|
||||
+ xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or
|
||||
less
|
||||
+ xmerge.c: minimum readability fixups
|
||||
+ xdiff-merge: optionally show conflicts in "diff3 -m" style
|
||||
+ xdl_fill_merge_buffer(): separate out a too deeply nested function
|
||||
+ checkout --ours/--theirs: allow checking out one side of a
|
||||
conflicting merge
|
||||
+ checkout -f: allow ignoring unmerged paths when checking out of
|
||||
the index
|
||||
|
||||
(Tip at 3407a7a)
|
||||
|
||||
* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits
|
||||
+ push: receiver end advertises refs from alternate repositories
|
||||
+ push: prepare sender to receive extended ref information from the
|
||||
receiver
|
||||
+ receive-pack: make it a builtin
|
||||
+ is_directory(): a generic helper function
|
||||
|
||||
(Tip at d79796b)
|
||||
|
||||
* bc/master-diff-hunk-header-fix (Sat Sep 20 18:36:22 2008 -0700) 10 commits
|
||||
+ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
|
||||
hunk-header-fix
|
||||
+ diff hunk pattern: fix misconverted "\{" tex macro introducers
|
||||
+ diff: fix "multiple regexp" semantics to find hunk header comment
|
||||
+ diff: use extended regexp to find hunk headers
|
||||
+ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
|
||||
hunk-header-fix
|
||||
+ diff: use extended regexp to find hunk headers
|
||||
+ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
|
||||
hunk-header-fix
|
||||
+ diff.*.xfuncname which uses "extended" regex's for hunk header
|
||||
selection
|
||||
+ diff.c: associate a flag with each pattern and use it for
|
||||
compiling regex
|
||||
+ diff.c: return pattern entry pointer rather than just the hunk
|
||||
header pattern
|
||||
|
||||
(Tip at 92bb978)
|
||||
|
||||
* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits
|
||||
+ wt-status: Teach how to discard changes in the working directory
|
||||
+ wt-status: Split header generation into three functions
|
||||
|
||||
(Tip at 4d6e4c4)
|
||||
|
||||
* mg/maint-remote-fix (Mon Sep 22 10:57:51 2008 +0200) 1 commit
|
||||
+ make "git remote" report multiple URLs
|
||||
|
||||
(Tip at 7d20e21)
|
||||
|
||||
* bc/maint-diff-hunk-header-fix (Sat Sep 20 15:30:12 2008 -0700) 5 commits
|
||||
+ diff hunk pattern: fix misconverted "\{" tex macro introducers
|
||||
+ diff: use extended regexp to find hunk headers
|
||||
+ diff.*.xfuncname which uses "extended" regex's for hunk header
|
||||
selection
|
||||
+ diff.c: associate a flag with each pattern and use it for
|
||||
compiling regex
|
||||
+ diff.c: return pattern entry pointer rather than just the hunk
|
||||
header pattern
|
||||
|
||||
(Tip at 96d1a8e)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Old New Topics]
|
||||
|
||||
* nd/narrow (Sun Sep 14 20:07:59 2008 +0700) 9 commits
|
||||
- grep: skip files that have not been checked out
|
||||
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
- Prevent diff machinery from examining worktree outside narrow
|
||||
checkout
|
||||
- Add tests for updating no-checkout entries in index
|
||||
- ls-files: add --narrow-checkout option to "will checkout" entries
|
||||
- update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
- Introduce CE_NO_CHECKOUT bit
|
||||
- Extend index to save more flags
|
||||
|
||||
[jc: This is an early half of the earlier series (I haven't had
|
||||
chance to look at the updated series yet), and should be replaced
|
||||
with the updated one posted recently.]
|
||||
|
||||
I haven't touched this branch since I inherited it from Junio.
|
||||
I'd appreciate a resend or a pointer to the updated series so I
|
||||
can at least replace it.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled -- Needs Action to Proceed (or to be dropped)]
|
||||
|
||||
* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
|
||||
- t7400: Add short "git submodule add" testsuite
|
||||
|
||||
[jc: Waiting for a reroll.]
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
- Use xdiff caching to improve git blame performance
|
||||
- Allow xdiff machinery to cache hash results for a file
|
||||
- Always initialize xpparam_t to 0
|
||||
- Bypass textual patch generation and parsing in git blame
|
||||
- Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
[jc: Réne had good comments on how the callback should be
|
||||
structured.]
|
||||
|
||||
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
|
||||
- git-am: Pass the --directory option through to git-apply
|
||||
|
||||
[jc: I think this is still buggy and drops the option when am stops
|
||||
with conflicts.]
|
||||
|
||||
All three of these are stalled. I'm not going to drop them just
|
||||
yet, but Junio's comments still hold. If there's no action on
|
||||
these next week we may seem them drop off.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will be merged to 'master/maint' soon]
|
||||
|
||||
* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
|
||||
+ git-add --intent-to-add (-N)
|
||||
|
||||
Teaches "git add" to record only the intent to add a path later.
|
||||
[jc: I rerolled this without the fake empty blob object.]
|
||||
|
||||
I'm inclined to merge this next week.
|
||||
|
||||
(Tip at 3942581)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
|
||||
+ Documentation: Refer to git-rebase(1) to warn against rewriting
|
||||
+ Documentation: new upstream rebase recovery section in git-rebase
|
||||
|
||||
[jc: My impression from the last round of discusson on the third
|
||||
patch in this series (not queued here) was that as long as we
|
||||
do not present it as "One True Workflow", the description was
|
||||
a good starting point, possibly others to add other recommended
|
||||
flows later.]
|
||||
|
||||
I haven't looked at this series yet. Based on Junios remarks above
|
||||
I'm looking for more input on this series before it goes anywhere.
|
||||
|
||||
* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit
|
||||
+ builtin-commit.c: show on which branch a commit was added
|
||||
|
||||
[jc: Tentatively kicked back to "still cooking" status after
|
||||
Jeff voiced his annoyance. I personally do not like making this
|
||||
multi-line as Jeff suggested as an alternative (the message already
|
||||
is too verbose to my taste).]
|
||||
|
||||
Agree with Junio. Hence its still here.
|
||||
|
||||
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
|
||||
+ date/time: do not get confused by fractional seconds
|
||||
|
||||
I need to look at this in more detail. I suspect we can merge
|
||||
this to master soon, but its been kicking around since Aug 16th.
|
||||
I need to look at it to see if there's any obvious reason why Junio
|
||||
has no notes on this branch and why it hasn't merged yet.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
[jc: I started making this incremental but the progress is not so great.]
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
[jc: The one at second from the tip needs reworking.]
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
|
||||
. WIP: start teaching the --whitespace=fix to merge machinery
|
||||
|
||||
This has a merge conflict with `next` and isn't even in pu right now.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
I should look at this in more detail. We may be able to merge it
|
||||
to next soon-ish.
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
[jc: This was previously in "will be in master soon" category,
|
||||
but it turns out that the synonyms to the ones this one deletes
|
||||
are fairly new invention that happend in 1.5.6 timeframe, and
|
||||
we cannot do this just yet. Perhaps in 1.7.0, but with the loud
|
||||
whining about moving git-foo out of $PATH we have been hearing,
|
||||
it might not be a bad idea to drop this.]
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
[jc: This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.]
|
||||
@@ -1,356 +0,0 @@
|
||||
Subject: What's cooking in git.git (Oct 2008, #01; Mon, 06)
|
||||
X-master-at: 276328ffb87cefdc515bee5f09916aea6e0244ed
|
||||
X-next-at: 395ff9bd88b9cf14617c5e2f461878c4969726f3
|
||||
|
||||
What's cooking in git.git (Oct 2008, #01; Mon, 06)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
Topics aren't sorted by name; I have tried to cluster them together
|
||||
to tell the story of how 'next' and 'pu' have evolved this past week.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* sp/describe-docs (Tue Sep 30 11:55:16 2008 -0700) 1 commit
|
||||
. docs: Improve the description of describe --tags
|
||||
|
||||
I'm probably going to drop this topic if I can ever get around to
|
||||
formally writing and posting sp/describe-lwtag for review.
|
||||
|
||||
* sp/describe-lwtag (Tue Sep 30 12:03:41 2008 -0700) 1 commit
|
||||
- [WIP] Change meaning of --tags and --all
|
||||
|
||||
Modifies "git describe --tags" to allow matching against lightweight
|
||||
tags even when an annotated tag is found in the history. Its not
|
||||
in next because I haven't formally written a commit message and
|
||||
posted the patch for discussion on the list.
|
||||
|
||||
This is a fairly significant change in behavior. Its most certainly
|
||||
1.6.1 material, but many argue the change is the _correct_ behavior
|
||||
and the current behavior in 1.6.0 is buggy.
|
||||
|
||||
* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits
|
||||
- diff: add filter for converting binary to text
|
||||
- diff: introduce diff.<driver>.binary
|
||||
- diff: unify external diff and funcname parsing code
|
||||
- t4012: use test_cmp instead of cmp
|
||||
|
||||
A general cleanup on how diff drivers are implemented. Its still
|
||||
missing documentation updates and tests but doesn't break anything
|
||||
current as far as I can tell. It needs more review before it can
|
||||
be slated for 'next'.
|
||||
|
||||
* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit
|
||||
- Do not rename read-only files during a push
|
||||
|
||||
Supposedly fixes pack file renames on Windows, but it makes the
|
||||
test suite fail on Linux. I haven't debugged why yet. Its very
|
||||
likely we need a replacement patch before this can move forward.
|
||||
|
||||
* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit
|
||||
- format-patch: autonumber by default
|
||||
|
||||
Fails the test suite; some of the test vectors need to be updated
|
||||
to account for the new default. Someone who cares about this
|
||||
change should follow through on the test suite update, or this may
|
||||
get dropped.
|
||||
|
||||
* sh/maint-intrebase (Wed Oct 1 01:11:07 2008 -0500) 1 commit
|
||||
+ Fix interactive rebase on dropped commits.
|
||||
|
||||
This merged to next, then was reverted out this morning, due to
|
||||
the introduction of the sh/maint-rebase3. Its dead and will be
|
||||
dropped from the next "What's cooking" release notes.
|
||||
|
||||
* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit
|
||||
- rebase--interactive: fix parent rewriting for dropped commits
|
||||
|
||||
A replacement for sh/maint-intrebase. Its in pu because I have
|
||||
gotten 3 different versions of this patch, two of them posted a
|
||||
full 4 days after I merged the first version into next. I felt
|
||||
burned by the patch author for not keeping up with my tree, so I'm
|
||||
not merging the patch to next.
|
||||
|
||||
At this point its going to sit in pu until Junio comes back.
|
||||
I think the topic needs a few more days to settle to see if the
|
||||
patch author is going to submit any more revisions.
|
||||
|
||||
* ns/rebase-noverify (Mon Oct 6 14:14:29 2008 +0900) 1 commit
|
||||
+ rebase --no-verify
|
||||
|
||||
This adds --no-verify to git rebase, to avoid the pre-rebase hook.
|
||||
Lacks documentation but otherwise looks sound.
|
||||
|
||||
* mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit
|
||||
+ builtin-commit: use reduce_heads() only when appropriate
|
||||
|
||||
Fixes "git merge --no-ff --no-commit".
|
||||
|
||||
* dp/cywginstat (Tue Sep 30 17:53:47 2008 +0400) 3 commits
|
||||
+ cygwin: Use native Win32 API for stat
|
||||
+ mingw: move common functionality to win32.h
|
||||
+ add have_git_dir() function
|
||||
|
||||
Performance improvement for Cygwin, bypassing the Cygwin stat
|
||||
function and using one more like MinGW uses. Probably ready for
|
||||
master on the next round. Several Cygwin users have given praise
|
||||
to the series.
|
||||
|
||||
* js/objc-funchdr (Wed Oct 1 00:46:34 2008 +0100) 1 commit
|
||||
+ Teach git diff about Objective-C syntax
|
||||
|
||||
Adds support for Objective-C function headers. I don't use
|
||||
Objective-C so I can't comment on how good/bad the patterns are
|
||||
for the language. Feedback (and improvements if necessary) from
|
||||
Objective-C users would be appreciated.
|
||||
|
||||
* dm/svn-branch (Sat Oct 4 19:35:17 2008 -0700) 1 commit
|
||||
+ Add git-svn branch to allow branch creation in SVN repositories
|
||||
|
||||
Adds "git svn branch" to build branches remotely in SVN.
|
||||
|
||||
Might be ready for master, it has an ACK from Eric. Slated into next
|
||||
just because I wasn't sure if Junio merges such things immediately
|
||||
into master or lets them cook for a bit.
|
||||
|
||||
* pb/gitweb (Fri Oct 3 07:41:25 2008 -0700) 7 commits
|
||||
+ Merge branch 'pb/gitweb-tagcloud' into pb/gitweb
|
||||
+ gitweb: Support for simple project search form
|
||||
+ gitweb: Make the by_tag filter delve in forks as well
|
||||
+ gitweb: Support for tag clouds
|
||||
+ gitweb: Add support for extending the action bar with custom links
|
||||
+ gitweb: Sort the list of forks on the summary page by age
|
||||
+ gitweb: Clean-up sorting of project list
|
||||
|
||||
I may have been a bad interm maintainer here by shoving together
|
||||
two different gitweb series from Pasky. Overall the combined set
|
||||
looks ready to me.
|
||||
|
||||
* ph/parseopt (Thu Oct 2 14:59:20 2008 +0200) 3 commits
|
||||
+ parse-opt: migrate builtin-merge-file.
|
||||
+ parse-opt: migrate git-merge-base.
|
||||
+ parse-opt: migrate fmt-merge-msg.
|
||||
|
||||
* rz/grepz (Wed Oct 1 18:11:15 2008 +0200) 1 commit
|
||||
+ git grep: Add "-z/--null" option as in GNU's grep.
|
||||
|
||||
* mv/merge-refresh (Fri Oct 3 15:02:31 2008 +0200) 1 commit
|
||||
+ builtin-merge: refresh the index before calling a strategy
|
||||
|
||||
* bc/xdiffnl (Wed Oct 1 14:28:26 2008 -0500) 1 commit
|
||||
+ xdiff-interface.c: strip newline (and cr) from line before pattern
|
||||
matching
|
||||
|
||||
* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit
|
||||
+ rebase: Support preserving merges in non-interactive mode
|
||||
|
||||
These last five all look ready for master, but should cook longer
|
||||
than just a few days.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Old New Topics]
|
||||
|
||||
* mw/sendemail (Sun Sep 28 07:51:21 2008 +0300) 10 commits
|
||||
+ bash completion: Add --[no-]validate to "git send-email"
|
||||
+ send-email: signedoffcc -> signedoffbycc, but handle both
|
||||
+ Docs: send-email: Create logical groupings for man text
|
||||
+ Docs: send-email: Create logical groupings for --help text
|
||||
+ Docs: send-email: Remove unnecessary config variable description
|
||||
+ Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to
|
||||
+ send-email: change --no-validate to boolean --[no-]validate
|
||||
+ Docs: send-email: Man page option ordering
|
||||
+ Docs: send-email usage text much sexier
|
||||
+ Docs: send-email's usage text and man page mention same options
|
||||
|
||||
This series looks pretty good to me. It probably can merge to
|
||||
master on the next "What's cooking" cycle.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Dropped Topics]
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This has been reverted from next and is being dropped. Its too
|
||||
soon to remove a feature that was just added in 1.5.6 timeframe.
|
||||
Perhaps in 1.7.0 this can be revisited.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stuck Topics]
|
||||
|
||||
* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
|
||||
- grep: skip files outside sparse checkout area
|
||||
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
- Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
- ls-files: Add tests for --sparse and friends
|
||||
- update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
- ls-files: add options to support sparse checkout
|
||||
- Introduce CE_NO_CHECKOUT bit
|
||||
- Extend index to save more flags
|
||||
|
||||
Recently updated with a repost. I've been too swamped at day-job
|
||||
to actively review the series. There has been some discussion on
|
||||
list about it so its not stalled, but it needs more eyeballs.
|
||||
|
||||
* gb/gitweb-pathinfo (Thu Oct 2 02:10:34 2008 +0200) 6 commits
|
||||
- gitweb: generate parent..current URLs
|
||||
- gitweb: parse parent..current syntax from pathinfo
|
||||
- gitweb: use_pathinfo filenames start with /
|
||||
- gitweb: generate project/action/hash URLs
|
||||
- gitweb: refactor input parameters parse/validation
|
||||
- gitweb: parse project/action/hash_base:filename PATH_INFO
|
||||
|
||||
Still going through revisions on the git ML. Its great work and
|
||||
is heading in the right direction. But the discussion and patch
|
||||
generation rate is too high to merge the topic into next just yet.
|
||||
|
||||
So its waiting for a re-roll of the series once discussion settles
|
||||
down and there is a final patch series available.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled -- Needs Action to Proceed (or to be dropped)]
|
||||
|
||||
* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
|
||||
- t7400: Add short "git submodule add" testsuite
|
||||
|
||||
Still waiting for a reroll. Should be dropped next week if we
|
||||
don't get one during this coming week.
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
- Use xdiff caching to improve git blame performance
|
||||
- Allow xdiff machinery to cache hash results for a file
|
||||
- Always initialize xpparam_t to 0
|
||||
- Bypass textual patch generation and parsing in git blame
|
||||
- Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
(jc: Réne had good comments on how the callback should be
|
||||
structured.)
|
||||
|
||||
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
|
||||
- git-am: Pass the --directory option through to git-apply
|
||||
|
||||
(jc: I think this is still buggy and drops the option when am stops
|
||||
with conflicts.)
|
||||
|
||||
All three of these are stalled. I'm not going to drop them just
|
||||
yet, but Junio's comments still hold. If there's no action on
|
||||
these next week we may seem them drop off.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will be merged to 'master/maint' soon]
|
||||
|
||||
* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
|
||||
+ git-add --intent-to-add (-N)
|
||||
|
||||
Teaches "git add" to record only the intent to add a path later.
|
||||
(jc: I rerolled this without the fake empty blob object.)
|
||||
|
||||
* mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit
|
||||
+ make prune report removed objects on -v
|
||||
|
||||
This is a pretty trivial new feature.
|
||||
|
||||
* pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits
|
||||
+ tutorial: update output of git commit
|
||||
+ reformat informational commit message
|
||||
+ git commit: Reformat output somewhat
|
||||
+ builtin-commit.c: show on which branch a commit was added
|
||||
|
||||
I think this topic is settled for now.
|
||||
|
||||
* jk/maint-soliconv (Fri Oct 3 02:39:36 2008 -0400) 1 commit
|
||||
+ Makefile: do not set NEEDS_LIBICONV for Solaris 8
|
||||
|
||||
* sg/maint-intrebase-msghook (Fri Oct 3 11:33:20 2008 +0200) 2 commits
|
||||
+ rebase -i: remove leftover debugging
|
||||
+ rebase -i: proper prepare-commit-msg hook argument when squashing
|
||||
|
||||
* bc/maint-stashref (Thu Oct 2 18:52:11 2008 -0500) 1 commit
|
||||
+ git-stash.sh: fix flawed fix of invalid ref handling (commit
|
||||
da65e7c1)
|
||||
|
||||
The latter three are ready for 'maint'. I felt burned by a bad
|
||||
commit into made directly into maint earlier in the week so these
|
||||
wound up getting queued into 'next' first, even though they are
|
||||
certainly maint material.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
|
||||
+ Documentation: Refer to git-rebase(1) to warn against rewriting
|
||||
+ Documentation: new upstream rebase recovery section in git-rebase
|
||||
|
||||
(jc: My impression from the last round of discusson on the third
|
||||
patch in this series (not queued here) was that as long as we
|
||||
do not present it as "One True Workflow", the description was
|
||||
a good starting point, possibly others to add other recommended
|
||||
flows later.)
|
||||
|
||||
I haven't looked at this series yet. Based on Junio's remarks above
|
||||
I'm looking for more input on this series before it goes anywhere.
|
||||
|
||||
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
|
||||
+ date/time: do not get confused by fractional seconds
|
||||
|
||||
I need to look at this in more detail. I suspect we can merge
|
||||
this to master soon, but its been kicking around since Aug 16th.
|
||||
I need to look at it to see if there's any obvious reason why Junio
|
||||
has no notes on this branch and why it hasn't merged yet.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
(jc: I started making this incremental but the progress is not
|
||||
so great.)
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
(jc: The one at second from the tip needs reworking.)
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This is a great idea, but IIRC its implementation has a deadlock
|
||||
during communication between the peers. Someone needs to pick up
|
||||
this topic and resolve the deadlock before it can continue.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
|
||||
. WIP: start teaching the --whitespace=fix to merge machinery
|
||||
|
||||
This has a merge conflict with `next` and isn't even in pu right now.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
(jc: This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.)
|
||||
@@ -1,337 +0,0 @@
|
||||
Subject: What's cooking in git/spearce.git (Oct 2008, #02; Sun, 12)
|
||||
X-master-at: 5c283eb13c94be6ca974aa722159dc9838d10d97
|
||||
X-next-at: 340fcf496c9eb7c8be7f14efdd282666a6b6a1f1
|
||||
|
||||
What's cooking in git/spearce.git (Oct 2008, #02; Sun, 12)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
gitster's back and I'm expecting he will take over from here.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* dp/checkattr (Tue Oct 7 04:16:52 2008 +0400) 2 commits
|
||||
+ check-attr: Add --stdin option
|
||||
+ check-attr: add an internal check_attr() function
|
||||
|
||||
Batch attr lookup via --stdin, for gitk and git-gui.
|
||||
|
||||
* mv/clonev (Thu Oct 9 01:40:32 2008 +0200) 1 commit
|
||||
+ Implement git clone -v
|
||||
|
||||
Does what it says it does. This may be ready for master soon,
|
||||
its a pretty trivial change.
|
||||
|
||||
* gb/refactor-pathinfo (Fri Oct 10 20:42:26 2008 +0200) 1 commit
|
||||
+ gitweb: refactor input parameters parse/validation
|
||||
|
||||
A major cleanup on the way gitweb parses its input arguments.
|
||||
Future gitweb patches to add more arguments into the PATH_INFO
|
||||
depend upon this initial cleanup work.
|
||||
|
||||
* ml/cygwin-filemode (Sun Oct 12 14:44:46 2008 -0400) 1 commit
|
||||
- compat/cygwin.c - Use cygwin's stat if core.filemode == true
|
||||
|
||||
I think another version may be coming to reuse the core.filemode
|
||||
parsing so this patch isn't in next yet.
|
||||
|
||||
* sh/rebase-i-p (Wed Oct 8 01:41:57 2008 -0500) 7 commits
|
||||
- rebase-i-p: if todo was reordered use HEAD as the rewritten parent
|
||||
- rebase-i-p: do not include non-first-parent commits touching
|
||||
UPSTREAM
|
||||
- rebase-i-p: only list commits that require rewriting in todo
|
||||
- rebase-i-p: fix 'no squashing merges' tripping up non-merges
|
||||
- rebase-i-p: delay saving current-commit to REWRITTEN if squashing
|
||||
- rebase-i-p: use HEAD for updating the ref instead of mapping
|
||||
OLDHEAD
|
||||
- rebase-i-p: test to exclude commits from todo based on its parents
|
||||
|
||||
Changes the `rebase -i -p` behavior to behave like git sequencer's
|
||||
rewrite of `rebase -i` would behave. Its parked in pu because I
|
||||
have not had the time to review the series in detail. First glance
|
||||
looked OK to me.
|
||||
|
||||
* js/keephardlinks (Sat Oct 11 13:45:13 2008 +0200) 1 commit
|
||||
- Introduce core.keepHardLinks
|
||||
|
||||
The value of this change is currently in question, and the commit
|
||||
message doesn't justify it very well.
|
||||
|
||||
* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
|
||||
- gitweb: Better processing format string in custom links in navbar
|
||||
|
||||
Waiting for some sort of response from Pasky.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* mw/sendemail (Sun Sep 28 07:51:21 2008 +0300) 10 commits
|
||||
+ bash completion: Add --[no-]validate to "git send-email"
|
||||
+ send-email: signedoffcc -> signedoffbycc, but handle both
|
||||
+ Docs: send-email: Create logical groupings for man text
|
||||
+ Docs: send-email: Create logical groupings for --help text
|
||||
+ Docs: send-email: Remove unnecessary config variable description
|
||||
+ Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to
|
||||
+ send-email: change --no-validate to boolean --[no-]validate
|
||||
+ Docs: send-email: Man page option ordering
|
||||
+ Docs: send-email usage text much sexier
|
||||
+ Docs: send-email's usage text and man page mention same options
|
||||
|
||||
* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
|
||||
+ git-add --intent-to-add (-N)
|
||||
|
||||
* mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit
|
||||
+ make prune report removed objects on -v
|
||||
|
||||
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
|
||||
+ date/time: do not get confused by fractional seconds
|
||||
|
||||
* dp/cywginstat (Tue Sep 30 17:53:47 2008 +0400) 3 commits
|
||||
+ cygwin: Use native Win32 API for stat
|
||||
+ mingw: move common functionality to win32.h
|
||||
+ add have_git_dir() function
|
||||
|
||||
Performance improvement for Cygwin, bypassing the Cygwin stat
|
||||
function and using one more like MinGW uses. Probably ready for
|
||||
master on the next round. Several Cygwin users have given praise
|
||||
to the series.
|
||||
|
||||
* js/objc-funchdr (Wed Oct 1 00:46:34 2008 +0100) 1 commit
|
||||
+ Teach git diff about Objective-C syntax
|
||||
|
||||
Adds support for Objective-C function headers.
|
||||
|
||||
* dm/svn-branch (Sat Oct 4 19:35:17 2008 -0700) 1 commit
|
||||
+ Add git-svn branch to allow branch creation in SVN repositories
|
||||
|
||||
Adds "git svn branch" to build branches remotely in SVN.
|
||||
|
||||
* pb/gitweb (Fri Oct 3 07:41:25 2008 -0700) 7 commits
|
||||
+ Merge branch 'pb/gitweb-tagcloud' into pb/gitweb
|
||||
+ gitweb: Support for simple project search form
|
||||
+ gitweb: Make the by_tag filter delve in forks as well
|
||||
+ gitweb: Support for tag clouds
|
||||
+ gitweb: Add support for extending the action bar with custom links
|
||||
+ gitweb: Sort the list of forks on the summary page by age
|
||||
+ gitweb: Clean-up sorting of project list
|
||||
|
||||
* ph/parseopt (Thu Oct 2 14:59:20 2008 +0200) 3 commits
|
||||
+ parse-opt: migrate builtin-merge-file.
|
||||
+ parse-opt: migrate git-merge-base.
|
||||
+ parse-opt: migrate fmt-merge-msg.
|
||||
|
||||
* rz/grepz (Wed Oct 1 18:11:15 2008 +0200) 1 commit
|
||||
+ git grep: Add "-z/--null" option as in GNU's grep.
|
||||
|
||||
* mv/merge-refresh (Fri Oct 3 15:02:31 2008 +0200) 1 commit
|
||||
+ builtin-merge: refresh the index before calling a strategy
|
||||
|
||||
* bc/xdiffnl (Wed Oct 1 14:28:26 2008 -0500) 1 commit
|
||||
+ xdiff-interface.c: strip newline (and cr) from line before pattern
|
||||
matching
|
||||
|
||||
* jk/maint-soliconv (Fri Oct 3 02:39:36 2008 -0400) 1 commit
|
||||
+ Makefile: do not set NEEDS_LIBICONV for Solaris 8
|
||||
|
||||
* sg/maint-intrebase-msghook (Fri Oct 3 11:33:20 2008 +0200) 2 commits
|
||||
+ rebase -i: remove leftover debugging
|
||||
+ rebase -i: proper prepare-commit-msg hook argument when squashing
|
||||
|
||||
* bc/maint-stashref (Thu Oct 2 18:52:11 2008 -0500) 1 commit
|
||||
+ git-stash.sh: fix flawed fix of invalid ref handling (commit
|
||||
da65e7c1)
|
||||
|
||||
The latter three were merged to 'maint' first.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Old New Topics]
|
||||
|
||||
* ns/rebase-noverify (Mon Oct 6 14:14:29 2008 +0900) 1 commit
|
||||
+ rebase --no-verify
|
||||
|
||||
This adds --no-verify to git rebase, to avoid the pre-rebase hook.
|
||||
Lacks documentation but otherwise looks sound.
|
||||
|
||||
* mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit
|
||||
+ builtin-commit: use reduce_heads() only when appropriate
|
||||
|
||||
Fixes "git merge --no-ff --no-commit".
|
||||
|
||||
* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit
|
||||
+ rebase: Support preserving merges in non-interactive mode
|
||||
|
||||
* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit
|
||||
- rebase--interactive: fix parent rewriting for dropped commits
|
||||
|
||||
A prior version of sh/rebase-i-p. This should be dropped.
|
||||
|
||||
* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit
|
||||
- Do not rename read-only files during a push
|
||||
|
||||
Supposedly fixes pack file renames on Windows, but it makes the
|
||||
test suite fail on Linux. I haven't debugged why yet. Its very
|
||||
likely we need a replacement patch before this can move forward.
|
||||
|
||||
* sp/describe-lwtag (Tue Sep 30 12:03:41 2008 -0700) 1 commit
|
||||
- describe: Make --tags and --all match lightweight tags more often
|
||||
|
||||
Based on feedback from the list this needs another spin. I will
|
||||
post a replacement patch soon.
|
||||
|
||||
* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit
|
||||
- format-patch: autonumber by default
|
||||
|
||||
Fails the test suite; some of the test vectors need to be updated
|
||||
to account for the new default. Someone who cares about this
|
||||
change should follow through on the test suite update, or this may
|
||||
get dropped.
|
||||
|
||||
* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
|
||||
. WIP: start teaching the --whitespace=fix to merge machinery
|
||||
|
||||
This has a merge conflict with `next` and isn't even in pu right now.
|
||||
|
||||
* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits
|
||||
- diff: add filter for converting binary to text
|
||||
- diff: introduce diff.<driver>.binary
|
||||
- diff: unify external diff and funcname parsing code
|
||||
- t4012: use test_cmp instead of cmp
|
||||
|
||||
A general cleanup on how diff drivers are implemented. Its still
|
||||
missing documentation updates and tests but doesn't break anything
|
||||
current as far as I can tell. It needs more review before it can
|
||||
be slated for 'next'.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stuck Topics]
|
||||
|
||||
* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
|
||||
- grep: skip files outside sparse checkout area
|
||||
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
- Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
- ls-files: Add tests for --sparse and friends
|
||||
- update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
- ls-files: add options to support sparse checkout
|
||||
- Introduce CE_NO_CHECKOUT bit
|
||||
- Extend index to save more flags
|
||||
|
||||
Recently updated with a repost. I've been too swamped at day-job
|
||||
to actively review the series. There has been some discussion on
|
||||
list about it so its not stalled, but it needs more eyeballs.
|
||||
|
||||
* gb/gitweb-pathinfo (Thu Oct 2 02:10:34 2008 +0200) 6 commits
|
||||
. gitweb: generate parent..current URLs
|
||||
. gitweb: parse parent..current syntax from pathinfo
|
||||
. gitweb: use_pathinfo filenames start with /
|
||||
. gitweb: generate project/action/hash URLs
|
||||
. gitweb: refactor input parameters parse/validation
|
||||
. gitweb: parse project/action/hash_base:filename PATH_INFO
|
||||
|
||||
Still going through revisions on the git ML. Its great work and
|
||||
is heading in the right direction. But the discussion and patch
|
||||
generation rate is too high to merge the topic into next just yet.
|
||||
|
||||
So its waiting for a re-roll of the series once discussion settles
|
||||
down and there is a final patch series available.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled -- Needs Action to Proceed (or to be dropped)]
|
||||
|
||||
* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
|
||||
- t7400: Add short "git submodule add" testsuite
|
||||
|
||||
Still waiting for a reroll. Should be dropped next week if we
|
||||
don't get one during this coming week.
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
- Use xdiff caching to improve git blame performance
|
||||
- Allow xdiff machinery to cache hash results for a file
|
||||
- Always initialize xpparam_t to 0
|
||||
- Bypass textual patch generation and parsing in git blame
|
||||
- Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
(jc: Réne had good comments on how the callback should be
|
||||
structured.)
|
||||
|
||||
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
|
||||
- git-am: Pass the --directory option through to git-apply
|
||||
|
||||
(jc: I think this is still buggy and drops the option when am stops
|
||||
with conflicts.)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will be merged to 'master/maint' soon]
|
||||
|
||||
* pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits
|
||||
+ tutorial: update output of git commit
|
||||
+ reformat informational commit message
|
||||
+ git commit: Reformat output somewhat
|
||||
+ builtin-commit.c: show on which branch a commit was added
|
||||
|
||||
I think this topic is settled for now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
|
||||
+ Documentation: Refer to git-rebase(1) to warn against rewriting
|
||||
+ Documentation: new upstream rebase recovery section in git-rebase
|
||||
|
||||
(jc: My impression from the last round of discusson on the third
|
||||
patch in this series (not queued here) was that as long as we
|
||||
do not present it as "One True Workflow", the description was
|
||||
a good starting point, possibly others to add other recommended
|
||||
flows later.)
|
||||
|
||||
An update came in recently, but I haven't applied it.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
(jc: I started making this incremental but the progress is not
|
||||
so great.)
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
(jc: The one at second from the tip needs reworking.)
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This is a great idea, but IIRC its implementation has a deadlock
|
||||
during communication between the peers. Someone needs to pick up
|
||||
this topic and resolve the deadlock before it can continue.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
(jc: This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.)
|
||||
@@ -1,223 +0,0 @@
|
||||
Subject: What's cooking in git.git (Oct 2008, #03; Tue, 14)
|
||||
X-master-at: 67faaaba8338cf59c212ce5239eeb223a77acdf0
|
||||
X-next-at: f1ba443bf7f7fae740f81058fca0bcff3613d999
|
||||
|
||||
What's cooking in git.git (Oct 2008, #03; Tue, 14)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
This round I haven't added anything new yet. Just getting my development
|
||||
repository back into shape and in sync with what I received from Shawn.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* js/maint-fetch-update-head (Mon Oct 13 11:36:52 2008 +0200) 1 commit
|
||||
- Fix fetch/pull when run without --update-head-ok
|
||||
|
||||
This looked sane to me.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stuck Topics]
|
||||
|
||||
* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
|
||||
- grep: skip files outside sparse checkout area
|
||||
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
- Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
- ls-files: Add tests for --sparse and friends
|
||||
- update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
- ls-files: add options to support sparse checkout
|
||||
- Introduce CE_NO_CHECKOUT bit
|
||||
- Extend index to save more flags
|
||||
|
||||
Recently updated with a repost. Shawn says he's been too swamped at
|
||||
day-job to actively review the series. There has been some discussion on
|
||||
list about it so its not stalled, but it needs more eyeballs.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled -- Needs Action to Proceed (or to be dropped)]
|
||||
|
||||
* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
|
||||
- t7400: Add short "git submodule add" testsuite
|
||||
|
||||
Still waiting for a reroll. Should be dropped next week if we don't
|
||||
get one during this coming week.
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
- Use xdiff caching to improve git blame performance
|
||||
- Allow xdiff machinery to cache hash results for a file
|
||||
- Always initialize xpparam_t to 0
|
||||
- Bypass textual patch generation and parsing in git blame
|
||||
- Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
Réne had good comments on how the callback should be structured.
|
||||
|
||||
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
|
||||
- git-am: Pass the --directory option through to git-apply
|
||||
|
||||
I think this is still buggy and drops the option when am stops with
|
||||
conflicts.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will be merged to 'master' soon]
|
||||
|
||||
* pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits
|
||||
+ tutorial: update output of git commit
|
||||
+ reformat informational commit message
|
||||
+ git commit: Reformat output somewhat
|
||||
+ builtin-commit.c: show on which branch a commit was added
|
||||
|
||||
Shawn thinks this topic is settled for now, and I see that the new output
|
||||
format does not bother me very much, so please expect this to be merged
|
||||
soon.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
|
||||
+ Documentation: Refer to git-rebase(1) to warn against rewriting
|
||||
+ Documentation: new upstream rebase recovery section in git-rebase
|
||||
|
||||
Shawn says that an update came in recently, but they are not here yet.
|
||||
I'd need to dig it up, but I haven't had time.
|
||||
|
||||
* ns/rebase-noverify (Mon Oct 6 14:14:29 2008 +0900) 1 commit
|
||||
+ rebase --no-verify
|
||||
|
||||
This adds --no-verify to git rebase, to avoid the pre-rebase hook. Lacks
|
||||
documentation but otherwise looks sound.
|
||||
|
||||
* mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit
|
||||
+ builtin-commit: use reduce_heads() only when appropriate
|
||||
|
||||
Fixes "git merge --no-ff --no-commit".
|
||||
|
||||
* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit
|
||||
+ rebase: Support preserving merges in non-interactive mode
|
||||
|
||||
* sh/rebase-i-p (Wed Oct 8 01:41:57 2008 -0500) 7 commits
|
||||
- rebase-i-p: if todo was reordered use HEAD as the rewritten parent
|
||||
- rebase-i-p: do not include non-first-parent commits touching
|
||||
UPSTREAM
|
||||
- rebase-i-p: only list commits that require rewriting in todo
|
||||
- rebase-i-p: fix 'no squashing merges' tripping up non-merges
|
||||
- rebase-i-p: delay saving current-commit to REWRITTEN if squashing
|
||||
- rebase-i-p: use HEAD for updating the ref instead of mapping
|
||||
OLDHEAD
|
||||
- rebase-i-p: test to exclude commits from todo based on its parents
|
||||
|
||||
Changes the `rebase -i -p` behavior to behave like git sequencer's
|
||||
rewrite of `rebase -i` would behave.
|
||||
|
||||
* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit
|
||||
. rebase--interactive: fix parent rewriting for dropped commits
|
||||
|
||||
Tentatively dropped from everwhere, waiting for a reroll together with
|
||||
sh/rebase-i-p.
|
||||
|
||||
* pb/rename-rowin32 (Sun Oct 12 21:01:23 2008 -0700) 2 commits
|
||||
- (squash): index-pack: do not unconditionally make packfile read-
|
||||
only
|
||||
- Do not rename read-only files during a push
|
||||
|
||||
Supposedly fixes pack file renames on Windows. The (squash) patch is my
|
||||
attempt to fix its breakage.
|
||||
|
||||
* sp/describe-lwtag (Mon Oct 13 07:39:46 2008 -0700) 1 commit
|
||||
- describe: Make --tags and --all match lightweight tags more often
|
||||
|
||||
When the user gives --tags, the request is asking to treat lightweight and
|
||||
annotated tags at equal weight, and if lightweight ones are closer, they
|
||||
should be used.
|
||||
|
||||
* gb/formatpatch-autonbr (Sun Oct 12 22:18:02 2008 -0700) 2 commits
|
||||
- (squash) adjust test vector for new behaviour of format-patch
|
||||
- format-patch: autonumber by default
|
||||
|
||||
* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits
|
||||
- diff: add filter for converting binary to text
|
||||
- diff: introduce diff.<driver>.binary
|
||||
- diff: unify external diff and funcname parsing code
|
||||
- t4012: use test_cmp instead of cmp
|
||||
|
||||
A general cleanup on how diff drivers are implemented. Its still
|
||||
missing documentation updates and tests but doesn't break anything
|
||||
current as far as I can tell. It needs more review before it can
|
||||
be slated for 'next'.
|
||||
|
||||
* dp/checkattr (Tue Oct 7 04:16:52 2008 +0400) 2 commits
|
||||
+ check-attr: Add --stdin option
|
||||
+ check-attr: add an internal check_attr() function
|
||||
|
||||
Batch attr lookup via --stdin, for gitk and git-gui.
|
||||
|
||||
* mv/clonev (Thu Oct 9 01:40:32 2008 +0200) 1 commit
|
||||
+ Implement git clone -v
|
||||
|
||||
Does what it says it does. This may be ready for master soon,
|
||||
its a pretty trivial change.
|
||||
|
||||
* gb/refactor-pathinfo (Fri Oct 10 20:42:26 2008 +0200) 1 commit
|
||||
+ gitweb: refactor input parameters parse/validation
|
||||
|
||||
A major cleanup on the way gitweb parses its input arguments.
|
||||
Future gitweb patches to add more arguments into the PATH_INFO
|
||||
depend upon this initial cleanup work.
|
||||
|
||||
* ml/cygwin-filemode (Mon Oct 13 00:33:31 2008 -0400) 1 commit
|
||||
- compat/cygwin.c - Use cygwin's stat if core.filemode == true
|
||||
|
||||
Is ready for 'next'.
|
||||
|
||||
* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
|
||||
- gitweb: Better processing format string in custom links in navbar
|
||||
|
||||
Waiting for some sort of response from Pasky.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
I started making this incremental but the progress is not
|
||||
so great.
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This seems to have a deadlock during communication between the peers.
|
||||
Someone needs to pick up this topic and resolve the deadlock before it can
|
||||
continue.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.
|
||||
@@ -1,233 +0,0 @@
|
||||
Subject: What's cooking in git.git (Oct 2008, #04; Sat, 18)
|
||||
X-master-at: 3041b98a9d40e5eb1aae9698c7e15c85ff37f344
|
||||
X-next-at: 8f0e41f379d486dd27766d84d994eb1da5b8319d
|
||||
|
||||
What's cooking in git.git (Oct 2008, #04; Sat, 18)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/gitweb-fix-cloud-tag (Tue Oct 14 21:27:12 2008 -0700) 1 commit
|
||||
+ Fix reading of cloud tags
|
||||
|
||||
* rs/alloc-ref (Sat Oct 18 10:44:18 2008 +0200) 3 commits
|
||||
+ make alloc_ref_from_str() the new alloc_ref()
|
||||
+ use alloc_ref_from_str() everywhere
|
||||
+ add alloc_ref_with_prefix()
|
||||
|
||||
* jc/maint-reset-remove-unmerged-new (Wed Oct 15 16:00:06 2008 -0700) 1 commit
|
||||
- reset --hard/read-tree --reset -u: remove unmerged new paths
|
||||
|
||||
* jk/fix-ls-files-other (Fri Oct 17 13:03:52 2008 -0700) 2 commits
|
||||
+ Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other
|
||||
+ refactor handling of "other" files in ls-files and status
|
||||
|
||||
* jc/maint-co-track (Fri Oct 17 15:44:39 2008 -0700) 4 commits
|
||||
- Fix checkout not to clobber the branch when using symlinked HEAD
|
||||
upon detaching
|
||||
- Enhance hold_lock_file_for_{update,append}() API
|
||||
- demonstrate breakage of detached checkout with symbolic link HEAD
|
||||
- Fix "checkout --track -b newbranch" on detached HEAD
|
||||
|
||||
* jk/maint-ls-files-other (Thu Oct 16 11:07:26 2008 -0400) 1 commit
|
||||
+ refactor handling of "other" files in ls-files and status
|
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
* np/index-pack (Fri Oct 17 15:57:58 2008 -0400) 2 commits
|
||||
+ index-pack: smarter memory usage during delta resolution
|
||||
+ index-pack: rationalize delta resolution code
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits
|
||||
+ tutorial: update output of git commit
|
||||
+ reformat informational commit message
|
||||
+ git commit: Reformat output somewhat
|
||||
+ builtin-commit.c: show on which branch a commit was added
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Needs review]
|
||||
|
||||
* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
|
||||
- grep: skip files outside sparse checkout area
|
||||
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
- Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
- ls-files: Add tests for --sparse and friends
|
||||
- update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
- ls-files: add options to support sparse checkout
|
||||
- Introduce CE_NO_CHECKOUT bit
|
||||
- Extend index to save more flags
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Dropped]
|
||||
|
||||
* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
|
||||
. t7400: Add short "git submodule add" testsuite
|
||||
|
||||
Was waiting for a reroll.
|
||||
|
||||
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
|
||||
. git-am: Pass the --directory option through to git-apply
|
||||
|
||||
I think this is still buggy and drops the option when am stops with
|
||||
conflicts.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
- Use xdiff caching to improve git blame performance
|
||||
- Allow xdiff machinery to cache hash results for a file
|
||||
- Always initialize xpparam_t to 0
|
||||
- Bypass textual patch generation and parsing in git blame
|
||||
- Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
Réne had good comments on how the callback should be structured.
|
||||
Waiting for a reroll.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will be merged to 'master' soon]
|
||||
|
||||
* js/maint-fetch-update-head (Tue Oct 14 15:32:20 2008 -0700) 2 commits
|
||||
+ pull: allow "git pull origin $something:$current_branch" into an
|
||||
unborn branch
|
||||
+ Fix fetch/pull when run without --update-head-ok
|
||||
|
||||
* ns/rebase-noverify (Tue Oct 14 08:17:16 2008 +0900) 2 commits
|
||||
+ rebase: Document --no-verify option to bypass pre-rebase hook
|
||||
+ rebase --no-verify
|
||||
|
||||
This adds --no-verify to git rebase, to avoid the pre-rebase hook.
|
||||
|
||||
* mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit
|
||||
+ builtin-commit: use reduce_heads() only when appropriate
|
||||
|
||||
Fixes "git merge --no-ff --no-commit".
|
||||
|
||||
* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit
|
||||
+ rebase: Support preserving merges in non-interactive mode
|
||||
|
||||
* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit
|
||||
+ Do not rename read-only files during a push
|
||||
|
||||
Fixes pack file renames on Windows.
|
||||
|
||||
* sp/describe-lwtag (Mon Oct 13 07:39:46 2008 -0700) 1 commit
|
||||
+ describe: Make --tags and --all match lightweight tags more often
|
||||
|
||||
When the user gives --tags, the request is asking to treat lightweight and
|
||||
annotated tags at equal weight, and if lightweight ones are closer, they
|
||||
should be used.
|
||||
|
||||
* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit
|
||||
+ format-patch: autonumber by default
|
||||
|
||||
* dp/checkattr (Wed Oct 15 09:11:52 2008 +0200) 3 commits
|
||||
+ git-check-attr(1): use 'verse' for multi-line synopsis sections
|
||||
+ check-attr: Add --stdin option
|
||||
+ check-attr: add an internal check_attr() function
|
||||
|
||||
Batch attr lookup via --stdin, for gitk and git-gui.
|
||||
|
||||
* gb/refactor-pathinfo (Fri Oct 10 20:42:26 2008 +0200) 1 commit
|
||||
+ gitweb: refactor input parameters parse/validation
|
||||
|
||||
A major cleanup on the way gitweb parses its input arguments.
|
||||
Future gitweb patches to add more arguments into the PATH_INFO
|
||||
depend upon this initial cleanup work.
|
||||
|
||||
* ml/cygwin-filemode (Mon Oct 13 00:33:31 2008 -0400) 1 commit
|
||||
+ compat/cygwin.c - Use cygwin's stat if core.filemode == true
|
||||
|
||||
* mv/clonev (Thu Oct 9 01:40:32 2008 +0200) 1 commit
|
||||
+ Implement git clone -v
|
||||
|
||||
Does what it says it does. This may be ready for master soon,
|
||||
its a pretty trivial change.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
|
||||
+ Documentation: Refer to git-rebase(1) to warn against rewriting
|
||||
+ Documentation: new upstream rebase recovery section in git-rebase
|
||||
|
||||
Expecting an update.
|
||||
|
||||
* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit
|
||||
+ rebase--interactive: fix parent rewriting for dropped commits
|
||||
|
||||
* sh/rebase-i-p (Wed Oct 15 02:44:40 2008 -0500) 8 commits
|
||||
- rebase-i-p: if todo was reordered use HEAD as the rewritten parent
|
||||
- rebase-i-p: do not include non-first-parent commits touching
|
||||
UPSTREAM
|
||||
- rebase-i-p: only list commits that require rewriting in todo
|
||||
- rebase-i-p: fix 'no squashing merges' tripping up non-merges
|
||||
- rebase-i-p: delay saving current-commit to REWRITTEN if squashing
|
||||
- rebase-i-p: use HEAD for updating the ref instead of mapping
|
||||
OLDHEAD
|
||||
- rebase-i-p: test to exclude commits from todo based on its parents
|
||||
+ rebase--interactive: fix parent rewriting for dropped commits
|
||||
|
||||
Changes the `rebase -i -p` behavior to behave like git sequencer's
|
||||
rewrite of `rebase -i` would behave.
|
||||
|
||||
* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits
|
||||
+ diff: add filter for converting binary to text
|
||||
+ diff: introduce diff.<driver>.binary
|
||||
+ diff: unify external diff and funcname parsing code
|
||||
+ t4012: use test_cmp instead of cmp
|
||||
|
||||
A general cleanup on how diff drivers are implemented. Its still
|
||||
missing documentation updates and tests but doesn't break anything
|
||||
current as far as I can tell.
|
||||
|
||||
* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
|
||||
- gitweb: Better processing format string in custom links in navbar
|
||||
|
||||
Waiting for some sort of response from Pasky.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
I started making this incremental but the progress is not
|
||||
so great.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This seems to have a deadlock during communication between the peers.
|
||||
Someone needs to pick up this topic and resolve the deadlock before it can
|
||||
continue.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.
|
||||
@@ -1,247 +0,0 @@
|
||||
Subject: What's cooking in git.git (Oct 2008, #05; Wed, 22)
|
||||
X-master-at: 759ad19e772a79a2a5ae6b7377d57eb21d29e6a0
|
||||
X-next-at: 6ea41095c3a924d4f7d4e9d3f61fb472507612c8
|
||||
|
||||
What's cooking in git.git (Oct 2008, #05; Wed, 22)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* cj/maint-gitpm-fix-maybe-self (Sat Oct 18 20:25:12 2008 +0200) 1 commit
|
||||
+ Git.pm: do not break inheritance
|
||||
|
||||
Looked Ok; will be in 'master' soon.
|
||||
|
||||
* gb/gitweb-pathinfo (Tue Oct 21 21:34:54 2008 +0200) 5 commits
|
||||
- gitweb: generate parent..current URLs
|
||||
- gitweb: parse parent..current syntax from PATH_INFO
|
||||
- gitweb: use_pathinfo filenames start with /
|
||||
- gitweb: generate project/action/hash URLs
|
||||
- gitweb: parse project/action/hash_base:filename PATH_INFO
|
||||
|
||||
Seventh iteration; hopefully the usual gitweb gangs will give quick
|
||||
comments and ack to push this out to 'next' soon.
|
||||
|
||||
* ag/blame-encoding (Wed Oct 22 00:55:57 2008 +0400) 1 commit
|
||||
+ builtin-blame: Reencode commit messages according to git-log
|
||||
rules.
|
||||
|
||||
Looked Ok; will be in 'master' soon.
|
||||
|
||||
* mv/parseopt-checkout-index (Sat Oct 18 03:17:23 2008 +0200) 1 commit
|
||||
+ parse-opt: migrate builtin-checkout-index.
|
||||
|
||||
Looked Ok; will be in 'master' soon.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* rs/alloc-ref (Sat Oct 18 10:44:18 2008 +0200) 3 commits
|
||||
+ make alloc_ref_from_str() the new alloc_ref()
|
||||
+ use alloc_ref_from_str() everywhere
|
||||
+ add alloc_ref_with_prefix()
|
||||
|
||||
* jc/maint-reset-remove-unmerged-new (Wed Oct 15 16:00:06 2008 -0700) 1 commit
|
||||
+ reset --hard/read-tree --reset -u: remove unmerged new paths
|
||||
|
||||
Teaches "reset --hard" to remove new paths in conflict.
|
||||
|
||||
* jk/fix-ls-files-other (Fri Oct 17 13:03:52 2008 -0700) 2 commits
|
||||
+ Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other
|
||||
+ refactor handling of "other" files in ls-files and status
|
||||
|
||||
* jc/maint-co-track (Fri Oct 17 15:44:39 2008 -0700) 4 commits
|
||||
+ Fix checkout not to clobber the branch when using symlinked HEAD
|
||||
upon detaching
|
||||
+ Enhance hold_lock_file_for_{update,append}() API
|
||||
+ demonstrate breakage of detached checkout with symbolic link HEAD
|
||||
+ Fix "checkout --track -b newbranch" on detached HEAD
|
||||
|
||||
* jk/maint-ls-files-other (Thu Oct 16 11:07:26 2008 -0400) 1 commit
|
||||
+ refactor handling of "other" files in ls-files and status
|
||||
|
||||
* pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits
|
||||
+ tutorial: update output of git commit
|
||||
+ reformat informational commit message
|
||||
+ git commit: Reformat output somewhat
|
||||
+ builtin-commit.c: show on which branch a commit was added
|
||||
|
||||
* js/maint-fetch-update-head (Tue Oct 14 15:32:20 2008 -0700) 2 commits
|
||||
+ pull: allow "git pull origin $something:$current_branch" into an
|
||||
unborn branch
|
||||
+ Fix fetch/pull when run without --update-head-ok
|
||||
|
||||
* ns/rebase-noverify (Tue Oct 14 08:17:16 2008 +0900) 2 commits
|
||||
+ rebase: Document --no-verify option to bypass pre-rebase hook
|
||||
+ rebase --no-verify
|
||||
|
||||
This adds --no-verify to git rebase, to avoid the pre-rebase hook.
|
||||
|
||||
* mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit
|
||||
+ builtin-commit: use reduce_heads() only when appropriate
|
||||
|
||||
Fixes "git merge --no-ff --no-commit".
|
||||
|
||||
* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit
|
||||
+ rebase: Support preserving merges in non-interactive mode
|
||||
|
||||
* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit
|
||||
+ Do not rename read-only files during a push
|
||||
|
||||
Fixes pack file renames on Windows.
|
||||
|
||||
* sp/describe-lwtag (Mon Oct 13 07:39:46 2008 -0700) 1 commit
|
||||
+ describe: Make --tags and --all match lightweight tags more often
|
||||
|
||||
When the user gives --tags, the request is asking to treat lightweight and
|
||||
annotated tags at equal weight, and if lightweight ones are closer, they
|
||||
should be used.
|
||||
|
||||
* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit
|
||||
+ format-patch: autonumber by default
|
||||
|
||||
* dp/checkattr (Wed Oct 15 09:11:52 2008 +0200) 3 commits
|
||||
+ git-check-attr(1): use 'verse' for multi-line synopsis sections
|
||||
+ check-attr: Add --stdin option
|
||||
+ check-attr: add an internal check_attr() function
|
||||
|
||||
Batch attr lookup via --stdin, for gitk and git-gui.
|
||||
|
||||
* gb/refactor-pathinfo (Fri Oct 10 20:42:26 2008 +0200) 1 commit
|
||||
+ gitweb: refactor input parameters parse/validation
|
||||
|
||||
A major cleanup on the way gitweb parses its input arguments.
|
||||
Future gitweb patches to add more arguments into the PATH_INFO
|
||||
depend upon this initial cleanup work.
|
||||
|
||||
* ml/cygwin-filemode (Mon Oct 13 00:33:31 2008 -0400) 1 commit
|
||||
+ compat/cygwin.c - Use cygwin's stat if core.filemode == true
|
||||
|
||||
* mv/clonev (Thu Oct 9 01:40:32 2008 +0200) 1 commit
|
||||
+ Implement git clone -v
|
||||
|
||||
Does what it says it does. This may be ready for master soon,
|
||||
its a pretty trivial change.
|
||||
|
||||
* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
|
||||
+ Documentation: Refer to git-rebase(1) to warn against rewriting
|
||||
+ Documentation: new upstream rebase recovery section in git-rebase
|
||||
|
||||
Also the workflow document itself is now in 'master'.
|
||||
|
||||
* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit
|
||||
+ rebase--interactive: fix parent rewriting for dropped commits
|
||||
|
||||
* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits
|
||||
+ diff: add filter for converting binary to text
|
||||
+ diff: introduce diff.<driver>.binary
|
||||
+ diff: unify external diff and funcname parsing code
|
||||
+ t4012: use test_cmp instead of cmp
|
||||
|
||||
A general cleanup on how diff drivers are implemented. Its still
|
||||
missing documentation updates and tests but doesn't break anything
|
||||
current as far as I can tell.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
|
||||
- grep: skip files outside sparse checkout area
|
||||
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
- Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
- ls-files: Add tests for --sparse and friends
|
||||
- update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
- ls-files: add options to support sparse checkout
|
||||
- Introduce CE_NO_CHECKOUT bit
|
||||
- Extend index to save more flags
|
||||
|
||||
Needs review.
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
- Use xdiff caching to improve git blame performance
|
||||
- Allow xdiff machinery to cache hash results for a file
|
||||
- Always initialize xpparam_t to 0
|
||||
- Bypass textual patch generation and parsing in git blame
|
||||
- Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
Réne had good comments on how the callback should be structured.
|
||||
Waiting for a reroll.
|
||||
|
||||
* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
|
||||
- gitweb: Better processing format string in custom links in navbar
|
||||
|
||||
Waiting for some sort of response from Pasky.
|
||||
|
||||
* jc/gitweb-fix-cloud-tag (Tue Oct 14 21:27:12 2008 -0700) 1 commit
|
||||
+ Fix reading of cloud tags
|
||||
|
||||
Request-for-review-and-ack sent; waiting for response.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* np/index-pack (Wed Oct 22 20:59:22 2008 -0400) 4 commits
|
||||
- improve index-pack tests
|
||||
+ fix multiple issues in index-pack
|
||||
+ index-pack: smarter memory usage during delta resolution
|
||||
+ index-pack: rationalize delta resolution code
|
||||
|
||||
The buglets that caused people on 'next' some surprises are quickly
|
||||
killed. Thanks.
|
||||
|
||||
* sh/rebase-i-p (Wed Oct 22 11:59:30 2008 -0700) 9 commits
|
||||
+ git-rebase--interactive.sh: comparision with == is bashism
|
||||
+ rebase-i-p: minimum fix to obvious issues
|
||||
+ rebase-i-p: if todo was reordered use HEAD as the rewritten parent
|
||||
+ rebase-i-p: do not include non-first-parent commits touching
|
||||
UPSTREAM
|
||||
+ rebase-i-p: only list commits that require rewriting in todo
|
||||
+ rebase-i-p: fix 'no squashing merges' tripping up non-merges
|
||||
+ rebase-i-p: delay saving current-commit to REWRITTEN if squashing
|
||||
+ rebase-i-p: use HEAD for updating the ref instead of mapping
|
||||
OLDHEAD
|
||||
+ rebase-i-p: test to exclude commits from todo based on its parents
|
||||
|
||||
Changes the `rebase -i -p` behavior to behave like git sequencer's
|
||||
rewrite of `rebase -i` would behave.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
- revision --simplify-merges: incremental simplification
|
||||
- revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
I started making this incremental but the progress is not
|
||||
so great.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This seems to have a deadlock during communication between the peers.
|
||||
Someone needs to pick up this topic and resolve the deadlock before it can
|
||||
continue.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.
|
||||
@@ -1,200 +0,0 @@
|
||||
Subject: What's cooking in git.git (Nov 2008, #01; Sun, 02)
|
||||
X-master-at: 6a509a6f7f38906996ac791449d5bcc2f32eef23
|
||||
X-next-at: d8fa4e31e3b8200edfff5aad88f249208cc0c5ae
|
||||
cc: "David M. Syzdek" <david.syzdek@acsalaska.net>, pasky@suse.cz
|
||||
|
||||
What's cooking in git.git (Nov 2008, #01; Sun, 02)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* mv/maint-branch-m-symref (Sat Nov 1 00:25:44 2008 +0100) 5 commits
|
||||
+ update-ref --no-deref -d: handle the case when the pointed ref is
|
||||
packed
|
||||
+ git branch -m: forbid renaming of a symref
|
||||
+ Fix git update-ref --no-deref -d.
|
||||
+ rename_ref(): handle the case when the reflog of a ref does not
|
||||
exist
|
||||
+ Fix git branch -m for symrefs.
|
||||
|
||||
* rs/blame (Sat Oct 25 15:31:36 2008 +0200) 5 commits
|
||||
- blame: use xdi_diff_hunks(), get rid of struct patch
|
||||
- add xdi_diff_hunks() for callers that only need hunk lengths
|
||||
- Allow alternate "low-level" emit function from xdl_diff
|
||||
- Always initialize xpparam_t to 0
|
||||
- blame: inline get_patch()
|
||||
|
||||
* ds/uintmax-config (Sun Oct 26 03:52:47 2008 -0800) 2 commits
|
||||
- Add Makefile check for FreeBSD 4.9-SECURITY
|
||||
- Build: add NO_UINTMAX_T to support ancient systems
|
||||
|
||||
I amended the topmost one to widen the applicability of this new feature
|
||||
to all FreeBSD 4.*, not limited to 4.9-SECURITY; testing before this hits
|
||||
'next' is appreciated.
|
||||
|
||||
* ds/autoconf (Sun Nov 2 01:04:46 2008 -0700) 2 commits
|
||||
- DONTMERGE: fixup with a convenience macro
|
||||
- autoconf: Add link tests to each AC_CHECK_FUNC() test
|
||||
|
||||
The topmost one is my attempt to simplify the new way of checking; the
|
||||
resulting configure.ac produces the identical configure script with or
|
||||
without it, so I think it is Ok, but testing before this hits 'next' is
|
||||
appreciated. If all goes well, I think the two should be squashed into
|
||||
one patch.
|
||||
|
||||
* jk/diff-convfilter-test-fix (Fri Oct 31 01:09:13 2008 -0400) 4 commits
|
||||
+ Avoid using non-portable `echo -n` in tests.
|
||||
+ add userdiff textconv tests
|
||||
+ document the diff driver textconv feature
|
||||
+ diff: add missing static declaration
|
||||
|
||||
* ar/maint-mksnpath (Mon Oct 27 11:22:09 2008 +0100) 7 commits
|
||||
+ Use git_pathdup instead of xstrdup(git_path(...))
|
||||
+ git_pathdup: returns xstrdup-ed copy of the formatted path
|
||||
+ Fix potentially dangerous use of git_path in ref.c
|
||||
+ Add git_snpath: a .git path formatting routine with output buffer
|
||||
+ Fix potentially dangerous uses of mkpath and git_path
|
||||
+ Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c
|
||||
+ Add mksnpath which allows you to specify the output buffer
|
||||
|
||||
* ar/mksnpath (Thu Oct 30 18:08:58 2008 -0700) 10 commits
|
||||
+ Merge branch 'ar/maint-mksnpath' into ar/mksnpath
|
||||
+ Use git_pathdup instead of xstrdup(git_path(...))
|
||||
+ git_pathdup: returns xstrdup-ed copy of the formatted path
|
||||
+ Fix potentially dangerous use of git_path in ref.c
|
||||
+ Add git_snpath: a .git path formatting routine with output buffer
|
||||
+ Fix potentially dangerous uses of mkpath and git_path
|
||||
+ Merge branch 'ar/maint-mksnpath' into HEAD
|
||||
+ Fix potentially dangerous uses of mkpath and git_path
|
||||
+ Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c
|
||||
+ Add mksnpath which allows you to specify the output buffer
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will be merged to 'master' soon]
|
||||
|
||||
* cj/maint-gitpm-fix-maybe-self (Sat Oct 18 20:25:12 2008 +0200) 1 commit
|
||||
+ Git.pm: do not break inheritance
|
||||
|
||||
Looked Ok; will be in 'master' soon.
|
||||
|
||||
* gb/gitweb-pathinfo (Tue Oct 21 21:34:54 2008 +0200) 5 commits
|
||||
+ gitweb: generate parent..current URLs
|
||||
+ gitweb: parse parent..current syntax from PATH_INFO
|
||||
+ gitweb: use_pathinfo filenames start with /
|
||||
+ gitweb: generate project/action/hash URLs
|
||||
+ gitweb: parse project/action/hash_base:filename PATH_INFO
|
||||
|
||||
Seventh iteration.
|
||||
|
||||
* ag/blame-encoding (Wed Oct 22 00:55:57 2008 +0400) 1 commit
|
||||
+ builtin-blame: Reencode commit messages according to git-log
|
||||
rules.
|
||||
|
||||
Looked Ok; will be in 'master' soon.
|
||||
|
||||
* mv/parseopt-checkout-index (Sat Oct 18 03:17:23 2008 +0200) 1 commit
|
||||
+ parse-opt: migrate builtin-checkout-index.
|
||||
|
||||
Looked Ok; will be in 'master' soon.
|
||||
|
||||
* sh/rebase-i-p (Wed Oct 22 11:59:30 2008 -0700) 9 commits
|
||||
+ git-rebase--interactive.sh: comparision with == is bashism
|
||||
+ rebase-i-p: minimum fix to obvious issues
|
||||
+ rebase-i-p: if todo was reordered use HEAD as the rewritten parent
|
||||
+ rebase-i-p: do not include non-first-parent commits touching
|
||||
UPSTREAM
|
||||
+ rebase-i-p: only list commits that require rewriting in todo
|
||||
+ rebase-i-p: fix 'no squashing merges' tripping up non-merges
|
||||
+ rebase-i-p: delay saving current-commit to REWRITTEN if squashing
|
||||
+ rebase-i-p: use HEAD for updating the ref instead of mapping
|
||||
OLDHEAD
|
||||
+ rebase-i-p: test to exclude commits from todo based on its parents
|
||||
|
||||
Changes the `rebase -i -p` behavior to behave like git sequencer's
|
||||
rewrite of `rebase -i` would behave.
|
||||
|
||||
* np/index-pack (Thu Oct 23 15:05:59 2008 -0400) 5 commits
|
||||
+ index-pack: don't leak leaf delta result
|
||||
+ improve index-pack tests
|
||||
+ fix multiple issues in index-pack
|
||||
+ index-pack: smarter memory usage during delta resolution
|
||||
+ index-pack: rationalize delta resolution code
|
||||
|
||||
The buglets that caused people on 'next' some surprises are quickly
|
||||
killed. Thanks.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* jk/diff-convfilter (Sun Oct 26 00:50:02 2008 -0400) 8 commits
|
||||
- enable textconv for diff in verbose status/commit
|
||||
- wt-status: load diff ui config
|
||||
|
||||
* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
|
||||
- grep: skip files outside sparse checkout area
|
||||
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
- Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
- ls-files: Add tests for --sparse and friends
|
||||
- update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
- ls-files: add options to support sparse checkout
|
||||
- Introduce CE_NO_CHECKOUT bit
|
||||
- Extend index to save more flags
|
||||
|
||||
Needs review.
|
||||
|
||||
* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
|
||||
- gitweb: Better processing format string in custom links in navbar
|
||||
|
||||
Waiting for some sort of response from Pasky.
|
||||
|
||||
* jc/gitweb-fix-cloud-tag (Tue Oct 14 21:27:12 2008 -0700) 1 commit
|
||||
+ Fix reading of cloud tags
|
||||
|
||||
Request-for-review-and-ack sent; still waiting for response.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Dropped]
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
. Use xdiff caching to improve git blame performance
|
||||
. Allow xdiff machinery to cache hash results for a file
|
||||
. Always initialize xpparam_t to 0
|
||||
. Bypass textual patch generation and parsing in git blame
|
||||
. Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
Réne started code restructuring, which is queued to 'pu'; this series is
|
||||
dropped.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This seems to have a deadlock during communication between the peers.
|
||||
Someone needs to pick up this topic and resolve the deadlock before it can
|
||||
continue.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
- git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.
|
||||
@@ -1,226 +0,0 @@
|
||||
Subject: What's cooking in git.git (Nov 2008, #02; Wed, 05)
|
||||
X-master-at: 6331adb9c4ec36c70dc3ecc6eb46b7dddb36952d
|
||||
X-next-at: f3cb49705482a19c16f6c9f5b6dab6181cc656d2
|
||||
|
||||
What's cooking in git.git (Nov 2008, #02; Wed, 05)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* gb/gitweb-snapshot-pathinfo (Sun Nov 2 10:21:39 2008 +0100) 3 commits
|
||||
- gitweb: embed snapshot format parameter in PATH_INFO
|
||||
- gitweb: retrieve snapshot format from PATH_INFO
|
||||
- gitweb: make the supported snapshot formats array global
|
||||
|
||||
Waiting for re-Ack.
|
||||
|
||||
* bc/maint-keep-pack (Mon Nov 3 14:43:22 2008 -0600) 3 commits
|
||||
- pack-objects: honor '.keep' files
|
||||
- packed_git: convert pack_local flag into a bitfield and add
|
||||
pack_keep
|
||||
- t7700: demonstrate mishandling of objects in packs with a .keep
|
||||
file
|
||||
|
||||
* st/tag (Wed Nov 5 00:20:36 2008 +0100) 2 commits
|
||||
- tag: Add more tests about mixing incompatible modes and options
|
||||
- tag: Check that options are only allowed in the appropriate mode
|
||||
|
||||
* np/pack-safer (Wed Oct 29 19:02:52 2008 -0400) 9 commits
|
||||
- pack-objects: don't leak pack window reference when splitting
|
||||
packs
|
||||
- extend test coverage for latest pack corruption resilience
|
||||
improvements
|
||||
- pack-objects: allow "fixing" a corrupted pack without a full
|
||||
repack
|
||||
- make find_pack_revindex() aware of the nasty world
|
||||
- make check_object() resilient to pack corruptions
|
||||
- make packed_object_info() resilient to pack corruptions
|
||||
- make unpack_object_header() non fatal
|
||||
- better validation on delta base object offsets
|
||||
- close another possibility for propagating pack corruption
|
||||
|
||||
* mv/remote-rename (Mon Nov 3 19:26:18 2008 +0100) 1 commit
|
||||
. Implement git remote rename
|
||||
|
||||
* lt/decorate (Mon Nov 3 11:25:46 2008 -0800) 4 commits
|
||||
+ revision traversal: '--simplify-by-decoration'
|
||||
+ Make '--decorate' set an explicit 'show_decorations' flag
|
||||
+ revision: make tree comparison functions take commits rather than
|
||||
trees
|
||||
+ Add a 'source' decorator for commits
|
||||
|
||||
* cb/maint-update-ref-fix (Wed Nov 5 21:55:54 2008 +0100) 2 commits
|
||||
+ push: fix local refs update if already up-to-date
|
||||
+ do not force write of packed refs
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* mv/maint-branch-m-symref (Sat Nov 1 00:25:44 2008 +0100) 5 commits
|
||||
+ update-ref --no-deref -d: handle the case when the pointed ref is
|
||||
packed
|
||||
+ git branch -m: forbid renaming of a symref
|
||||
+ Fix git update-ref --no-deref -d.
|
||||
+ rename_ref(): handle the case when the reflog of a ref does not
|
||||
exist
|
||||
+ Fix git branch -m for symrefs.
|
||||
|
||||
Will merge down to 'maint' in the next round.
|
||||
|
||||
* ar/maint-mksnpath (Mon Oct 27 11:22:09 2008 +0100) 7 commits
|
||||
+ Use git_pathdup instead of xstrdup(git_path(...))
|
||||
+ git_pathdup: returns xstrdup-ed copy of the formatted path
|
||||
+ Fix potentially dangerous use of git_path in ref.c
|
||||
+ Add git_snpath: a .git path formatting routine with output buffer
|
||||
+ Fix potentially dangerous uses of mkpath and git_path
|
||||
+ Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c
|
||||
+ Add mksnpath which allows you to specify the output buffer
|
||||
|
||||
Will merge down to 'maint' in the next round.
|
||||
|
||||
* cj/maint-gitpm-fix-maybe-self (Sat Oct 18 20:25:12 2008 +0200) 1 commit
|
||||
+ Git.pm: do not break inheritance
|
||||
|
||||
Will merge down to 'maint' in the next round.
|
||||
|
||||
* gb/gitweb-pathinfo (Tue Oct 21 21:34:54 2008 +0200) 5 commits
|
||||
+ gitweb: generate parent..current URLs
|
||||
+ gitweb: parse parent..current syntax from PATH_INFO
|
||||
+ gitweb: use_pathinfo filenames start with /
|
||||
+ gitweb: generate project/action/hash URLs
|
||||
+ gitweb: parse project/action/hash_base:filename PATH_INFO
|
||||
|
||||
Seventh iteration.
|
||||
|
||||
* ag/blame-encoding (Wed Oct 22 00:55:57 2008 +0400) 1 commit
|
||||
+ builtin-blame: Reencode commit messages according to git-log
|
||||
rules.
|
||||
|
||||
* mv/parseopt-checkout-index (Sat Oct 18 03:17:23 2008 +0200) 1 commit
|
||||
+ parse-opt: migrate builtin-checkout-index.
|
||||
|
||||
* sh/rebase-i-p (Wed Oct 22 11:59:30 2008 -0700) 9 commits
|
||||
+ git-rebase--interactive.sh: comparision with == is bashism
|
||||
+ rebase-i-p: minimum fix to obvious issues
|
||||
+ rebase-i-p: if todo was reordered use HEAD as the rewritten parent
|
||||
+ rebase-i-p: do not include non-first-parent commits touching
|
||||
UPSTREAM
|
||||
+ rebase-i-p: only list commits that require rewriting in todo
|
||||
+ rebase-i-p: fix 'no squashing merges' tripping up non-merges
|
||||
+ rebase-i-p: delay saving current-commit to REWRITTEN if squashing
|
||||
+ rebase-i-p: use HEAD for updating the ref instead of mapping
|
||||
OLDHEAD
|
||||
+ rebase-i-p: test to exclude commits from todo based on its parents
|
||||
|
||||
Changes the `rebase -i -p` behavior to behave like git sequencer's
|
||||
rewrite of `rebase -i` would behave.
|
||||
|
||||
* np/index-pack (Thu Oct 23 15:05:59 2008 -0400) 5 commits
|
||||
+ index-pack: don't leak leaf delta result
|
||||
+ improve index-pack tests
|
||||
+ fix multiple issues in index-pack
|
||||
+ index-pack: smarter memory usage during delta resolution
|
||||
+ index-pack: rationalize delta resolution code
|
||||
|
||||
The buglets that caused people on 'next' some surprises are quickly
|
||||
killed. Thanks.
|
||||
|
||||
* jc/gitweb-fix-cloud-tag (Tue Oct 14 21:27:12 2008 -0700) 1 commit
|
||||
+ Fix reading of cloud tags
|
||||
|
||||
Got tired of waiting for an Ack.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* rs/blame (Sat Oct 25 15:31:36 2008 +0200) 5 commits
|
||||
+ blame: use xdi_diff_hunks(), get rid of struct patch
|
||||
+ add xdi_diff_hunks() for callers that only need hunk lengths
|
||||
+ Allow alternate "low-level" emit function from xdl_diff
|
||||
+ Always initialize xpparam_t to 0
|
||||
+ blame: inline get_patch()
|
||||
|
||||
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 4 commits
|
||||
. [WaitForResponse] Add autoconf tests for pthreads
|
||||
+ Make Pthread link flags configurable
|
||||
+ Add Makefile check for FreeBSD 4.9-SECURITY
|
||||
+ Build: add NO_UINTMAX_T to support ancient systems
|
||||
|
||||
The topmost one unconditionally enables threaded delta search on any
|
||||
platform on which Pthread library is detected to be available, which
|
||||
may not be what we want.
|
||||
|
||||
* ds/autoconf (Sun Oct 26 03:52:19 2008 -0800) 1 commit
|
||||
+ autoconf: Add link tests to each AC_CHECK_FUNC() test
|
||||
|
||||
Attempts to help FreeBSD whose compiler does not error out when told to
|
||||
compile a program that calls unavailable functions.
|
||||
|
||||
* jk/diff-convfilter (Sun Oct 26 00:50:02 2008 -0400) 8 commits
|
||||
+ enable textconv for diff in verbose status/commit
|
||||
+ wt-status: load diff ui config
|
||||
+ only textconv regular files
|
||||
+ userdiff: require explicitly allowing textconv
|
||||
+ refactor userdiff textconv code
|
||||
+ add userdiff textconv tests
|
||||
+ document the diff driver textconv feature
|
||||
+ diff: add missing static declaration
|
||||
|
||||
* jk/diff-convfilter-test-fix (Fri Oct 31 01:09:13 2008 -0400) 1 commit
|
||||
+ Avoid using non-portable `echo -n` in tests.
|
||||
|
||||
An update to the one above.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
|
||||
- grep: skip files outside sparse checkout area
|
||||
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
- Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
- ls-files: Add tests for --sparse and friends
|
||||
- update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
- ls-files: add options to support sparse checkout
|
||||
- Introduce CE_NO_CHECKOUT bit
|
||||
- Extend index to save more flags
|
||||
|
||||
Needs review.
|
||||
|
||||
* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
|
||||
- gitweb: Better processing format string in custom links in navbar
|
||||
|
||||
Waiting for some sort of response from Pasky.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This seems to have a deadlock during communication between the peers.
|
||||
Someone needs to pick up this topic and resolve the deadlock before it can
|
||||
continue.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.
|
||||
@@ -1,171 +0,0 @@
|
||||
Subject: What's cooking in git.git (Nov 2008, #03; Sun, 09)
|
||||
X-master-at: a9645b780b698703cd7dee25051d6ce39b0544c6
|
||||
X-next-at: aca556e49fea7423c223973632ed9b94c03b19eb
|
||||
|
||||
What's cooking in git.git (Nov 2008, #03; Sun, 09)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jk/deny-push-to-current (Sat Nov 8 20:49:27 2008 -0500) 2 commits
|
||||
+ receive-pack: detect push to current branch of non-bare repo
|
||||
+ t5516: refactor oddball tests
|
||||
|
||||
* dl/xdiff (Fri Nov 7 21:24:33 2008 -0800) 1 commit
|
||||
+ xdiff: give up scanning similar lines early
|
||||
|
||||
This performance fix may eventually need to be cherry-picked to 'maint'.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* cb/maint-update-ref-fix (Wed Nov 5 21:55:54 2008 +0100) 2 commits
|
||||
+ push: fix local refs update if already up-to-date
|
||||
+ do not force write of packed refs
|
||||
|
||||
* rs/blame (Sat Oct 25 15:31:36 2008 +0200) 5 commits
|
||||
+ blame: use xdi_diff_hunks(), get rid of struct patch
|
||||
+ add xdi_diff_hunks() for callers that only need hunk lengths
|
||||
+ Allow alternate "low-level" emit function from xdl_diff
|
||||
+ Always initialize xpparam_t to 0
|
||||
+ blame: inline get_patch()
|
||||
|
||||
* ds/autoconf (Sun Oct 26 03:52:19 2008 -0800) 1 commit
|
||||
+ autoconf: Add link tests to each AC_CHECK_FUNC() test
|
||||
|
||||
Attempts to help FreeBSD whose compiler does not error out when told to
|
||||
compile a program that calls unavailable functions.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* gb/gitweb-snapshot-pathinfo (Sun Nov 2 10:21:39 2008 +0100) 3 commits
|
||||
+ gitweb: embed snapshot format parameter in PATH_INFO
|
||||
+ gitweb: retrieve snapshot format from PATH_INFO
|
||||
+ gitweb: make the supported snapshot formats array global
|
||||
|
||||
Got sick of waiting for re-Ack. Merged to 'next'.
|
||||
|
||||
* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
|
||||
+ gitweb: Better processing format string in custom links in navbar
|
||||
|
||||
Got sick of waiting for some sort of response from Pasky. Merged to 'next'.
|
||||
|
||||
* st/tag (Wed Nov 5 00:20:36 2008 +0100) 2 commits
|
||||
+ tag: Add more tests about mixing incompatible modes and options
|
||||
+ tag: Check that options are only allowed in the appropriate mode
|
||||
|
||||
* np/pack-safer (Sun Nov 9 13:11:06 2008 -0800) 11 commits
|
||||
+ t5303: fix printf format string for portability
|
||||
+ t5303: work around printf breakage in dash
|
||||
+ pack-objects: don't leak pack window reference when splitting
|
||||
packs
|
||||
+ extend test coverage for latest pack corruption resilience
|
||||
improvements
|
||||
+ pack-objects: allow "fixing" a corrupted pack without a full
|
||||
repack
|
||||
+ make find_pack_revindex() aware of the nasty world
|
||||
+ make check_object() resilient to pack corruptions
|
||||
+ make packed_object_info() resilient to pack corruptions
|
||||
+ make unpack_object_header() non fatal
|
||||
+ better validation on delta base object offsets
|
||||
+ close another possibility for propagating pack corruption
|
||||
|
||||
* mv/remote-rename (Mon Nov 3 19:26:18 2008 +0100) 1 commit
|
||||
+ Implement git remote rename
|
||||
|
||||
* lt/decorate (Mon Nov 3 11:25:46 2008 -0800) 4 commits
|
||||
+ revision traversal: '--simplify-by-decoration'
|
||||
+ Make '--decorate' set an explicit 'show_decorations' flag
|
||||
+ revision: make tree comparison functions take commits rather than
|
||||
trees
|
||||
+ Add a 'source' decorator for commits
|
||||
|
||||
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 5 commits
|
||||
- autoconf: Enable threaded delta search when pthreads are supported
|
||||
+ Add autoconf tests for pthreads
|
||||
+ Make Pthread link flags configurable
|
||||
+ Add Makefile check for FreeBSD 4.9-SECURITY
|
||||
+ Build: add NO_UINTMAX_T to support ancient systems
|
||||
|
||||
I split the part that unconditionally enable threaded delta search on any
|
||||
platform on which Pthread library is detected to be available from the
|
||||
topmost one.
|
||||
|
||||
* jk/diff-convfilter (Sun Oct 26 00:50:02 2008 -0400) 8 commits
|
||||
+ enable textconv for diff in verbose status/commit
|
||||
+ wt-status: load diff ui config
|
||||
+ only textconv regular files
|
||||
+ userdiff: require explicitly allowing textconv
|
||||
+ refactor userdiff textconv code
|
||||
+ add userdiff textconv tests
|
||||
+ document the diff driver textconv feature
|
||||
+ diff: add missing static declaration
|
||||
|
||||
* jk/diff-convfilter-test-fix (Fri Oct 31 01:09:13 2008 -0400) 4 commits
|
||||
+ Avoid using non-portable `echo -n` in tests.
|
||||
+ add userdiff textconv tests
|
||||
+ document the diff driver textconv feature
|
||||
+ diff: add missing static declaration
|
||||
|
||||
An update to the one above.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
|
||||
- grep: skip files outside sparse checkout area
|
||||
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
- Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
- ls-files: Add tests for --sparse and friends
|
||||
- update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
- ls-files: add options to support sparse checkout
|
||||
- Introduce CE_NO_CHECKOUT bit
|
||||
- Extend index to save more flags
|
||||
|
||||
Early parts looked Ok; I am trying to find time to review the whole thing
|
||||
but fixing bugs in topics from other people here and there took almost all
|
||||
my time this weekend. Not good.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Dropped]
|
||||
|
||||
* bc/maint-keep-pack (Mon Nov 3 14:43:22 2008 -0600) 3 commits
|
||||
. pack-objects: honor '.keep' files
|
||||
. packed_git: convert pack_local flag into a bitfield and add
|
||||
pack_keep
|
||||
. t7700: demonstrate mishandling of objects in packs with a .keep
|
||||
file
|
||||
|
||||
It seems this is better rethought from the design level.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This seems to have a deadlock during communication between the peers.
|
||||
Someone needs to pick up this topic and resolve the deadlock before it can
|
||||
continue.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.
|
||||
@@ -1,197 +0,0 @@
|
||||
Subject: What's cooking in git.git (Nov 2008, #04; Wed, 12)
|
||||
X-master-at: 171d7661eda111d3e35f6e8097a1a3a07b30026c
|
||||
X-next-at: c990ab59beabbf7e62799d0a0190cc0a5171aba2
|
||||
|
||||
What's cooking in git.git (Nov 2008, #04; Wed, 12)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
I think we should declare -rc0 by the end of this week, with the goal of
|
||||
including everything that are in 'next' as of tonight, plus the "narrow
|
||||
checkout" and possibly Pierre's send-email that acts as format-patch
|
||||
frontend, by the time we hit -rc1, perhaps soon after the end of month.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* mk/maint-cg-push (Mon Nov 10 22:47:11 2008 +0100) 1 commit
|
||||
+ git push: Interpret $GIT_DIR/branches in a Cogito compatible way
|
||||
|
||||
* jk/commit-v-strip (Wed Nov 12 03:23:37 2008 -0500) 5 commits
|
||||
+ status: show "-v" diff even for initial commit
|
||||
+ Merge branch 'jk/maint-commit-v-strip' into jk/commit-v-strip
|
||||
+ commit: Fix stripping of patch in verbose mode.
|
||||
+ wt-status: refactor initial commit printing
|
||||
+ define empty tree sha1 as a macro
|
||||
|
||||
* jk/maint-commit-v-strip (Wed Nov 12 03:25:52 2008 -0500) 1 commit
|
||||
+ commit: Fix stripping of patch in verbose mode.
|
||||
|
||||
* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits
|
||||
- git send-email: ask less questions when --compose is used.
|
||||
- git send-email: add --annotate option
|
||||
- git send-email: interpret unknown files as revision lists
|
||||
- git send-email: make the message file name more specific.
|
||||
|
||||
* nd/rename-cache (Sat Nov 8 18:27:33 2008 +0700) 2 commits
|
||||
- diffcore-rename: add config option to allow to cache renames
|
||||
- diffcore-rename: support rename cache
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* jk/deny-push-to-current (Sat Nov 8 20:49:27 2008 -0500) 2 commits
|
||||
+ receive-pack: detect push to current branch of non-bare repo
|
||||
+ t5516: refactor oddball tests
|
||||
|
||||
* dl/xdiff (Fri Nov 7 21:24:33 2008 -0800) 1 commit
|
||||
+ xdiff: give up scanning similar lines early
|
||||
|
||||
This performance fix may eventually need to be cherry-picked to 'maint'.
|
||||
|
||||
* lt/decorate (Wed Nov 12 11:51:28 2008 +0100) 7 commits
|
||||
+ rev-list documentation: clarify the two parts of history
|
||||
simplification
|
||||
+ Document "git log --simplify-by-decoration"
|
||||
+ Document "git log --source"
|
||||
+ revision traversal: '--simplify-by-decoration'
|
||||
+ Make '--decorate' set an explicit 'show_decorations' flag
|
||||
+ revision: make tree comparison functions take commits rather than
|
||||
trees
|
||||
+ Add a 'source' decorator for commits
|
||||
|
||||
* gb/gitweb-snapshot-pathinfo (Sun Nov 2 10:21:39 2008 +0100) 3 commits
|
||||
+ gitweb: embed snapshot format parameter in PATH_INFO
|
||||
+ gitweb: retrieve snapshot format from PATH_INFO
|
||||
+ gitweb: make the supported snapshot formats array global
|
||||
|
||||
Got sick of waiting for re-Ack.
|
||||
|
||||
* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
|
||||
+ gitweb: Better processing format string in custom links in navbar
|
||||
|
||||
Got sick of waiting for some sort of response from Pasky.
|
||||
|
||||
* st/tag (Wed Nov 5 00:20:36 2008 +0100) 2 commits
|
||||
+ tag: Add more tests about mixing incompatible modes and options
|
||||
+ tag: Check that options are only allowed in the appropriate mode
|
||||
|
||||
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 5 commits
|
||||
- autoconf: Enable threaded delta search when pthreads are supported
|
||||
+ Add autoconf tests for pthreads
|
||||
+ Make Pthread link flags configurable
|
||||
+ Add Makefile check for FreeBSD 4.9-SECURITY
|
||||
+ Build: add NO_UINTMAX_T to support ancient systems
|
||||
|
||||
I split the part that unconditionally enable threaded delta search on any
|
||||
platform on which Pthread library is detected to be available from the
|
||||
topmost one. Will merge the rest to 'master' soon.
|
||||
|
||||
* jk/diff-convfilter (Sun Oct 26 00:50:02 2008 -0400) 8 commits
|
||||
+ enable textconv for diff in verbose status/commit
|
||||
+ wt-status: load diff ui config
|
||||
+ only textconv regular files
|
||||
+ userdiff: require explicitly allowing textconv
|
||||
+ refactor userdiff textconv code
|
||||
+ add userdiff textconv tests
|
||||
+ document the diff driver textconv feature
|
||||
+ diff: add missing static declaration
|
||||
|
||||
* jk/diff-convfilter-test-fix (Fri Oct 31 01:09:13 2008 -0400) 4 commits
|
||||
+ Avoid using non-portable `echo -n` in tests.
|
||||
+ add userdiff textconv tests
|
||||
+ document the diff driver textconv feature
|
||||
+ diff: add missing static declaration
|
||||
|
||||
An update to the one above.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* bc/maint-keep-pack (Sun Nov 9 23:59:58 2008 -0600) 9 commits
|
||||
+ pack-objects: extend --local to mean ignore non-local loose
|
||||
objects too
|
||||
+ sha1_file.c: split has_loose_object() into local and non-local
|
||||
counterparts
|
||||
+ t7700: demonstrate mishandling of loose objects in an alternate
|
||||
ODB
|
||||
+ builtin-gc.c: use new pack_keep bitfield to detect .keep file
|
||||
existence
|
||||
+ repack: do not fall back to incremental repacking with [-a|-A]
|
||||
+ repack: don't repack local objects in packs with .keep file
|
||||
+ pack-objects: new option --honor-pack-keep
|
||||
+ packed_git: convert pack_local flag into a bitfield and add
|
||||
pack_keep
|
||||
+ t7700: demonstrate mishandling of objects in packs with a .keep
|
||||
file
|
||||
|
||||
A few commits were rewound from 'next' and replaced with new ones.
|
||||
|
||||
* np/pack-safer (Sun Nov 9 13:11:06 2008 -0800) 11 commits
|
||||
+ t5303: fix printf format string for portability
|
||||
+ t5303: work around printf breakage in dash
|
||||
+ pack-objects: don't leak pack window reference when splitting
|
||||
packs
|
||||
+ extend test coverage for latest pack corruption resilience
|
||||
improvements
|
||||
+ pack-objects: allow "fixing" a corrupted pack without a full
|
||||
repack
|
||||
+ make find_pack_revindex() aware of the nasty world
|
||||
+ make check_object() resilient to pack corruptions
|
||||
+ make packed_object_info() resilient to pack corruptions
|
||||
+ make unpack_object_header() non fatal
|
||||
+ better validation on delta base object offsets
|
||||
+ close another possibility for propagating pack corruption
|
||||
|
||||
* mv/remote-rename (Mon Nov 10 21:43:03 2008 +0100) 4 commits
|
||||
+ git-remote: document the migration feature of the rename
|
||||
subcommand
|
||||
+ git-remote rename: migrate from remotes/ and branches/
|
||||
+ remote: add a new 'origin' variable to the struct
|
||||
+ Implement git remote rename
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
|
||||
- grep: skip files outside sparse checkout area
|
||||
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
- Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
- ls-files: Add tests for --sparse and friends
|
||||
- update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
- ls-files: add options to support sparse checkout
|
||||
- Introduce CE_NO_CHECKOUT bit
|
||||
- Extend index to save more flags
|
||||
|
||||
Early parts looked Ok; I am trying to find time to review the whole thing
|
||||
but fixing bugs in topics from other people here and there took almost all
|
||||
my time this weekend. Not good.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This seems to have a deadlock during communication between the peers.
|
||||
Someone needs to pick up this topic and resolve the deadlock before it can
|
||||
continue.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.
|
||||
@@ -1,192 +0,0 @@
|
||||
Subject: What's cooking in git.git (Nov 2008, #05; Sat, 15)
|
||||
X-master-at: ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd
|
||||
X-next-at: a277108ccd37bb47333edf23a681288943b48ef3
|
||||
|
||||
What's cooking in git.git (Nov 2008, #05; Sat, 15)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* lt/preload-lstat (Thu Nov 13 16:36:30 2008 -0800) 1 commit
|
||||
- Add cache preload facility
|
||||
|
||||
* cb/mergetool (Thu Nov 13 12:41:15 2008 +0000) 3 commits
|
||||
- [DONTMERGE] Add -k/--keep-going option to mergetool
|
||||
- Add -y/--no-prompt option to mergetool
|
||||
- Fix some tab/space inconsistencies in git-mergetool.sh
|
||||
|
||||
Jeff had good comments on the last one; the discussion needs concluded,
|
||||
and also waiting for comments from the original author (Ted).
|
||||
|
||||
* ta/quiet-pull (Sat Nov 15 01:14:24 2008 +0100) 1 commit
|
||||
- Teach/Fix pull/fetch -q/-v options
|
||||
|
||||
This has my fixes to preserve "fetch -v -v" behaviour squashed in.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* mk/maint-cg-push (Mon Nov 10 22:47:11 2008 +0100) 1 commit
|
||||
+ git push: Interpret $GIT_DIR/branches in a Cogito compatible way
|
||||
|
||||
Will need to further downmerge to 'maint'.
|
||||
|
||||
* jk/maint-commit-v-strip (Wed Nov 12 03:25:52 2008 -0500) 1 commit
|
||||
+ commit: Fix stripping of patch in verbose mode.
|
||||
|
||||
Will need to further downmerge to 'maint'.
|
||||
|
||||
* st/maint-tag (Wed Nov 5 00:20:36 2008 +0100) 2 commits
|
||||
+ tag: Add more tests about mixing incompatible modes and options
|
||||
+ tag: Check that options are only allowed in the appropriate mode
|
||||
|
||||
Will need to further downmerge to 'maint'.
|
||||
|
||||
* jk/deny-push-to-current (Sat Nov 8 20:49:27 2008 -0500) 2 commits
|
||||
+ receive-pack: detect push to current branch of non-bare repo
|
||||
+ t5516: refactor oddball tests
|
||||
|
||||
* dl/xdiff (Fri Nov 7 21:24:33 2008 -0800) 1 commit
|
||||
+ xdiff: give up scanning similar lines early
|
||||
|
||||
This performance fix may eventually need to be cherry-picked to 'maint'.
|
||||
|
||||
* lt/decorate (Wed Nov 12 11:51:28 2008 +0100) 7 commits
|
||||
+ rev-list documentation: clarify the two parts of history
|
||||
simplification
|
||||
+ Document "git log --simplify-by-decoration"
|
||||
+ Document "git log --source"
|
||||
+ revision traversal: '--simplify-by-decoration'
|
||||
+ Make '--decorate' set an explicit 'show_decorations' flag
|
||||
+ revision: make tree comparison functions take commits rather than
|
||||
trees
|
||||
+ Add a 'source' decorator for commits
|
||||
|
||||
* gb/gitweb-snapshot-pathinfo (Sun Nov 2 10:21:39 2008 +0100) 3 commits
|
||||
+ gitweb: embed snapshot format parameter in PATH_INFO
|
||||
+ gitweb: retrieve snapshot format from PATH_INFO
|
||||
+ gitweb: make the supported snapshot formats array global
|
||||
|
||||
* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
|
||||
+ gitweb: Better processing format string in custom links in navbar
|
||||
|
||||
* jk/diff-convfilter (Sun Oct 26 00:50:02 2008 -0400) 8 commits
|
||||
+ enable textconv for diff in verbose status/commit
|
||||
+ wt-status: load diff ui config
|
||||
+ only textconv regular files
|
||||
+ userdiff: require explicitly allowing textconv
|
||||
+ refactor userdiff textconv code
|
||||
+ add userdiff textconv tests
|
||||
+ document the diff driver textconv feature
|
||||
+ diff: add missing static declaration
|
||||
|
||||
* jk/diff-convfilter-test-fix (Fri Oct 31 01:09:13 2008 -0400) 1 commit
|
||||
+ Avoid using non-portable `echo -n` in tests.
|
||||
|
||||
An update to the one above.
|
||||
|
||||
* np/pack-safer (Sun Nov 9 13:11:06 2008 -0800) 11 commits
|
||||
+ t5303: fix printf format string for portability
|
||||
+ t5303: work around printf breakage in dash
|
||||
+ pack-objects: don't leak pack window reference when splitting
|
||||
packs
|
||||
+ extend test coverage for latest pack corruption resilience
|
||||
improvements
|
||||
+ pack-objects: allow "fixing" a corrupted pack without a full
|
||||
repack
|
||||
+ make find_pack_revindex() aware of the nasty world
|
||||
+ make check_object() resilient to pack corruptions
|
||||
+ make packed_object_info() resilient to pack corruptions
|
||||
+ make unpack_object_header() non fatal
|
||||
+ better validation on delta base object offsets
|
||||
+ close another possibility for propagating pack corruption
|
||||
|
||||
* mv/remote-rename (Mon Nov 10 21:43:03 2008 +0100) 4 commits
|
||||
+ git-remote: document the migration feature of the rename
|
||||
subcommand
|
||||
+ git-remote rename: migrate from remotes/ and branches/
|
||||
+ remote: add a new 'origin' variable to the struct
|
||||
+ Implement git remote rename
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* bc/maint-keep-pack (Thu Nov 13 14:11:46 2008 -0600) 1 commit
|
||||
+ repack: only unpack-unreachable if we are deleting redundant packs
|
||||
|
||||
This makes "repack -A -d" without -d do the same thing as "repack -a -d",
|
||||
which makes sense. This does not have to go to 'maint', though.
|
||||
|
||||
* jk/commit-v-strip (Wed Nov 12 03:23:37 2008 -0500) 4 commits
|
||||
+ status: show "-v" diff even for initial commit
|
||||
+ Merge branch 'jk/maint-commit-v-strip' into jk/commit-v-strip
|
||||
+ wt-status: refactor initial commit printing
|
||||
+ define empty tree sha1 as a macro
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
|
||||
+ grep: skip files outside sparse checkout area
|
||||
+ checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
+ Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
+ ls-files: Add tests for --sparse and friends
|
||||
+ update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
+ update-index: refactor mark_valid() in preparation for new options
|
||||
+ ls-files: add options to support sparse checkout
|
||||
+ Introduce CE_NO_CHECKOUT bit
|
||||
+ Extend index to save more flags
|
||||
|
||||
I think the basic idea and structure of this is sound. Let's see if
|
||||
people who try this feature can find holes in what it currently does.
|
||||
|
||||
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
|
||||
- autoconf: Enable threaded delta search when pthreads are supported
|
||||
|
||||
* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits
|
||||
- git send-email: ask less questions when --compose is used.
|
||||
- git send-email: add --annotate option
|
||||
- git send-email: interpret unknown files as revision lists
|
||||
- git send-email: make the message file name more specific.
|
||||
|
||||
* nd/rename-cache (Sat Nov 8 18:27:33 2008 +0700) 2 commits
|
||||
- diffcore-rename: add config option to allow to cache renames
|
||||
- diffcore-rename: support rename cache
|
||||
|
||||
I am moderately negative on this one in its current shape. We shouldn't
|
||||
have to be storing what can be recomputed (and recomputed differently in
|
||||
later software), and we shouldn't be keeping such cached result
|
||||
indefinitely.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This seems to have a deadlock during communication between the peers.
|
||||
Someone needs to pick up this topic and resolve the deadlock before it can
|
||||
continue.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.
|
||||
@@ -1,200 +0,0 @@
|
||||
Subject: What's cooking in git.git (Nov 2008, #06; Wed, 26)
|
||||
X-master-at: aa14a0c3f191ee4df7344eed119be5b4a527a0ff
|
||||
X-next-at: 406979f7fe53d139cdb79bf8c5eecf8735f4f146
|
||||
|
||||
What's cooking in git.git (Nov 2008, #06; Wed, 26)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* cr/remote-update-v (Tue Nov 18 19:04:02 2008 +0800) 1 commit
|
||||
+ git-remote: add verbose mode to git remote update
|
||||
|
||||
Should be in 1.6.1-rc1.
|
||||
|
||||
* rs/strbuf-expand (Sun Nov 23 00:16:59 2008 +0100) 6 commits
|
||||
+ remove the unused files interpolate.c and interpolate.h
|
||||
+ daemon: deglobalize variable 'directory'
|
||||
+ daemon: inline fill_in_extra_table_entries()
|
||||
+ daemon: use strbuf_expand() instead of interpolate()
|
||||
+ merge-recursive: use strbuf_expand() instead of interpolate()
|
||||
+ add strbuf_expand_dict_cb(), a helper for simple cases
|
||||
|
||||
Should be in 1.6.1-rc1.
|
||||
|
||||
* mv/fast-export (Sun Nov 23 12:55:54 2008 +0100) 2 commits
|
||||
+ fast-export: use an unsorted string list for extra_refs
|
||||
+ Add new testcase to show fast-export does not always exports all
|
||||
tags
|
||||
|
||||
Should be in 1.6.1-rc1 and backmerged to 'maint'.
|
||||
|
||||
* st/levenshtein (Thu Nov 20 14:27:27 2008 +0100) 2 commits
|
||||
+ Document levenshtein.c
|
||||
+ Fix deletion of last character in levenshtein distance
|
||||
|
||||
Should be in 1.6.1-rc1.
|
||||
|
||||
* js/mingw-rename-fix (Wed Nov 19 17:25:27 2008 +0100) 1 commit
|
||||
+ compat/mingw.c: Teach mingw_rename() to replace read-only files
|
||||
|
||||
Should be in 1.6.1-rc1 and backmerged to 'maint'.
|
||||
|
||||
* mv/clone-strbuf (Fri Nov 21 01:45:01 2008 +0100) 3 commits
|
||||
+ builtin_clone: use strbuf in cmd_clone()
|
||||
+ builtin-clone: use strbuf in clone_local() and
|
||||
copy_or_link_directory()
|
||||
+ builtin-clone: use strbuf in guess_dir_name()
|
||||
|
||||
Should be in 1.6.1-rc1.
|
||||
|
||||
* pw/maint-p4 (Wed Nov 26 13:52:15 2008 -0500) 1 commit
|
||||
- git-p4: fix keyword-expansion regex
|
||||
|
||||
Waiting for Ack from git-p4 folks.
|
||||
|
||||
* cc/bisect-skip (Sun Nov 23 22:02:49 2008 +0100) 1 commit
|
||||
- bisect: teach "skip" to accept special arguments like "A..B"
|
||||
|
||||
Should be in 1.6.1-rc1.
|
||||
|
||||
* cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits
|
||||
- bisect: add "--no-replace" option to bisect without using replace
|
||||
refs
|
||||
- rev-list: make it possible to disable replacing using "--no-
|
||||
bisect-replace"
|
||||
- bisect: use "--bisect-replace" options when checking merge bases
|
||||
- merge-base: add "--bisect-replace" option to use fixed up revs
|
||||
- commit: add "bisect_replace_all" prototype to "commit.h"
|
||||
- rev-list: add "--bisect-replace" to list revisions with fixed up
|
||||
history
|
||||
- Documentation: add "git bisect replace" documentation
|
||||
- bisect: add test cases for "git bisect replace"
|
||||
- bisect: add "git bisect replace" subcommand
|
||||
|
||||
I really hate the idea of introducing a potentially much more useful
|
||||
replacement of the existing graft mechanism and tie it very tightly to
|
||||
bisect, making it unusable from outside.
|
||||
|
||||
(1) I do not think "bisect replace" workflow is a practical and usable
|
||||
one;
|
||||
|
||||
(2) The underlying mechanism to express "this object replaces that other
|
||||
object" is much easier to work with than what the graft does which is
|
||||
"the parents of this commit are these", and idea to use the normal
|
||||
ref to point at them means this can potentially be used for
|
||||
transferring the graft information across repositories, which the
|
||||
current graft mechanism cannot do.
|
||||
|
||||
(3) Because I like the aspect (2) of this series so much, it deeply
|
||||
disappoints and troubles me that this is implemented minimally near
|
||||
the surface, and that it is controlled by the "bisect" Porcelain
|
||||
alone, by explicitly passing command line arguments.
|
||||
|
||||
I think a mechanism like this should be added to replace grafts, but it
|
||||
should always be enabled for normal revision traversal operation, while
|
||||
always disabled for object enumeration and transfer operation (iow, fsck,
|
||||
fetch and push should use the real ancestry information recorded in the
|
||||
underlying objects, while rev-list, log, etc. should always use the
|
||||
replaced objects). I have a suspicion that even cat-file could honor it.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* bc/maint-keep-pack (Thu Nov 13 14:11:46 2008 -0600) 1 commit
|
||||
+ repack: only unpack-unreachable if we are deleting redundant packs
|
||||
|
||||
This makes "repack -A -d" without -d do the same thing as "repack -a -d",
|
||||
which makes sense. This does not have to go to 'maint', though.
|
||||
|
||||
* jk/commit-v-strip (Wed Nov 12 03:23:37 2008 -0500) 4 commits
|
||||
+ status: show "-v" diff even for initial commit
|
||||
+ Merge branch 'jk/maint-commit-v-strip' into jk/commit-v-strip
|
||||
+ wt-status: refactor initial commit printing
|
||||
+ define empty tree sha1 as a macro
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* lt/preload-lstat (Mon Nov 17 09:01:20 2008 -0800) 2 commits
|
||||
+ Fix index preloading for racy dirty case
|
||||
+ Add cache preload facility
|
||||
|
||||
* ta/quiet-pull (Mon Nov 17 23:09:30 2008 +0100) 2 commits
|
||||
+ Retain multiple -q/-v occurrences in git pull
|
||||
+ Teach/Fix pull/fetch -q/-v options
|
||||
|
||||
* nd/narrow (Tue Nov 18 06:33:16 2008 -0500) 10 commits
|
||||
+ t2104: touch portability fix
|
||||
+ grep: skip files outside sparse checkout area
|
||||
+ checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
+ Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
+ ls-files: Add tests for --sparse and friends
|
||||
+ update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
+ update-index: refactor mark_valid() in preparation for new options
|
||||
+ ls-files: add options to support sparse checkout
|
||||
+ Introduce CE_NO_CHECKOUT bit
|
||||
+ Extend index to save more flags
|
||||
|
||||
* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits
|
||||
+ git send-email: ask less questions when --compose is used.
|
||||
+ git send-email: add --annotate option
|
||||
+ git send-email: interpret unknown files as revision lists
|
||||
+ git send-email: make the message file name more specific.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* cb/mergetool (Thu Nov 13 12:41:15 2008 +0000) 3 commits
|
||||
- [DONTMERGE] Add -k/--keep-going option to mergetool
|
||||
- Add -y/--no-prompt option to mergetool
|
||||
- Fix some tab/space inconsistencies in git-mergetool.sh
|
||||
|
||||
Jeff had good comments on the last one; the discussion needs concluded,
|
||||
and also waiting for comments from the original author (Ted).
|
||||
|
||||
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
|
||||
- autoconf: Enable threaded delta search when pthreads are supported
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This seems to have a deadlock during communication between the peers.
|
||||
Someone needs to pick up this topic and resolve the deadlock before it can
|
||||
continue.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
@@ -1,247 +0,0 @@
|
||||
Subject: What's cooking in git.git (Dec 2008, #01; Tue, 02)
|
||||
X-master-at: 757c7f60a78004fc3d0ea62f44320d54ef430c10
|
||||
X-next-at: 44b0c4a7f55234e12cead3e1909c17be7c068dca
|
||||
|
||||
What's cooking in git.git (Dec 2008, #01; Tue, 02)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
As we have already passed -rc1, things queued in 'next' let alone 'pu' are
|
||||
unlikely to be merged to 'master' by the end of year unless otherwise
|
||||
noted.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* gb/gitweb-patch (Sat Nov 29 14:41:11 2008 +0100) 2 commits
|
||||
- [DONTMERGE: wait for signoff] gitweb: links to patch action in
|
||||
commitdiff and shortlog view
|
||||
- gitweb: add patch view
|
||||
|
||||
* lt/reset-merge (Mon Dec 1 09:30:31 2008 -0800) 1 commit
|
||||
+ Add 'merge' mode to 'git reset'
|
||||
|
||||
Unfortunately, I cannot write down a good use case in what circumstances
|
||||
this is needed, even though I do recall that I occasionally (perhaps once
|
||||
every two months) needed to do "read-tree -m -u" myself in the past, and
|
||||
this patch brings that feature close to Porcelain. On the other hand, the
|
||||
existing "reset --mixed" is very easily explained ("after starting to add
|
||||
changes to the staging area, you realized that you screwed up, and you
|
||||
want to redo it from scratch"). Therefore, I cannot justify what the log
|
||||
message of this change claims myself.
|
||||
|
||||
* jc/rm-i-t-a (Fri Nov 28 19:56:34 2008 -0800) 5 commits
|
||||
+ git add --intent-to-add: do not let an empty blob be committed by
|
||||
accident
|
||||
+ git add --intent-to-add: fix removal of cached emptiness
|
||||
+ builtin-rm.c: explain and clarify the "local change" logic
|
||||
+ Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
|
||||
+ Extend index to save more flags
|
||||
|
||||
As intent-to-add index entry is a new feature for 1.6.1, it probably is a
|
||||
good idea to merge this to 'master'. Nitpicks and bugfixes are very much
|
||||
appreciated.
|
||||
|
||||
* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
|
||||
- In add --patch, Handle K,k,J,j slightly more gracefully.
|
||||
- Add / command in add --patch
|
||||
- git-add -i/-p: Change prompt separater from slash to comma
|
||||
|
||||
There are some other useful bits and pieces around this area exchanged on
|
||||
the list with the author of these patches. I think it would become a
|
||||
useful series after reassembling their pieces. Waiting for v2.
|
||||
|
||||
* jn/gitweb-utf8 (Mon Dec 1 19:01:42 2008 +0100) 1 commit
|
||||
- gitweb: Fix handling of non-ASCII characters in inserted HTML
|
||||
files.
|
||||
|
||||
Possibly a bugfix worthy to have in 1.6.1.
|
||||
|
||||
* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits
|
||||
- clone: test the new HEAD detection logic
|
||||
- Merge commit 'HEAD@{2}' into HEAD
|
||||
- upload-pack: send the HEAD information
|
||||
- clone: find the current branch more explicitly
|
||||
- connect.c::read_extra_info(): find where HEAD points at
|
||||
- connect.c::read_extra_info(): prepare to receive more than server
|
||||
capabilities
|
||||
- get_remote_heads(): refactor code to read "server capabilities"
|
||||
|
||||
This is no way meant for 1.6.1, let alone next, yet.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* cr/remote-update-v (Tue Nov 18 19:04:02 2008 +0800) 1 commit
|
||||
+ git-remote: add verbose mode to git remote update
|
||||
|
||||
* rs/strbuf-expand (Sun Nov 23 00:16:59 2008 +0100) 6 commits
|
||||
+ remove the unused files interpolate.c and interpolate.h
|
||||
+ daemon: deglobalize variable 'directory'
|
||||
+ daemon: inline fill_in_extra_table_entries()
|
||||
+ daemon: use strbuf_expand() instead of interpolate()
|
||||
+ merge-recursive: use strbuf_expand() instead of interpolate()
|
||||
+ add strbuf_expand_dict_cb(), a helper for simple cases
|
||||
|
||||
* mv/fast-export (Sun Nov 23 12:55:54 2008 +0100) 2 commits
|
||||
+ fast-export: use an unsorted string list for extra_refs
|
||||
+ Add new testcase to show fast-export does not always exports all
|
||||
tags
|
||||
|
||||
* st/levenshtein (Thu Nov 20 14:27:27 2008 +0100) 2 commits
|
||||
+ Document levenshtein.c
|
||||
+ Fix deletion of last character in levenshtein distance
|
||||
|
||||
* js/mingw-rename-fix (Wed Nov 19 17:25:27 2008 +0100) 1 commit
|
||||
+ compat/mingw.c: Teach mingw_rename() to replace read-only files
|
||||
|
||||
* mv/clone-strbuf (Fri Nov 21 01:45:01 2008 +0100) 3 commits
|
||||
+ builtin_clone: use strbuf in cmd_clone()
|
||||
+ builtin-clone: use strbuf in clone_local() and
|
||||
copy_or_link_directory()
|
||||
+ builtin-clone: use strbuf in guess_dir_name()
|
||||
|
||||
* pw/maint-p4 (Wed Nov 26 13:52:15 2008 -0500) 1 commit
|
||||
- git-p4: fix keyword-expansion regex
|
||||
|
||||
* cc/bisect-skip (Sun Nov 23 22:02:49 2008 +0100) 1 commit
|
||||
- bisect: teach "skip" to accept special arguments like "A..B"
|
||||
|
||||
Should be in 1.6.1-rc1.
|
||||
|
||||
* lt/preload-lstat (Mon Nov 17 09:01:20 2008 -0800) 2 commits
|
||||
+ Fix index preloading for racy dirty case
|
||||
+ Add cache preload facility
|
||||
|
||||
* ta/quiet-pull (Mon Nov 17 23:09:30 2008 +0100) 2 commits
|
||||
+ Retain multiple -q/-v occurrences in git pull
|
||||
+ Teach/Fix pull/fetch -q/-v options
|
||||
|
||||
* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits
|
||||
+ git send-email: ask less questions when --compose is used.
|
||||
+ git send-email: add --annotate option
|
||||
+ git send-email: interpret unknown files as revision lists
|
||||
+ git send-email: make the message file name more specific.
|
||||
|
||||
After merging these to 'master' I found a breakage which I hopefully
|
||||
fixed.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
What are you looking for? We are in -rc ;-)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* cb/mergetool (Thu Nov 13 12:41:15 2008 +0000) 3 commits
|
||||
- [DONTMERGE] Add -k/--keep-going option to mergetool
|
||||
- Add -y/--no-prompt option to mergetool
|
||||
- Fix some tab/space inconsistencies in git-mergetool.sh
|
||||
|
||||
Jeff had good comments on the last one; the discussion needs concluded,
|
||||
and also waiting for comments from the original author (Ted).
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
|
||||
- autoconf: Enable threaded delta search when pthreads are supported
|
||||
|
||||
Rebased to 'master', that introduced NO_PTHREADS.
|
||||
|
||||
* cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits
|
||||
- bisect: add "--no-replace" option to bisect without using replace
|
||||
refs
|
||||
- rev-list: make it possible to disable replacing using "--no-
|
||||
bisect-replace"
|
||||
- bisect: use "--bisect-replace" options when checking merge bases
|
||||
- merge-base: add "--bisect-replace" option to use fixed up revs
|
||||
- commit: add "bisect_replace_all" prototype to "commit.h"
|
||||
- rev-list: add "--bisect-replace" to list revisions with fixed up
|
||||
history
|
||||
- Documentation: add "git bisect replace" documentation
|
||||
- bisect: add test cases for "git bisect replace"
|
||||
- bisect: add "git bisect replace" subcommand
|
||||
|
||||
I really hate the idea of introducing a potentially much more useful
|
||||
replacement of the existing graft mechanism and tie it very tightly to
|
||||
bisect, making it unusable from outside.
|
||||
|
||||
(1) I do not think "bisect replace" workflow is a practical and usable
|
||||
one;
|
||||
|
||||
(2) The underlying mechanism to express "this object replaces that other
|
||||
object" is much easier to work with than what the graft does which is
|
||||
"the parents of this commit are these", and idea to use the normal
|
||||
ref to point at them means this can potentially be used for
|
||||
transferring the graft information across repositories, which the
|
||||
current graft mechanism cannot do.
|
||||
|
||||
(3) Because I like the aspect (2) of this series so much, it deeply
|
||||
disappoints and troubles me that this is implemented minimally near
|
||||
the surface, and that it is controlled by the "bisect" Porcelain
|
||||
alone, by explicitly passing command line arguments.
|
||||
|
||||
I think a mechanism like this should be added to replace grafts, but it
|
||||
should always be enabled for normal revision traversal operation, while
|
||||
always disabled for object enumeration and transfer operation (iow, fsck,
|
||||
fetch and push should use the real ancestry information recorded in the
|
||||
underlying objects, while rev-list, log, etc. should always use the
|
||||
replaced objects). I have a suspicion that even cat-file could honor it.
|
||||
|
||||
* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 18 commits
|
||||
- wt-status: show sparse checkout info
|
||||
- Introduce default sparse patterns (core.defaultsparse)
|
||||
- checkout: add new options to support sparse checkout
|
||||
- clone: support sparse checkout with --sparse-checkout option
|
||||
- unpack_trees(): add support for sparse checkout
|
||||
- unpack_trees(): keep track of unmerged entries
|
||||
- Introduce "sparse patterns"
|
||||
- Merge branch 'master' into nd/narrow
|
||||
+ t2104: touch portability fix
|
||||
+ grep: skip files outside sparse checkout area
|
||||
+ checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
+ Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
+ ls-files: Add tests for --sparse and friends
|
||||
+ update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
+ update-index: refactor mark_valid() in preparation for new options
|
||||
+ ls-files: add options to support sparse checkout
|
||||
+ Introduce CE_NO_CHECKOUT bit
|
||||
+ Extend index to save more flags
|
||||
|
||||
Kicked back to 'on hold' until 1.6.1 final by popular(?) demand.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This seems to have a deadlock during communication between the peers.
|
||||
Someone needs to pick up this topic and resolve the deadlock before it can
|
||||
continue.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
@@ -1,223 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Dec 2008, #02; Sun, 14)
|
||||
bcc: William Pursell <bill.pursell@gmail.com>, Theodore Tso <tytso@mit.edu>
|
||||
X-master-at: 7e76aba317b690932c8236311219b0faf97f1571
|
||||
X-next-at: eb2f0c452e2cf87efa16cc9ace8587e198d60eb0
|
||||
|
||||
What's cooking in git.git (Dec 2008, #02; Sun, 14)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
As we have already passed -rc2, things queued in 'next' let alone 'pu' are
|
||||
unlikely to be merged to 'master' by the end of year unless otherwise
|
||||
noted.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits
|
||||
+ Add 'g' command to go to a hunk
|
||||
+ Add subroutine to display one-line summary of hunks
|
||||
|
||||
* jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits
|
||||
- gitweb: cache $parent_commit info in git_blame()
|
||||
- gitweb: A bit of code cleanup in git_blame()
|
||||
- gitweb: Move 'lineno' id from link to row element in git_blame
|
||||
|
||||
I've briefly looked at the resurrection of Ajaxy blame that comes on top
|
||||
of this series and it looked promising.
|
||||
|
||||
* mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit
|
||||
- Add support for a pdf version of the user manual
|
||||
|
||||
I do not have a new enough combination of dblatex and asciidoc myself but
|
||||
this would help interested people.
|
||||
|
||||
* np/auto-thread (Sat Dec 13 15:06:40 2008 -0500) 2 commits
|
||||
+ pack-objects: don't use too many threads with few objects
|
||||
+ autodetect number of CPUs by default when using threads
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Post 1.6.1 items]
|
||||
|
||||
* gb/gitweb-patch (Sat Dec 6 16:02:35 2008 +0100) 3 commits
|
||||
- gitweb: link to patch(es) view from commit and log views
|
||||
- gitweb: add patches view
|
||||
- gitweb: add patch view
|
||||
|
||||
Updated series. Reviews and Acks?
|
||||
|
||||
* lt/reset-merge (Wed Dec 3 18:00:12 2008 -0800) 2 commits
|
||||
+ Document "git-reset --merge"
|
||||
+ Add 'merge' mode to 'git reset'
|
||||
|
||||
With updated documents.
|
||||
|
||||
* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
|
||||
. In add --patch, Handle K,k,J,j slightly more gracefully.
|
||||
. Add / command in add --patch
|
||||
. git-add -i/-p: Change prompt separater from slash to comma
|
||||
|
||||
I am still holding onto this earlier topic to add '/' subcommand to allow
|
||||
finding a hunk with given text, but I'd rather not merge/rebase it on top
|
||||
of wp/add-p-goto series myself. Waiting for a reroll.
|
||||
|
||||
* cb/mergetool (Fri Dec 12 21:48:41 2008 +0000) 4 commits
|
||||
- mergetool: Don't keep temporary merge files unless told to
|
||||
- mergetool: Add prompt to continue after failing to merge a file
|
||||
- Add -y/--no-prompt option to mergetool
|
||||
- Fix some tab/space inconsistencies in git-mergetool.sh
|
||||
|
||||
Updated series. Waiting for comments from the original author (Ted) and
|
||||
other interested parties.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* jc/rm-i-t-a (Fri Nov 28 19:56:34 2008 -0800) 5 commits
|
||||
+ git add --intent-to-add: do not let an empty blob be committed by
|
||||
accident
|
||||
+ git add --intent-to-add: fix removal of cached emptiness
|
||||
+ builtin-rm.c: explain and clarify the "local change" logic
|
||||
+ Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
|
||||
+ Extend index to save more flags
|
||||
|
||||
As intent-to-add index entry is a new feature for 1.6.1, it probably is a
|
||||
good idea to merge this to 'master'. Nitpicks and bugfixes are very much
|
||||
appreciated.
|
||||
|
||||
* jn/gitweb-utf8 (Mon Dec 1 19:01:42 2008 +0100) 1 commit
|
||||
+ gitweb: Fix handling of non-ASCII characters in inserted HTML
|
||||
files.
|
||||
|
||||
A bugfix.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
What are you looking for? We are in -rc ;-)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
|
||||
- autoconf: Enable threaded delta search when pthreads are supported
|
||||
|
||||
Rebased to 'master', that introduced NO_PTHREADS.
|
||||
|
||||
* cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits
|
||||
- bisect: add "--no-replace" option to bisect without using replace
|
||||
refs
|
||||
- rev-list: make it possible to disable replacing using "--no-
|
||||
bisect-replace"
|
||||
- bisect: use "--bisect-replace" options when checking merge bases
|
||||
- merge-base: add "--bisect-replace" option to use fixed up revs
|
||||
- commit: add "bisect_replace_all" prototype to "commit.h"
|
||||
- rev-list: add "--bisect-replace" to list revisions with fixed up
|
||||
history
|
||||
- Documentation: add "git bisect replace" documentation
|
||||
- bisect: add test cases for "git bisect replace"
|
||||
- bisect: add "git bisect replace" subcommand
|
||||
|
||||
I really hate the idea of introducing a potentially much more useful
|
||||
replacement of the existing graft mechanism and tie it very tightly to
|
||||
bisect, making it unusable from outside.
|
||||
|
||||
(1) I do not think "bisect replace" workflow is a practical and usable
|
||||
one;
|
||||
|
||||
(2) The underlying mechanism to express "this object replaces that other
|
||||
object" is much easier to work with than what the graft does which is
|
||||
"the parents of this commit are these", and idea to use the normal
|
||||
ref to point at them means this can potentially be used for
|
||||
transferring the graft information across repositories, which the
|
||||
current graft mechanism cannot do.
|
||||
|
||||
(3) Because I like the aspect (2) of this series so much, it deeply
|
||||
disappoints and troubles me that this is implemented minimally near
|
||||
the surface, and that it is controlled by the "bisect" Porcelain
|
||||
alone, by explicitly passing command line arguments.
|
||||
|
||||
I think a mechanism like this should be added to replace grafts, but it
|
||||
should always be enabled for normal revision traversal operation, while
|
||||
always disabled for object enumeration and transfer operation (iow, fsck,
|
||||
fetch and push should use the real ancestry information recorded in the
|
||||
underlying objects, while rev-list, log, etc. should always use the
|
||||
replaced objects). I have a suspicion that even cat-file could honor it.
|
||||
|
||||
* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 17 commits
|
||||
- wt-status: show sparse checkout info
|
||||
- Introduce default sparse patterns (core.defaultsparse)
|
||||
- checkout: add new options to support sparse checkout
|
||||
- clone: support sparse checkout with --sparse-checkout option
|
||||
- unpack_trees(): add support for sparse checkout
|
||||
- unpack_trees(): keep track of unmerged entries
|
||||
- Introduce "sparse patterns"
|
||||
- Merge branch 'master' into nd/narrow
|
||||
+ t2104: touch portability fix
|
||||
+ grep: skip files outside sparse checkout area
|
||||
+ checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
+ Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
+ ls-files: Add tests for --sparse and friends
|
||||
+ update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
+ update-index: refactor mark_valid() in preparation for new options
|
||||
+ ls-files: add options to support sparse checkout
|
||||
+ Introduce CE_NO_CHECKOUT bit
|
||||
|
||||
Kicked back to 'on hold' until 1.6.1 final by popular demand; will be
|
||||
dropped from 'next' (see recent discussion on the interaction between the
|
||||
checkout area and commands such as "grep").
|
||||
|
||||
* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits
|
||||
- clone: test the new HEAD detection logic
|
||||
- Merge commit 'HEAD@{2}' into HEAD
|
||||
- upload-pack: send the HEAD information
|
||||
- clone: find the current branch more explicitly
|
||||
- connect.c::read_extra_info(): find where HEAD points at
|
||||
- connect.c::read_extra_info(): prepare to receive more than server
|
||||
capabilities
|
||||
- get_remote_heads(): refactor code to read "server capabilities"
|
||||
|
||||
This is no way meant for 1.6.1, let alone next, yet.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This seems to have a deadlock during communication between the peers.
|
||||
Someone needs to pick up this topic and resolve the deadlock before it can
|
||||
continue.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
@@ -1,263 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
cc: Johannes Sixt <j6t@kdbg.org>,
|
||||
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
|
||||
"Simon Schubert" <corecode@fs.ei.tum.de>
|
||||
Subject: What's cooking in git.git (Dec 2008, #03; Sun, 21)
|
||||
X-master-at: b3eae84dc10e452add0e79c7373ceee16f73f7f0
|
||||
X-next-at: 43db18a982c1bdb5d2c1849c429ae3a456b8a51e
|
||||
|
||||
What's cooking in git.git (Dec 2008, #03; Sun, 21)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'. The ones marked with '.' do not appear in any of the branches,
|
||||
but I am still holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
As we have already passed -rc3, things queued in 'next' let alone 'pu' are
|
||||
unlikely to be merged to 'master' by the end of year unless otherwise
|
||||
noted.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* mk/gitweb-feature (Mon Dec 15 22:16:19 2008 -0800) 1 commit
|
||||
- gitweb: unify boolean feature subroutines
|
||||
|
||||
* cb/merge-recursive-fix (Mon Dec 15 02:41:24 2008 -0800) 3 commits
|
||||
- Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-
|
||||
recursive-fix
|
||||
- merge-recursive: do not clobber untracked working tree garbage
|
||||
- modify/delete conflict resolution overwrites untracked file
|
||||
|
||||
* cb/maint-merge-recursive-fix (Sun Dec 14 19:40:09 2008 -0800) 2 commits
|
||||
- merge-recursive: do not clobber untracked working tree garbage
|
||||
- modify/delete conflict resolution overwrites untracked file
|
||||
|
||||
* js/notes (Sat Dec 20 13:06:03 2008 +0100) 4 commits
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
* js/rebase-i-p (Mon Dec 15 11:05:31 2008 +0100) 2 commits
|
||||
- rebase -i -p: Fix --continue after a merge could not be redone
|
||||
- Show a failure of rebase -p if the merge had a conflict
|
||||
|
||||
I am undecided whether I should include these in 1.6.1 and have been
|
||||
waiting for comments from Dscho.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Post 1.6.1 items]
|
||||
|
||||
* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits
|
||||
+ Add 'g' command to go to a hunk
|
||||
+ Add subroutine to display one-line summary of hunks
|
||||
|
||||
* jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits
|
||||
- gitweb: cache $parent_commit info in git_blame()
|
||||
- gitweb: A bit of code cleanup in git_blame()
|
||||
- gitweb: Move 'lineno' id from link to row element in git_blame
|
||||
|
||||
I've briefly looked at the resurrection of Ajaxy blame that comes on top
|
||||
of this series and it looked promising.
|
||||
|
||||
* mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit
|
||||
- Add support for a pdf version of the user manual
|
||||
|
||||
I do not have a new enough combination of dblatex and asciidoc myself but
|
||||
this may help interested people.
|
||||
|
||||
* np/auto-thread (Mon Dec 15 20:44:30 2008 +0100) 3 commits
|
||||
+ Force t5302 to use a single thread
|
||||
+ pack-objects: don't use too many threads with few objects
|
||||
+ autodetect number of CPUs by default when using threads
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
* gb/gitweb-patch (Thu Dec 18 08:13:19 2008 +0100) 4 commits
|
||||
- gitweb: link to patch(es) view in commit(diff) and (short)log view
|
||||
- gitweb: add patches view
|
||||
- gitweb: change call pattern for git_commitdiff
|
||||
- gitweb: add patch view
|
||||
|
||||
Updated series.
|
||||
|
||||
* lt/reset-merge (Wed Dec 3 18:00:12 2008 -0800) 2 commits
|
||||
+ Document "git-reset --merge"
|
||||
+ Add 'merge' mode to 'git reset'
|
||||
|
||||
* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
|
||||
. In add --patch, Handle K,k,J,j slightly more gracefully.
|
||||
. Add / command in add --patch
|
||||
. git-add -i/-p: Change prompt separater from slash to comma
|
||||
|
||||
I am still holding onto this earlier topic to add '/' subcommand to allow
|
||||
finding a hunk with given text, but I'd rather not merge/rebase it on top
|
||||
of wp/add-p-goto series myself. Waiting for a reroll.
|
||||
|
||||
* cb/mergetool (Fri Dec 12 21:48:41 2008 +0000) 4 commits
|
||||
- mergetool: Don't keep temporary merge files unless told to
|
||||
- mergetool: Add prompt to continue after failing to merge a file
|
||||
- Add -y/--no-prompt option to mergetool
|
||||
- Fix some tab/space inconsistencies in git-mergetool.sh
|
||||
|
||||
Updated series. Waiting for comments from the original author (Ted) and
|
||||
other interested parties.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
Nothing cooking was "not so trivial but want to have in final".
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
What are you looking for? We are in -rc ;-)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
|
||||
. git-am: Pass the --directory option through to git-apply
|
||||
|
||||
A reroll of this by Simon Schubert triggered a series to fix a parameter
|
||||
propagation bug, and another reroll to add "git am --directory=path/"
|
||||
should be much easier now. I am not likely to use the feature myself, so
|
||||
it is up to intrested volunteers to carry it forward.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
|
||||
- autoconf: Enable threaded delta search when pthreads are supported
|
||||
|
||||
Rebased to 'master', that introduced NO_PTHREADS.
|
||||
|
||||
* cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits
|
||||
- bisect: add "--no-replace" option to bisect without using replace
|
||||
refs
|
||||
- rev-list: make it possible to disable replacing using "--no-
|
||||
bisect-replace"
|
||||
- bisect: use "--bisect-replace" options when checking merge bases
|
||||
- merge-base: add "--bisect-replace" option to use fixed up revs
|
||||
- commit: add "bisect_replace_all" prototype to "commit.h"
|
||||
- rev-list: add "--bisect-replace" to list revisions with fixed up
|
||||
history
|
||||
- Documentation: add "git bisect replace" documentation
|
||||
- bisect: add test cases for "git bisect replace"
|
||||
- bisect: add "git bisect replace" subcommand
|
||||
|
||||
I really hate the idea of introducing a potentially much more useful
|
||||
replacement of the existing graft mechanism and tie it very tightly to
|
||||
bisect, making it unusable from outside.
|
||||
|
||||
(1) I do not think "bisect replace" workflow is a practical and usable
|
||||
one;
|
||||
|
||||
(2) The underlying mechanism to express "this object replaces that other
|
||||
object" is much easier to work with than what the graft does which is
|
||||
"the parents of this commit are these", and idea to use the normal
|
||||
ref to point at them means this can potentially be used for
|
||||
transferring the graft information across repositories, which the
|
||||
current graft mechanism cannot do.
|
||||
|
||||
(3) Because I like the aspect (2) of this series so much, it deeply
|
||||
disappoints and troubles me that this is implemented minimally near
|
||||
the surface, and that it is controlled by the "bisect" Porcelain
|
||||
alone, by explicitly passing command line arguments.
|
||||
|
||||
I think a mechanism like this should be added to replace grafts, but it
|
||||
should always be enabled for normal revision traversal operation, while
|
||||
always disabled for object enumeration and transfer operation (iow, fsck,
|
||||
fetch and push should use the real ancestry information recorded in the
|
||||
underlying objects, while rev-list, log, etc. should always use the
|
||||
replaced objects). I have a suspicion that even cat-file could honor it.
|
||||
|
||||
* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 17 commits
|
||||
- wt-status: show sparse checkout info
|
||||
- Introduce default sparse patterns (core.defaultsparse)
|
||||
- checkout: add new options to support sparse checkout
|
||||
- clone: support sparse checkout with --sparse-checkout option
|
||||
- unpack_trees(): add support for sparse checkout
|
||||
- unpack_trees(): keep track of unmerged entries
|
||||
- Introduce "sparse patterns"
|
||||
- Merge branch 'master' into nd/narrow
|
||||
+ t2104: touch portability fix
|
||||
+ grep: skip files outside sparse checkout area
|
||||
+ checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
+ Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
+ ls-files: Add tests for --sparse and friends
|
||||
+ update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
+ update-index: refactor mark_valid() in preparation for new options
|
||||
+ ls-files: add options to support sparse checkout
|
||||
+ Introduce CE_NO_CHECKOUT bit
|
||||
|
||||
Kicked back to 'on hold' until 1.6.1 final by popular demand; will be
|
||||
dropped from 'next' (see recent discussion on the interaction between the
|
||||
checkout area and commands such as "grep").
|
||||
|
||||
* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits
|
||||
- clone: test the new HEAD detection logic
|
||||
- Merge commit 'HEAD@{2}' into HEAD
|
||||
- upload-pack: send the HEAD information
|
||||
- clone: find the current branch more explicitly
|
||||
- connect.c::read_extra_info(): find where HEAD points at
|
||||
- connect.c::read_extra_info(): prepare to receive more than server
|
||||
capabilities
|
||||
- get_remote_heads(): refactor code to read "server capabilities"
|
||||
|
||||
This is no way meant for 1.6.1, let alone next, yet.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This seems to have a deadlock during communication between the peers.
|
||||
Someone needs to pick up this topic and resolve the deadlock before it can
|
||||
continue.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
. revision --simplify-merges: incremental simplification
|
||||
. revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
* jc/clone-symref (Sat Nov 29 23:38:21 2008 -0800) 6 commits
|
||||
. clone: test the new HEAD detection logic
|
||||
. Merge sender side of "symbolic-ref" protocol extension
|
||||
. upload-pack: implement protocol extension "symbolic-ref"
|
||||
. clone: find the current branch more explicitly
|
||||
. get_remote_heads(): do not assume that the operation is one-way
|
||||
. upload-pack.c: refactor receive_needs()
|
||||
|
||||
* jk/valgrind (Thu Oct 23 04:30:45 2008 +0000) 2 commits
|
||||
. valgrind: ignore ldso errors
|
||||
. add valgrind support in test scripts
|
||||
|
||||
* jc/apply (Sun Sep 7 14:36:24 2008 -0700) 1 commit
|
||||
. WIP
|
||||
@@ -1,247 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Dec 2008, #04; Mon, 29)
|
||||
X-master-at: c32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf
|
||||
X-next-at: 6f67462436796045e0656107418221a6696bd5f2
|
||||
|
||||
What's cooking in git.git (Dec 2008, #04; Mon, 29)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'. The ones marked with '.' do not appear in any of the branches,
|
||||
but I am still holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* nd/grep-assume-unchanged (Sat Dec 27 15:21:03 2008 +0700) 2 commits
|
||||
- grep: grep cache entries if they are "assume unchanged"
|
||||
- grep: support --no-ext-grep to test builtin grep
|
||||
|
||||
* rs/diff-ihc (Sun Dec 28 19:45:32 2008 +0100) 1 commit
|
||||
+ diff: add option to show context between close hunks
|
||||
|
||||
* as/maint-shortlog-cleanup (Wed Dec 24 17:34:44 2008 +0100) 2 commits
|
||||
- builtin-shortlog.c: do not unnecessarily strdup before insertion
|
||||
in list
|
||||
- builtin-shortlog.c: use string_list_append() instead of
|
||||
duplicating its code
|
||||
|
||||
* js/maint-merge-recursive-r-d-conflict (Mon Dec 22 23:10:20 2008 +0100) 1 commit
|
||||
+ merge-recursive: mark rename/delete conflict as unmerged
|
||||
|
||||
* kk/maint-http-push (Tue Dec 23 11:31:15 2008 +0300) 1 commit
|
||||
+ http-push: support full URI in handle_remote_ls_ctx()
|
||||
|
||||
* jc/maint-ls-tree (Thu Dec 25 16:54:23 2008 -0800) 1 commit
|
||||
+ ls-tree: add --full-tree option
|
||||
|
||||
* mh/maint-sendmail-cc-doc (Mon Dec 29 00:37:25 2008 +0100) 1 commit
|
||||
+ doc/git-send-email: mention sendemail.cc config variable
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
|
||||
. In add --patch, Handle K,k,J,j slightly more gracefully.
|
||||
. Add / command in add --patch
|
||||
. git-add -i/-p: Change prompt separater from slash to comma
|
||||
|
||||
I am still holding onto this earlier topic to add '/' subcommand to allow
|
||||
finding a hunk with given text, but I'd rather not merge/rebase it on top
|
||||
of wp/add-p-goto series myself. Waiting for a reroll.
|
||||
|
||||
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
|
||||
. git-am: Pass the --directory option through to git-apply
|
||||
|
||||
A reroll of this by Simon Schubert triggered a series to fix a parameter
|
||||
propagation bug, and another reroll to add "git am --directory=path/"
|
||||
should be much easier now. I am not likely to use the feature myself, so
|
||||
it is up to intrested volunteers to carry it forward.
|
||||
|
||||
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
|
||||
- autoconf: Enable threaded delta search when pthreads are supported
|
||||
|
||||
This automatically enables threaded delta search code when autoconf
|
||||
detects pthreads are usable. I haven't heard neither positive nor
|
||||
negative comments from minority platforms that might be harmed.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. The line number in the "previous" information
|
||||
may need refining, and sanity checking code for reference counting may
|
||||
need to be resurrected before this can move forward.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* mk/gitweb-feature (Mon Dec 15 22:16:19 2008 -0800) 1 commit
|
||||
- gitweb: unify boolean feature subroutines
|
||||
|
||||
* cb/merge-recursive-fix (Mon Dec 15 02:41:24 2008 -0800) 3 commits
|
||||
+ Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-
|
||||
recursive-fix
|
||||
+ merge-recursive: do not clobber untracked working tree garbage
|
||||
+ modify/delete conflict resolution overwrites untracked file
|
||||
|
||||
* cb/maint-merge-recursive-fix (Sun Dec 14 19:40:09 2008 -0800) 2 commits
|
||||
+ merge-recursive: do not clobber untracked working tree garbage
|
||||
+ modify/delete conflict resolution overwrites untracked file
|
||||
|
||||
* js/notes (Sat Dec 20 13:06:03 2008 +0100) 4 commits
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits
|
||||
+ Add 'g' command to go to a hunk
|
||||
+ Add subroutine to display one-line summary of hunks
|
||||
|
||||
* jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits
|
||||
- gitweb: cache $parent_commit info in git_blame()
|
||||
- gitweb: A bit of code cleanup in git_blame()
|
||||
- gitweb: Move 'lineno' id from link to row element in git_blame
|
||||
|
||||
Jakub seemed to feel they are not yet ready.
|
||||
|
||||
* mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit
|
||||
+ Add support for a pdf version of the user manual
|
||||
|
||||
I do not have a new enough combination of dblatex and asciidoc myself but
|
||||
this may help interested people.
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
* gb/gitweb-patch (Thu Dec 18 08:13:19 2008 +0100) 4 commits
|
||||
- gitweb: link to patch(es) view in commit(diff) and (short)log view
|
||||
- gitweb: add patches view
|
||||
- gitweb: change call pattern for git_commitdiff
|
||||
- gitweb: add patch view
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* js/rebase-i-p (Mon Dec 15 11:05:31 2008 +0100) 2 commits
|
||||
+ rebase -i -p: Fix --continue after a merge could not be redone
|
||||
+ Show a failure of rebase -p if the merge had a conflict
|
||||
|
||||
* np/auto-thread (Mon Dec 15 20:44:30 2008 +0100) 3 commits
|
||||
+ Force t5302 to use a single thread
|
||||
+ pack-objects: don't use too many threads with few objects
|
||||
+ autodetect number of CPUs by default when using threads
|
||||
|
||||
* lt/reset-merge (Wed Dec 3 18:00:12 2008 -0800) 2 commits
|
||||
+ Document "git-reset --merge"
|
||||
+ Add 'merge' mode to 'git reset'
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* cb/mergetool (Fri Dec 12 21:48:41 2008 +0000) 4 commits
|
||||
+ mergetool: Don't keep temporary merge files unless told to
|
||||
+ mergetool: Add prompt to continue after failing to merge a file
|
||||
+ Add -y/--no-prompt option to mergetool
|
||||
+ Fix some tab/space inconsistencies in git-mergetool.sh
|
||||
|
||||
I have been waiting for comments from the original author and other
|
||||
interested parties, but haven't heard anything yet. This tool is on the
|
||||
fringe from my point of view anyway, so I'll push them out to 'master'
|
||||
soon. If there is a breakage that annoys real people, we will hear from
|
||||
them, and we can take it from there.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 17 commits
|
||||
- wt-status: show sparse checkout info
|
||||
- Introduce default sparse patterns (core.defaultsparse)
|
||||
- checkout: add new options to support sparse checkout
|
||||
- clone: support sparse checkout with --sparse-checkout option
|
||||
- unpack_trees(): add support for sparse checkout
|
||||
- unpack_trees(): keep track of unmerged entries
|
||||
- Introduce "sparse patterns"
|
||||
- Merge branch 'master' into nd/narrow
|
||||
- t2104: touch portability fix
|
||||
- grep: skip files outside sparse checkout area
|
||||
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
- Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
- ls-files: Add tests for --sparse and friends
|
||||
- update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
- ls-files: add options to support sparse checkout
|
||||
- Introduce CE_NO_CHECKOUT bit
|
||||
|
||||
Kicked out of 'next' by popular demand (see recent discussion on the
|
||||
interaction between the checkout area and commands such as "grep").
|
||||
|
||||
* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits
|
||||
- clone: test the new HEAD detection logic
|
||||
- Merge commit 'HEAD@{2}' into HEAD
|
||||
- upload-pack: send the HEAD information
|
||||
- clone: find the current branch more explicitly
|
||||
- connect.c::read_extra_info(): find where HEAD points at
|
||||
- connect.c::read_extra_info(): prepare to receive more than server
|
||||
capabilities
|
||||
- get_remote_heads(): refactor code to read "server capabilities"
|
||||
|
||||
An attempt to extend the fetch protocol to make the logic to detect where
|
||||
HEAD on the origin site points to more robust.
|
||||
|
||||
* cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits
|
||||
- bisect: add "--no-replace" option to bisect without using replace
|
||||
refs
|
||||
- rev-list: make it possible to disable replacing using "--no-
|
||||
bisect-replace"
|
||||
- bisect: use "--bisect-replace" options when checking merge bases
|
||||
- merge-base: add "--bisect-replace" option to use fixed up revs
|
||||
- commit: add "bisect_replace_all" prototype to "commit.h"
|
||||
- rev-list: add "--bisect-replace" to list revisions with fixed up
|
||||
history
|
||||
- Documentation: add "git bisect replace" documentation
|
||||
- bisect: add test cases for "git bisect replace"
|
||||
- bisect: add "git bisect replace" subcommand
|
||||
|
||||
I think a mechanism like this should be added to replace grafts, but it
|
||||
should always be enabled for normal revision traversal operation, while
|
||||
always disabled for object enumeration and transfer operation (iow, fsck,
|
||||
fetch and push should use the real ancestry information recorded in the
|
||||
underlying objects, while rev-list, log, etc. should always use the
|
||||
replaced objects). I have a suspicion that even cat-file could honor it.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This seems to have a deadlock during communication between the peers.
|
||||
Someone needs to pick up this topic and resolve the deadlock before it can
|
||||
continue.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
@@ -1,283 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Jan 2009, #01; Mon, 05)
|
||||
X-master-at: e9b852310ebc271bdd71bb3b980e77325ad7f75f
|
||||
X-next-at: 866a4abd3e8fee98a6d3bc74510db28c4bca0c48
|
||||
|
||||
What's cooking in git.git (Jan 2009, #01; Mon, 05)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'. The ones marked with '.' do not appear in any of the branches,
|
||||
but I am still holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
Sorry to have been lagging a bit. There are a few patches I am interested
|
||||
in but haven't studied yet nor mentioned here. I've been swamped outside
|
||||
git lately for the past few days, but hopefully I can get to them shortly.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* js/bundle-tags (Fri Jan 2 19:08:46 2009 +0100) 1 commit
|
||||
+ bundle: allow rev-list options to exclude annotated tags
|
||||
|
||||
* js/add-not-submodule (Fri Jan 2 19:08:40 2009 +0100) 1 commit
|
||||
+ git add: do not add files from a submodule
|
||||
|
||||
* pb/maint-git-pm-false-dir (Mon Dec 29 01:25:00 2008 +0100) 1 commit
|
||||
+ Git.pm: correctly handle directory name that evaluates to "false"
|
||||
|
||||
* pj/maint-ldflags (Sun Jan 4 21:27:41 2009 -0500) 1 commit
|
||||
+ configure clobbers LDFLAGS
|
||||
|
||||
* fe/cvsserver (Fri Jan 2 16:40:14 2009 +0100) 2 commits
|
||||
+ cvsserver: change generation of CVS author names
|
||||
+ cvsserver: add option to configure commit message
|
||||
|
||||
* js/maint-bisect-gitk (Fri Jan 2 19:08:00 2009 +0100) 1 commit
|
||||
+ bisect view: call gitk if Cygwin's SESSIONNAME variable is set
|
||||
|
||||
* np/no-loosen-prune-expire-now (Tue Dec 30 14:45:11 2008 -0500) 1 commit
|
||||
+ objects to be pruned immediately don't have to be loosened
|
||||
|
||||
* cb/maint-unpack-trees-absense (Thu Jan 1 21:54:33 2009 +0100) 3 commits
|
||||
+ unpack-trees: remove redundant path search in verify_absent
|
||||
+ unpack-trees: fix path search bug in verify_absent
|
||||
+ unpack-trees: handle failure in verify_absent
|
||||
|
||||
* mc/cd-p-pwd (Tue Dec 30 07:10:24 2008 -0800) 1 commit
|
||||
+ git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on
|
||||
OS X
|
||||
|
||||
All of the above are good fixes and clean-ups; will be fast-tracked to
|
||||
'master' and maintenance branches as appropriate.
|
||||
|
||||
* mv/apply-parse-opt (Sun Dec 28 00:03:57 2008 +0100) 1 commit
|
||||
+ parse-opt: migrate builtin-apply.
|
||||
|
||||
* mh/cherry-default (Thu Jan 1 22:56:29 2009 +0100) 2 commits
|
||||
+ Documentation: clarify which parameters are optional to git-cherry
|
||||
+ git-cherry: make <upstream> parameter optional
|
||||
|
||||
* rs/maint-shortlog-foldline (Mon Dec 29 23:15:50 2008 +0100) 1 commit
|
||||
- [Need tidying up the log] pretty: support multiline subjects with
|
||||
format:
|
||||
|
||||
* tr/rebase-root (Fri Jan 2 23:28:29 2009 +0100) 4 commits
|
||||
- rebase: update documentation for --root
|
||||
- rebase -i: learn to rebase root commit
|
||||
- rebase: learn to rebase root commit
|
||||
- rebase -i: execute hook only after argument checking
|
||||
|
||||
I should be able to find time to read this over again and merge to
|
||||
'next' sometime this week.
|
||||
|
||||
* as/autocorrect-alias (Sun Jan 4 18:16:01 2009 +0100) 1 commit
|
||||
+ git.c: make autocorrected aliases work
|
||||
|
||||
* as/commit-signoff (Mon Dec 29 12:16:45 2008 +0100) 1 commit
|
||||
- [WIP] Add a commit.signoff configuration option to always use --
|
||||
signoff in commit
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
|
||||
. In add --patch, Handle K,k,J,j slightly more gracefully.
|
||||
. Add / command in add --patch
|
||||
. git-add -i/-p: Change prompt separater from slash to comma
|
||||
|
||||
Will discard and wait for a resubmit.
|
||||
|
||||
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
|
||||
. git-am: Pass the --directory option through to git-apply
|
||||
|
||||
A reroll of this by Simon Schubert triggered a series to fix a parameter
|
||||
propagation bug, and another reroll to add "git am --directory=path/"
|
||||
should be much easier now. I am not likely to use the feature myself, so
|
||||
it is up to intrested volunteers to carry it forward.
|
||||
|
||||
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
|
||||
- autoconf: Enable threaded delta search when pthreads are supported
|
||||
|
||||
This automatically enables threaded delta search code when autoconf
|
||||
detects pthreads are usable. I haven't heard neither positive nor
|
||||
negative comments from minority platforms that might be harmed, but
|
||||
this feels like the right thing to do, so perhaps the best course of
|
||||
action is to merge this down to 'master' and see if anybody screams.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. The line number in the "previous" information
|
||||
may need refining, and sanity checking code for reference counting may
|
||||
need to be resurrected before this can move forward.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* nd/grep-assume-unchanged (Sat Dec 27 15:21:03 2008 +0700) 2 commits
|
||||
+ grep: grep cache entries if they are "assume unchanged"
|
||||
+ grep: support --no-ext-grep to test builtin grep
|
||||
|
||||
* as/maint-shortlog-cleanup (Tue Dec 30 22:01:44 2008 +0100) 1 commit
|
||||
+ builtin-shortlog.c: use string_list_append(), and don't strdup
|
||||
unnecessarily
|
||||
|
||||
* jc/maint-ls-tree (Wed Dec 31 19:00:50 2008 +0900) 2 commits
|
||||
+ Document git-ls-tree --full-tree
|
||||
+ ls-tree: add --full-tree option
|
||||
|
||||
* js/notes (Sat Dec 20 13:06:03 2008 +0100) 4 commits
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
* gb/gitweb-patch (Thu Dec 18 08:13:19 2008 +0100) 4 commits
|
||||
- gitweb: link to patch(es) view in commit(diff) and (short)log view
|
||||
- gitweb: add patches view
|
||||
- gitweb: change call pattern for git_commitdiff
|
||||
- gitweb: add patch view
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* cb/mergetool (Fri Dec 12 21:48:41 2008 +0000) 4 commits
|
||||
+ mergetool: Don't keep temporary merge files unless told to
|
||||
+ mergetool: Add prompt to continue after failing to merge a file
|
||||
+ Add -y/--no-prompt option to mergetool
|
||||
+ Fix some tab/space inconsistencies in git-mergetool.sh
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* mh/maint-sendmail-cc-doc (Mon Dec 29 00:37:25 2008 +0100) 1 commit
|
||||
+ doc/git-send-email: mention sendemail.cc config variable
|
||||
|
||||
* rs/diff-ihc (Sun Dec 28 19:45:32 2008 +0100) 1 commit
|
||||
+ diff: add option to show context between close hunks
|
||||
|
||||
* js/maint-merge-recursive-r-d-conflict (Mon Dec 22 23:10:20 2008 +0100) 1 commit
|
||||
+ merge-recursive: mark rename/delete conflict as unmerged
|
||||
|
||||
* mk/gitweb-feature (Mon Dec 15 22:16:19 2008 -0800) 1 commit
|
||||
+ gitweb: unify boolean feature subroutines
|
||||
|
||||
* cb/merge-recursive-fix (Mon Dec 15 02:41:24 2008 -0800) 3 commits
|
||||
+ Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-
|
||||
recursive-fix
|
||||
+ merge-recursive: do not clobber untracked working tree garbage
|
||||
+ modify/delete conflict resolution overwrites untracked file
|
||||
|
||||
* cb/maint-merge-recursive-fix (Sun Dec 14 19:40:09 2008 -0800) 2 commits
|
||||
+ merge-recursive: do not clobber untracked working tree garbage
|
||||
+ modify/delete conflict resolution overwrites untracked file
|
||||
|
||||
* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits
|
||||
+ Add 'g' command to go to a hunk
|
||||
+ Add subroutine to display one-line summary of hunks
|
||||
|
||||
* jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits
|
||||
+ gitweb: cache $parent_commit info in git_blame()
|
||||
+ gitweb: A bit of code cleanup in git_blame()
|
||||
+ gitweb: Move 'lineno' id from link to row element in git_blame
|
||||
|
||||
* mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit
|
||||
+ Add support for a pdf version of the user manual
|
||||
|
||||
* kk/maint-http-push (Tue Dec 23 11:31:15 2008 +0300) 1 commit
|
||||
+ http-push: support full URI in handle_remote_ls_ctx()
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 17 commits
|
||||
- wt-status: show sparse checkout info
|
||||
- Introduce default sparse patterns (core.defaultsparse)
|
||||
- checkout: add new options to support sparse checkout
|
||||
- clone: support sparse checkout with --sparse-checkout option
|
||||
- unpack_trees(): add support for sparse checkout
|
||||
- unpack_trees(): keep track of unmerged entries
|
||||
- Introduce "sparse patterns"
|
||||
- Merge branch 'master' into nd/narrow
|
||||
- t2104: touch portability fix
|
||||
- grep: skip files outside sparse checkout area
|
||||
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
|
||||
- Prevent diff machinery from examining worktree outside sparse
|
||||
checkout
|
||||
- ls-files: Add tests for --sparse and friends
|
||||
- update-index: add --checkout/--no-checkout to update
|
||||
CE_NO_CHECKOUT bit
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
- ls-files: add options to support sparse checkout
|
||||
- Introduce CE_NO_CHECKOUT bit
|
||||
|
||||
Will drop shortly, but there may be some other fixes to CE_VALID, like
|
||||
nd/grep-assume-unchanged topic above, that we may want to resurrect.
|
||||
|
||||
* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits
|
||||
- clone: test the new HEAD detection logic
|
||||
- Merge commit 'HEAD@{2}' into HEAD
|
||||
- upload-pack: send the HEAD information
|
||||
- clone: find the current branch more explicitly
|
||||
- connect.c::read_extra_info(): find where HEAD points at
|
||||
- connect.c::read_extra_info(): prepare to receive more than server
|
||||
capabilities
|
||||
- get_remote_heads(): refactor code to read "server capabilities"
|
||||
|
||||
An attempt to extend the fetch protocol to make the logic to detect where
|
||||
HEAD on the origin site points to more robust. Will drop shortly as the
|
||||
protocol extension was not very popular.
|
||||
|
||||
* cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits
|
||||
- bisect: add "--no-replace" option to bisect without using replace
|
||||
refs
|
||||
- rev-list: make it possible to disable replacing using "--no-
|
||||
bisect-replace"
|
||||
- bisect: use "--bisect-replace" options when checking merge bases
|
||||
- merge-base: add "--bisect-replace" option to use fixed up revs
|
||||
- commit: add "bisect_replace_all" prototype to "commit.h"
|
||||
- rev-list: add "--bisect-replace" to list revisions with fixed up
|
||||
history
|
||||
- Documentation: add "git bisect replace" documentation
|
||||
- bisect: add test cases for "git bisect replace"
|
||||
- bisect: add "git bisect replace" subcommand
|
||||
|
||||
Will drop and replace it with the resubmitted series when it comes.
|
||||
|
||||
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
|
||||
- "git push": tellme-more protocol extension
|
||||
|
||||
This seems to have a deadlock during communication between the peers.
|
||||
Will drop shortly.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
@@ -1,250 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Jan 2009, #02; Sun, 11)
|
||||
X-master-at: 7eb5bbdb645e04d746bc0edea102744f50a5e529
|
||||
X-next-at: 1b01dafc9b8818adbe83018ebe1c21daf7fbed87
|
||||
|
||||
What's cooking in git.git (Jan 2009, #02; Sun, 11)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'. The ones marked with '.' do not appear in any of the branches,
|
||||
but I am still holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
Sorry to have been lagging a bit. There are a few patches I am interested
|
||||
in but haven't studied yet nor mentioned here. I've been swamped outside
|
||||
git lately for the past few days, but hopefully I can get to them shortly.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* rs/fgrep (Sat Jan 10 00:18:34 2009 +0100) 2 commits
|
||||
+ grep: don't call regexec() for fixed strings
|
||||
+ grep -w: forward to next possible position after rejected match
|
||||
|
||||
* lt/zlib-wrap-xprm (Wed Jan 7 19:54:47 2009 -0800) 1 commit
|
||||
- Wrap inflateInit to retry allocation after releasing pack memory
|
||||
|
||||
Need to clean up the log message, perhaps rebase it to maint-1.6.0 and
|
||||
start cooking in 'next'.
|
||||
|
||||
* jc/maint-format-patch (Sat Jan 10 12:41:33 2009 -0800) 1 commit
|
||||
+ format-patch: show patch text for the root commit
|
||||
|
||||
* tr/maint-no-index-fixes (Wed Jan 7 12:15:30 2009 +0100) 3 commits
|
||||
+ diff --no-index -q: fix endless loop
|
||||
+ diff --no-index: test for pager after option parsing
|
||||
+ diff: accept -- when using --no-index
|
||||
|
||||
* gb/gitweb-opml (Fri Jan 2 13:49:30 2009 +0100) 2 commits
|
||||
- gitweb: suggest name for OPML view
|
||||
- gitweb: don't use pathinfo for global actions
|
||||
|
||||
* mh/maint-commit-color-status (Thu Jan 8 19:53:05 2009 +0100) 2 commits
|
||||
- git-status -v: color diff output when color.ui is set
|
||||
- git-commit: color status output when color.ui is set
|
||||
|
||||
* ks/maint-mailinfo-folded (Thu Jan 8 01:43:42 2009 +0300) 1 commit
|
||||
- mailinfo: correctly handle multiline 'Subject:' header
|
||||
|
||||
* js/patience-diff (Thu Jan 1 17:39:37 2009 +0100) 3 commits
|
||||
- bash completions: Add the --patience option
|
||||
- Introduce the diff option '--patience'
|
||||
- Implement the patience diff algorithm
|
||||
|
||||
All of the above 'pu' topics are ready for 'next'.
|
||||
|
||||
* ap/clone-into-empty (Fri Jan 9 02:24:23 2009 +0300) 2 commits
|
||||
- Use is_pseudo_dir_name everywhere
|
||||
- Allow cloning to an existing empty directory
|
||||
|
||||
There is an updated patch that only refactors the repeated code to check
|
||||
if a dirent is dot or dot-dot posted, which I should have picked up to
|
||||
replace these but I haven't yet (the "clone into empty" can and should
|
||||
build on top of it).
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
|
||||
- autoconf: Enable threaded delta search when pthreads are supported
|
||||
|
||||
This automatically enables threaded delta search code when autoconf
|
||||
detects pthreads are usable. I haven't heard neither positive nor
|
||||
negative comments from minority platforms that might be harmed, but
|
||||
this feels like the right thing to do, so perhaps the best course of
|
||||
action is to merge this down to 'master' and see if anybody screams.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. The line number in the "previous" information
|
||||
may need refining, and sanity checking code for reference counting may
|
||||
need to be resurrected before this can move forward.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* mv/apply-parse-opt (Fri Jan 9 22:21:36 2009 -0800) 2 commits
|
||||
+ Resurrect "git apply --flags -" to read from the standard input
|
||||
+ parse-opt: migrate builtin-apply.
|
||||
|
||||
* rs/maint-shortlog-foldline (Tue Jan 6 21:41:06 2009 +0100) 1 commit
|
||||
+ shortlog: handle multi-line subjects like log --pretty=oneline et.
|
||||
al. do
|
||||
|
||||
* tr/rebase-root (Fri Jan 2 23:28:29 2009 +0100) 4 commits
|
||||
- rebase: update documentation for --root
|
||||
- rebase -i: learn to rebase root commit
|
||||
- rebase: learn to rebase root commit
|
||||
- rebase -i: execute hook only after argument checking
|
||||
|
||||
I should be able to find time to read this over again and merge to
|
||||
'next' sometime this week.
|
||||
|
||||
* as/autocorrect-alias (Sun Jan 4 18:16:01 2009 +0100) 1 commit
|
||||
+ git.c: make autocorrected aliases work
|
||||
|
||||
* js/notes (Sat Dec 20 13:06:03 2008 +0100) 4 commits
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
* gb/gitweb-patch (Thu Dec 18 08:13:19 2008 +0100) 4 commits
|
||||
- gitweb: link to patch(es) view in commit(diff) and (short)log view
|
||||
- gitweb: add patches view
|
||||
- gitweb: change call pattern for git_commitdiff
|
||||
- gitweb: add patch view
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* mh/maint-sendmail-cc-doc (Mon Dec 29 00:37:25 2008 +0100) 1 commit
|
||||
+ doc/git-send-email: mention sendemail.cc config variable
|
||||
|
||||
* rs/diff-ihc (Sun Dec 28 19:45:32 2008 +0100) 1 commit
|
||||
+ diff: add option to show context between close hunks
|
||||
|
||||
* js/maint-merge-recursive-r-d-conflict (Mon Dec 22 23:10:20 2008 +0100) 1 commit
|
||||
+ merge-recursive: mark rename/delete conflict as unmerged
|
||||
|
||||
* mk/gitweb-feature (Mon Dec 15 22:16:19 2008 -0800) 1 commit
|
||||
+ gitweb: unify boolean feature subroutines
|
||||
|
||||
* cb/merge-recursive-fix (Mon Dec 15 02:41:24 2008 -0800) 3 commits
|
||||
+ Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-
|
||||
recursive-fix
|
||||
+ merge-recursive: do not clobber untracked working tree garbage
|
||||
+ modify/delete conflict resolution overwrites untracked file
|
||||
|
||||
* cb/maint-merge-recursive-fix (Sun Dec 14 19:40:09 2008 -0800) 2 commits
|
||||
+ merge-recursive: do not clobber untracked working tree garbage
|
||||
+ modify/delete conflict resolution overwrites untracked file
|
||||
|
||||
* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits
|
||||
+ Add 'g' command to go to a hunk
|
||||
+ Add subroutine to display one-line summary of hunks
|
||||
|
||||
* jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits
|
||||
+ gitweb: cache $parent_commit info in git_blame()
|
||||
+ gitweb: A bit of code cleanup in git_blame()
|
||||
+ gitweb: Move 'lineno' id from link to row element in git_blame
|
||||
|
||||
* mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit
|
||||
+ Add support for a pdf version of the user manual
|
||||
|
||||
* kk/maint-http-push (Tue Dec 23 11:31:15 2008 +0300) 1 commit
|
||||
+ http-push: support full URI in handle_remote_ls_ctx()
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* nd/grep-assume-unchanged (Sat Dec 27 15:21:03 2008 +0700) 2 commits
|
||||
+ grep: grep cache entries if they are "assume unchanged"
|
||||
+ grep: support --no-ext-grep to test builtin grep
|
||||
|
||||
* as/maint-shortlog-cleanup (Tue Dec 30 22:01:44 2008 +0100) 1 commit
|
||||
+ builtin-shortlog.c: use string_list_append(), and don't strdup
|
||||
unnecessarily
|
||||
|
||||
* jc/maint-ls-tree (Wed Dec 31 19:00:50 2008 +0900) 2 commits
|
||||
+ Document git-ls-tree --full-tree
|
||||
+ ls-tree: add --full-tree option
|
||||
|
||||
* js/bundle-tags (Fri Jan 2 19:08:46 2009 +0100) 1 commit
|
||||
+ bundle: allow rev-list options to exclude annotated tags
|
||||
|
||||
* js/add-not-submodule (Fri Jan 2 19:08:40 2009 +0100) 1 commit
|
||||
+ git add: do not add files from a submodule
|
||||
|
||||
* pb/maint-git-pm-false-dir (Mon Dec 29 01:25:00 2008 +0100) 1 commit
|
||||
+ Git.pm: correctly handle directory name that evaluates to "false"
|
||||
|
||||
* pj/maint-ldflags (Sun Jan 4 21:27:41 2009 -0500) 1 commit
|
||||
+ configure clobbers LDFLAGS
|
||||
|
||||
* fe/cvsserver (Fri Jan 2 16:40:14 2009 +0100) 2 commits
|
||||
+ cvsserver: change generation of CVS author names
|
||||
+ cvsserver: add option to configure commit message
|
||||
|
||||
* js/maint-bisect-gitk (Fri Jan 2 19:08:00 2009 +0100) 1 commit
|
||||
+ bisect view: call gitk if Cygwin's SESSIONNAME variable is set
|
||||
|
||||
* np/no-loosen-prune-expire-now (Tue Dec 30 14:45:11 2008 -0500) 1 commit
|
||||
+ objects to be pruned immediately don't have to be loosened
|
||||
|
||||
* cb/maint-unpack-trees-absense (Thu Jan 1 21:54:33 2009 +0100) 3 commits
|
||||
+ unpack-trees: remove redundant path search in verify_absent
|
||||
+ unpack-trees: fix path search bug in verify_absent
|
||||
+ unpack-trees: handle failure in verify_absent
|
||||
|
||||
* mc/cd-p-pwd (Tue Dec 30 07:10:24 2008 -0800) 1 commit
|
||||
+ git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on
|
||||
OS X
|
||||
|
||||
* mh/cherry-default (Thu Jan 1 22:56:29 2009 +0100) 2 commits
|
||||
+ Documentation: clarify which parameters are optional to git-cherry
|
||||
+ git-cherry: make <upstream> parameter optional
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will drop]
|
||||
|
||||
* as/commit-signoff (Mon Dec 29 12:16:45 2008 +0100) 1 commit
|
||||
- [WIP] Add a commit.signoff configuration option to always use --
|
||||
signoff in commit
|
||||
|
||||
The semantics when "git commit" was used as a backend for other actions
|
||||
such as rebase and cherry-pick was unclear.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
- diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
This would be the right thing to do for command line use,
|
||||
but gitk will be hit due to tcl/tk's limitation, so I am holding
|
||||
this back for now.
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
- git-am --forge: add Signed-off-by: line for the author
|
||||
- git-am: clean-up Signed-off-by: lines
|
||||
- stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
- stripspace: use parse_options()
|
||||
- Add "git am -s" test
|
||||
- git-am: refactor code to add signed-off-by line for the committer
|
||||
@@ -1,245 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Jan 2009, #03; Wed, 14)
|
||||
X-master-at: 3cf3b838c7b379824c68ee87799aaaa9028b36cd
|
||||
X-next-at: 5b4a894b226c0bf6c51c888eeb06524eeb201ab9
|
||||
|
||||
What's cooking in git.git (Jan 2009, #03; Wed, 14)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
with '-' are only in 'pu' while commits prefixed with '+' are
|
||||
in 'next'. The ones marked with '.' do not appear in any of the branches,
|
||||
but I am still holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* kb/am-directory (Sun Jan 11 22:21:48 2009 -0800) 1 commit
|
||||
+ git-am: add --directory=<dir> option
|
||||
|
||||
This is "third-time-lucky, perhaps?" resurrection. I do not think I'd be
|
||||
using this very often, but it originated from a real user request.
|
||||
|
||||
* jk/signal-cleanup (Sun Jan 11 06:36:49 2009 -0500) 3 commits
|
||||
- pager: do wait_for_pager on signal death
|
||||
- refactor signal handling for cleanup functions
|
||||
- chain kill signals for cleanup functions
|
||||
|
||||
* kb/lstat-cache (Tue Jan 13 13:29:08 2009 +0100) 5 commits
|
||||
- lstat_cache(): introduce clear_lstat_cache() function
|
||||
- lstat_cache(): introduce invalidate_lstat_cache() function
|
||||
- lstat_cache(): introduce has_dirs_only_path() function
|
||||
- lstat_cache(): introduce has_symlink_or_noent_leading_path()
|
||||
function
|
||||
- lstat_cache(): more cache effective symlink/directory detection
|
||||
|
||||
This is the seventh round; although the author asked me not to bother, I
|
||||
couldn't resist. I renamed one helper function while reading the patches
|
||||
and made minor adjustments on styles, but it looked reasonable.
|
||||
|
||||
* lh/submodule-tree-traversal (Mon Jan 12 00:45:55 2009 +0100) 3 commits
|
||||
- builtin-ls-tree: enable traversal of submodules
|
||||
- archive.c: enable traversal of submodules
|
||||
- tree.c: add support for traversal of submodules
|
||||
|
||||
* jc/maint-format-patch-o-relative (Mon Jan 12 15:18:02 2009 -0800) 1 commit
|
||||
- Teach format-patch to handle output directory relative to cwd
|
||||
|
||||
This was my lunchtime "this may fix it" response to a breakage report. I
|
||||
haven't really thought things through but my gut feeling is this might
|
||||
break things for minorities who are accustomed to the existing behaviour,
|
||||
especially wrt the filenames reported on the standard output.
|
||||
|
||||
* lt/maint-wrap-zlib (Wed Jan 7 19:54:47 2009 -0800) 1 commit
|
||||
+ Wrap inflate and other zlib routines for better error reporting
|
||||
|
||||
Needs the "free our memory upon seeing Z_MEM_ERROR and try again" bits
|
||||
extracted from Shawn's patch on top of this one.
|
||||
|
||||
* js/diff-color-words (Sun Jan 11 21:00:58 2009 +0100) 4 commits
|
||||
- color-words: take an optional regular expression describing words
|
||||
- color-words: refactor to allow for 0-character word boundaries
|
||||
- color-words: refactor word splitting and use ALLOC_GROW()
|
||||
- Add color_fwrite(), a function coloring each line individually
|
||||
|
||||
Dscho's series that was done in response to Thomas's original; two agreed
|
||||
to work together on this codebase.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
|
||||
. autoconf: Enable threaded delta search when pthreads are supported
|
||||
|
||||
I haven't heard neither positive nor negative comments from minority
|
||||
platforms that might be harmed, but this feels like the right thing to do,
|
||||
so perhaps the best course of action is to merge this down to 'master' and
|
||||
see if anybody screams.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. The line number in the "previous" information
|
||||
may need refining, and sanity checking code for reference counting may
|
||||
need to be resurrected before this can move forward.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* gb/gitweb-opml (Fri Jan 2 13:49:30 2009 +0100) 2 commits
|
||||
+ gitweb: suggest name for OPML view
|
||||
+ gitweb: don't use pathinfo for global actions
|
||||
|
||||
* ks/maint-mailinfo-folded (Mon Jan 12 15:22:11 2009 -0800) 2 commits
|
||||
- mailinfo: 'From:' header should be unfold as well
|
||||
- mailinfo: correctly handle multiline 'Subject:' header
|
||||
|
||||
The author seems to have more updates, but I couldn't extract them from
|
||||
the e-mail.
|
||||
|
||||
* js/patience-diff (Thu Jan 1 17:39:37 2009 +0100) 3 commits
|
||||
+ bash completions: Add the --patience option
|
||||
+ Introduce the diff option '--patience'
|
||||
+ Implement the patience diff algorithm
|
||||
|
||||
* mv/apply-parse-opt (Fri Jan 9 22:21:36 2009 -0800) 2 commits
|
||||
+ Resurrect "git apply --flags -" to read from the standard input
|
||||
+ parse-opt: migrate builtin-apply.
|
||||
|
||||
* tr/rebase-root (Fri Jan 2 23:28:29 2009 +0100) 4 commits
|
||||
+ rebase: update documentation for --root
|
||||
+ rebase -i: learn to rebase root commit
|
||||
+ rebase: learn to rebase root commit
|
||||
+ rebase -i: execute hook only after argument checking
|
||||
|
||||
Looked reasonable.
|
||||
|
||||
* js/notes (Tue Jan 13 20:57:16 2009 +0100) 6 commits
|
||||
+ git-notes: fix printing of multi-line notes
|
||||
+ notes: fix core.notesRef documentation
|
||||
+ Add an expensive test for git-notes
|
||||
+ Speed up git notes lookup
|
||||
+ Add a script to edit/inspect notes
|
||||
+ Introduce commit notes
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* nd/grep-assume-unchanged (Sat Dec 27 15:21:03 2008 +0700) 2 commits
|
||||
+ grep: grep cache entries if they are "assume unchanged"
|
||||
+ grep: support --no-ext-grep to test builtin grep
|
||||
|
||||
* as/maint-shortlog-cleanup (Tue Dec 30 22:01:44 2008 +0100) 1 commit
|
||||
+ builtin-shortlog.c: use string_list_append(), and don't strdup
|
||||
unnecessarily
|
||||
|
||||
* jc/maint-ls-tree (Wed Dec 31 19:00:50 2008 +0900) 2 commits
|
||||
+ Document git-ls-tree --full-tree
|
||||
+ ls-tree: add --full-tree option
|
||||
|
||||
* js/bundle-tags (Fri Jan 2 19:08:46 2009 +0100) 1 commit
|
||||
+ bundle: allow rev-list options to exclude annotated tags
|
||||
|
||||
* js/add-not-submodule (Fri Jan 2 19:08:40 2009 +0100) 1 commit
|
||||
+ git add: do not add files from a submodule
|
||||
|
||||
* pb/maint-git-pm-false-dir (Mon Dec 29 01:25:00 2008 +0100) 1 commit
|
||||
+ Git.pm: correctly handle directory name that evaluates to "false"
|
||||
|
||||
* pj/maint-ldflags (Sun Jan 4 21:27:41 2009 -0500) 1 commit
|
||||
+ configure clobbers LDFLAGS
|
||||
|
||||
* fe/cvsserver (Fri Jan 2 16:40:14 2009 +0100) 2 commits
|
||||
+ cvsserver: change generation of CVS author names
|
||||
+ cvsserver: add option to configure commit message
|
||||
|
||||
* js/maint-bisect-gitk (Fri Jan 2 19:08:00 2009 +0100) 1 commit
|
||||
+ bisect view: call gitk if Cygwin's SESSIONNAME variable is set
|
||||
|
||||
* np/no-loosen-prune-expire-now (Tue Dec 30 14:45:11 2008 -0500) 1 commit
|
||||
+ objects to be pruned immediately don't have to be loosened
|
||||
|
||||
* cb/maint-unpack-trees-absense (Thu Jan 1 21:54:33 2009 +0100) 3 commits
|
||||
+ unpack-trees: remove redundant path search in verify_absent
|
||||
+ unpack-trees: fix path search bug in verify_absent
|
||||
+ unpack-trees: handle failure in verify_absent
|
||||
|
||||
* mc/cd-p-pwd (Tue Dec 30 07:10:24 2008 -0800) 1 commit
|
||||
+ git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on
|
||||
OS X
|
||||
|
||||
* mh/cherry-default (Thu Jan 1 22:56:29 2009 +0100) 2 commits
|
||||
+ Documentation: clarify which parameters are optional to git-cherry
|
||||
+ git-cherry: make <upstream> parameter optional
|
||||
|
||||
Some of the above will still need to be downmerged to respective
|
||||
maintenance branches after they are widely used on 'master'.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* mh/maint-commit-color-status (Thu Jan 8 19:53:05 2009 +0100) 2 commits
|
||||
+ git-status -v: color diff output when color.ui is set
|
||||
+ git-commit: color status output when color.ui is set
|
||||
|
||||
* rs/maint-shortlog-foldline (Tue Jan 6 21:41:06 2009 +0100) 1 commit
|
||||
+ shortlog: handle multi-line subjects like log --pretty=oneline et.
|
||||
al. do
|
||||
|
||||
* rs/fgrep (Sat Jan 10 00:18:34 2009 +0100) 2 commits
|
||||
+ grep: don't call regexec() for fixed strings
|
||||
+ grep -w: forward to next possible position after rejected match
|
||||
|
||||
* as/autocorrect-alias (Sun Jan 4 18:16:01 2009 +0100) 1 commit
|
||||
+ git.c: make autocorrected aliases work
|
||||
|
||||
* tr/maint-no-index-fixes (Wed Jan 7 12:15:30 2009 +0100) 3 commits
|
||||
+ diff --no-index -q: fix endless loop
|
||||
+ diff --no-index: test for pager after option parsing
|
||||
+ diff: accept -- when using --no-index
|
||||
|
||||
* jc/maint-format-patch (Sat Jan 10 12:41:33 2009 -0800) 1 commit
|
||||
+ format-patch: show patch text for the root commit
|
||||
|
||||
* ap/clone-into-empty (Sun Jan 11 15:19:12 2009 +0300) 2 commits
|
||||
+ Allow cloning to an existing empty directory
|
||||
+ add is_dot_or_dotdot inline function
|
||||
|
||||
* gb/gitweb-patch (Thu Dec 18 08:13:19 2008 +0100) 4 commits
|
||||
+ gitweb: link to patch(es) view in commit(diff) and (short)log view
|
||||
+ gitweb: add patches view
|
||||
+ gitweb: change call pattern for git_commitdiff
|
||||
+ gitweb: add patch view
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
. diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
@@ -1,289 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Jan 2009, #04; Mon, 19)
|
||||
X-master-at: 28da86a58d7861626eb9d33a1bcfa3e1e79a4d13
|
||||
X-next-at: 9c367b51316264d3883a39443778c45b2439bb3d
|
||||
|
||||
What's cooking in git.git (Jan 2009, #04; Mon, 19)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jk/color-parse (Sat Jan 17 10:38:46 2009 -0500) 2 commits
|
||||
+ expand --pretty=format color options
|
||||
+ color: make it easier for non-config to parse color specs
|
||||
|
||||
* sb/hook-cleanup (Sat Jan 17 04:02:55 2009 +0100) 5 commits
|
||||
+ run_hook(): allow more than 9 hook arguments
|
||||
+ run_hook(): check the executability of the hook before filling
|
||||
argv
|
||||
+ api-run-command.txt: talk about run_hook()
|
||||
+ Move run_hook() from builtin-commit.c into run-command.c (libgit)
|
||||
+ checkout: don't crash on file checkout before running post-
|
||||
checkout hook
|
||||
|
||||
* js/maint-all-implies-HEAD (Sat Jan 17 22:27:08 2009 -0800) 2 commits
|
||||
- bundle: allow the same ref to be given more than once
|
||||
- revision walker: include a detached HEAD in --all
|
||||
|
||||
* tr/previous-branch (Sat Jan 17 19:08:12 2009 +0100) 6 commits
|
||||
- Fix parsing of @{-1}@{1}
|
||||
- interpret_nth_last_branch(): avoid traversing the reflog twice
|
||||
- checkout: implement "-" abbreviation, add docs and tests
|
||||
- sha1_name: support @{-N} syntax in get_sha1()
|
||||
- sha1_name: tweak @{-N} lookup
|
||||
- checkout: implement "@{-N}" shortcut name for N-th last branch
|
||||
|
||||
* rs/ctype (Sat Jan 17 16:50:37 2009 +0100) 4 commits
|
||||
+ Add is_regex_special()
|
||||
+ Change NUL char handling of isspecial()
|
||||
+ Reformat ctype.c
|
||||
+ Add ctype test
|
||||
|
||||
* mh/unify-color (Sun Jan 18 21:39:12 2009 +0100) 2 commits
|
||||
- move the color variables to color.c
|
||||
- handle color.ui at a central place
|
||||
|
||||
* jf/am-failure-report (Sun Jan 18 19:34:31 2009 -0800) 2 commits
|
||||
+ git-am: re-fix the diag message printing
|
||||
+ git-am: Make it easier to see which patch failed
|
||||
|
||||
* cb/add-pathspec (Wed Jan 14 15:54:35 2009 +0100) 2 commits
|
||||
- remove pathspec_match, use match_pathspec instead
|
||||
- clean up pathspec matching
|
||||
|
||||
* sg/maint-gitdir-in-subdir (Fri Jan 16 16:37:33 2009 +0100) 1 commit
|
||||
+ Fix gitdir detection when in subdir of gitdir
|
||||
|
||||
This has my "don't do the fullpath if you are directly inside .git"
|
||||
squashed in, so it should be much safer.
|
||||
|
||||
* am/maint-push-doc (Sun Jan 18 15:36:58 2009 +0100) 4 commits
|
||||
+ Documentation: avoid using undefined parameters
|
||||
+ Documentation: mention branches rather than heads
|
||||
+ Documentation: remove a redundant elaboration
|
||||
+ Documentation: git push repository can also be a remote
|
||||
|
||||
* sp/runtime-prefix (Sun Jan 18 13:00:15 2009 +0100) 5 commits
|
||||
- Windows: Revert to default paths and convert them by
|
||||
RUNTIME_PREFIX
|
||||
- Modify setup_path() to only add git_exec_path() to PATH
|
||||
- Add calls to git_extract_argv0_path() in programs that call
|
||||
git_config_*
|
||||
- git_extract_argv0_path(): Move check for valid argv0 from caller
|
||||
to callee
|
||||
- Move computation of absolute paths from Makefile to runtime (in
|
||||
preparation for RUNTIME_PREFIX)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. The line number in the "previous" information
|
||||
may need refining, and sanity checking code for reference counting may
|
||||
need to be resurrected before this can move forward.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
The "spec" did not seem quite well cooked yet, but in the longer term I
|
||||
think something like this to allow interoperating with other SCMs as if
|
||||
the other end is a native git repository is a very worthy goal.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* kb/lstat-cache (Sun Jan 18 16:14:54 2009 +0100) 5 commits
|
||||
+ lstat_cache(): introduce clear_lstat_cache() function
|
||||
+ lstat_cache(): introduce invalidate_lstat_cache() function
|
||||
+ lstat_cache(): introduce has_dirs_only_path() function
|
||||
+ lstat_cache(): introduce has_symlink_or_noent_leading_path()
|
||||
function
|
||||
+ lstat_cache(): more cache effective symlink/directory detection
|
||||
|
||||
This is the tenth round, now in 'next'.
|
||||
|
||||
* lh/submodule-tree-traversal (Mon Jan 12 00:45:55 2009 +0100) 3 commits
|
||||
- builtin-ls-tree: enable traversal of submodules
|
||||
- archive.c: enable traversal of submodules
|
||||
- tree.c: add support for traversal of submodules
|
||||
|
||||
Still getting active reviews.
|
||||
|
||||
* lt/maint-wrap-zlib (Wed Jan 7 19:54:47 2009 -0800) 1 commit
|
||||
+ Wrap inflate and other zlib routines for better error reporting
|
||||
|
||||
Needs the "free our memory upon seeing Z_MEM_ERROR and try again" bits
|
||||
extracted from Shawn's patch on top of this one.
|
||||
|
||||
* jk/signal-cleanup (Sun Jan 11 06:36:49 2009 -0500) 3 commits
|
||||
- pager: do wait_for_pager on signal death
|
||||
- refactor signal handling for cleanup functions
|
||||
- chain kill signals for cleanup functions
|
||||
|
||||
Sorry, I lost track. What is the status of this one?
|
||||
|
||||
* js/diff-color-words (Sat Jan 17 17:29:48 2009 +0100) 7 commits
|
||||
- color-words: make regex configurable via attributes
|
||||
- color-words: expand docs with precise semantics
|
||||
- color-words: enable REG_NEWLINE to help user
|
||||
- color-words: take an optional regular expression describing words
|
||||
- color-words: change algorithm to allow for 0-character word
|
||||
boundaries
|
||||
- color-words: refactor word splitting and use ALLOC_GROW()
|
||||
- Add color_fwrite_lines(), a function coloring each line
|
||||
individually
|
||||
|
||||
Dscho's series that was done in response to Thomas's original; two agreed
|
||||
to work together on this codebase.
|
||||
|
||||
* ks/maint-mailinfo-folded (Tue Jan 13 01:21:04 2009 +0300) 5 commits
|
||||
- mailinfo: tests for RFC2047 examples
|
||||
- mailinfo: add explicit test for mails like '<a.u.thor@example.com>
|
||||
(A U Thor)'
|
||||
- mailinfo: more smarter removal of rfc822 comments from 'From'
|
||||
+ mailinfo: 'From:' header should be unfold as well
|
||||
+ mailinfo: correctly handle multiline 'Subject:' header
|
||||
|
||||
I think "more smarter" one is too aggressive for our purpose. Perhaps not
|
||||
removing comments at all would be what we want.
|
||||
|
||||
* js/patience-diff (Thu Jan 1 17:39:37 2009 +0100) 3 commits
|
||||
+ bash completions: Add the --patience option
|
||||
+ Introduce the diff option '--patience'
|
||||
+ Implement the patience diff algorithm
|
||||
|
||||
* js/notes (Tue Jan 13 20:57:16 2009 +0100) 6 commits
|
||||
+ git-notes: fix printing of multi-line notes
|
||||
+ notes: fix core.notesRef documentation
|
||||
+ Add an expensive test for git-notes
|
||||
+ Speed up git notes lookup
|
||||
+ Add a script to edit/inspect notes
|
||||
+ Introduce commit notes
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
|
||||
+ autoconf: Enable threaded delta search when pthreads are supported
|
||||
|
||||
See if anybody screams.
|
||||
|
||||
* gb/gitweb-opml (Fri Jan 2 13:49:30 2009 +0100) 2 commits
|
||||
+ gitweb: suggest name for OPML view
|
||||
+ gitweb: don't use pathinfo for global actions
|
||||
|
||||
* mv/apply-parse-opt (Fri Jan 9 22:21:36 2009 -0800) 2 commits
|
||||
+ Resurrect "git apply --flags -" to read from the standard input
|
||||
+ parse-opt: migrate builtin-apply.
|
||||
|
||||
* tr/rebase-root (Fri Jan 2 23:28:29 2009 +0100) 4 commits
|
||||
+ rebase: update documentation for --root
|
||||
+ rebase -i: learn to rebase root commit
|
||||
+ rebase: learn to rebase root commit
|
||||
+ rebase -i: execute hook only after argument checking
|
||||
|
||||
Looked reasonable.
|
||||
|
||||
* mh/maint-commit-color-status (Thu Jan 8 19:53:05 2009 +0100) 2 commits
|
||||
+ git-status -v: color diff output when color.ui is set
|
||||
+ git-commit: color status output when color.ui is set
|
||||
|
||||
* rs/maint-shortlog-foldline (Tue Jan 6 21:41:06 2009 +0100) 1 commit
|
||||
+ shortlog: handle multi-line subjects like log --pretty=oneline et.
|
||||
al. do
|
||||
|
||||
* rs/fgrep (Sat Jan 10 00:18:34 2009 +0100) 2 commits
|
||||
+ grep: don't call regexec() for fixed strings
|
||||
+ grep -w: forward to next possible position after rejected match
|
||||
|
||||
* as/autocorrect-alias (Sun Jan 4 18:16:01 2009 +0100) 1 commit
|
||||
+ git.c: make autocorrected aliases work
|
||||
|
||||
* tr/maint-no-index-fixes (Wed Jan 7 12:15:30 2009 +0100) 3 commits
|
||||
+ diff --no-index -q: fix endless loop
|
||||
+ diff --no-index: test for pager after option parsing
|
||||
+ diff: accept -- when using --no-index
|
||||
|
||||
* jc/maint-format-patch (Sat Jan 10 12:41:33 2009 -0800) 1 commit
|
||||
+ format-patch: show patch text for the root commit
|
||||
|
||||
* ap/clone-into-empty (Sun Jan 11 15:19:12 2009 +0300) 2 commits
|
||||
+ Allow cloning to an existing empty directory
|
||||
+ add is_dot_or_dotdot inline function
|
||||
|
||||
* gb/gitweb-patch (Thu Dec 18 08:13:19 2008 +0100) 4 commits
|
||||
+ gitweb: link to patch(es) view in commit(diff) and (short)log view
|
||||
+ gitweb: add patches view
|
||||
+ gitweb: change call pattern for git_commitdiff
|
||||
+ gitweb: add patch view
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* kb/am-directory (Wed Jan 14 16:29:59 2009 -0800) 2 commits
|
||||
+ git-am: fix shell quoting
|
||||
+ git-am: add --directory=<dir> option
|
||||
|
||||
This is "third-time-lucky, perhaps?" resurrection. I do not think I'd be
|
||||
using this very often, but it originated from a real user request.
|
||||
|
||||
* jc/maint-format-patch-o-relative (Mon Jan 12 15:18:02 2009 -0800) 1 commit
|
||||
+ Teach format-patch to handle output directory relative to cwd
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
. diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
. revision --simplify-merges: incremental simplification
|
||||
. revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
* jk/valgrind (Thu Oct 23 04:30:45 2008 +0000) 2 commits
|
||||
. valgrind: ignore ldso errors
|
||||
. add valgrind support in test scripts
|
||||
|
||||
* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
|
||||
. In add --patch, Handle K,k,J,j slightly more gracefully.
|
||||
. Add / command in add --patch
|
||||
. git-add -i/-p: Change prompt separater from slash to comma
|
||||
|
||||
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
|
||||
. [BROKEN wrt shallow clones] Ignore graft during object transfer
|
||||
|
||||
* jc/replace (Fri Oct 31 09:21:39 2008 -0700) 1 commit
|
||||
. WIP
|
||||
|
||||
@@ -1,252 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Jan 2009, #05; Wed, 21)
|
||||
X-master-at: 9a01387b9714452ebcae431705a288e1a7e099c3
|
||||
X-next-at: 0d272dd28471e8ace6f341f646eac2157628f634
|
||||
|
||||
What's cooking in git.git (Jan 2009, #05; Wed, 21)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* js/valgrind (Wed Jan 21 02:36:40 2009 +0100) 2 commits
|
||||
- valgrind: ignore ldso errors
|
||||
- Add valgrind support in test scripts
|
||||
|
||||
Dscho seems to have some updates out of discussion with Peff.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. The line number in the "previous" information
|
||||
may need refining, and sanity checking code for reference counting may
|
||||
need to be resurrected before this can move forward.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
The "spec" did not seem quite well cooked yet, but in the longer term I
|
||||
think something like this to allow interoperating with other SCMs as if
|
||||
the other end is a native git repository is a very worthy goal.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* sp/runtime-prefix (Sun Jan 18 13:00:15 2009 +0100) 7 commits
|
||||
- Windows: Revert to default paths and convert them by
|
||||
RUNTIME_PREFIX
|
||||
- Compute prefix at runtime if RUNTIME_PREFIX is set
|
||||
- Modify setup_path() to only add git_exec_path() to PATH
|
||||
- Add calls to git_extract_argv0_path() in programs that call
|
||||
git_config_*
|
||||
- git_extract_argv0_path(): Move check for valid argv0 from caller
|
||||
to callee
|
||||
- Refactor git_set_argv0_path() to git_extract_argv0_path()
|
||||
- Move computation of absolute paths from Makefile to runtime (in
|
||||
preparation for RUNTIME_PREFIX)
|
||||
|
||||
We should move this to 'next' soon with J6t's blessing.
|
||||
|
||||
* lh/submodule-tree-traversal (Mon Jan 12 00:45:55 2009 +0100) 3 commits
|
||||
+ builtin-ls-tree: enable traversal of submodules
|
||||
+ archive.c: enable traversal of submodules
|
||||
+ tree.c: add support for traversal of submodules
|
||||
|
||||
I think choosing the submodules to descend into by seeing if the commit
|
||||
happens to be available is a horribly broken semantics; it needs to be
|
||||
fixed before this can move to 'master'.
|
||||
|
||||
* jk/signal-cleanup (Sun Jan 11 06:36:49 2009 -0500) 3 commits
|
||||
- pager: do wait_for_pager on signal death
|
||||
- refactor signal handling for cleanup functions
|
||||
- chain kill signals for cleanup functions
|
||||
|
||||
I think this can move to 'next', as Peff and J6t agreed on how to fix
|
||||
things up as needed for Windows.
|
||||
|
||||
* ks/maint-mailinfo-folded (Tue Jan 13 01:21:04 2009 +0300) 5 commits
|
||||
- mailinfo: tests for RFC2047 examples
|
||||
- mailinfo: add explicit test for mails like '<a.u.thor@example.com>
|
||||
(A U Thor)'
|
||||
- mailinfo: more smarter removal of rfc822 comments from 'From'
|
||||
+ mailinfo: 'From:' header should be unfold as well
|
||||
+ mailinfo: correctly handle multiline 'Subject:' header
|
||||
|
||||
As far as I can see, the only remaining thing is a minor fix-up in the
|
||||
"comment removal" one before we can move this fully to 'next'.
|
||||
|
||||
* js/notes (Tue Jan 13 20:57:16 2009 +0100) 6 commits
|
||||
+ git-notes: fix printing of multi-line notes
|
||||
+ notes: fix core.notesRef documentation
|
||||
+ Add an expensive test for git-notes
|
||||
+ Speed up git notes lookup
|
||||
+ Add a script to edit/inspect notes
|
||||
+ Introduce commit notes
|
||||
|
||||
It would be nice to hear a real world success story using the notes
|
||||
mechanism before casting this design in stone.
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
Design discussion between Jakub and Sebastien continues.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* jk/color-parse (Sat Jan 17 10:38:46 2009 -0500) 2 commits
|
||||
+ expand --pretty=format color options
|
||||
+ color: make it easier for non-config to parse color specs
|
||||
|
||||
* sb/hook-cleanup (Sat Jan 17 04:02:55 2009 +0100) 5 commits
|
||||
+ run_hook(): allow more than 9 hook arguments
|
||||
+ run_hook(): check the executability of the hook before filling
|
||||
argv
|
||||
+ api-run-command.txt: talk about run_hook()
|
||||
+ Move run_hook() from builtin-commit.c into run-command.c (libgit)
|
||||
+ checkout: don't crash on file checkout before running post-
|
||||
checkout hook
|
||||
|
||||
* rs/ctype (Sat Jan 17 16:50:37 2009 +0100) 4 commits
|
||||
+ Add is_regex_special()
|
||||
+ Change NUL char handling of isspecial()
|
||||
+ Reformat ctype.c
|
||||
+ Add ctype test
|
||||
|
||||
* jf/am-failure-report (Sun Jan 18 19:34:31 2009 -0800) 2 commits
|
||||
+ git-am: re-fix the diag message printing
|
||||
+ git-am: Make it easier to see which patch failed
|
||||
|
||||
* sg/maint-gitdir-in-subdir (Fri Jan 16 16:37:33 2009 +0100) 1 commit
|
||||
+ Fix gitdir detection when in subdir of gitdir
|
||||
|
||||
This has my "don't do the fullpath if you are directly inside .git"
|
||||
squashed in, so it should be much safer.
|
||||
|
||||
* am/maint-push-doc (Sun Jan 18 15:36:58 2009 +0100) 4 commits
|
||||
+ Documentation: avoid using undefined parameters
|
||||
+ Documentation: mention branches rather than heads
|
||||
+ Documentation: remove a redundant elaboration
|
||||
+ Documentation: git push repository can also be a remote
|
||||
|
||||
* lt/maint-wrap-zlib (Wed Jan 7 19:54:47 2009 -0800) 1 commit
|
||||
+ Wrap inflate and other zlib routines for better error reporting
|
||||
|
||||
Needs the "free our memory upon seeing Z_MEM_ERROR and try again" bits
|
||||
extracted from Shawn's patch on top of this one.
|
||||
|
||||
* kb/am-directory (Wed Jan 14 16:29:59 2009 -0800) 2 commits
|
||||
+ git-am: fix shell quoting
|
||||
+ git-am: add --directory=<dir> option
|
||||
|
||||
This is "third-time-lucky, perhaps?" resurrection. I do not think I'd be
|
||||
using this very often, but it originated from a real user request.
|
||||
|
||||
* jc/maint-format-patch-o-relative (Mon Jan 12 15:18:02 2009 -0800) 1 commit
|
||||
+ Teach format-patch to handle output directory relative to cwd
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* kb/lstat-cache (Sun Jan 18 16:14:54 2009 +0100) 5 commits
|
||||
+ lstat_cache(): introduce clear_lstat_cache() function
|
||||
+ lstat_cache(): introduce invalidate_lstat_cache() function
|
||||
+ lstat_cache(): introduce has_dirs_only_path() function
|
||||
+ lstat_cache(): introduce has_symlink_or_noent_leading_path()
|
||||
function
|
||||
+ lstat_cache(): more cache effective symlink/directory detection
|
||||
|
||||
* tr/previous-branch (Wed Jan 21 00:37:38 2009 -0800) 10 commits
|
||||
+ Simplify parsing branch switching events in reflog
|
||||
+ Introduce for_each_recent_reflog_ent().
|
||||
+ interpret_nth_last_branch(): plug small memleak
|
||||
+ Fix reflog parsing for a malformed branch switching entry
|
||||
+ Fix parsing of @{-1}@{1}
|
||||
+ interpret_nth_last_branch(): avoid traversing the reflog twice
|
||||
+ checkout: implement "-" abbreviation, add docs and tests
|
||||
+ sha1_name: support @{-N} syntax in get_sha1()
|
||||
+ sha1_name: tweak @{-N} lookup
|
||||
+ checkout: implement "@{-N}" shortcut name for N-th last branch
|
||||
|
||||
* js/maint-all-implies-HEAD (Sat Jan 17 22:27:08 2009 -0800) 2 commits
|
||||
+ bundle: allow the same ref to be given more than once
|
||||
+ revision walker: include a detached HEAD in --all
|
||||
|
||||
* mh/unify-color (Sun Jan 18 21:39:12 2009 +0100) 2 commits
|
||||
+ move the color variables to color.c
|
||||
+ handle color.ui at a central place
|
||||
|
||||
* cb/add-pathspec (Wed Jan 14 15:54:35 2009 +0100) 2 commits
|
||||
+ remove pathspec_match, use match_pathspec instead
|
||||
+ clean up pathspec matching
|
||||
|
||||
* js/diff-color-words (Tue Jan 20 21:46:57 2009 -0600) 8 commits
|
||||
+ color-words: Support diff.wordregex config option
|
||||
+ color-words: make regex configurable via attributes
|
||||
+ color-words: expand docs with precise semantics
|
||||
+ color-words: enable REG_NEWLINE to help user
|
||||
+ color-words: take an optional regular expression describing words
|
||||
+ color-words: change algorithm to allow for 0-character word
|
||||
boundaries
|
||||
+ color-words: refactor word splitting and use ALLOC_GROW()
|
||||
+ Add color_fwrite_lines(), a function coloring each line
|
||||
individually
|
||||
|
||||
* js/patience-diff (Thu Jan 1 17:39:37 2009 +0100) 3 commits
|
||||
+ bash completions: Add the --patience option
|
||||
+ Introduce the diff option '--patience'
|
||||
+ Implement the patience diff algorithm
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
. diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
. revision --simplify-merges: incremental simplification
|
||||
. revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
* jk/valgrind (Thu Oct 23 04:30:45 2008 +0000) 2 commits
|
||||
. valgrind: ignore ldso errors
|
||||
. add valgrind support in test scripts
|
||||
|
||||
* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
|
||||
. In add --patch, Handle K,k,J,j slightly more gracefully.
|
||||
. Add / command in add --patch
|
||||
. git-add -i/-p: Change prompt separater from slash to comma
|
||||
|
||||
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
|
||||
. [BROKEN wrt shallow clones] Ignore graft during object transfer
|
||||
|
||||
* jc/replace (Fri Oct 31 09:21:39 2008 -0700) 1 commit
|
||||
. WIP
|
||||
@@ -1,235 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Jan 2009, #06; Sat, 24)
|
||||
X-master-at: 5dc1308562ab5991ecada68b06707709bea408c9
|
||||
X-next-at: 7298c8d081d90e4a3c5161414c17908750ecf5a9
|
||||
|
||||
What's cooking in git.git (Jan 2009, #06; Sat, 24)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jg/mergetool (Sat Jan 24 00:12:45 2009 +0100) 1 commit
|
||||
- [wait for an ack from ted] mergetool: Don't repeat merge tool
|
||||
candidates
|
||||
|
||||
* cb/mergetool (Wed Jan 21 22:57:48 2009 +0000) 1 commit
|
||||
- [wait for ack from ted] mergetool: respect autocrlf by using
|
||||
checkout-index
|
||||
|
||||
* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
|
||||
- git commit: pathspec without -i/-o implies -i semantics during a
|
||||
merge
|
||||
- builtin-commit: shorten eye-sore overlong lines
|
||||
- Add "partial commit" tests during a conflicted merge
|
||||
|
||||
This is only meant as a weatherballoon to help facilitate discussion.
|
||||
|
||||
* sr/clone-empty (Fri Jan 23 01:07:32 2009 +0100) 1 commit
|
||||
+ Allow cloning an empty repository
|
||||
|
||||
At last ;-) This is a reasonable thing to do, and should be fast tracked
|
||||
to 'master'.
|
||||
|
||||
* cc/replace (Fri Jan 23 10:07:46 2009 +0100) 7 commits
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. The line number in the "previous" information
|
||||
may need refining, and sanity checking code for reference counting may
|
||||
need to be resurrected before this can move forward.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
The "spec" did not seem quite well cooked yet, but in the longer term I
|
||||
think something like this to allow interoperating with other SCMs as if
|
||||
the other end is a native git repository is a very worthy goal.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Reverted]
|
||||
|
||||
* mh/unify-color (Fri Jan 23 01:25:23 2009 -0800) 3 commits
|
||||
? Revert previous two commits
|
||||
? move the color variables to color.c
|
||||
? handle color.ui at a central place
|
||||
|
||||
This broke git-format-patch badly.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* js/valgrind (Wed Jan 21 02:36:40 2009 +0100) 2 commits
|
||||
- valgrind: ignore ldso errors
|
||||
- Add valgrind support in test scripts
|
||||
|
||||
Dscho seems to have some updates out of discussion with Peff, which is not
|
||||
queued here.
|
||||
|
||||
* sp/runtime-prefix (Sun Jan 18 13:00:15 2009 +0100) 7 commits
|
||||
- Windows: Revert to default paths and convert them by
|
||||
RUNTIME_PREFIX
|
||||
- Compute prefix at runtime if RUNTIME_PREFIX is set
|
||||
- Modify setup_path() to only add git_exec_path() to PATH
|
||||
- Add calls to git_extract_argv0_path() in programs that call
|
||||
git_config_*
|
||||
- git_extract_argv0_path(): Move check for valid argv0 from caller
|
||||
to callee
|
||||
- Refactor git_set_argv0_path() to git_extract_argv0_path()
|
||||
- Move computation of absolute paths from Makefile to runtime (in
|
||||
preparation for RUNTIME_PREFIX)
|
||||
|
||||
We should move this to 'next' soon with J6t's blessing.
|
||||
|
||||
* lh/submodule-tree-traversal (Mon Jan 12 00:45:55 2009 +0100) 3 commits
|
||||
+ builtin-ls-tree: enable traversal of submodules
|
||||
+ archive.c: enable traversal of submodules
|
||||
+ tree.c: add support for traversal of submodules
|
||||
|
||||
There were a few updates posted, which I haven't picked up.
|
||||
|
||||
* jk/signal-cleanup (Thu Jan 22 01:03:28 2009 -0500) 5 commits
|
||||
- pager: do wait_for_pager on signal death
|
||||
- refactor signal handling for cleanup functions
|
||||
- chain kill signals for cleanup functions
|
||||
- diff: refactor tempfile cleanup handling
|
||||
- Windows: Fix signal numbers
|
||||
|
||||
Ready for 'next', but not tonight (yet).
|
||||
|
||||
* ks/maint-mailinfo-folded (Tue Jan 13 01:21:04 2009 +0300) 5 commits
|
||||
- mailinfo: tests for RFC2047 examples
|
||||
- mailinfo: add explicit test for mails like '<a.u.thor@example.com>
|
||||
(A U Thor)'
|
||||
- mailinfo: more smarter removal of rfc822 comments from 'From'
|
||||
+ mailinfo: 'From:' header should be unfold as well
|
||||
+ mailinfo: correctly handle multiline 'Subject:' header
|
||||
|
||||
As far as I can see, the only remaining thing is a minor fix-up in the
|
||||
"comment removal" one before we can move this fully to 'next'.
|
||||
|
||||
* js/notes (Tue Jan 13 20:57:16 2009 +0100) 6 commits
|
||||
+ git-notes: fix printing of multi-line notes
|
||||
+ notes: fix core.notesRef documentation
|
||||
+ Add an expensive test for git-notes
|
||||
+ Speed up git notes lookup
|
||||
+ Add a script to edit/inspect notes
|
||||
+ Introduce commit notes
|
||||
|
||||
It would be nice to hear a real world success story using the notes
|
||||
mechanism; Dscho says he also wants to make sure the current choice
|
||||
of the structure scales well before casting it in stone.
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
Design discussion between Jakub and Sebastien continues.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* js/patience-diff (Thu Jan 1 17:39:37 2009 +0100) 3 commits
|
||||
+ bash completions: Add the --patience option
|
||||
+ Introduce the diff option '--patience'
|
||||
+ Implement the patience diff algorithm
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* kb/lstat-cache (Sun Jan 18 16:14:54 2009 +0100) 5 commits
|
||||
+ lstat_cache(): introduce clear_lstat_cache() function
|
||||
+ lstat_cache(): introduce invalidate_lstat_cache() function
|
||||
+ lstat_cache(): introduce has_dirs_only_path() function
|
||||
+ lstat_cache(): introduce has_symlink_or_noent_leading_path()
|
||||
function
|
||||
+ lstat_cache(): more cache effective symlink/directory detection
|
||||
|
||||
* tr/previous-branch (Wed Jan 21 00:37:38 2009 -0800) 10 commits
|
||||
+ Simplify parsing branch switching events in reflog
|
||||
+ Introduce for_each_recent_reflog_ent().
|
||||
+ interpret_nth_last_branch(): plug small memleak
|
||||
+ Fix reflog parsing for a malformed branch switching entry
|
||||
+ Fix parsing of @{-1}@{1}
|
||||
+ interpret_nth_last_branch(): avoid traversing the reflog twice
|
||||
+ checkout: implement "-" abbreviation, add docs and tests
|
||||
+ sha1_name: support @{-N} syntax in get_sha1()
|
||||
+ sha1_name: tweak @{-N} lookup
|
||||
+ checkout: implement "@{-N}" shortcut name for N-th last branch
|
||||
|
||||
* js/maint-all-implies-HEAD (Sat Jan 17 22:27:08 2009 -0800) 2 commits
|
||||
+ bundle: allow the same ref to be given more than once
|
||||
+ revision walker: include a detached HEAD in --all
|
||||
|
||||
* cb/add-pathspec (Wed Jan 14 15:54:35 2009 +0100) 2 commits
|
||||
+ remove pathspec_match, use match_pathspec instead
|
||||
+ clean up pathspec matching
|
||||
|
||||
* js/diff-color-words (Tue Jan 20 22:59:54 2009 -0600) 9 commits
|
||||
+ Change the spelling of "wordregex".
|
||||
+ color-words: Support diff.wordregex config option
|
||||
+ color-words: make regex configurable via attributes
|
||||
+ color-words: expand docs with precise semantics
|
||||
+ color-words: enable REG_NEWLINE to help user
|
||||
+ color-words: take an optional regular expression describing words
|
||||
+ color-words: change algorithm to allow for 0-character word
|
||||
boundaries
|
||||
+ color-words: refactor word splitting and use ALLOC_GROW()
|
||||
+ Add color_fwrite_lines(), a function coloring each line
|
||||
individually
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
. diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
. revision --simplify-merges: incremental simplification
|
||||
. revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
* jk/valgrind (Thu Oct 23 04:30:45 2008 +0000) 2 commits
|
||||
. valgrind: ignore ldso errors
|
||||
. add valgrind support in test scripts
|
||||
|
||||
* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
|
||||
. In add --patch, Handle K,k,J,j slightly more gracefully.
|
||||
. Add / command in add --patch
|
||||
. git-add -i/-p: Change prompt separater from slash to comma
|
||||
@@ -1,302 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Jan 2009, #07; Wed, 28)
|
||||
X-master-at: 8712b3cdb0495f5a56b91cd67e2697412447a886
|
||||
X-next-at: c2891ee32a7e8274426c22439ed8d536a5b0bb43
|
||||
|
||||
What's cooking in git.git (Jan 2009, #07; Wed, 28)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/maint-1.6.0-split-diff-metainfo (Mon Jan 26 00:08:24 2009 -0800) 1 commit
|
||||
+ diff.c: output correct index lines for a split diff
|
||||
|
||||
This is slated for maintenance series 1.6.0.X, 1.6.1.X and also for
|
||||
'master'. I think the change is pretty safe and sane to go directly to
|
||||
'master' but I had too many other topoics to look at that I did not feel
|
||||
comfortable enough to do so.
|
||||
|
||||
* jc/maint-split-diff-metainfo (Tue Jan 27 01:08:02 2009 -0800) 2 commits
|
||||
+ Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-
|
||||
split-diff-metainfo
|
||||
+ diff.c: output correct index lines for a split diff
|
||||
|
||||
Early conflict resolution branch for the above to carry it to 1.6.1X
|
||||
series.
|
||||
|
||||
* js/maint-rebase-i-submodule (Tue Jan 27 12:42:31 2009 +0100) 2 commits
|
||||
+ Fix submodule squashing into unrelated commit
|
||||
+ rebase -i squashes submodule changes into unrelated commit
|
||||
|
||||
* jg/tag-contains (Mon Jan 26 09:13:25 2009 -0500) 3 commits
|
||||
+ git-tag: Add --contains option
|
||||
+ Make has_commit() non-static
|
||||
+ Make opt_parse_with_commit() non-static
|
||||
|
||||
* jk/maint-cleanup-after-exec-failure (Wed Jan 28 02:38:14 2009 -0500) 4 commits
|
||||
+ git: use run_command() to execute dashed externals
|
||||
+ run_command(): help callers distinguish errors
|
||||
+ run_command(): handle missing command errors more gracefully
|
||||
+ git: s/run_command/run_builtin/
|
||||
|
||||
* jc/maint-allow-uninteresting-missing (Tue Jan 27 23:19:30 2009 -0800) 1 commit
|
||||
+ revision traversal: allow UNINTERESTING objects to be missing
|
||||
|
||||
This is a small follow-up to the fix to send-pack in 1.6.1; meant to go in
|
||||
1.6.1.X maintenance series and newer.
|
||||
|
||||
* am/maint-push-doc (Mon Jan 26 00:45:33 2009 +0100) 3 commits
|
||||
+ Documentation: rework src/dst description in git push
|
||||
+ Documentation: more git push examples
|
||||
+ Documentation: simplify refspec format description
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* jc/maint-add-u-remove-conflicted (Wed Jan 28 14:24:53 2009 -0800) 1 commit
|
||||
- add -u: do not fail to resolve a path as deleted
|
||||
|
||||
This has been updated from the posted version with a correction.
|
||||
|
||||
* ns/am-slacker (Sat Jan 24 10:18:02 2009 +0900) 2 commits
|
||||
+ git-am: Add --ignore-date option
|
||||
+ am: Add --committer-date-is-author-date option
|
||||
|
||||
It is a (probably) useful new feature with a sort-of cute explanation.
|
||||
|
||||
* jc/maint-apply-fix (Sun Jan 25 23:41:26 2009 -0800) 1 commit
|
||||
+ builtin-apply.c: do not set bogus mode in check_preimage() for
|
||||
deleted path
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. The line number in the "previous" information
|
||||
may need refining, and sanity checking code for reference counting may
|
||||
need to be resurrected before this can move forward.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
The "spec" did not seem quite well cooked yet, but in the longer term I
|
||||
think something like this to allow interoperating with other SCMs as if
|
||||
the other end is a native git repository is a very worthy goal.
|
||||
|
||||
* cc/replace (Fri Jan 23 10:07:46 2009 +0100) 7 commits
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
Nobody has review comments on this yet.
|
||||
|
||||
* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 6 commits
|
||||
- archive.c: add support for --submodules[=(all|checkedout)]
|
||||
- tree.c: allow read_tree_recursive() to traverse gitlink entries
|
||||
+ Revert round #1 of the series
|
||||
+ builtin-ls-tree: enable traversal of submodules
|
||||
+ archive.c: enable traversal of submodules
|
||||
+ tree.c: add support for traversal of submodules
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Reverted]
|
||||
|
||||
* mh/unify-color (Fri Jan 23 01:25:23 2009 -0800) 3 commits
|
||||
? Revert previous two commits
|
||||
? move the color variables to color.c
|
||||
? handle color.ui at a central place
|
||||
|
||||
This broke git-format-patch badly.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* js/valgrind (Wed Jan 21 02:36:40 2009 +0100) 2 commits
|
||||
- valgrind: ignore ldso errors
|
||||
- Add valgrind support in test scripts
|
||||
|
||||
Dscho and Peff had further exchanges on the list; I am sort of waiting for
|
||||
the conclusion before picking any intermediate version up.
|
||||
|
||||
* ks/maint-mailinfo-folded (Tue Jan 13 01:21:04 2009 +0300) 4 commits
|
||||
+ mailinfo: tests for RFC2047 examples
|
||||
+ mailinfo: add explicit test for mails like '<a.u.thor@example.com>
|
||||
(A U Thor)'
|
||||
+ mailinfo: 'From:' header should be unfold as well
|
||||
+ mailinfo: correctly handle multiline 'Subject:' header
|
||||
|
||||
I just got tired of waiting and cleaned up the series myself.
|
||||
|
||||
* js/notes (Tue Jan 13 20:57:16 2009 +0100) 6 commits
|
||||
+ git-notes: fix printing of multi-line notes
|
||||
+ notes: fix core.notesRef documentation
|
||||
+ Add an expensive test for git-notes
|
||||
+ Speed up git notes lookup
|
||||
+ Add a script to edit/inspect notes
|
||||
+ Introduce commit notes
|
||||
|
||||
It would be nice to hear a real world success story using the notes
|
||||
mechanism; Dscho says he also wants to make sure the current choice
|
||||
of the structure scales well before casting it in stone.
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
Design discussion between Jakub and Sebastien continues.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* sr/clone-empty (Fri Jan 23 01:07:32 2009 +0100) 1 commit
|
||||
+ Allow cloning an empty repository
|
||||
|
||||
Has anybody actually tried this and made sure the resulting empty clone
|
||||
works fine after the clone source gets updated with some contents?
|
||||
|
||||
* kb/lstat-cache (Sun Jan 18 16:14:54 2009 +0100) 5 commits
|
||||
+ lstat_cache(): introduce clear_lstat_cache() function
|
||||
+ lstat_cache(): introduce invalidate_lstat_cache() function
|
||||
+ lstat_cache(): introduce has_dirs_only_path() function
|
||||
+ lstat_cache(): introduce has_symlink_or_noent_leading_path()
|
||||
function
|
||||
+ lstat_cache(): more cache effective symlink/directory detection
|
||||
|
||||
* tr/previous-branch (Wed Jan 21 00:37:38 2009 -0800) 10 commits
|
||||
+ Simplify parsing branch switching events in reflog
|
||||
+ Introduce for_each_recent_reflog_ent().
|
||||
+ interpret_nth_last_branch(): plug small memleak
|
||||
+ Fix reflog parsing for a malformed branch switching entry
|
||||
+ Fix parsing of @{-1}@{1}
|
||||
+ interpret_nth_last_branch(): avoid traversing the reflog twice
|
||||
+ checkout: implement "-" abbreviation, add docs and tests
|
||||
+ sha1_name: support @{-N} syntax in get_sha1()
|
||||
+ sha1_name: tweak @{-N} lookup
|
||||
+ checkout: implement "@{-N}" shortcut name for N-th last branch
|
||||
|
||||
* js/maint-all-implies-HEAD (Sat Jan 17 22:27:08 2009 -0800) 2 commits
|
||||
+ bundle: allow the same ref to be given more than once
|
||||
+ revision walker: include a detached HEAD in --all
|
||||
|
||||
* cb/add-pathspec (Wed Jan 14 15:54:35 2009 +0100) 2 commits
|
||||
+ remove pathspec_match, use match_pathspec instead
|
||||
+ clean up pathspec matching
|
||||
|
||||
* js/diff-color-words (Tue Jan 20 22:59:54 2009 -0600) 9 commits
|
||||
+ Change the spelling of "wordregex".
|
||||
+ color-words: Support diff.wordregex config option
|
||||
+ color-words: make regex configurable via attributes
|
||||
+ color-words: expand docs with precise semantics
|
||||
+ color-words: enable REG_NEWLINE to help user
|
||||
+ color-words: take an optional regular expression describing words
|
||||
+ color-words: change algorithm to allow for 0-character word
|
||||
boundaries
|
||||
+ color-words: refactor word splitting and use ALLOC_GROW()
|
||||
+ Add color_fwrite_lines(), a function coloring each line
|
||||
individually
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* jg/mergetool (Sat Jan 24 00:12:45 2009 +0100) 1 commit
|
||||
+ mergetool: Don't repeat merge tool candidates
|
||||
|
||||
* cb/mergetool (Wed Jan 21 22:57:48 2009 +0000) 1 commit
|
||||
+ mergetool: respect autocrlf by using checkout-index
|
||||
|
||||
Now Ted told us not to wait for him, we'll go ahead by ourselves ;-).
|
||||
|
||||
* jk/signal-cleanup (Thu Jan 22 01:03:28 2009 -0500) 5 commits
|
||||
+ pager: do wait_for_pager on signal death
|
||||
+ refactor signal handling for cleanup functions
|
||||
+ chain kill signals for cleanup functions
|
||||
+ diff: refactor tempfile cleanup handling
|
||||
+ Windows: Fix signal numbers
|
||||
|
||||
* sp/runtime-prefix (Sun Jan 18 13:00:15 2009 +0100) 7 commits
|
||||
+ Windows: Revert to default paths and convert them by
|
||||
RUNTIME_PREFIX
|
||||
+ Compute prefix at runtime if RUNTIME_PREFIX is set
|
||||
+ Modify setup_path() to only add git_exec_path() to PATH
|
||||
+ Add calls to git_extract_argv0_path() in programs that call
|
||||
git_config_*
|
||||
+ git_extract_argv0_path(): Move check for valid argv0 from caller
|
||||
to callee
|
||||
+ Refactor git_set_argv0_path() to git_extract_argv0_path()
|
||||
+ Move computation of absolute paths from Makefile to runtime (in
|
||||
preparation for RUNTIME_PREFIX)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
|
||||
- git commit: pathspec without -i/-o implies -i semantics during a
|
||||
merge
|
||||
- builtin-commit: shorten eye-sore overlong lines
|
||||
- Add "partial commit" tests during a conflicted merge
|
||||
|
||||
This is only meant as a weatherballoon to help facilitate discussion.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
. diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
. revision --simplify-merges: incremental simplification
|
||||
. revision --simplify-merges: prepare for incremental simplification
|
||||
|
||||
* jk/valgrind (Thu Oct 23 04:30:45 2008 +0000) 2 commits
|
||||
. valgrind: ignore ldso errors
|
||||
. add valgrind support in test scripts
|
||||
|
||||
* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
|
||||
. In add --patch, Handle K,k,J,j slightly more gracefully.
|
||||
. Add / command in add --patch
|
||||
. git-add -i/-p: Change prompt separater from slash to comma
|
||||
@@ -1,353 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Feb 2009, #01; Sun, 01)
|
||||
X-master-at: 2ea3c17189bf9ca459879129ca190792b5451f05
|
||||
X-next-at: 5bad675db98a79d08ce5abadd3347d829c6c5b36
|
||||
|
||||
What's cooking in git.git (Feb 2009, #01; Sun, 01)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* gt/utf8-width (Fri Jan 30 04:41:29 2009 -0500) 2 commits
|
||||
- builtin-blame.c: Use utf8_strwidth for author's names
|
||||
- utf8: add utf8_strwidth()
|
||||
|
||||
I am not sure if utf8_strwidth() behaves sensibly when fed a non-UTF8
|
||||
string (a possible failure mode is utf8_width() says "no" and it returns
|
||||
0, resulting in width of all zero and causing division by zero somewhere
|
||||
downstream, or something silly like that), but other than that, I do not
|
||||
think it would hurt, and will actively improve the current code.
|
||||
|
||||
* jc/refuse-push-to-current (Sat Jan 31 17:34:05 2009 -0800) 2 commits
|
||||
- Set receive.denyCurrentBranch to true in a new non-bare repository
|
||||
- receive-pack: explain what to do when push updates the current
|
||||
branch
|
||||
|
||||
This prepares to finally switch the default for receive.denyCurrentBranch
|
||||
to "refuse". The idea is to issue a big warning to people who push into
|
||||
currently checked out branch when the configuration is unset and we
|
||||
default to "warn", and explain in detail (1) why it is not likely to be
|
||||
what they want to do (to help new people), (2) if it is what they want,
|
||||
how to squelch that annoyingly long message, and (3) the default will be
|
||||
changed to "refuse" in a future release of git. The tip commit also sets
|
||||
the configuration to refuse in a newly created repository, but with a
|
||||
twist. People who get the "refusal" configuration this way may be
|
||||
expecting the recipe they picked up to push into a live repository,
|
||||
perhaps a website, and let its post-update hook to "reset --hard" the
|
||||
deployment, and we will explain that (1) it will no longer work (because
|
||||
we default to "refuse" in a newly created repository), (2) how to
|
||||
configure it to work again, and (3) how to squelch the annoying message.
|
||||
|
||||
I personally do not think anything short of an approach like this would
|
||||
work without a huge fallout like we had when yanked git-foo commands from
|
||||
people's $PATH in 1.6.0, but I can still be pursuaded by a better
|
||||
alternative, and that is why they are not in 'next' yet. Saying "old
|
||||
timers can flip a single switch just once" is not a better alternative, as
|
||||
I explained already.
|
||||
|
||||
* jc/fsck (Fri Jan 30 02:44:13 2009 -0800) 7 commits
|
||||
- fsck: revert --quick to the default and introduce --medium
|
||||
- fsck: three levels of validation
|
||||
- verify-pack: add --quick
|
||||
- verify_pack(): allow a quicker verification for a pack with
|
||||
version 2 idx
|
||||
- pack-check.c: minor formatting fix to match coding style
|
||||
+ fsck: check loose objects from alternate object stores by default
|
||||
+ fsck: HEAD is part of refs
|
||||
|
||||
I haven't heard anything positive nor negative about this series. I
|
||||
consider the bottom two changes are pure bugfixes and should probably be
|
||||
in 1.6.2.
|
||||
|
||||
I think the tip two commits should be squashed (and perhaps the option
|
||||
parser cleaned up as suggested on the list) if we were to take the
|
||||
remainder.
|
||||
|
||||
* rc/http-push (Sat Jan 31 07:51:55 2009 +0800) 1 commit
|
||||
+ http-push: refactor request url creation
|
||||
|
||||
Looked fine for 1.6.2.
|
||||
|
||||
* jk/head-symref (Thu Jan 29 03:33:02 2009 -0500) 2 commits
|
||||
+ symbolic ref: refuse non-ref targets in HEAD
|
||||
+ validate_headref: tighten ref-matching to just branches
|
||||
|
||||
Looked fine for 1.6.2.
|
||||
|
||||
* kb/checkout-optim (Sun Feb 1 21:23:39 2009 +0100) 7 commits
|
||||
- unpack-trees.c: introduce schedule_dir_for_removal()
|
||||
- lstat_cache(): print a warning if doing ping-pong between cache
|
||||
types
|
||||
- combine-diff.c: remove a call to fstat() inside show_patch_diff()
|
||||
- write_entry(): use fstat() instead of lstat() when file is open
|
||||
- cleanup of write_entry() in entry.c
|
||||
- remove some memcpy() and strchr() calls inside
|
||||
create_directories()
|
||||
- symlinks.c: small cleanup and optimisation
|
||||
|
||||
Love to have in 1.6.2
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user. I do not need it in 1.6.2
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. The line number in the "previous" information
|
||||
may need refining, and sanity checking code for reference counting may
|
||||
need to be resurrected before this can move forward.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
The "spec" did not seem quite well cooked yet, but in the longer term I
|
||||
think something like this to allow interoperating with other SCMs as if
|
||||
the other end is a native git repository is a very worthy goal.
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I think the code is much cleaner than the first round, but I am not
|
||||
convinced it is doing the right thing in the connectivity traverser.
|
||||
I'd like to keep this out of 1.6.2.
|
||||
|
||||
* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 6 commits
|
||||
- archive.c: add support for --submodules[=(all|checkedout)]
|
||||
- tree.c: allow read_tree_recursive() to traverse gitlink entries
|
||||
+ Revert round #1 of the series
|
||||
+ builtin-ls-tree: enable traversal of submodules
|
||||
+ archive.c: enable traversal of submodules
|
||||
+ tree.c: add support for traversal of submodules
|
||||
|
||||
Sorry, but what's the status of this one? I am not particularly
|
||||
interested in this new feature myself, so unless I hear otherwise from
|
||||
people, I'd like to keep this out of 1.6.2. That would have the added
|
||||
benefit of being able to discard the first four that is already in 'next'
|
||||
to get a fresh start post 1.6.2 ;-)
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
Design discussion between Jakub and Sebastien seems to have stalled.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Reverted]
|
||||
|
||||
* mh/unify-color (Fri Jan 23 01:25:23 2009 -0800) 3 commits
|
||||
? Revert previous two commits
|
||||
? move the color variables to color.c
|
||||
? handle color.ui at a central place
|
||||
|
||||
This broke git-format-patch badly.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
|
||||
+ In add --patch, Handle K,k,J,j slightly more gracefully.
|
||||
+ Add / command in add --patch
|
||||
+ git-add -i/-p: Change prompt separater from slash to comma
|
||||
|
||||
I think this is Ok to have in 1.6.2
|
||||
|
||||
* cb/mergetool (Fri Jan 30 23:20:11 2009 +0000) 3 commits
|
||||
- mergetool: fix running mergetool in sub-directories
|
||||
- mergetool: Add a test for running mergetool in a sub-directory
|
||||
+ mergetool: respect autocrlf by using checkout-index
|
||||
|
||||
The fix to its subdirectory behaviour looked somewhat iffy and may have a
|
||||
potential for cleaning up. But we should have it in 1.6.2.
|
||||
|
||||
* js/valgrind (Wed Jan 21 02:36:40 2009 +0100) 2 commits
|
||||
- valgrind: ignore ldso errors
|
||||
- Add valgrind support in test scripts
|
||||
|
||||
Dscho and Peff had further exchanges on the list; I am sort of waiting for
|
||||
the conclusion before picking any intermediate version up.
|
||||
|
||||
* js/notes (Tue Jan 13 20:57:16 2009 +0100) 6 commits
|
||||
+ git-notes: fix printing of multi-line notes
|
||||
+ notes: fix core.notesRef documentation
|
||||
+ Add an expensive test for git-notes
|
||||
+ Speed up git notes lookup
|
||||
+ Add a script to edit/inspect notes
|
||||
+ Introduce commit notes
|
||||
|
||||
It would be nice to hear a real world success story using the notes
|
||||
mechanism; Dscho says he also wants to make sure the current choice
|
||||
of the structure scales well before casting it in stone.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* jc/maint-1.6.0-split-diff-metainfo (Mon Jan 26 00:08:24 2009 -0800) 1 commit
|
||||
+ diff.c: output correct index lines for a split diff
|
||||
|
||||
This is slated for maintenance series 1.6.0.X.
|
||||
|
||||
* jc/maint-split-diff-metainfo (Tue Jan 27 01:08:02 2009 -0800) 2 commits
|
||||
+ Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-
|
||||
split-diff-metainfo
|
||||
+ diff.c: output correct index lines for a split diff
|
||||
|
||||
Early conflict resolution branch for the above to carry it to 1.6.1.X
|
||||
series.
|
||||
|
||||
* js/maint-rebase-i-submodule (Tue Jan 27 12:42:31 2009 +0100) 2 commits
|
||||
+ Fix submodule squashing into unrelated commit
|
||||
+ rebase -i squashes submodule changes into unrelated commit
|
||||
|
||||
* jg/tag-contains (Mon Jan 26 09:13:25 2009 -0500) 3 commits
|
||||
+ git-tag: Add --contains option
|
||||
+ Make has_commit() non-static
|
||||
+ Make opt_parse_with_commit() non-static
|
||||
|
||||
* jc/maint-allow-uninteresting-missing (Tue Jan 27 23:19:30 2009 -0800) 1 commit
|
||||
+ revision traversal: allow UNINTERESTING objects to be missing
|
||||
|
||||
This is a small follow-up to the fix to send-pack in 1.6.1; meant to go in
|
||||
1.6.1.X maintenance series and newer.
|
||||
|
||||
* am/maint-push-doc (Mon Jan 26 00:45:33 2009 +0100) 3 commits
|
||||
+ Documentation: rework src/dst description in git push
|
||||
+ Documentation: more git push examples
|
||||
+ Documentation: simplify refspec format description
|
||||
|
||||
* jc/maint-apply-fix (Sun Jan 25 23:41:26 2009 -0800) 1 commit
|
||||
+ builtin-apply.c: do not set bogus mode in check_preimage() for
|
||||
deleted path
|
||||
|
||||
* ks/maint-mailinfo-folded (Tue Jan 13 01:21:04 2009 +0300) 4 commits
|
||||
+ mailinfo: tests for RFC2047 examples
|
||||
+ mailinfo: add explicit test for mails like '<a.u.thor@example.com>
|
||||
(A U Thor)'
|
||||
+ mailinfo: 'From:' header should be unfold as well
|
||||
+ mailinfo: correctly handle multiline 'Subject:' header
|
||||
|
||||
Graduated with a follow-up patch from the original author.
|
||||
|
||||
* jg/mergetool (Sat Jan 24 00:12:45 2009 +0100) 1 commit
|
||||
+ mergetool: Don't repeat merge tool candidates
|
||||
|
||||
* jk/signal-cleanup (Thu Jan 22 01:03:28 2009 -0500) 5 commits
|
||||
+ pager: do wait_for_pager on signal death
|
||||
+ refactor signal handling for cleanup functions
|
||||
+ chain kill signals for cleanup functions
|
||||
+ diff: refactor tempfile cleanup handling
|
||||
+ Windows: Fix signal numbers
|
||||
|
||||
* sp/runtime-prefix (Sun Jan 18 13:00:15 2009 +0100) 7 commits
|
||||
+ Windows: Revert to default paths and convert them by
|
||||
RUNTIME_PREFIX
|
||||
+ Compute prefix at runtime if RUNTIME_PREFIX is set
|
||||
+ Modify setup_path() to only add git_exec_path() to PATH
|
||||
+ Add calls to git_extract_argv0_path() in programs that call
|
||||
git_config_*
|
||||
+ git_extract_argv0_path(): Move check for valid argv0 from caller
|
||||
to callee
|
||||
+ Refactor git_set_argv0_path() to git_extract_argv0_path()
|
||||
+ Move computation of absolute paths from Makefile to runtime (in
|
||||
preparation for RUNTIME_PREFIX)
|
||||
|
||||
There was a report that this breaks with older GNU Make.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* jc/maint-add-u-remove-conflicted (Wed Jan 28 14:24:53 2009 -0800) 1 commit
|
||||
- add -u: do not fail to resolve a path as deleted
|
||||
|
||||
This has been updated from the posted version with a correction. We
|
||||
should have it in 1.6.2
|
||||
|
||||
* jk/maint-cleanup-after-exec-failure (Wed Jan 28 02:38:14 2009 -0500) 4 commits
|
||||
+ git: use run_command() to execute dashed externals
|
||||
+ run_command(): help callers distinguish errors
|
||||
+ run_command(): handle missing command errors more gracefully
|
||||
+ git: s/run_command/run_builtin/
|
||||
|
||||
Looked good for 1.6.2.
|
||||
|
||||
* ns/am-slacker (Sat Jan 24 10:18:02 2009 +0900) 2 commits
|
||||
+ git-am: Add --ignore-date option
|
||||
+ am: Add --committer-date-is-author-date option
|
||||
|
||||
It is a (probably) useful new feature with a sort-of cute explanation.
|
||||
I am not sure if it needs further work (such as hooking it to rebase),
|
||||
but other than that, I think it is Ok to have in 1.6.2.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
|
||||
- git commit: pathspec without -i/-o implies -i semantics during a
|
||||
merge
|
||||
- builtin-commit: shorten eye-sore overlong lines
|
||||
- Add "partial commit" tests during a conflicted merge
|
||||
|
||||
This is only meant as a weatherballoon to help facilitate discussion.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
. diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
. revision --simplify-merges: incremental simplification
|
||||
. revision --simplify-merges: prepare for incremental simplification
|
||||
@@ -1,286 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Feb 2009, #02; Wed, 04)
|
||||
X-master-at: 88ccb9f9745ff1f44bff7c6d6c17ad4b46870706
|
||||
X-next-at: c5d3fa64fe3170d80a48f5c5b99f14dbabcbd9b4
|
||||
|
||||
What's cooking in git.git (Feb 2009, #02; Wed, 04)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
I was this close (shows thumb and index finger almost touching) to merge
|
||||
js/notes to master and declare 1.6.2-rc0 but decided against it, because I
|
||||
thought I need to at least have heard about somebody who used it before
|
||||
doing so. Perhaps I'll try it out myself to keep track of commits that
|
||||
happened between 1.6.1 and master that need to be cherry-picked to maint,
|
||||
or something silly like that. In any case, my prediction is that -rc0
|
||||
would look like what 'next' tonight looks like, nothing more, not much
|
||||
less (I'd probably drop jc/blame).
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Sat Jan 31 17:34:05 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
This is for 1.7.0.
|
||||
|
||||
* js/maint-remote-remove-mirror (Wed Feb 4 11:06:07 2009 -0500) 2 commits
|
||||
+ builtin-remote: make rm operation safer in mirrored repository
|
||||
+ builtin-remote: make rm() use properly named variable to hold
|
||||
return value
|
||||
|
||||
* ek/maint-filter-branch-bare (Tue Feb 3 13:27:03 2009 -0500) 1 commit
|
||||
+ filter-branch: Fix fatal error on bare repositories
|
||||
|
||||
* tr/add-p-single (Wed Feb 4 21:12:39 2009 +0100) 2 commits
|
||||
- add -p: print errors in separate color
|
||||
- add -p: prompt for single characters
|
||||
|
||||
Will move to 'next'; it may or may not mature in time for 1.6.2.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user. I do not need it in 1.6.2
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. The line number in the "previous" information
|
||||
may need refining, and sanity checking code for reference counting may
|
||||
need to be resurrected before this can move forward.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
The "spec" did not seem quite well cooked yet, but in the longer term I
|
||||
think something like this to allow interoperating with other SCMs as if
|
||||
the other end is a native git repository is a very worthy goal.
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I think the code is much cleaner than the first round, but I am not
|
||||
convinced it is doing the right thing in the connectivity traverser.
|
||||
I'd like to keep this out of 1.6.2.
|
||||
|
||||
* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 6 commits
|
||||
- archive.c: add support for --submodules[=(all|checkedout)]
|
||||
- tree.c: allow read_tree_recursive() to traverse gitlink entries
|
||||
+ Revert round #1 of the series
|
||||
+ builtin-ls-tree: enable traversal of submodules
|
||||
+ archive.c: enable traversal of submodules
|
||||
+ tree.c: add support for traversal of submodules
|
||||
|
||||
Sorry, but what's the status of this one? I am not particularly
|
||||
interested in this new feature myself, so unless I hear otherwise from
|
||||
people, I'd like to keep this out of 1.6.2. That would have the added
|
||||
benefit of being able to discard the first four that is already in 'next'
|
||||
to get a fresh start post 1.6.2 ;-)
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
Design discussion between Jakub and Sebastien seems to have stalled.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Reverted]
|
||||
|
||||
* mh/unify-color (Fri Jan 23 01:25:23 2009 -0800) 3 commits
|
||||
? Revert previous two commits
|
||||
? move the color variables to color.c
|
||||
? handle color.ui at a central place
|
||||
|
||||
This broke git-format-patch badly.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* jc/fsck (Fri Jan 30 02:44:13 2009 -0800) 5 commits
|
||||
- fsck: revert --quick to the default and introduce --medium
|
||||
- fsck: three levels of validation
|
||||
- verify-pack: add --quick
|
||||
- verify_pack(): allow a quicker verification for a pack with
|
||||
version 2 idx
|
||||
- pack-check.c: minor formatting fix to match coding style
|
||||
|
||||
I haven't heard anything positive nor negative about this series. I think
|
||||
the tip two commits should be squashed (and perhaps the option parser
|
||||
cleaned up as suggested on the list).
|
||||
|
||||
* kb/checkout-optim (Wed Feb 4 13:53:20 2009 +0100) 8 commits
|
||||
- lstat_cache(): print a warning if doing ping-pong between cache
|
||||
types
|
||||
- show_patch_diff(): remove a call to fstat()
|
||||
- write_entry(): cleanup of some duplicated code
|
||||
- create_directories(): remove some memcpy() and strchr() calls
|
||||
- unlink_entry(): introduce schedule_dir_for_removal()
|
||||
- lstat_cache(): swap func(length, string) into func(string, length)
|
||||
- lstat_cache(): generalise longest_match_lstat_cache()
|
||||
- lstat_cache(): small cleanup and optimisation
|
||||
|
||||
Should be in 'next' soon.
|
||||
|
||||
* js/valgrind (Wed Feb 4 00:26:31 2009 +0100) 8 commits
|
||||
- test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
|
||||
- Tests: let --valgrind imply --verbose and --tee
|
||||
- Add a script to coalesce the valgrind outputs
|
||||
- t/Makefile: provide a 'valgrind' target
|
||||
- test-lib.sh: optionally output to test-results/$TEST.out, too
|
||||
- Valgrind support: check for more than just programming errors
|
||||
- valgrind: ignore ldso and more libz errors
|
||||
- Add valgrind support in test scripts
|
||||
|
||||
Should be in 'next' soon.
|
||||
|
||||
* js/notes (Tue Jan 13 20:57:16 2009 +0100) 6 commits
|
||||
+ git-notes: fix printing of multi-line notes
|
||||
+ notes: fix core.notesRef documentation
|
||||
+ Add an expensive test for git-notes
|
||||
+ Speed up git notes lookup
|
||||
+ Add a script to edit/inspect notes
|
||||
+ Introduce commit notes
|
||||
|
||||
It would be nice to hear a real world success story using the notes
|
||||
mechanism; Dscho says he also wants to make sure the current choice
|
||||
of the structure scales well before casting it in stone, but nothing
|
||||
has happened since then.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
|
||||
+ In add --patch, Handle K,k,J,j slightly more gracefully.
|
||||
+ Add / command in add --patch
|
||||
+ git-add -i/-p: Change prompt separater from slash to comma
|
||||
|
||||
* jc/maint-add-u-remove-conflicted (Wed Jan 28 14:24:53 2009 -0800) 1 commit
|
||||
+ add -u: do not fail to resolve a path as deleted
|
||||
|
||||
* jk/maint-cleanup-after-exec-failure (Wed Jan 28 02:38:14 2009 -0500) 4 commits
|
||||
+ git: use run_command() to execute dashed externals
|
||||
+ run_command(): help callers distinguish errors
|
||||
+ run_command(): handle missing command errors more gracefully
|
||||
+ git: s/run_command/run_builtin/
|
||||
|
||||
* ns/am-slacker (Sat Jan 24 10:18:02 2009 +0900) 2 commits
|
||||
+ git-am: Add --ignore-date option
|
||||
+ am: Add --committer-date-is-author-date option
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* gt/utf8-width (Fri Jan 30 04:41:29 2009 -0500) 2 commits
|
||||
+ builtin-blame.c: Use utf8_strwidth for author's names
|
||||
+ utf8: add utf8_strwidth()
|
||||
|
||||
I replaced the bottom one with a cheesy "if it does not look like
|
||||
utf8, give strlen back" to make the result behave sensibly for legacy
|
||||
encodings. It does improve "git blame git-stash.sh" output (especially
|
||||
if you remove .mailmap).
|
||||
|
||||
* jk/head-symref (Thu Jan 29 03:33:02 2009 -0500) 2 commits
|
||||
+ symbolic ref: refuse non-ref targets in HEAD
|
||||
+ validate_headref: tighten ref-matching to just branches
|
||||
|
||||
Looked fine for 1.6.2.
|
||||
|
||||
* rc/http-push (Tue Feb 3 20:39:00 2009 +0800) 4 commits
|
||||
+ http-push: wrap signature of get_remote_object_url
|
||||
+ http-push: add back underscore separator before lock token
|
||||
+ http-push.c: get_remote_object_url() is only used under
|
||||
USE_CURL_MULTI
|
||||
+ http-push: refactor request url creation
|
||||
|
||||
As these are supposed to be only clean-ups without any functionality
|
||||
change, let's flush it out before 1.6.2.
|
||||
|
||||
* jc/refuse-push-to-current (Sat Jan 31 17:34:05 2009 -0800) 1 commit
|
||||
+ receive-pack: explain what to do when push updates the current
|
||||
branch
|
||||
|
||||
This prepares to finally switch the default for receive.denyCurrentBranch
|
||||
to "refuse". The idea is to issue a big warning to people who push into
|
||||
currently checked out branch when the configuration is unset and we
|
||||
default to "warn", and explain in detail (1) why it is not likely to be
|
||||
what they want to do (to help new people), (2) if it is what they want,
|
||||
how to squelch that annoyingly long message, and (3) the default will be
|
||||
changed to "refuse" in a future release of git.
|
||||
|
||||
* cb/mergetool (Fri Jan 30 23:20:11 2009 +0000) 3 commits
|
||||
+ mergetool: fix running mergetool in sub-directories
|
||||
+ mergetool: Add a test for running mergetool in a sub-directory
|
||||
+ mergetool: respect autocrlf by using checkout-index
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
|
||||
- git commit: pathspec without -i/-o implies -i semantics during a
|
||||
merge
|
||||
- builtin-commit: shorten eye-sore overlong lines
|
||||
- Add "partial commit" tests during a conflicted merge
|
||||
|
||||
This is only meant as a weatherballoon to help facilitate discussion.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
. diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
. revision --simplify-merges: incremental simplification
|
||||
. revision --simplify-merges: prepare for incremental simplification
|
||||
@@ -1,301 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Feb 2009, #03; Sat, 07)
|
||||
X-master-at: 621f1b4bcf40f1469fc59202248df35619e33c82
|
||||
X-next-at: 5e148c2bfc7eda43fad0646e9583a9959b15bb2a
|
||||
|
||||
What's cooking in git.git (Feb 2009, #03; Sat, 07)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
The master branch is at -rc0 now.
|
||||
|
||||
Traditionally, rc freeze, especially post -rc1, meant that I stop paying
|
||||
attention to whatever topic that did not graduate to 'master', and not
|
||||
queuing further updates to 'next' to encourage people to concentrate on
|
||||
'master' bugfixes by discouraging them from tinkering the topics that
|
||||
won't be in the next release.
|
||||
|
||||
I do not think that approach has worked well in practice, so let's try
|
||||
something slightly different.
|
||||
|
||||
I'll try to leave 'next' open during this freeze, but the new topics and
|
||||
topics that hasn't cooked to maturity by -rc1 will not be in 1.6.2. That
|
||||
is what a freeze means, so it may not be necessary to say so, but I am
|
||||
just trying to make it clear.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jn/gitweb-committag (Fri Feb 6 10:12:41 2009 +0100) 1 commit
|
||||
+ gitweb: Better regexp for SHA-1 committag match
|
||||
|
||||
* js/maint-1.6.0-path-normalize (Sat Feb 7 16:08:31 2009 +0100) 5 commits
|
||||
+ Remove unused normalize_absolute_path()
|
||||
+ Test and fix normalize_path_copy()
|
||||
+ Fix GIT_CEILING_DIRECTORIES on Windows
|
||||
+ Move sanitary_path_copy() to path.c and rename it to
|
||||
normalize_path_copy()
|
||||
+ Make test-path-utils more robust against incorrect use
|
||||
|
||||
Replaces one from René that was queued earlier.
|
||||
|
||||
* js/git-submodule-trailing-slash (Sat Feb 7 14:43:15 2009 +0100) 2 commits
|
||||
+ submodule: warn about non-submodules
|
||||
+ Let ls-files strip trailing slashes in submodules' paths
|
||||
|
||||
* ms/mailmap (Thu Feb 5 09:06:41 2009 +0100) 4 commits
|
||||
- Change current mailmap usage to do matching on both name and email
|
||||
of author/committer.
|
||||
- Add map_user() and clear_mailmap() to mailmap
|
||||
- Add find_insert_index, insert_at_index and clear_func functions to
|
||||
string_list
|
||||
- Add log.mailmap as configurational option for mailmap location
|
||||
|
||||
* ff/submodule-no-fetch (Thu Feb 5 20:18:32 2009 -0200) 1 commit
|
||||
- submodule: add --no-fetch parameter to update command
|
||||
|
||||
* mc/setup-cd-p (Fri Feb 6 19:24:28 2009 -0800) 1 commit
|
||||
- git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work
|
||||
tree
|
||||
|
||||
* js/rebase-error-a-bit-more-verbose (Sat Feb 7 18:20:09 2009 +0100) 1 commit
|
||||
+ rebase: explain why when the HEAD could not be detached
|
||||
|
||||
All of these looked sensible, and I think many deserve to be in 1.6.2.
|
||||
They are not in -rc0 only because I started the release engineering before
|
||||
they arrived.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. The line number in the "previous" information
|
||||
may need refining, and sanity checking code for reference counting may
|
||||
need to be resurrected before this can move forward.
|
||||
|
||||
Recent tig discussion may blow new life into it. Let's see.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
The "spec" did not seem quite well cooked yet, but in the longer term I
|
||||
think something like this to allow interoperating with other SCMs as if
|
||||
the other end is a native git repository is a very worthy goal.
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I think the code is much cleaner than the first round, but I am not
|
||||
convinced it is doing the right thing in the connectivity traverser.
|
||||
I'd like to keep this out of 1.6.2.
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
Design discussion between Jakub and Sebastien seems to have stalled.
|
||||
|
||||
* jc/fsck (Fri Jan 30 02:33:47 2009 -0800) 4 commits
|
||||
- fsck: three levels of validation
|
||||
- verify-pack: add --quick
|
||||
- verify_pack(): allow a quicker verification for a pack with
|
||||
version 2 idx
|
||||
- pack-check.c: minor formatting fix to match coding style
|
||||
|
||||
J6t has a good point that if this had any value then medium level should
|
||||
replace the default. I am tempted to actually dropping this as a failed
|
||||
experiment.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Reverted]
|
||||
|
||||
* mh/unify-color (Fri Jan 23 01:25:23 2009 -0800) 3 commits
|
||||
? Revert previous two commits
|
||||
? move the color variables to color.c
|
||||
? handle color.ui at a central place
|
||||
|
||||
This broke git-format-patch badly.
|
||||
|
||||
* rs/maint-1.6.0-windows-ceiling (Sat Feb 7 12:40:40 2009 -0800) 2 commits
|
||||
? Revert "fix t1504 on Windows"
|
||||
? fix t1504 on Windows
|
||||
|
||||
I'm giving a fresh start to J6t's series which contains this.
|
||||
|
||||
* lh/reverted-submodule-tree-traversal (Sun Jan 25 18:39:55 2009 -0800) 4 commits
|
||||
? Revert round #1 of the series
|
||||
? builtin-ls-tree: enable traversal of submodules
|
||||
? archive.c: enable traversal of submodules
|
||||
? tree.c: add support for traversal of submodules
|
||||
|
||||
I'm giving a fresh start to Lars's second iteration.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 2 commits
|
||||
- archive.c: add support for --submodules[=(all|checkedout)]
|
||||
+ tree.c: allow read_tree_recursive() to traverse gitlink entries
|
||||
|
||||
I think the first one is Ok to have in 1.6.2 but I didn't audit all the
|
||||
r-t-r callback functions myself to make sure they do not return
|
||||
READ_TREE_RECURSIVE when they shouldn't. Perhaps somebody else should
|
||||
double check.
|
||||
|
||||
* kb/checkout-optim (Wed Feb 4 13:53:20 2009 +0100) 8 commits
|
||||
- lstat_cache(): print a warning if doing ping-pong between cache
|
||||
types
|
||||
- show_patch_diff(): remove a call to fstat()
|
||||
- write_entry(): cleanup of some duplicated code
|
||||
- create_directories(): remove some memcpy() and strchr() calls
|
||||
- unlink_entry(): introduce schedule_dir_for_removal()
|
||||
- lstat_cache(): swap func(length, string) into func(string, length)
|
||||
- lstat_cache(): generalise longest_match_lstat_cache()
|
||||
- lstat_cache(): small cleanup and optimisation
|
||||
|
||||
I thought it looked fine, but Kjetil asks to cook this a bit longer.
|
||||
|
||||
* js/valgrind (Thu Feb 5 22:03:00 2009 +0100) 9 commits
|
||||
+ valgrind: do not require valgrind 3.4.0 or newer
|
||||
+ test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
|
||||
+ Tests: let --valgrind imply --verbose and --tee
|
||||
+ Add a script to coalesce the valgrind outputs
|
||||
+ t/Makefile: provide a 'valgrind' target
|
||||
+ test-lib.sh: optionally output to test-results/$TEST.out, too
|
||||
+ Valgrind support: check for more than just programming errors
|
||||
+ valgrind: ignore ldso and more libz errors
|
||||
+ Add valgrind support in test scripts
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* js/maint-remote-remove-mirror (Wed Feb 4 11:06:07 2009 -0500) 2 commits
|
||||
+ builtin-remote: make rm operation safer in mirrored repository
|
||||
+ builtin-remote: make rm() use properly named variable to hold
|
||||
return value
|
||||
|
||||
* ek/maint-filter-branch-bare (Tue Feb 3 13:27:03 2009 -0500) 1 commit
|
||||
+ filter-branch: Fix fatal error on bare repositories
|
||||
|
||||
* tr/add-p-single (Fri Feb 6 20:30:01 2009 +0100) 3 commits
|
||||
+ add -p: import Term::ReadKey with 'require'
|
||||
+ add -p: print errors in separate color
|
||||
+ add -p: prompt for single characters
|
||||
|
||||
* js/notes (Tue Jan 13 20:57:16 2009 +0100) 6 commits
|
||||
+ git-notes: fix printing of multi-line notes
|
||||
+ notes: fix core.notesRef documentation
|
||||
+ Add an expensive test for git-notes
|
||||
+ Speed up git notes lookup
|
||||
+ Add a script to edit/inspect notes
|
||||
+ Introduce commit notes
|
||||
|
||||
* gt/utf8-width (Fri Jan 30 04:41:29 2009 -0500) 2 commits
|
||||
+ builtin-blame.c: Use utf8_strwidth for author's names
|
||||
+ utf8: add utf8_strwidth()
|
||||
|
||||
I replaced the bottom one with a cheesy "if it does not look like
|
||||
utf8, give strlen back" to make the result behave sensibly for legacy
|
||||
encodings. It does improve "git blame git-stash.sh" output (especially
|
||||
if you remove .mailmap).
|
||||
|
||||
* jk/head-symref (Thu Jan 29 03:33:02 2009 -0500) 2 commits
|
||||
+ symbolic ref: refuse non-ref targets in HEAD
|
||||
+ validate_headref: tighten ref-matching to just branches
|
||||
|
||||
* rc/http-push (Tue Feb 3 20:39:00 2009 +0800) 4 commits
|
||||
+ http-push: wrap signature of get_remote_object_url
|
||||
+ http-push: add back underscore separator before lock token
|
||||
+ http-push.c: get_remote_object_url() is only used under
|
||||
USE_CURL_MULTI
|
||||
+ http-push: refactor request url creation
|
||||
|
||||
* jc/refuse-push-to-current (Sat Jan 31 17:34:05 2009 -0800) 1 commit
|
||||
+ receive-pack: explain what to do when push updates the current
|
||||
branch
|
||||
|
||||
* cb/mergetool (Fri Jan 30 23:20:11 2009 +0000) 3 commits
|
||||
+ mergetool: fix running mergetool in sub-directories
|
||||
+ mergetool: Add a test for running mergetool in a sub-directory
|
||||
+ mergetool: respect autocrlf by using checkout-index
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Sat Jan 31 17:34:05 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
This is for 1.7.0.
|
||||
|
||||
* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
|
||||
- git commit: pathspec without -i/-o implies -i semantics during a
|
||||
merge
|
||||
- builtin-commit: shorten eye-sore overlong lines
|
||||
- Add "partial commit" tests during a conflicted merge
|
||||
|
||||
This is only meant as a weatherballoon to help facilitate discussion.
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user. I do not need it in 1.6.2
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
. diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
. revision --simplify-merges: incremental simplification
|
||||
. revision --simplify-merges: prepare for incremental simplification
|
||||
@@ -1,316 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Feb 2009, #04; Sun, 15)
|
||||
X-master-at: 075394e26cd7fb38e08d5f637a5fc825ab0b3fb3
|
||||
X-next-at: 607872276f2e9c2cf5c5bb05e9a9a741f3792148
|
||||
|
||||
What's cooking in git.git (Feb 2009, #04; Sun, 15)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
The master branch will be tagged as 1.6.2-rc1 by the end of the long
|
||||
weekend.
|
||||
|
||||
Traditionally, rc freeze, especially post -rc1, meant that I stop paying
|
||||
attention to whatever topic that did not graduate to 'master', and not
|
||||
queuing further updates to 'next' to encourage people to concentrate on
|
||||
'master' bugfixes by discouraging them from tinkering the topics that
|
||||
won't be in the next release.
|
||||
|
||||
I do not think that approach has worked well in practice, so let's try
|
||||
something slightly different.
|
||||
|
||||
I'll try to leave 'next' open during this freeze, but the new topics and
|
||||
topics that hasn't cooked to maturity by -rc1 will not be in 1.6.2 (that
|
||||
is what a freeze means).
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jw/imap-preformatted-html (Thu Feb 12 08:58:12 2009 -0600) 1 commit
|
||||
- imap.preformattedHTML to tell Thunderbird to send non-flowed text
|
||||
|
||||
The patch text should be identical to Jeremy's "Virtual Patch", except
|
||||
that the configuration variable was renamed per list discussion.
|
||||
|
||||
* jw/format-patch-attach (Thu Feb 12 09:51:55 2009 -0600) 1 commit
|
||||
- Enable setting attach as the default in .gitconfig for git-format-
|
||||
patch.
|
||||
|
||||
* sr/force-rebase (Fri Feb 13 23:48:01 2009 +0100) 1 commit
|
||||
- Teach rebase to rebase even if upstream is up to date
|
||||
|
||||
* fg/exclude-bq (Tue Feb 10 15:20:17 2009 +0100) 1 commit
|
||||
- Support "\" in non-wildcard exclusion entries
|
||||
|
||||
* fc/config-editor (Sat Feb 7 23:53:00 2009 +0200) 1 commit
|
||||
- config: Add new option to open an editor.
|
||||
|
||||
* dm/add-i-edit-abort (Thu Feb 12 00:19:41 2009 -0500) 1 commit
|
||||
- add -i: revisit hunk on editor failure
|
||||
|
||||
* tp/completion (Wed Feb 11 13:03:26 2009 -0500) 4 commits
|
||||
- completion: More fixes to prevent unbound variable errors
|
||||
- completion: Better __git_ps1 support when not in working directory
|
||||
- completion: Use consistent if [...] convention, not "test"
|
||||
- completion: For consistency, change "git rev-parse" to __gitdir
|
||||
calls
|
||||
|
||||
* js/branch-symref (Fri Feb 13 04:40:18 2009 -0500) 1 commit
|
||||
- builtin-branch: improve output when displaying remote branches
|
||||
|
||||
* js/send-email (Sat Feb 14 23:32:15 2009 -0500) 3 commits
|
||||
- send-email: --suppress-cc improvements
|
||||
- send-email: handle multiple Cc addresses when reading mbox message
|
||||
- send-email: allow send-email to run outside a repo
|
||||
|
||||
* al/ansi-color (Fri Feb 13 22:53:41 2009 +0100) 2 commits
|
||||
- builtin-branch.c: Rename branch category color names
|
||||
- Clean up use of ANSI color sequences
|
||||
|
||||
All of the above are probably ready for 'next'.
|
||||
|
||||
* js/remote-set-head (Sat Feb 14 05:30:30 2009 -0500) 5 commits
|
||||
- builtin-remote: better handling of multiple remote HEADs
|
||||
- builtin-remote: add set-head subcommand
|
||||
- builtin-remote: teach show to display remote HEAD
|
||||
- builtin-remote: move duplicated cleanup code its own function
|
||||
- builtin-clone: move locate_head() to remote.c so it can be re-used
|
||||
|
||||
* jk/head-lookup (Sun Feb 15 01:18:18 2009 -0500) 5 commits
|
||||
- remote: use exact HEAD lookup if it is available
|
||||
- remote: refactor guess_remote_head
|
||||
- refactor find_refs_by_name to accept const list
|
||||
- add basic http clone/fetch tests
|
||||
- test scripts: refactor start_httpd helper
|
||||
|
||||
Builds on top of Jay Soffian's js/remote-set-head topic.
|
||||
|
||||
* sg/rerere-cleanup (Sat Feb 14 23:21:04 2009 +0100) 1 commit
|
||||
- rerere: remove duplicated functions
|
||||
|
||||
* ns/stash-keep (Thu Feb 12 06:25:14 2009 +0900) 1 commit
|
||||
- stash: --keep option just saves
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit
|
||||
- archive.c: add support for --submodules[=(all|checkedout)]
|
||||
|
||||
Discussion stalled on the submodule selection criteria.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. The line number in the "previous" information
|
||||
may need refining, and sanity checking code for reference counting may
|
||||
need to be resurrected before this can move forward.
|
||||
|
||||
Recent tig discussion may blow new life into it. Let's see.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
The "spec" did not seem quite well cooked yet, but in the longer term I
|
||||
think something like this to allow interoperating with other SCMs as if
|
||||
the other end is a native git repository is a very worthy goal.
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I think the code is much cleaner than the first round, but I am not
|
||||
convinced it is doing the right thing in the connectivity traverser.
|
||||
I'd like to keep this out of 1.6.2.
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
Design discussion between Jakub and Sebastien seems to have stalled.
|
||||
|
||||
* jc/fsck (Fri Jan 30 02:33:47 2009 -0800) 4 commits
|
||||
- fsck: three levels of validation
|
||||
- verify-pack: add --quick
|
||||
- verify_pack(): allow a quicker verification for a pack with
|
||||
version 2 idx
|
||||
- pack-check.c: minor formatting fix to match coding style
|
||||
|
||||
J6t has a good point that if this had any value then medium level should
|
||||
replace the default. I am tempted to actually dropping this as a failed
|
||||
experiment.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Reverted]
|
||||
|
||||
* mh/unify-color (Fri Jan 23 01:25:23 2009 -0800) 3 commits
|
||||
? Revert previous two commits
|
||||
? move the color variables to color.c
|
||||
? handle color.ui at a central place
|
||||
|
||||
This broke git-format-patch badly.
|
||||
|
||||
* js/rebase-error-a-bit-more-verbose (Sun Feb 8 21:22:18 2009 -0800) 2 commits
|
||||
? Revert "rebase: explain why when the HEAD could not be detached"
|
||||
? rebase: explain why when the HEAD could not be detached
|
||||
|
||||
This turned out to be unnecessary.
|
||||
|
||||
* rs/maint-1.6.0-windows-ceiling (Sat Feb 7 12:40:40 2009 -0800) 2 commits
|
||||
? Revert "fix t1504 on Windows"
|
||||
? fix t1504 on Windows
|
||||
|
||||
I'm giving a fresh start to J6t's series which contains this.
|
||||
|
||||
* lh/reverted-submodule-tree-traversal (Sun Jan 25 18:39:55 2009 -0800) 4 commits
|
||||
? Revert round #1 of the series
|
||||
? builtin-ls-tree: enable traversal of submodules
|
||||
? archive.c: enable traversal of submodules
|
||||
? tree.c: add support for traversal of submodules
|
||||
|
||||
I'm giving a fresh start to Lars's second iteration.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* kb/checkout-optim (Mon Feb 9 21:54:53 2009 +0100) 9 commits
|
||||
- lstat_cache(): print a warning if doing ping-pong between cache
|
||||
types
|
||||
- show_patch_diff(): remove a call to fstat()
|
||||
- write_entry(): use fstat() instead of lstat() when file is open
|
||||
- write_entry(): cleanup of some duplicated code
|
||||
- create_directories(): remove some memcpy() and strchr() calls
|
||||
- unlink_entry(): introduce schedule_dir_for_removal()
|
||||
- lstat_cache(): swap func(length, string) into func(string, length)
|
||||
- lstat_cache(): generalise longest_match_lstat_cache()
|
||||
- lstat_cache(): small cleanup and optimisation
|
||||
|
||||
Should be ready for 'next'.
|
||||
|
||||
* js/valgrind (Thu Feb 5 22:03:00 2009 +0100) 9 commits
|
||||
+ valgrind: do not require valgrind 3.4.0 or newer
|
||||
+ test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
|
||||
+ Tests: let --valgrind imply --verbose and --tee
|
||||
+ Add a script to coalesce the valgrind outputs
|
||||
+ t/Makefile: provide a 'valgrind' target
|
||||
+ test-lib.sh: optionally output to test-results/$TEST.out, too
|
||||
+ Valgrind support: check for more than just programming errors
|
||||
+ valgrind: ignore ldso and more libz errors
|
||||
+ Add valgrind support in test scripts
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* jn/gitweb-committag (Fri Feb 6 10:12:41 2009 +0100) 1 commit
|
||||
+ gitweb: Better regexp for SHA-1 committag match
|
||||
|
||||
* js/maint-1.6.0-path-normalize (Sat Feb 7 16:08:31 2009 +0100) 5 commits
|
||||
+ Remove unused normalize_absolute_path()
|
||||
+ Test and fix normalize_path_copy()
|
||||
+ Fix GIT_CEILING_DIRECTORIES on Windows
|
||||
+ Move sanitary_path_copy() to path.c and rename it to
|
||||
normalize_path_copy()
|
||||
+ Make test-path-utils more robust against incorrect use
|
||||
|
||||
Replaces one from René that was queued earlier.
|
||||
|
||||
* js/git-submodule-trailing-slash (Sat Feb 7 14:43:15 2009 +0100) 2 commits
|
||||
+ submodule: warn about non-submodules
|
||||
+ Let ls-files strip trailing slashes in submodules' paths
|
||||
|
||||
* ms/mailmap (Thu Feb 8 15:34:31 2009 +0100) 5 commits
|
||||
+ Move mailmap documentation into separate file
|
||||
+ Change current mailmap usage to do matching on both name and email
|
||||
of author/committer.
|
||||
+ Add map_user() and clear_mailmap() to mailmap
|
||||
+ Add find_insert_index, insert_at_index and clear_func functions to
|
||||
string_list
|
||||
+ Add log.mailmap as configurational option for mailmap location
|
||||
|
||||
* ff/submodule-no-fetch (Thu Feb 5 20:18:32 2009 -0200) 1 commit
|
||||
+ submodule: add --no-fetch parameter to update command
|
||||
|
||||
* mc/setup-cd-p (Fri Feb 6 19:24:28 2009 -0800) 1 commit
|
||||
+ git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work
|
||||
tree
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
This is for 1.7.0.
|
||||
|
||||
* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
|
||||
- git commit: pathspec without -i/-o implies -i semantics during a
|
||||
merge
|
||||
- builtin-commit: shorten eye-sore overlong lines
|
||||
- Add "partial commit" tests during a conflicted merge
|
||||
|
||||
This is only meant as a weatherballoon to help facilitate discussion.
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user. I do not need it in 1.6.2
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
. diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
. revision --simplify-merges: incremental simplification
|
||||
. revision --simplify-merges: prepare for incremental simplification
|
||||
@@ -1,328 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Feb 2009, #05; Mon, 16)
|
||||
X-master-at: 81d3fe9f4871e42ebd1af0221fa091fe5476e2f7
|
||||
X-next-at: fe6246962442d691150184fe12c71dd019e1b41f
|
||||
|
||||
What's cooking in git.git (Feb 2009, #05; Mon, 16)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
The master branch is slightly past 1.6.2-rc1.
|
||||
|
||||
As an experiment, 'next' and 'pu' stay open during this release freeze;
|
||||
new topics are accepted as time permits, but people are much more strongly
|
||||
encouraged to find issues on what is already on 'master', and patches to
|
||||
fix them always takes precedence over what is still on 'next' and will
|
||||
never graduate until 1.6.2 final.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* gb/gitweb-base (Sun Feb 15 10:18:36 2009 +0100) 1 commit
|
||||
- gitweb: fix wrong base URL when non-root DirectoryIndex
|
||||
|
||||
Should this go in 1.6.2-rc2?
|
||||
|
||||
* tr/gcov (Sun Feb 15 23:25:45 2009 +0100) 8 commits
|
||||
- Test git-patch-id
|
||||
- Test rev-list --parents/--children
|
||||
- Test log --decorate
|
||||
- Test fsck a bit harder
|
||||
- Test log --graph
|
||||
- Test diff --dirstat functionality
|
||||
- Test that diff can read from stdin
|
||||
- Support coverage testing with GCC/gcov
|
||||
|
||||
* jc/add-p-unquote (Mon Feb 16 22:43:43 2009 -0800) 1 commit
|
||||
- git-add -i/-p: learn to unwrap C-quoted paths
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* ns/stash-keep (Thu Feb 12 06:25:14 2009 +0900) 1 commit
|
||||
- stash: --keep option just saves
|
||||
|
||||
Do we want to keep this one?
|
||||
|
||||
* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit
|
||||
- archive.c: add support for --submodules[=(all|checkedout)]
|
||||
|
||||
Discussion stalled on the submodule selection criteria.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. The line number in the "previous" information
|
||||
may need refining, and sanity checking code for reference counting may
|
||||
need to be resurrected before this can move forward.
|
||||
|
||||
I thought recent tig discussion may blow new life into it, but is this
|
||||
unneeded? If so I'd rather revert it (or discard after 1.6.2).
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
The "spec" did not seem quite well cooked yet, but in the longer term I
|
||||
think something like this to allow interoperating with other SCMs as if
|
||||
the other end is a native git repository is a very worthy goal.
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I think the code is much cleaner than the first round, but I am not
|
||||
convinced it is doing the right thing in the connectivity traverser.
|
||||
Independent review sorely needed.
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
Design discussion between Jakub and Sebastien seems to have stalled, but
|
||||
Jakub seems to be taking this over.
|
||||
|
||||
* jc/fsck (Fri Jan 30 02:33:47 2009 -0800) 4 commits
|
||||
- fsck: three levels of validation
|
||||
- verify-pack: add --quick
|
||||
- verify_pack(): allow a quicker verification for a pack with
|
||||
version 2 idx
|
||||
- pack-check.c: minor formatting fix to match coding style
|
||||
|
||||
J6t has a good point that if this had any value then medium level should
|
||||
replace the default. I am tempted to actually dropping this as a failed
|
||||
experiment.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Reverted]
|
||||
|
||||
* mh/unify-color (Fri Jan 23 01:25:23 2009 -0800) 3 commits
|
||||
? Revert previous two commits
|
||||
? move the color variables to color.c
|
||||
? handle color.ui at a central place
|
||||
|
||||
This broke git-format-patch badly.
|
||||
|
||||
* js/rebase-error-a-bit-more-verbose (Sun Feb 8 21:22:18 2009 -0800) 2 commits
|
||||
? Revert "rebase: explain why when the HEAD could not be detached"
|
||||
? rebase: explain why when the HEAD could not be detached
|
||||
|
||||
This turned out to be unnecessary.
|
||||
|
||||
* rs/maint-1.6.0-windows-ceiling (Sat Feb 7 12:40:40 2009 -0800) 2 commits
|
||||
? Revert "fix t1504 on Windows"
|
||||
? fix t1504 on Windows
|
||||
|
||||
I'm giving a fresh start to J6t's series which contains this.
|
||||
|
||||
* lh/reverted-submodule-tree-traversal (Sun Jan 25 18:39:55 2009 -0800) 4 commits
|
||||
? Revert round #1 of the series
|
||||
? builtin-ls-tree: enable traversal of submodules
|
||||
? archive.c: enable traversal of submodules
|
||||
? tree.c: add support for traversal of submodules
|
||||
|
||||
I'm giving a fresh start to Lars's second iteration.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to 'next' soon]
|
||||
|
||||
* js/send-email (Sat Feb 14 23:32:15 2009 -0500) 3 commits
|
||||
- send-email: --suppress-cc improvements
|
||||
- send-email: handle multiple Cc addresses when reading mbox message
|
||||
- send-email: allow send-email to run outside a repo
|
||||
|
||||
* sg/rerere-cleanup (Sat Feb 14 23:21:04 2009 +0100) 1 commit
|
||||
- rerere: remove duplicated functions
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Ready for 'master' after 1.6.2]
|
||||
|
||||
* jw/imap-preformatted-html (Thu Feb 12 08:58:12 2009 -0600) 1 commit
|
||||
+ imap.preformattedHTML to tell Thunderbird to send non-flowed text
|
||||
|
||||
The patch text should be identical to Jeremy's "Virtual Patch", except
|
||||
that the configuration variable was renamed per list discussion.
|
||||
|
||||
* jw/format-patch-attach (Thu Feb 12 09:51:55 2009 -0600) 1 commit
|
||||
+ Enable setting attach as the default in .gitconfig for git-format-
|
||||
patch.
|
||||
|
||||
* sr/force-rebase (Fri Feb 13 23:48:01 2009 +0100) 1 commit
|
||||
+ Teach rebase to rebase even if upstream is up to date
|
||||
|
||||
* fg/exclude-bq (Tue Feb 10 15:20:17 2009 +0100) 1 commit
|
||||
+ Support "\" in non-wildcard exclusion entries
|
||||
|
||||
* dm/add-i-edit-abort (Thu Feb 12 00:19:41 2009 -0500) 1 commit
|
||||
+ add -i: revisit hunk on editor failure
|
||||
|
||||
* tp/completion (Wed Feb 11 13:03:26 2009 -0500) 4 commits
|
||||
+ completion: More fixes to prevent unbound variable errors
|
||||
+ completion: Better __git_ps1 support when not in working directory
|
||||
+ completion: Use consistent if [...] convention, not "test"
|
||||
+ completion: For consistency, change "git rev-parse" to __gitdir
|
||||
calls
|
||||
|
||||
* js/branch-symref (Fri Feb 13 04:40:18 2009 -0500) 1 commit
|
||||
+ builtin-branch: improve output when displaying remote branches
|
||||
|
||||
* al/ansi-color (Fri Feb 13 22:53:41 2009 +0100) 2 commits
|
||||
+ builtin-branch.c: Rename branch category color names
|
||||
+ Clean up use of ANSI color sequences
|
||||
|
||||
* kb/checkout-optim (Mon Feb 9 21:54:53 2009 +0100) 9 commits
|
||||
+ lstat_cache(): print a warning if doing ping-pong between cache
|
||||
types
|
||||
+ show_patch_diff(): remove a call to fstat()
|
||||
+ write_entry(): use fstat() instead of lstat() when file is open
|
||||
+ write_entry(): cleanup of some duplicated code
|
||||
+ create_directories(): remove some memcpy() and strchr() calls
|
||||
+ unlink_entry(): introduce schedule_dir_for_removal()
|
||||
+ lstat_cache(): swap func(length, string) into func(string, length)
|
||||
+ lstat_cache(): generalise longest_match_lstat_cache()
|
||||
+ lstat_cache(): small cleanup and optimisation
|
||||
|
||||
* js/valgrind (Thu Feb 5 22:03:00 2009 +0100) 9 commits
|
||||
+ valgrind: do not require valgrind 3.4.0 or newer
|
||||
+ test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
|
||||
+ Tests: let --valgrind imply --verbose and --tee
|
||||
+ Add a script to coalesce the valgrind outputs
|
||||
+ t/Makefile: provide a 'valgrind' target
|
||||
+ test-lib.sh: optionally output to test-results/$TEST.out, too
|
||||
+ Valgrind support: check for more than just programming errors
|
||||
+ valgrind: ignore ldso and more libz errors
|
||||
+ Add valgrind support in test scripts
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* js/notes (Sat Feb 14 21:23:25 2009 +0100) 13 commits
|
||||
- notes: refuse to edit notes outside refs/notes/
|
||||
- t3301: use test_must_fail instead of !
|
||||
- t3301: fix confusing quoting in test for valid notes ref
|
||||
- notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
|
||||
- notes: only clean up message file when editing
|
||||
- handle empty notes gracefully
|
||||
+ git notes show: test empty notes
|
||||
+ git-notes: fix printing of multi-line notes
|
||||
+ notes: fix core.notesRef documentation
|
||||
+ Add an expensive test for git-notes
|
||||
+ Speed up git notes lookup
|
||||
+ Add a script to edit/inspect notes
|
||||
+ Introduce commit notes
|
||||
|
||||
Earlier part was merged to master and then reverted there. I probably
|
||||
should rebase this after 1.6.2 to keep my sanity.
|
||||
|
||||
* fc/config-editor (Tue Feb 17 02:54:54 2009 +0200) 9 commits
|
||||
. config: Cleanup editor action.
|
||||
. config: Codestyle cleanups.
|
||||
. config: Don't allow extra arguments for -e or -l.
|
||||
. config: Disallow multiple config file locations.
|
||||
. config: Disallow multiple variable types.
|
||||
. config: Use parseopt.
|
||||
. config: Reorganize get_color*.
|
||||
. config: Trivial rename in preparation for parseopt.
|
||||
- config: Add new option to open an editor.
|
||||
|
||||
The follow-up series does not pass the test suite, and evicted from 'pu';
|
||||
the first one might be 'next' worthy, though.
|
||||
|
||||
* js/remote-set-head (Sat Feb 14 05:30:30 2009 -0500) 5 commits
|
||||
- builtin-remote: better handling of multiple remote HEADs
|
||||
- builtin-remote: add set-head subcommand
|
||||
- builtin-remote: teach show to display remote HEAD
|
||||
- builtin-remote: move duplicated cleanup code its own function
|
||||
- builtin-clone: move locate_head() to remote.c so it can be re-used
|
||||
|
||||
* jk/head-lookup (Sun Feb 15 01:18:18 2009 -0500) 5 commits
|
||||
- remote: use exact HEAD lookup if it is available
|
||||
- remote: refactor guess_remote_head
|
||||
- refactor find_refs_by_name to accept const list
|
||||
- add basic http clone/fetch tests
|
||||
- test scripts: refactor start_httpd helper
|
||||
|
||||
Builds on top of Jay Soffian's js/remote-set-head topic. How well do
|
||||
these two work in practice in the real world? Success stories?
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
This is for 1.7.0.
|
||||
|
||||
* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
|
||||
- git commit: pathspec without -i/-o implies -i semantics during a
|
||||
merge
|
||||
- builtin-commit: shorten eye-sore overlong lines
|
||||
- Add "partial commit" tests during a conflicted merge
|
||||
|
||||
This was only meant as a weatherballoon to help facilitate discussion.
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user. I do not need it in 1.6.2
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
[Perhaps will discard]
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
. diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
. revision --simplify-merges: incremental simplification
|
||||
. revision --simplify-merges: prepare for incremental simplification
|
||||
@@ -1,336 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Feb 2009, #06; Wed, 18)
|
||||
X-master-at: 25487f8e2ae266936df0f807ae79dca41606e404
|
||||
X-next-at: 7bf82e6b638b58e0dd7bf2ab96f861e1f239b822
|
||||
|
||||
What's cooking in git.git (Feb 2009, #06; Wed, 18)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
The master branch is slightly past 1.6.2-rc1.
|
||||
|
||||
As an experiment, 'next' and 'pu' stay open during this release freeze;
|
||||
new topics are accepted as time permits, but people are much more strongly
|
||||
encouraged to find issues on what is already on 'master', and patches to
|
||||
fix them always takes precedence over what is still on 'next' and will
|
||||
never graduate until 1.6.2 final.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* fc/parseopt-config (Tue Feb 17 15:52:56 2009 +0200) 11 commits
|
||||
. config: Don't allow extra arguments for -e or -l
|
||||
. config: Disallow multiple variable types
|
||||
. config: Disallow multiple config file locations
|
||||
. config: Disallow --getcolor* and other actions used together
|
||||
. config: Use parseopt
|
||||
. config: Reorganize get_color*
|
||||
. config: Trivial rename in preparation for parseopt
|
||||
. ??? config: Make git_config() more flexible
|
||||
. config: Cleanup editor action
|
||||
. config: style clean-ups
|
||||
- config: Add new option to open an editor.
|
||||
|
||||
Builds on top of "config -e" change.
|
||||
|
||||
* mv/parseopt-ls-files (Tue Feb 17 15:27:11 2009 +0100) 2 commits
|
||||
- parse-opt: migrate builtin-ls-files.
|
||||
- Turn the flags in struct dir_struct into a single variable
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* ns/stash-keep (Thu Feb 12 06:25:14 2009 +0900) 1 commit
|
||||
- stash: --keep option just saves
|
||||
|
||||
Do we want to keep this one?
|
||||
|
||||
* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit
|
||||
- archive.c: add support for --submodules[=(all|checkedout)]
|
||||
|
||||
Discussion stalled on the submodule selection criteria.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. The line number in the "previous" information
|
||||
may need refining, and sanity checking code for reference counting may
|
||||
need to be resurrected before this can move forward.
|
||||
|
||||
I thought recent tig discussion may blow new life into it, but is this
|
||||
unneeded? If so I'd rather revert it (or discard after 1.6.2).
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
The "spec" did not seem quite well cooked yet, but in the longer term I
|
||||
think something like this to allow interoperating with other SCMs as if
|
||||
the other end is a native git repository is a very worthy goal.
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I think the code is much cleaner than the first round, but I am not
|
||||
convinced it is doing the right thing in the connectivity traverser.
|
||||
Independent review sorely needed.
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
Design discussion between Jakub and Sebastien seems to have stalled, but
|
||||
Jakub seems to be taking this over.
|
||||
|
||||
* jc/fsck (Fri Jan 30 02:33:47 2009 -0800) 4 commits
|
||||
- fsck: three levels of validation
|
||||
- verify-pack: add --quick
|
||||
- verify_pack(): allow a quicker verification for a pack with
|
||||
version 2 idx
|
||||
- pack-check.c: minor formatting fix to match coding style
|
||||
|
||||
J6t has a good point that if this had any value then medium level should
|
||||
replace the default. I am tempted to actually dropping this as a failed
|
||||
experiment.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Reverted]
|
||||
|
||||
* mh/unify-color (Fri Jan 23 01:25:23 2009 -0800) 3 commits
|
||||
? Revert previous two commits
|
||||
? move the color variables to color.c
|
||||
? handle color.ui at a central place
|
||||
|
||||
This broke git-format-patch badly.
|
||||
|
||||
* js/rebase-error-a-bit-more-verbose (Sun Feb 8 21:22:18 2009 -0800) 2 commits
|
||||
? Revert "rebase: explain why when the HEAD could not be detached"
|
||||
? rebase: explain why when the HEAD could not be detached
|
||||
|
||||
This turned out to be unnecessary.
|
||||
|
||||
* rs/maint-1.6.0-windows-ceiling (Sat Feb 7 12:40:40 2009 -0800) 2 commits
|
||||
? Revert "fix t1504 on Windows"
|
||||
? fix t1504 on Windows
|
||||
|
||||
I'm giving a fresh start to J6t's series which contains this.
|
||||
|
||||
* lh/reverted-submodule-tree-traversal (Sun Jan 25 18:39:55 2009 -0800) 4 commits
|
||||
? Revert round #1 of the series
|
||||
? builtin-ls-tree: enable traversal of submodules
|
||||
? archive.c: enable traversal of submodules
|
||||
? tree.c: add support for traversal of submodules
|
||||
|
||||
I'm giving a fresh start to Lars's second iteration.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to 'next' soon]
|
||||
|
||||
* tr/gcov (Sun Feb 15 23:25:45 2009 +0100) 8 commits
|
||||
- Test git-patch-id
|
||||
- Test rev-list --parents/--children
|
||||
- Test log --decorate
|
||||
- Test fsck a bit harder
|
||||
- Test log --graph
|
||||
- Test diff --dirstat functionality
|
||||
- Test that diff can read from stdin
|
||||
- Support coverage testing with GCC/gcov
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Ready for 'master' after 1.6.2]
|
||||
|
||||
* jw/imap-preformatted-html (Thu Feb 12 08:58:12 2009 -0600) 1 commit
|
||||
+ imap.preformattedHTML to tell Thunderbird to send non-flowed text
|
||||
|
||||
The patch text should be identical to Jeremy's "Virtual Patch", except
|
||||
that the configuration variable was renamed per list discussion.
|
||||
|
||||
* jw/format-patch-attach (Thu Feb 12 09:51:55 2009 -0600) 1 commit
|
||||
+ Enable setting attach as the default in .gitconfig for git-format-
|
||||
patch.
|
||||
|
||||
* sr/force-rebase (Fri Feb 13 23:48:01 2009 +0100) 1 commit
|
||||
+ Teach rebase to rebase even if upstream is up to date
|
||||
|
||||
* fg/exclude-bq (Tue Feb 10 15:20:17 2009 +0100) 1 commit
|
||||
+ Support "\" in non-wildcard exclusion entries
|
||||
|
||||
* dm/add-i-edit-abort (Thu Feb 12 00:19:41 2009 -0500) 1 commit
|
||||
+ add -i: revisit hunk on editor failure
|
||||
|
||||
* tp/completion (Wed Feb 11 13:03:26 2009 -0500) 4 commits
|
||||
+ completion: More fixes to prevent unbound variable errors
|
||||
+ completion: Better __git_ps1 support when not in working directory
|
||||
+ completion: Use consistent if [...] convention, not "test"
|
||||
+ completion: For consistency, change "git rev-parse" to __gitdir
|
||||
calls
|
||||
|
||||
* js/branch-symref (Wed Feb 18 19:14:59 2009 +0100) 2 commits
|
||||
+ Avoid segfault with 'git branch' when the HEAD is detached
|
||||
+ builtin-branch: improve output when displaying remote branches
|
||||
|
||||
* al/ansi-color (Fri Feb 13 22:53:41 2009 +0100) 2 commits
|
||||
+ builtin-branch.c: Rename branch category color names
|
||||
+ Clean up use of ANSI color sequences
|
||||
|
||||
* kb/checkout-optim (Wed Feb 18 23:18:03 2009 +0100) 10 commits
|
||||
+ check_updates(): effective removal of cache entries marked
|
||||
CE_REMOVE
|
||||
+ lstat_cache(): print a warning if doing ping-pong between cache
|
||||
types
|
||||
+ show_patch_diff(): remove a call to fstat()
|
||||
+ write_entry(): use fstat() instead of lstat() when file is open
|
||||
+ write_entry(): cleanup of some duplicated code
|
||||
+ create_directories(): remove some memcpy() and strchr() calls
|
||||
+ unlink_entry(): introduce schedule_dir_for_removal()
|
||||
+ lstat_cache(): swap func(length, string) into func(string, length)
|
||||
+ lstat_cache(): generalise longest_match_lstat_cache()
|
||||
+ lstat_cache(): small cleanup and optimisation
|
||||
|
||||
* js/valgrind (Thu Feb 5 22:03:00 2009 +0100) 9 commits
|
||||
+ valgrind: do not require valgrind 3.4.0 or newer
|
||||
+ test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
|
||||
+ Tests: let --valgrind imply --verbose and --tee
|
||||
+ Add a script to coalesce the valgrind outputs
|
||||
+ t/Makefile: provide a 'valgrind' target
|
||||
+ test-lib.sh: optionally output to test-results/$TEST.out, too
|
||||
+ Valgrind support: check for more than just programming errors
|
||||
+ valgrind: ignore ldso and more libz errors
|
||||
+ Add valgrind support in test scripts
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* jc/add-p-unquote (Mon Feb 16 22:43:43 2009 -0800) 1 commit
|
||||
+ git-add -i/-p: learn to unwrap C-quoted paths
|
||||
|
||||
* js/send-email (Sat Feb 14 23:32:15 2009 -0500) 3 commits
|
||||
+ send-email: --suppress-cc improvements
|
||||
+ send-email: handle multiple Cc addresses when reading mbox message
|
||||
+ send-email: allow send-email to run outside a repo
|
||||
|
||||
* sg/rerere-cleanup (Sat Feb 14 23:21:04 2009 +0100) 1 commit
|
||||
+ rerere: remove duplicated functions
|
||||
|
||||
* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits
|
||||
+ tests: fix "export var=val"
|
||||
+ notes: refuse to edit notes outside refs/notes/
|
||||
+ t3301: use test_must_fail instead of !
|
||||
+ t3301: fix confusing quoting in test for valid notes ref
|
||||
+ notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
|
||||
+ notes: only clean up message file when editing
|
||||
+ handle empty notes gracefully
|
||||
+ git notes show: test empty notes
|
||||
+ git-notes: fix printing of multi-line notes
|
||||
+ notes: fix core.notesRef documentation
|
||||
+ Add an expensive test for git-notes
|
||||
+ Speed up git notes lookup
|
||||
+ Add a script to edit/inspect notes
|
||||
+ Introduce commit notes
|
||||
|
||||
Earlier part was merged to master and then reverted there. I probably
|
||||
should rebase this after 1.6.2 to keep my sanity.
|
||||
|
||||
* fc/config-editor (Sat Feb 7 23:53:00 2009 +0200) 1 commit
|
||||
- config: Add new option to open an editor.
|
||||
|
||||
* js/remote-set-head (Sat Feb 14 05:30:30 2009 -0500) 5 commits
|
||||
- builtin-remote: better handling of multiple remote HEADs
|
||||
- builtin-remote: add set-head subcommand
|
||||
- builtin-remote: teach show to display remote HEAD
|
||||
- builtin-remote: move duplicated cleanup code its own function
|
||||
- builtin-clone: move locate_head() to remote.c so it can be re-used
|
||||
|
||||
* jk/head-lookup (Sun Feb 15 01:18:18 2009 -0500) 5 commits
|
||||
- remote: use exact HEAD lookup if it is available
|
||||
- remote: refactor guess_remote_head
|
||||
- refactor find_refs_by_name to accept const list
|
||||
- add basic http clone/fetch tests
|
||||
- test scripts: refactor start_httpd helper
|
||||
|
||||
Builds on top of Jay Soffian's js/remote-set-head topic. How well do
|
||||
these two work in practice in the real world? Success stories?
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
This is for 1.7.0.
|
||||
|
||||
* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
|
||||
- git commit: pathspec without -i/-o implies -i semantics during a
|
||||
merge
|
||||
- builtin-commit: shorten eye-sore overlong lines
|
||||
- Add "partial commit" tests during a conflicted merge
|
||||
|
||||
This was only meant as a weatherballoon to help facilitate discussion.
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user. I do not need it in 1.6.2
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Perhaps will discard]
|
||||
|
||||
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
|
||||
. diff: enable "too large a rename" warning when -M/-C is explicitly
|
||||
asked for
|
||||
|
||||
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
|
||||
. git-am --forge: add Signed-off-by: line for the author
|
||||
. git-am: clean-up Signed-off-by: lines
|
||||
. stripspace: add --log-clean option to clean up signed-off-by:
|
||||
lines
|
||||
. stripspace: use parse_options()
|
||||
. Add "git am -s" test
|
||||
. git-am: refactor code to add signed-off-by line for the committer
|
||||
|
||||
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
|
||||
. revision --simplify-merges: incremental simplification
|
||||
. revision --simplify-merges: prepare for incremental simplification
|
||||
@@ -1,436 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Mar 2009, #01; Tue, 03)
|
||||
X-master-at: 1d035f85649cbb0a4fcc3e341f7e854acf9cf3c1
|
||||
X-next-at: 23381c887989ea63153c562061b1c4703ee75baf
|
||||
|
||||
What's cooking in git.git (Mar 2009, #01; Tue, 03)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
The master branch is slightly past 1.6.2-rc2. It's been a week and I
|
||||
think I can declare the final on this Wednesday, *if* I am not too mired
|
||||
by the day job, but I do not know what would happen yet.
|
||||
|
||||
As an experiment, 'next' and 'pu' stayed open during this release freeze;
|
||||
new topics have been accepted. I have to say that the experiment was a
|
||||
moderate success, and many topics in 'next' seem to be of fairly high
|
||||
quality already, which would mean that we will have a shorter cycle before
|
||||
1.6.3.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jk/clone-post-checkout (Tue Mar 3 00:37:51 2009 -0500) 1 commit
|
||||
- clone: run post-checkout hook when checking out
|
||||
|
||||
* hv/cvsimport (Mon Mar 2 18:59:36 2009 +0100) 1 commit
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
|
||||
* jc/push-to-create (Mon Mar 2 22:36:16 2009 -0800) 1 commit
|
||||
- Push to create
|
||||
|
||||
* fc/parseopt-config (Sat Feb 21 02:49:29 2009 +0200) 11 commits
|
||||
- git config: don't allow --get-color* and variable type
|
||||
- git config: don't allow extra arguments for -e or -l.
|
||||
- git config: don't allow multiple variable types
|
||||
- git config: don't allow multiple config file locations
|
||||
- git config: reorganize to use parseopt
|
||||
- git config: reorganize get_color*
|
||||
- git config: trivial rename in preparation for parseopt
|
||||
- git_config(): not having a per-repo config file is not an error
|
||||
+ git config: trivial cleanup for editor action
|
||||
+ git config: codestyle cleanups
|
||||
+ config: Add new option to open an editor.
|
||||
|
||||
* tr/format-patch-thread (Thu Feb 19 22:26:33 2009 +0100) 4 commits
|
||||
- format-patch: support deep threading
|
||||
- format-patch: thread as reply to cover letter even with in-reply-
|
||||
to
|
||||
- format-patch: track several references
|
||||
- format-patch: threading test reactivation
|
||||
|
||||
* ns/pretty-format (Tue Feb 24 15:33:29 2009 +0200) 5 commits
|
||||
+ bash completion: add --format= and --oneline options for "git log"
|
||||
+ Add tests for git log --pretty, --format and --oneline.
|
||||
+ Add --oneline that is a synonym to "--pretty=oneline --abbrev-
|
||||
commit"
|
||||
+ Give short-hands to --pretty=tformat:%formatstring
|
||||
+ Add --format that is a synonym to --pretty
|
||||
|
||||
* mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits
|
||||
- Add a test of "git cvsimport"'s handling of tags and branches
|
||||
- Add some tests of git-cvsimport's handling of vendor branches
|
||||
- Test contents of entire cvsimported "master" tree contents
|
||||
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
- Start a library for cvsimport-related tests
|
||||
|
||||
* tr/maint-1.6.0-send-email-irt (Sun Mar 1 23:45:41 2009 +0100) 1 commit
|
||||
- send-email: respect in-reply-to regardless of threading
|
||||
|
||||
* jc/maint-1.6.0-keep-pack (Sat Feb 28 00:37:19 2009 -0800) 6 commits
|
||||
+ is_kept_pack(): final clean-up
|
||||
+ Simplify is_kept_pack()
|
||||
+ Consolidate ignore_packed logic more
|
||||
+ has_sha1_kept_pack(): take "struct rev_info"
|
||||
+ has_sha1_pack(): refactor "pretend these packs do not exist"
|
||||
interface
|
||||
+ git-repack: resist stray environment variable
|
||||
|
||||
* en/maint-hash-object (Sat Feb 28 12:56:49 2009 -0700) 1 commit
|
||||
+ Ensure proper setup of git_dir for git-hash-object
|
||||
|
||||
* el/blame-date (Fri Feb 20 14:51:11 2009 -0800) 1 commit
|
||||
- Make git blame's date output format configurable, like git log
|
||||
|
||||
* js/remote-improvements (Wed Feb 25 03:32:28 2009 -0500) 22 commits
|
||||
- builtin-remote: new show output style for push refspecs
|
||||
- builtin-remote: new show output style
|
||||
- remote: make guess_remote_head() use exact HEAD lookup if it is
|
||||
available
|
||||
- builtin-remote: add set-head subcommand
|
||||
- builtin-remote: teach show to display remote HEAD
|
||||
- builtin-remote: fix two inconsistencies in the output of "show
|
||||
<remote>"
|
||||
- builtin-remote: make get_remote_ref_states() always populate
|
||||
states.tracked
|
||||
- builtin-remote: rename variables and eliminate redundant function
|
||||
call
|
||||
- builtin-remote: remove unused code in get_ref_states
|
||||
- builtin-remote: refactor duplicated cleanup code
|
||||
- string-list: new for_each_string_list() function
|
||||
- remote: make match_refs() not short-circuit
|
||||
- remote: make match_refs() copy src ref before assigning to
|
||||
peer_ref
|
||||
- remote: let guess_remote_head() optionally return all matches
|
||||
- remote: make copy_ref() perform a deep copy
|
||||
- remote: simplify guess_remote_head()
|
||||
- move locate_head() to remote.c
|
||||
- move duplicated ref_newer() to remote.c
|
||||
- move duplicated get_local_heads() to remote.c
|
||||
- refactor find_ref_by_name() to accept const list
|
||||
- add basic http clone/fetch tests
|
||||
- test scripts: refactor start_httpd helper
|
||||
|
||||
* js/clone-depth-local (Fri Feb 27 00:04:06 2009 -0800) 3 commits
|
||||
. parse_options(): do not "increment" boolean
|
||||
. clone: ignore --depth when cloning locally (implicitly --local)
|
||||
. clone: do not ignore --no-local option
|
||||
|
||||
Jeff had a good suggestion for this series but it was tripped by
|
||||
a misfeature in parse_options().
|
||||
|
||||
* rs/memmem (Tue Mar 3 00:19:30 2009 +0100) 2 commits
|
||||
- optimize compat/ memmem()
|
||||
- diffcore-pickaxe: use memmem()
|
||||
|
||||
As always with patches from René, this is already next material.
|
||||
|
||||
* mv/parseopt-ls-files (Tue Feb 17 15:27:11 2009 +0100) 2 commits
|
||||
- parse-opt: migrate builtin-ls-files.
|
||||
- Turn the flags in struct dir_struct into a single variable
|
||||
|
||||
* jk/sane-relative-time (Tue Feb 24 00:42:16 2009 -0500) 1 commit
|
||||
+ never fallback relative times to absolute
|
||||
|
||||
* tv/rebase-stat (Sun Mar 1 22:28:28 2009 +0100) 2 commits
|
||||
- git-pull: Allow --stat and --no-stat to be used with --rebase
|
||||
- git-rebase: Add --stat and --no-stat for producing diffstat on
|
||||
rebase
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Discarded]
|
||||
|
||||
* jc/fsck (Fri Jan 30 02:33:47 2009 -0800) 4 commits
|
||||
- fsck: three levels of validation
|
||||
- verify-pack: add --quick
|
||||
- verify_pack(): allow a quicker verification for a pack with
|
||||
version 2 idx
|
||||
- pack-check.c: minor formatting fix to match coding style
|
||||
|
||||
J6t has a good point that if this had any value then medium level should
|
||||
replace the default. I am tempted to actually dropping this as a failed
|
||||
experiment.
|
||||
|
||||
* js/remote-set-head (Sat Feb 14 05:30:30 2009 -0500) 5 commits
|
||||
- builtin-remote: better handling of multiple remote HEADs
|
||||
- builtin-remote: add set-head subcommand
|
||||
- builtin-remote: teach show to display remote HEAD
|
||||
- builtin-remote: move duplicated cleanup code its own function
|
||||
- builtin-clone: move locate_head() to remote.c so it can be re-used
|
||||
|
||||
* jk/head-lookup (Sun Feb 15 01:18:18 2009 -0500) 5 commits
|
||||
- remote: use exact HEAD lookup if it is available
|
||||
- remote: refactor guess_remote_head
|
||||
- refactor find_refs_by_name to accept const list
|
||||
- add basic http clone/fetch tests
|
||||
- test scripts: refactor start_httpd helper
|
||||
|
||||
These two are now consolidated into Jay's remove-improvements series
|
||||
listed above.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* gb/gitweb-base (Sun Feb 15 10:18:36 2009 +0100) 1 commit
|
||||
- gitweb: fix wrong base URL when non-root DirectoryIndex
|
||||
|
||||
* ns/stash-keep (Thu Feb 12 06:25:14 2009 +0900) 1 commit
|
||||
- stash: --keep option just saves
|
||||
|
||||
Do we want to keep this one?
|
||||
|
||||
* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit
|
||||
- archive.c: add support for --submodules[=(all|checkedout)]
|
||||
|
||||
Discussion stalled on the submodule selection criteria.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. The line number in the "previous" information
|
||||
may need refining, and sanity checking code for reference counting may
|
||||
need to be resurrected before this can move forward.
|
||||
|
||||
I thought recent tig discussion may blow new life into it, but is this
|
||||
unneeded? If so I'd rather revert it (or discard after 1.6.2).
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
The "spec" did not seem quite well cooked yet, but in the longer term I
|
||||
think something like this to allow interoperating with other SCMs as if
|
||||
the other end is a native git repository is a very worthy goal.
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I think the code is much cleaner than the first round, but I am not
|
||||
convinced it is doing the right thing in the connectivity traverser.
|
||||
Independent review sorely needed.
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
Design discussion between Jakub and Sebastien seems to have stalled, but
|
||||
Jakub seems to be taking this over.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Reverted]
|
||||
|
||||
* mh/unify-color (Fri Jan 23 01:25:23 2009 -0800) 3 commits
|
||||
? Revert previous two commits
|
||||
? move the color variables to color.c
|
||||
? handle color.ui at a central place
|
||||
|
||||
This broke git-format-patch badly.
|
||||
|
||||
* js/rebase-error-a-bit-more-verbose (Sun Feb 8 21:22:18 2009 -0800) 2 commits
|
||||
? Revert "rebase: explain why when the HEAD could not be detached"
|
||||
? rebase: explain why when the HEAD could not be detached
|
||||
|
||||
This turned out to be unnecessary.
|
||||
|
||||
* rs/maint-1.6.0-windows-ceiling (Sat Feb 7 12:40:40 2009 -0800) 2 commits
|
||||
? Revert "fix t1504 on Windows"
|
||||
? fix t1504 on Windows
|
||||
|
||||
I'm giving a fresh start to J6t's series which contains this.
|
||||
|
||||
* lh/reverted-submodule-tree-traversal (Sun Jan 25 18:39:55 2009 -0800) 4 commits
|
||||
? Revert round #1 of the series
|
||||
? builtin-ls-tree: enable traversal of submodules
|
||||
? archive.c: enable traversal of submodules
|
||||
? tree.c: add support for traversal of submodules
|
||||
|
||||
I'm giving a fresh start to Lars's second iteration.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to 'next' soon]
|
||||
|
||||
* js/send-email (Mon Mar 2 23:52:18 2009 -0500) 5 commits
|
||||
- send-email: add --confirm option and configuration setting
|
||||
+ send-email: don't create temporary compose file until it is needed
|
||||
+ send-email: --suppress-cc improvements
|
||||
+ send-email: handle multiple Cc addresses when reading mbox message
|
||||
+ send-email: allow send-email to run outside a repo
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Ready for 'master' after 1.6.2]
|
||||
|
||||
* sg/rerere-cleanup (Sat Feb 14 23:21:04 2009 +0100) 1 commit
|
||||
+ rerere: remove duplicated functions
|
||||
|
||||
* jc/add-p-unquote (Mon Feb 16 22:43:43 2009 -0800) 1 commit
|
||||
+ git-add -i/-p: learn to unwrap C-quoted paths
|
||||
|
||||
* jw/imap-preformatted-html (Thu Feb 12 08:58:12 2009 -0600) 1 commit
|
||||
+ imap.preformattedHTML to tell Thunderbird to send non-flowed text
|
||||
|
||||
The patch text should be identical to Jeremy's "Virtual Patch", except
|
||||
that the configuration variable was renamed per list discussion.
|
||||
|
||||
* jw/format-patch-attach (Thu Feb 12 09:51:55 2009 -0600) 1 commit
|
||||
+ Enable setting attach as the default in .gitconfig for git-format-
|
||||
patch.
|
||||
|
||||
* sr/force-rebase (Fri Feb 13 23:48:01 2009 +0100) 1 commit
|
||||
+ Teach rebase to rebase even if upstream is up to date
|
||||
|
||||
* fg/exclude-bq (Tue Feb 10 15:20:17 2009 +0100) 1 commit
|
||||
+ Support "\" in non-wildcard exclusion entries
|
||||
|
||||
* dm/add-i-edit-abort (Thu Feb 12 00:19:41 2009 -0500) 1 commit
|
||||
+ add -i: revisit hunk on editor failure
|
||||
|
||||
* tp/completion (Sat Feb 21 15:48:43 2009 +0100) 6 commits
|
||||
+ Fixup: Add bare repository indicator for __git_ps1
|
||||
+ Add bare repository indicator for __git_ps1
|
||||
+ completion: More fixes to prevent unbound variable errors
|
||||
+ completion: Better __git_ps1 support when not in working directory
|
||||
+ completion: Use consistent if [...] convention, not "test"
|
||||
+ completion: For consistency, change "git rev-parse" to __gitdir
|
||||
calls
|
||||
|
||||
* js/branch-symref (Wed Feb 18 22:34:44 2009 -0500) 4 commits
|
||||
+ add basic branch display tests
|
||||
+ branch: clean up repeated strlen
|
||||
+ Avoid segfault with 'git branch' when the HEAD is detached
|
||||
+ builtin-branch: improve output when displaying remote branches
|
||||
|
||||
* al/ansi-color (Fri Feb 13 22:53:41 2009 +0100) 2 commits
|
||||
+ builtin-branch.c: Rename branch category color names
|
||||
+ Clean up use of ANSI color sequences
|
||||
|
||||
* kb/checkout-optim (Mon Feb 23 19:02:57 2009 +0100) 14 commits
|
||||
+ write_index(): update index_state->timestamp after flushing to
|
||||
disk
|
||||
+ verify_uptodate(): add ce_uptodate(ce) test
|
||||
+ make USE_NSEC work as expected
|
||||
+ fix compile error when USE_NSEC is defined
|
||||
+ check_updates(): effective removal of cache entries marked
|
||||
CE_REMOVE
|
||||
+ lstat_cache(): print a warning if doing ping-pong between cache
|
||||
types
|
||||
+ show_patch_diff(): remove a call to fstat()
|
||||
+ write_entry(): use fstat() instead of lstat() when file is open
|
||||
+ write_entry(): cleanup of some duplicated code
|
||||
+ create_directories(): remove some memcpy() and strchr() calls
|
||||
+ unlink_entry(): introduce schedule_dir_for_removal()
|
||||
+ lstat_cache(): swap func(length, string) into func(string, length)
|
||||
+ lstat_cache(): generalise longest_match_lstat_cache()
|
||||
+ lstat_cache(): small cleanup and optimisation
|
||||
|
||||
* js/valgrind (Thu Feb 5 22:03:00 2009 +0100) 9 commits
|
||||
+ valgrind: do not require valgrind 3.4.0 or newer
|
||||
+ test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
|
||||
+ Tests: let --valgrind imply --verbose and --tee
|
||||
+ Add a script to coalesce the valgrind outputs
|
||||
+ t/Makefile: provide a 'valgrind' target
|
||||
+ test-lib.sh: optionally output to test-results/$TEST.out, too
|
||||
+ Valgrind support: check for more than just programming errors
|
||||
+ valgrind: ignore ldso and more libz errors
|
||||
+ Add valgrind support in test scripts
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* tr/gcov (Thu Feb 19 12:13:42 2009 +0100) 8 commits
|
||||
- Test git-patch-id
|
||||
- Test rev-list --parents/--children
|
||||
- Test log --decorate
|
||||
- Test fsck a bit harder
|
||||
- Test log --graph
|
||||
- Test diff --dirstat functionality
|
||||
- Test that diff can read from stdin
|
||||
- Support coverage testing with GCC/gcov
|
||||
|
||||
* js/notes (Sat Feb 14 21:23:25 2009 +0100) 13 commits
|
||||
- notes: refuse to edit notes outside refs/notes/
|
||||
- t3301: use test_must_fail instead of !
|
||||
- t3301: fix confusing quoting in test for valid notes ref
|
||||
- notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
|
||||
- notes: only clean up message file when editing
|
||||
- handle empty notes gracefully
|
||||
+ git notes show: test empty notes
|
||||
+ git-notes: fix printing of multi-line notes
|
||||
+ notes: fix core.notesRef documentation
|
||||
+ Add an expensive test for git-notes
|
||||
+ Speed up git notes lookup
|
||||
+ Add a script to edit/inspect notes
|
||||
+ Introduce commit notes
|
||||
|
||||
Earlier part was merged to master and then reverted there. Will be
|
||||
rebased 1.6.2 to keep my sanity.
|
||||
|
||||
* fc/config-editor (Sat Feb 21 02:48:54 2009 +0200) 3 commits
|
||||
+ git config: trivial cleanup for editor action
|
||||
+ git config: codestyle cleanups
|
||||
+ config: Add new option to open an editor.
|
||||
|
||||
Rerolled and looked sane.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
This is for 1.7.0.
|
||||
|
||||
* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
|
||||
- git commit: pathspec without -i/-o implies -i semantics during a
|
||||
merge
|
||||
- builtin-commit: shorten eye-sore overlong lines
|
||||
- Add "partial commit" tests during a conflicted merge
|
||||
|
||||
This was only meant as a weatherballoon to help facilitate discussion.
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user. I do not need it in 1.6.2
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
@@ -1,406 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Mar 2009, #02; Thu, 05)
|
||||
X-master-at: 836769e875ecf47e83137a39de5937652e0e861e
|
||||
X-next-at: c65e767e015b0309eb047b5a4d2b20dcaceeab22
|
||||
|
||||
What's cooking in git.git (Mar 2009, #02; Thu, 05)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
The master branch is slightly past 1.6.2, but embarrasingly enough we
|
||||
already have a real commit on 'maint'.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* hv/cvsimport-tests (Mon Mar 2 18:59:36 2009 +0100) 1 commit
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
|
||||
Yet more tests without fixing anything...
|
||||
|
||||
* jc/clone-branch-rebase (Tue Mar 3 22:29:55 2009 -0800) 1 commit
|
||||
- Make git-clone respect branch.autosetuprebase
|
||||
|
||||
This is rewrite of a patch from Pat Notz.
|
||||
|
||||
* mg/maint-submodule-normalize-path (Tue Mar 3 16:08:21 2009 +0100) 2 commits
|
||||
- git submodule: Fix adding of submodules at paths with ./, .. and //
|
||||
- git submodule: Add test cases for git submodule add
|
||||
|
||||
* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit
|
||||
- stat_tracking_info(): only count real commits
|
||||
|
||||
This gives the merge commits zero weight when talking about how many
|
||||
commits you have ahead (or behind) of the branch you are tracking. Even
|
||||
though I agree that they should carry much less weight than the "real"
|
||||
commits, because your repeated merge from the other branch does not really
|
||||
add any real value to the end result, giving them absolute zero weight
|
||||
somehow feels wrong. At least it shows that your have been _active_ on the
|
||||
branch. But I do not feel very strongly about it.
|
||||
|
||||
* js/rebase-i-opt (Tue Mar 3 10:55:31 2009 +0100) 1 commit
|
||||
- rebase -i: avoid 'git reset' when possible
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to 'master' soon]
|
||||
|
||||
* jk/sane-relative-time (Tue Feb 24 00:42:16 2009 -0500) 1 commit
|
||||
+ never fallback relative times to absolute
|
||||
|
||||
I think I sent out a "here is how" patch for something related to
|
||||
--date=<format> option that may be related to this topic; I seem to have
|
||||
lost it.
|
||||
|
||||
* js/send-email (Mon Mar 2 23:52:18 2009 -0500) 5 commits
|
||||
+ send-email: add --confirm option and configuration setting
|
||||
+ send-email: don't create temporary compose file until it is needed
|
||||
+ send-email: --suppress-cc improvements
|
||||
+ send-email: handle multiple Cc addresses when reading mbox message
|
||||
+ send-email: allow send-email to run outside a repo
|
||||
|
||||
* sg/rerere-cleanup (Sat Feb 14 23:21:04 2009 +0100) 1 commit
|
||||
+ rerere: remove duplicated functions
|
||||
|
||||
* jc/add-p-unquote (Mon Feb 16 22:43:43 2009 -0800) 1 commit
|
||||
+ git-add -i/-p: learn to unwrap C-quoted paths
|
||||
|
||||
* jw/imap-preformatted-html (Thu Feb 12 08:58:12 2009 -0600) 1 commit
|
||||
+ imap.preformattedHTML to tell Thunderbird to send non-flowed text
|
||||
|
||||
The patch text should be identical to Jeremy's "Virtual Patch", except
|
||||
that the configuration variable was renamed per list discussion.
|
||||
|
||||
* jw/format-patch-attach (Thu Feb 12 09:51:55 2009 -0600) 1 commit
|
||||
+ Enable setting attach as the default in .gitconfig for git-format-
|
||||
patch.
|
||||
|
||||
* sr/force-rebase (Fri Feb 13 23:48:01 2009 +0100) 1 commit
|
||||
+ Teach rebase to rebase even if upstream is up to date
|
||||
|
||||
* fg/exclude-bq (Tue Feb 10 15:20:17 2009 +0100) 1 commit
|
||||
+ Support "\" in non-wildcard exclusion entries
|
||||
|
||||
* dm/add-i-edit-abort (Thu Feb 12 00:19:41 2009 -0500) 1 commit
|
||||
+ add -i: revisit hunk on editor failure
|
||||
|
||||
* tp/completion (Sat Feb 21 15:48:43 2009 +0100) 6 commits
|
||||
+ Fixup: Add bare repository indicator for __git_ps1
|
||||
+ Add bare repository indicator for __git_ps1
|
||||
+ completion: More fixes to prevent unbound variable errors
|
||||
+ completion: Better __git_ps1 support when not in working directory
|
||||
+ completion: Use consistent if [...] convention, not "test"
|
||||
+ completion: For consistency, change "git rev-parse" to __gitdir
|
||||
calls
|
||||
|
||||
* js/branch-symref (Wed Feb 18 22:34:44 2009 -0500) 4 commits
|
||||
+ add basic branch display tests
|
||||
+ branch: clean up repeated strlen
|
||||
+ Avoid segfault with 'git branch' when the HEAD is detached
|
||||
+ builtin-branch: improve output when displaying remote branches
|
||||
|
||||
* al/ansi-color (Fri Feb 13 22:53:41 2009 +0100) 2 commits
|
||||
+ builtin-branch.c: Rename branch category color names
|
||||
+ Clean up use of ANSI color sequences
|
||||
|
||||
* js/valgrind (Thu Feb 5 22:03:00 2009 +0100) 9 commits
|
||||
+ valgrind: do not require valgrind 3.4.0 or newer
|
||||
+ test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
|
||||
+ Tests: let --valgrind imply --verbose and --tee
|
||||
+ Add a script to coalesce the valgrind outputs
|
||||
+ t/Makefile: provide a 'valgrind' target
|
||||
+ test-lib.sh: optionally output to test-results/$TEST.out, too
|
||||
+ Valgrind support: check for more than just programming errors
|
||||
+ valgrind: ignore ldso and more libz errors
|
||||
+ Add valgrind support in test scripts
|
||||
|
||||
* fc/config-editor (Sat Feb 21 02:48:54 2009 +0200) 3 commits
|
||||
+ git config: trivial cleanup for editor action
|
||||
+ git config: codestyle cleanups
|
||||
+ config: Add new option to open an editor.
|
||||
|
||||
Rerolled and looked sane.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
This gives Porcelains (like gitweb) the information on the commit _before_
|
||||
the one that the final blame is laid on, which should save them one
|
||||
rev-parse to dig further. Jakub seems to want this for gitweb.
|
||||
|
||||
* ns/pretty-format (Tue Feb 24 15:33:29 2009 +0200) 5 commits
|
||||
+ bash completion: add --format= and --oneline options for "git log"
|
||||
+ Add tests for git log --pretty, --format and --oneline.
|
||||
+ Add --oneline that is a synonym to "--pretty=oneline --abbrev-
|
||||
commit"
|
||||
+ Give short-hands to --pretty=tformat:%formatstring
|
||||
+ Add --format that is a synonym to --pretty
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Discarded]
|
||||
|
||||
* js/clone-depth-local (Fri Feb 27 00:04:06 2009 -0800) 3 commits
|
||||
. parse_options(): do not "increment" boolean
|
||||
. clone: ignore --depth when cloning locally (implicitly --local)
|
||||
. clone: do not ignore --no-local option
|
||||
|
||||
Jeff had a good suggestion for this series but it was tripped by
|
||||
a misfeature in parse_options().
|
||||
|
||||
* ns/stash-keep (Thu Feb 12 06:25:14 2009 +0900) 1 commit
|
||||
. stash: --keep option just saves
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit
|
||||
- archive.c: add support for --submodules[=(all|checkedout)]
|
||||
|
||||
Discussion stalled on the submodule selection criteria.
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
The "spec" did not seem quite well cooked yet, but in the longer term I
|
||||
think something like this to allow interoperating with other SCMs as if
|
||||
the other end is a native git repository is a very worthy goal.
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I think the code is much cleaner than the first round, but I am not
|
||||
convinced it is doing the right thing in the connectivity traverser.
|
||||
Independent review sorely needed.
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
- gitweb: Optional grouping of projects by category
|
||||
- gitweb: Split git_project_list_body in two functions
|
||||
- gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
Design discussion between Jakub and Sebastien seems to have stalled, but
|
||||
Jakub seems to be taking this over, so I'll probably discard these three
|
||||
shortly.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* kb/checkout-optim (Wed Mar 4 18:47:40 2009 +0100) 15 commits
|
||||
- better introduction of GIT with USE_NSEC defined
|
||||
+ write_index(): update index_state->timestamp after flushing to
|
||||
disk
|
||||
+ verify_uptodate(): add ce_uptodate(ce) test
|
||||
+ make USE_NSEC work as expected
|
||||
+ fix compile error when USE_NSEC is defined
|
||||
+ check_updates(): effective removal of cache entries marked
|
||||
CE_REMOVE
|
||||
+ lstat_cache(): print a warning if doing ping-pong between cache
|
||||
types
|
||||
+ show_patch_diff(): remove a call to fstat()
|
||||
+ write_entry(): use fstat() instead of lstat() when file is open
|
||||
+ write_entry(): cleanup of some duplicated code
|
||||
+ create_directories(): remove some memcpy() and strchr() calls
|
||||
+ unlink_entry(): introduce schedule_dir_for_removal()
|
||||
+ lstat_cache(): swap func(length, string) into func(string, length)
|
||||
+ lstat_cache(): generalise longest_match_lstat_cache()
|
||||
+ lstat_cache(): small cleanup and optimisation
|
||||
|
||||
* rs/memmem (Tue Mar 3 00:19:30 2009 +0100) 2 commits
|
||||
- optimize compat/ memmem()
|
||||
- diffcore-pickaxe: use memmem()
|
||||
|
||||
As always with patches from René, this is already next material.
|
||||
|
||||
* jc/push-to-create (Mon Mar 2 22:36:16 2009 -0800) 1 commit
|
||||
- Push to create
|
||||
|
||||
This was a failed weatherbaloon patch to allow creation of a new
|
||||
repository from the remote side. Will discard.
|
||||
|
||||
* mv/parseopt-ls-files (Tue Feb 17 15:27:11 2009 +0100) 2 commits
|
||||
- parse-opt: migrate builtin-ls-files.
|
||||
- Turn the flags in struct dir_struct into a single variable
|
||||
|
||||
* tv/rebase-stat (Sun Mar 1 22:28:28 2009 +0100) 2 commits
|
||||
- git-pull: Allow --stat and --no-stat to be used with --rebase
|
||||
- git-rebase: Add --stat and --no-stat for producing diffstat on
|
||||
rebase
|
||||
|
||||
* jk/clone-post-checkout (Tue Mar 3 00:37:51 2009 -0500) 1 commit
|
||||
- clone: run post-checkout hook when checking out
|
||||
|
||||
* js/remote-improvements (Wed Feb 25 03:32:28 2009 -0500) 22 commits
|
||||
- builtin-remote: new show output style for push refspecs
|
||||
- builtin-remote: new show output style
|
||||
- remote: make guess_remote_head() use exact HEAD lookup if it is
|
||||
available
|
||||
- builtin-remote: add set-head subcommand
|
||||
- builtin-remote: teach show to display remote HEAD
|
||||
- builtin-remote: fix two inconsistencies in the output of "show
|
||||
<remote>"
|
||||
- builtin-remote: make get_remote_ref_states() always populate
|
||||
states.tracked
|
||||
- builtin-remote: rename variables and eliminate redundant function
|
||||
call
|
||||
- builtin-remote: remove unused code in get_ref_states
|
||||
- builtin-remote: refactor duplicated cleanup code
|
||||
- string-list: new for_each_string_list() function
|
||||
- remote: make match_refs() not short-circuit
|
||||
- remote: make match_refs() copy src ref before assigning to
|
||||
peer_ref
|
||||
- remote: let guess_remote_head() optionally return all matches
|
||||
- remote: make copy_ref() perform a deep copy
|
||||
- remote: simplify guess_remote_head()
|
||||
- move locate_head() to remote.c
|
||||
- move duplicated ref_newer() to remote.c
|
||||
- move duplicated get_local_heads() to remote.c
|
||||
- refactor find_ref_by_name() to accept const list
|
||||
- add basic http clone/fetch tests
|
||||
- test scripts: refactor start_httpd helper
|
||||
|
||||
* fc/parseopt-config (Sat Feb 21 02:49:29 2009 +0200) 11 commits
|
||||
- git config: don't allow --get-color* and variable type
|
||||
- git config: don't allow extra arguments for -e or -l.
|
||||
- git config: don't allow multiple variable types
|
||||
- git config: don't allow multiple config file locations
|
||||
- git config: reorganize to use parseopt
|
||||
- git config: reorganize get_color*
|
||||
- git config: trivial rename in preparation for parseopt
|
||||
- git_config(): not having a per-repo config file is not an error
|
||||
+ git config: trivial cleanup for editor action
|
||||
+ git config: codestyle cleanups
|
||||
+ config: Add new option to open an editor.
|
||||
|
||||
* tr/format-patch-thread (Thu Feb 19 22:26:33 2009 +0100) 4 commits
|
||||
- format-patch: support deep threading
|
||||
- format-patch: thread as reply to cover letter even with in-reply-
|
||||
to
|
||||
- format-patch: track several references
|
||||
- format-patch: threading test reactivation
|
||||
|
||||
* el/blame-date (Fri Feb 20 14:51:11 2009 -0800) 1 commit
|
||||
- Make git blame's date output format configurable, like git log
|
||||
|
||||
I think the above seven series were basically Ok; I'll hopefully have time
|
||||
to re-read them and merge them to 'next'.
|
||||
|
||||
* mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits
|
||||
- Add a test of "git cvsimport"'s handling of tags and branches
|
||||
- Add some tests of git-cvsimport's handling of vendor branches
|
||||
- Test contents of entire cvsimported "master" tree contents
|
||||
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
- Start a library for cvsimport-related tests
|
||||
|
||||
Tests without fixes are of dubious value. Any takers?
|
||||
|
||||
* tr/maint-1.6.0-send-email-irt (Sun Mar 1 23:45:41 2009 +0100) 1 commit
|
||||
- send-email: respect in-reply-to regardless of threading
|
||||
|
||||
Tests?
|
||||
|
||||
* jc/maint-1.6.0-keep-pack (Sat Feb 28 00:37:19 2009 -0800) 6 commits
|
||||
+ is_kept_pack(): final clean-up
|
||||
+ Simplify is_kept_pack()
|
||||
+ Consolidate ignore_packed logic more
|
||||
+ has_sha1_kept_pack(): take "struct rev_info"
|
||||
+ has_sha1_pack(): refactor "pretend these packs do not exist"
|
||||
interface
|
||||
+ git-repack: resist stray environment variable
|
||||
|
||||
This is in response to Linus's "Really slow 'git gc'" ($gmane/110743)
|
||||
|
||||
* en/maint-hash-object (Sat Feb 28 12:56:49 2009 -0700) 1 commit
|
||||
+ Ensure proper setup of git_dir for git-hash-object
|
||||
|
||||
Obvious fix that can also go to 1.6.1.X
|
||||
|
||||
* tr/gcov (Thu Feb 19 12:13:42 2009 +0100) 8 commits
|
||||
- Test git-patch-id
|
||||
- Test rev-list --parents/--children
|
||||
- Test log --decorate
|
||||
- Test fsck a bit harder
|
||||
- Test log --graph
|
||||
- Test diff --dirstat functionality
|
||||
- Test that diff can read from stdin
|
||||
- Support coverage testing with GCC/gcov
|
||||
|
||||
* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits
|
||||
- tests: fix "export var=val"
|
||||
- notes: refuse to edit notes outside refs/notes/
|
||||
- t3301: use test_must_fail instead of !
|
||||
- t3301: fix confusing quoting in test for valid notes ref
|
||||
- notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
|
||||
- notes: only clean up message file when editing
|
||||
- handle empty notes gracefully
|
||||
- git notes show: test empty notes
|
||||
- git-notes: fix printing of multi-line notes
|
||||
- notes: fix core.notesRef documentation
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
Rebased and then kicked back to 'pu' to give the author a chance to
|
||||
rearrange if necessary. I might do some trivial squashing myself.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
|
||||
* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
|
||||
- git commit: pathspec without -i/-o implies -i semantics during a
|
||||
merge
|
||||
- builtin-commit: shorten eye-sore overlong lines
|
||||
- Add "partial commit" tests during a conflicted merge
|
||||
|
||||
This was only meant as a weatherballoon to help facilitate discussion.
|
||||
Will be discarded.
|
||||
@@ -1,444 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Mar 2009, #03; Wed, 11)
|
||||
X-master-at: e47eec8fc6efb5ad0574b4862fd8e8e82b6a62fa
|
||||
X-next-at: b2e4c32e13df1b7f18e7b4a9f746650471a3122e
|
||||
|
||||
What's cooking in git.git (Mar 2009, #03; Wed, 11)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* db/maint-missing-origin (Wed Mar 11 01:47:20 2009 -0400) 1 commit
|
||||
- Give error when no remote is configured
|
||||
|
||||
* js/sideband-stderr (Tue Mar 10 22:58:09 2009 +0100) 2 commits
|
||||
- winansi: support ESC [ K (erase in line)
|
||||
- recv_sideband: Bands #2 and #3 always go to stderr
|
||||
|
||||
* js/rsync-local (Mon Mar 9 19:44:55 2009 +0100) 1 commit
|
||||
- rsync transport: allow local paths, and fix tests
|
||||
|
||||
* rs/color-grep (Sun Mar 8 18:22:44 2009 -0700) 6 commits
|
||||
+ grep: cast printf %.*s "precision" argument explicitly to int
|
||||
+ grep: add support for coloring with external greps
|
||||
+ grep: color patterns in output
|
||||
+ grep: add pmatch and eflags arguments to match_one_pattern()
|
||||
+ grep: remove grep_opt argument from match_expr_eval()
|
||||
+ grep: micro-optimize hit collection for AND nodes
|
||||
|
||||
* db/refspec-wildcard-in-the-middle (Sat Mar 7 01:11:39 2009 -0500) 5 commits
|
||||
+ Support '*' in the middle of a refspec
|
||||
+ Keep '*' in pattern refspecs
|
||||
+ Use the matching function to generate the match results
|
||||
+ Use a single function to match names against patterns
|
||||
+ Make clone parse the default refspec with the normal code
|
||||
|
||||
* db/push-cleanup (Sun Mar 8 21:06:07 2009 -0400) 2 commits
|
||||
- Move push matching and reporting logic into transport.c
|
||||
- Use a common function to get the pretty name of refs
|
||||
|
||||
* xx/db-refspec-vs-js-remote (Sun Mar 8 00:12:33 2009 -0800) 1 commit
|
||||
+ Adjust js/remote-improvements and db/refspec-wildcard-in-the-
|
||||
middle
|
||||
|
||||
* fg/push-default (Mon Mar 9 23:35:51 2009 +0100) 7 commits
|
||||
- git push: Remove warning for "git push" default change
|
||||
- git push: Change default for "git push" to nothing.
|
||||
- git push: Document that "nothing" is the future push default
|
||||
- git push: Display warning on unconfigured default push
|
||||
- git push: New options --matching and --current
|
||||
- New config option push.default
|
||||
- remote: Make "-" an alias for the current remote
|
||||
|
||||
With the topmost three patches, tonight's 'pu' does not pass the self test
|
||||
as expected. I am not sure there is a wide support for changing the
|
||||
default, either.
|
||||
|
||||
* kg/http-auth (Mon Mar 9 23:34:25 2009 -0700) 3 commits
|
||||
- http authentication via prompts
|
||||
- http_init(): Fix config file parsing
|
||||
- http.c: style cleanups
|
||||
|
||||
This only deals with the fetch side.
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* jk/sane-relative-time (Tue Feb 24 00:42:16 2009 -0500) 1 commit
|
||||
+ never fallback relative times to absolute
|
||||
|
||||
* js/send-email (Mon Mar 2 23:52:18 2009 -0500) 5 commits
|
||||
+ send-email: add --confirm option and configuration setting
|
||||
+ send-email: don't create temporary compose file until it is needed
|
||||
+ send-email: --suppress-cc improvements
|
||||
+ send-email: handle multiple Cc addresses when reading mbox message
|
||||
+ send-email: allow send-email to run outside a repo
|
||||
|
||||
* sg/rerere-cleanup (Sat Feb 14 23:21:04 2009 +0100) 1 commit
|
||||
+ rerere: remove duplicated functions
|
||||
|
||||
* jc/add-p-unquote (Mon Feb 16 22:43:43 2009 -0800) 1 commit
|
||||
+ git-add -i/-p: learn to unwrap C-quoted paths
|
||||
|
||||
* jw/imap-preformatted-html (Thu Feb 12 08:58:12 2009 -0600) 1 commit
|
||||
+ imap.preformattedHTML to tell Thunderbird to send non-flowed text
|
||||
|
||||
* jw/format-patch-attach (Thu Feb 12 09:51:55 2009 -0600) 1 commit
|
||||
+ Enable setting attach as the default in .gitconfig for git-format-
|
||||
patch.
|
||||
|
||||
* sr/force-rebase (Fri Feb 13 23:48:01 2009 +0100) 1 commit
|
||||
+ Teach rebase to rebase even if upstream is up to date
|
||||
|
||||
* fg/exclude-bq (Tue Feb 10 15:20:17 2009 +0100) 1 commit
|
||||
+ Support "\" in non-wildcard exclusion entries
|
||||
|
||||
* dm/add-i-edit-abort (Thu Feb 12 00:19:41 2009 -0500) 1 commit
|
||||
+ add -i: revisit hunk on editor failure
|
||||
|
||||
* tp/completion (Sat Feb 21 15:48:43 2009 +0100) 6 commits
|
||||
+ Fixup: Add bare repository indicator for __git_ps1
|
||||
+ Add bare repository indicator for __git_ps1
|
||||
+ completion: More fixes to prevent unbound variable errors
|
||||
+ completion: Better __git_ps1 support when not in working directory
|
||||
+ completion: Use consistent if [...] convention, not "test"
|
||||
+ completion: For consistency, change "git rev-parse" to __gitdir
|
||||
calls
|
||||
|
||||
* js/branch-symref (Wed Feb 18 22:34:44 2009 -0500) 4 commits
|
||||
+ add basic branch display tests
|
||||
+ branch: clean up repeated strlen
|
||||
+ Avoid segfault with 'git branch' when the HEAD is detached
|
||||
+ builtin-branch: improve output when displaying remote branches
|
||||
|
||||
* al/ansi-color (Fri Feb 13 22:53:41 2009 +0100) 2 commits
|
||||
+ builtin-branch.c: Rename branch category color names
|
||||
+ Clean up use of ANSI color sequences
|
||||
|
||||
* js/valgrind (Thu Feb 5 22:03:00 2009 +0100) 9 commits
|
||||
+ valgrind: do not require valgrind 3.4.0 or newer
|
||||
+ test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
|
||||
+ Tests: let --valgrind imply --verbose and --tee
|
||||
+ Add a script to coalesce the valgrind outputs
|
||||
+ t/Makefile: provide a 'valgrind' target
|
||||
+ test-lib.sh: optionally output to test-results/$TEST.out, too
|
||||
+ Valgrind support: check for more than just programming errors
|
||||
+ valgrind: ignore ldso and more libz errors
|
||||
+ Add valgrind support in test scripts
|
||||
|
||||
* fc/config-editor (Sat Feb 21 02:48:54 2009 +0200) 3 commits
|
||||
+ git config: trivial cleanup for editor action
|
||||
+ git config: codestyle cleanups
|
||||
+ config: Add new option to open an editor.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
|
||||
+ blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
+ git-blame: refactor code to emit "porcelain format" output
|
||||
|
||||
* ns/pretty-format (Tue Feb 24 15:33:29 2009 +0200) 5 commits
|
||||
+ bash completion: add --format= and --oneline options for "git log"
|
||||
+ Add tests for git log --pretty, --format and --oneline.
|
||||
+ Add --oneline that is a synonym to "--pretty=oneline --abbrev-
|
||||
commit"
|
||||
+ Give short-hands to --pretty=tformat:%formatstring
|
||||
+ Add --format that is a synonym to --pretty
|
||||
|
||||
* en/maint-hash-object (Sat Feb 28 12:56:49 2009 -0700) 1 commit
|
||||
+ Ensure proper setup of git_dir for git-hash-object
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to 'master' soon]
|
||||
|
||||
* mg/maint-submodule-normalize-path (Tue Mar 3 16:08:21 2009 +0100) 2 commits
|
||||
+ git submodule: Fix adding of submodules at paths with ./, .. and
|
||||
//
|
||||
+ git submodule: Add test cases for git submodule add
|
||||
|
||||
* rs/memmem (Tue Mar 3 00:19:30 2009 +0100) 2 commits
|
||||
+ optimize compat/ memmem()
|
||||
+ diffcore-pickaxe: use memmem()
|
||||
|
||||
* tv/rebase-stat (Sun Mar 1 22:28:28 2009 +0100) 2 commits
|
||||
+ git-pull: Allow --stat and --no-stat to be used with --rebase
|
||||
+ git-rebase: Add --stat and --no-stat for producing diffstat on
|
||||
rebase
|
||||
|
||||
* jk/clone-post-checkout (Tue Mar 3 00:37:51 2009 -0500) 1 commit
|
||||
+ clone: run post-checkout hook when checking out
|
||||
|
||||
* jc/maint-1.6.0-keep-pack (Sat Feb 28 00:37:19 2009 -0800) 6 commits
|
||||
+ is_kept_pack(): final clean-up
|
||||
+ Simplify is_kept_pack()
|
||||
+ Consolidate ignore_packed logic more
|
||||
+ has_sha1_kept_pack(): take "struct rev_info"
|
||||
+ has_sha1_pack(): refactor "pretend these packs do not exist"
|
||||
interface
|
||||
+ git-repack: resist stray environment variable
|
||||
|
||||
This is in response to Linus's "Really slow 'git gc'" ($gmane/110743)
|
||||
|
||||
* el/blame-date (Fri Feb 20 14:51:11 2009 -0800) 1 commit
|
||||
+ Make git blame's date output format configurable, like git log
|
||||
|
||||
* tr/gcov (Thu Feb 19 12:13:42 2009 +0100) 8 commits
|
||||
+ Test git-patch-id
|
||||
+ Test rev-list --parents/--children
|
||||
+ Test log --decorate
|
||||
+ Test fsck a bit harder
|
||||
+ Test log --graph
|
||||
+ Test diff --dirstat functionality
|
||||
+ Test that diff can read from stdin
|
||||
+ Support coverage testing with GCC/gcov
|
||||
|
||||
* tr/format-patch-thread (Thu Feb 19 22:26:33 2009 +0100) 4 commits
|
||||
+ format-patch: support deep threading
|
||||
+ format-patch: thread as reply to cover letter even with in-reply-
|
||||
to
|
||||
+ format-patch: track several references
|
||||
+ format-patch: threading test reactivation
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit
|
||||
- archive.c: add support for --submodules[=(all|checkedout)]
|
||||
|
||||
Discussion stalled on the submodule selection criteria.
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
The "spec" did not seem quite well cooked yet, but in the longer term I
|
||||
think something like this to allow interoperating with other SCMs as if
|
||||
the other end is a native git repository is a very worthy goal.
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I think the code is much cleaner than the first round, but I am not
|
||||
convinced it is doing the right thing in the connectivity traverser.
|
||||
Independent review sorely needed.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Discarded]
|
||||
|
||||
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
|
||||
. gitweb: Optional grouping of projects by category
|
||||
. gitweb: Split git_project_list_body in two functions
|
||||
. gitweb: Modularized git_get_project_description to be more generic
|
||||
|
||||
Design discussion between Jakub and Sebastien seems to have stalled, but
|
||||
Jakub seems to be taking this over.
|
||||
|
||||
* jc/push-to-create (Mon Mar 2 22:36:16 2009 -0800) 1 commit
|
||||
. Push to create
|
||||
|
||||
This was a failed weatherbaloon patch to allow creation of a new
|
||||
repository from the remote side.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* hv/cvsimport-tests (Mon Mar 2 18:59:36 2009 +0100) 1 commit
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
|
||||
Yet more tests without fixing anything...
|
||||
|
||||
* jc/clone-branch-rebase (Tue Mar 10 01:20:42 2009 -0700) 2 commits
|
||||
+ Improve "git branch --tracking" output
|
||||
+ Make git-clone respect branch.autosetuprebase
|
||||
|
||||
This is a rewrite of a patch from Pat Notz.
|
||||
|
||||
* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit
|
||||
+ stat_tracking_info(): only count real commits
|
||||
|
||||
This gives the merge commits zero weight when talking about how many
|
||||
commits you have ahead (or behind) of the branch you are tracking. Even
|
||||
though I agree that they should carry much less weight than the "real"
|
||||
commits, because your repeated merge from the other branch does not really
|
||||
add any real value to the end result, giving them absolute zero weight
|
||||
somehow feels wrong. At least it shows that your have been _active_ on the
|
||||
branch. But I do not feel very strongly about it.
|
||||
|
||||
* js/rebase-i-opt (Tue Mar 3 10:55:31 2009 +0100) 1 commit
|
||||
+ rebase -i: avoid 'git reset' when possible
|
||||
|
||||
* kb/checkout-optim (Sun Mar 8 17:22:51 2009 -0400) 18 commits
|
||||
+ Makefile: Set compiler switch for USE_NSEC
|
||||
+ Create USE_ST_TIMESPEC and turn it on for Darwin
|
||||
+ Not all systems use st_[cm]tim field for ns resolution file
|
||||
timestamp
|
||||
+ Record ns-timestamps if possible, but do not use it without
|
||||
USE_NSEC
|
||||
+ write_index(): update index_state->timestamp after flushing to
|
||||
disk
|
||||
+ verify_uptodate(): add ce_uptodate(ce) test
|
||||
+ make USE_NSEC work as expected
|
||||
+ fix compile error when USE_NSEC is defined
|
||||
+ check_updates(): effective removal of cache entries marked
|
||||
CE_REMOVE
|
||||
+ lstat_cache(): print a warning if doing ping-pong between cache
|
||||
types
|
||||
+ show_patch_diff(): remove a call to fstat()
|
||||
+ write_entry(): use fstat() instead of lstat() when file is open
|
||||
+ write_entry(): cleanup of some duplicated code
|
||||
+ create_directories(): remove some memcpy() and strchr() calls
|
||||
+ unlink_entry(): introduce schedule_dir_for_removal()
|
||||
+ lstat_cache(): swap func(length, string) into func(string, length)
|
||||
+ lstat_cache(): generalise longest_match_lstat_cache()
|
||||
+ lstat_cache(): small cleanup and optimisation
|
||||
|
||||
* mv/parseopt-ls-files (Sat Mar 7 20:27:22 2009 -0500) 4 commits
|
||||
+ ls-files: fix broken --no-empty-directory
|
||||
+ t3000: use test_cmp instead of diff
|
||||
+ parse-opt: migrate builtin-ls-files.
|
||||
+ Turn the flags in struct dir_struct into a single variable
|
||||
|
||||
The tip one was a subject for further discussion, but nothing is queued
|
||||
yet.
|
||||
|
||||
* js/remote-improvements (Sun Mar 8 00:10:33 2009 -0800) 23 commits
|
||||
+ builtin-remote.c: no "commented out" code, please
|
||||
+ builtin-remote: new show output style for push refspecs
|
||||
+ builtin-remote: new show output style
|
||||
+ remote: make guess_remote_head() use exact HEAD lookup if it is
|
||||
available
|
||||
+ builtin-remote: add set-head subcommand
|
||||
+ builtin-remote: teach show to display remote HEAD
|
||||
+ builtin-remote: fix two inconsistencies in the output of "show
|
||||
<remote>"
|
||||
+ builtin-remote: make get_remote_ref_states() always populate
|
||||
states.tracked
|
||||
+ builtin-remote: rename variables and eliminate redundant function
|
||||
call
|
||||
+ builtin-remote: remove unused code in get_ref_states
|
||||
+ builtin-remote: refactor duplicated cleanup code
|
||||
+ string-list: new for_each_string_list() function
|
||||
+ remote: make match_refs() not short-circuit
|
||||
+ remote: make match_refs() copy src ref before assigning to
|
||||
peer_ref
|
||||
+ remote: let guess_remote_head() optionally return all matches
|
||||
+ remote: make copy_ref() perform a deep copy
|
||||
+ remote: simplify guess_remote_head()
|
||||
+ move locate_head() to remote.c
|
||||
+ move duplicated ref_newer() to remote.c
|
||||
+ move duplicated get_local_heads() to remote.c
|
||||
+ refactor find_ref_by_name() to accept const list
|
||||
+ add basic http clone/fetch tests
|
||||
+ test scripts: refactor start_httpd helper
|
||||
|
||||
* fc/parseopt-config (Sat Mar 7 12:14:05 2009 -0500) 9 commits
|
||||
+ config: set help text for --bool-or-int
|
||||
+ git config: don't allow --get-color* and variable type
|
||||
+ git config: don't allow extra arguments for -e or -l.
|
||||
+ git config: don't allow multiple variable types
|
||||
+ git config: don't allow multiple config file locations
|
||||
+ git config: reorganize to use parseopt
|
||||
+ git config: reorganize get_color*
|
||||
+ git config: trivial rename in preparation for parseopt
|
||||
+ git_config(): not having a per-repo config file is not an error
|
||||
|
||||
* mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits
|
||||
- Add a test of "git cvsimport"'s handling of tags and branches
|
||||
- Add some tests of git-cvsimport's handling of vendor branches
|
||||
- Test contents of entire cvsimported "master" tree contents
|
||||
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
- Start a library for cvsimport-related tests
|
||||
|
||||
Tests without fixes are of dubious value. Any takers?
|
||||
|
||||
* tr/maint-1.6.0-send-email-irt (Sun Mar 1 23:45:41 2009 +0100) 1 commit
|
||||
+ send-email: respect in-reply-to regardless of threading
|
||||
|
||||
Tests?
|
||||
|
||||
* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits
|
||||
- tests: fix "export var=val"
|
||||
- notes: refuse to edit notes outside refs/notes/
|
||||
- t3301: use test_must_fail instead of !
|
||||
- t3301: fix confusing quoting in test for valid notes ref
|
||||
- notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
|
||||
- notes: only clean up message file when editing
|
||||
- handle empty notes gracefully
|
||||
- git notes show: test empty notes
|
||||
- git-notes: fix printing of multi-line notes
|
||||
- notes: fix core.notesRef documentation
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
Rebased and then kicked back to 'pu' to give the author a chance to
|
||||
rearrange if necessary.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
|
||||
* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
|
||||
- git commit: pathspec without -i/-o implies -i semantics during a
|
||||
merge
|
||||
- builtin-commit: shorten eye-sore overlong lines
|
||||
- Add "partial commit" tests during a conflicted merge
|
||||
|
||||
This was only meant as a weatherballoon to help facilitate discussion.
|
||||
Will be discarded.
|
||||
@@ -1,365 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Mar 2009, #04; Sat, 14)
|
||||
X-master-at: bba2a7b22fdde7a214516e93d957a950571a2026
|
||||
X-next-at: 333522ea3cea320f865fda2140ad362fbf46932f
|
||||
|
||||
What's cooking in git.git (Mar 2009, #04; Sat, 14)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* bw/autoconf (Thu Mar 12 15:20:12 2009 -0400) 7 commits
|
||||
- configure: rework pthread handling to allow for user defined flags
|
||||
- configure: make iconv tests aware of user arguments
|
||||
- configure: asciidoc version test cleanup
|
||||
- configure: wrap some library tests with GIT_STASH_FLAGS
|
||||
- configure: add macros to stash FLAG variables
|
||||
- configure: reorganize flow of argument checks
|
||||
- configure: ensure settings from user are also usable in the script
|
||||
|
||||
Looked quite expertly done but I do not use autoconf myself, so I'd merge
|
||||
this to 'next' soon and see anybody screams.
|
||||
|
||||
* jc/maint-1.6.0-read-tree-overlay (Thu Mar 12 00:02:12 2009 -0700) 1 commit
|
||||
- read-tree A B C: do not create a bogus index and do not segfault
|
||||
|
||||
* fg/push-default (Wed Mar 11 23:01:45 2009 +0100) 1 commit
|
||||
- New config push.default to decide default behavior for push
|
||||
|
||||
Replaced the old series with the first step to allow a smooth transition.
|
||||
Some might argue that this should not give any warning but just give users
|
||||
this new configuration to play with first, and after we know we are going
|
||||
to switch default some day, start the warning.
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
* jc/attributes-checkout (Fri Mar 13 21:24:08 2009 -0700) 1 commit
|
||||
- Read attributes from the index that is being checked out
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* mg/maint-submodule-normalize-path (Tue Mar 3 16:08:21 2009 +0100) 2 commits
|
||||
+ git submodule: Fix adding of submodules at paths with ./, .. and
|
||||
//
|
||||
+ git submodule: Add test cases for git submodule add
|
||||
|
||||
* rs/memmem (Tue Mar 3 00:19:30 2009 +0100) 2 commits
|
||||
+ optimize compat/ memmem()
|
||||
+ diffcore-pickaxe: use memmem()
|
||||
|
||||
* tv/rebase-stat (Sun Mar 1 22:28:28 2009 +0100) 2 commits
|
||||
+ git-pull: Allow --stat and --no-stat to be used with --rebase
|
||||
+ git-rebase: Add --stat and --no-stat for producing diffstat on
|
||||
rebase
|
||||
|
||||
* jk/clone-post-checkout (Tue Mar 3 00:37:51 2009 -0500) 1 commit
|
||||
+ clone: run post-checkout hook when checking out
|
||||
|
||||
* jc/maint-1.6.0-keep-pack (Sat Feb 28 00:37:19 2009 -0800) 6 commits
|
||||
+ is_kept_pack(): final clean-up
|
||||
+ Simplify is_kept_pack()
|
||||
+ Consolidate ignore_packed logic more
|
||||
+ has_sha1_kept_pack(): take "struct rev_info"
|
||||
+ has_sha1_pack(): refactor "pretend these packs do not exist"
|
||||
interface
|
||||
+ git-repack: resist stray environment variable
|
||||
|
||||
This is in response to Linus's "Really slow 'git gc'" ($gmane/110743)
|
||||
|
||||
* el/blame-date (Fri Feb 20 14:51:11 2009 -0800) 1 commit
|
||||
+ Make git blame's date output format configurable, like git log
|
||||
|
||||
* tr/gcov (Thu Feb 19 12:13:42 2009 +0100) 8 commits
|
||||
+ Test git-patch-id
|
||||
+ Test rev-list --parents/--children
|
||||
+ Test log --decorate
|
||||
+ Test fsck a bit harder
|
||||
+ Test log --graph
|
||||
+ Test diff --dirstat functionality
|
||||
+ Test that diff can read from stdin
|
||||
+ Support coverage testing with GCC/gcov
|
||||
|
||||
* tr/format-patch-thread (Thu Feb 19 22:26:33 2009 +0100) 4 commits
|
||||
+ format-patch: support deep threading
|
||||
+ format-patch: thread as reply to cover letter even with in-reply-
|
||||
to
|
||||
+ format-patch: track several references
|
||||
+ format-patch: threading test reactivation
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to 'master' soon]
|
||||
|
||||
* kb/checkout-optim (Sun Mar 8 17:22:51 2009 -0400) 18 commits
|
||||
+ Makefile: Set compiler switch for USE_NSEC
|
||||
+ Create USE_ST_TIMESPEC and turn it on for Darwin
|
||||
+ Not all systems use st_[cm]tim field for ns resolution file
|
||||
timestamp
|
||||
+ Record ns-timestamps if possible, but do not use it without
|
||||
USE_NSEC
|
||||
+ write_index(): update index_state->timestamp after flushing to
|
||||
disk
|
||||
+ verify_uptodate(): add ce_uptodate(ce) test
|
||||
+ make USE_NSEC work as expected
|
||||
+ fix compile error when USE_NSEC is defined
|
||||
+ check_updates(): effective removal of cache entries marked
|
||||
CE_REMOVE
|
||||
+ lstat_cache(): print a warning if doing ping-pong between cache
|
||||
types
|
||||
+ show_patch_diff(): remove a call to fstat()
|
||||
+ write_entry(): use fstat() instead of lstat() when file is open
|
||||
+ write_entry(): cleanup of some duplicated code
|
||||
+ create_directories(): remove some memcpy() and strchr() calls
|
||||
+ unlink_entry(): introduce schedule_dir_for_removal()
|
||||
+ lstat_cache(): swap func(length, string) into func(string, length)
|
||||
+ lstat_cache(): generalise longest_match_lstat_cache()
|
||||
+ lstat_cache(): small cleanup and optimisation
|
||||
|
||||
Kjetil has another fix-up patch for ctime/mtime gotcha that is not on this
|
||||
list but after that is applied this series can go to 'master'.
|
||||
|
||||
* tr/maint-1.6.0-send-email-irt (Wed Mar 11 23:40:13 2009 +0100) 2 commits
|
||||
+ send-email: test --no-thread --in-reply-to combination
|
||||
+ send-email: respect in-reply-to regardless of threading
|
||||
|
||||
* js/remote-improvements (Sun Mar 8 00:10:33 2009 -0800) 23 commits
|
||||
+ builtin-remote.c: no "commented out" code, please
|
||||
+ builtin-remote: new show output style for push refspecs
|
||||
+ builtin-remote: new show output style
|
||||
+ remote: make guess_remote_head() use exact HEAD lookup if it is
|
||||
available
|
||||
+ builtin-remote: add set-head subcommand
|
||||
+ builtin-remote: teach show to display remote HEAD
|
||||
+ builtin-remote: fix two inconsistencies in the output of "show
|
||||
<remote>"
|
||||
+ builtin-remote: make get_remote_ref_states() always populate
|
||||
states.tracked
|
||||
+ builtin-remote: rename variables and eliminate redundant function
|
||||
call
|
||||
+ builtin-remote: remove unused code in get_ref_states
|
||||
+ builtin-remote: refactor duplicated cleanup code
|
||||
+ string-list: new for_each_string_list() function
|
||||
+ remote: make match_refs() not short-circuit
|
||||
+ remote: make match_refs() copy src ref before assigning to
|
||||
peer_ref
|
||||
+ remote: let guess_remote_head() optionally return all matches
|
||||
+ remote: make copy_ref() perform a deep copy
|
||||
+ remote: simplify guess_remote_head()
|
||||
+ move locate_head() to remote.c
|
||||
+ move duplicated ref_newer() to remote.c
|
||||
+ move duplicated get_local_heads() to remote.c
|
||||
+ refactor find_ref_by_name() to accept const list
|
||||
+ add basic http clone/fetch tests
|
||||
+ test scripts: refactor start_httpd helper
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Discarded]
|
||||
|
||||
* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
|
||||
. git commit: pathspec without -i/-o implies -i semantics during a
|
||||
merge
|
||||
. builtin-commit: shorten eye-sore overlong lines
|
||||
. Add "partial commit" tests during a conflicted merge
|
||||
|
||||
This was only meant as a weatherballoon to help facilitate discussion.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit
|
||||
- archive.c: add support for --submodules[=(all|checkedout)]
|
||||
|
||||
Discussion stalled on the submodule selection criteria.
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
The "spec" did not seem quite well cooked yet, but in the longer term I
|
||||
think something like this to allow interoperating with other SCMs as if
|
||||
the other end is a native git repository is a very worthy goal.
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* mg/http-auth (Thu Mar 12 22:34:43 2009 -0700) 4 commits
|
||||
+ http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient
|
||||
versions of cURL
|
||||
+ http authentication via prompts
|
||||
+ http_init(): Fix config file parsing
|
||||
+ http.c: style cleanups
|
||||
|
||||
This does only the fetch side but without any additional configuration
|
||||
variables that looked like band-aid.
|
||||
|
||||
* db/maint-missing-origin (Wed Mar 11 01:47:20 2009 -0400) 1 commit
|
||||
+ Give error when no remote is configured
|
||||
|
||||
* js/sideband-stderr (Tue Mar 10 22:58:09 2009 +0100) 2 commits
|
||||
+ winansi: support ESC [ K (erase in line)
|
||||
+ recv_sideband: Bands #2 and #3 always go to stderr
|
||||
|
||||
* js/rsync-local (Mon Mar 9 19:44:55 2009 +0100) 1 commit
|
||||
+ rsync transport: allow local paths, and fix tests
|
||||
|
||||
* rs/color-grep (Sun Mar 8 18:22:44 2009 -0700) 6 commits
|
||||
+ grep: cast printf %.*s "precision" argument explicitly to int
|
||||
+ grep: add support for coloring with external greps
|
||||
+ grep: color patterns in output
|
||||
+ grep: add pmatch and eflags arguments to match_one_pattern()
|
||||
+ grep: remove grep_opt argument from match_expr_eval()
|
||||
+ grep: micro-optimize hit collection for AND nodes
|
||||
|
||||
* db/refspec-wildcard-in-the-middle (Sat Mar 7 01:11:39 2009 -0500) 5 commits
|
||||
+ Support '*' in the middle of a refspec
|
||||
+ Keep '*' in pattern refspecs
|
||||
+ Use the matching function to generate the match results
|
||||
+ Use a single function to match names against patterns
|
||||
+ Make clone parse the default refspec with the normal code
|
||||
|
||||
* db/push-cleanup (Sun Mar 8 21:06:07 2009 -0400) 2 commits
|
||||
- Move push matching and reporting logic into transport.c
|
||||
- Use a common function to get the pretty name of refs
|
||||
|
||||
* xx/db-refspec-vs-js-remote (Sun Mar 8 00:12:33 2009 -0800) 1 commit
|
||||
+ Adjust js/remote-improvements and db/refspec-wildcard-in-the-
|
||||
middle
|
||||
|
||||
* hv/cvsimport-tests (Mon Mar 2 18:59:36 2009 +0100) 1 commit
|
||||
+ cvsimport: add test illustrating a bug in cvsps
|
||||
|
||||
Yet more tests without fixing anything...
|
||||
|
||||
* jc/clone-branch-rebase (Tue Mar 10 01:20:42 2009 -0700) 2 commits
|
||||
+ Improve "git branch --tracking" output
|
||||
+ Make git-clone respect branch.autosetuprebase
|
||||
|
||||
This is a rewrite of a patch from Pat Notz.
|
||||
|
||||
* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit
|
||||
+ stat_tracking_info(): only count real commits
|
||||
|
||||
This gives the merge commits zero weight when talking about how many
|
||||
commits you have ahead (or behind) of the branch you are tracking. Even
|
||||
though I agree that they should carry much less weight than the "real"
|
||||
commits, because your repeated merge from the other branch does not really
|
||||
add any real value to the end result, giving them absolute zero weight
|
||||
somehow feels wrong. At least it shows that your have been _active_ on the
|
||||
branch. But I do not feel very strongly about it.
|
||||
|
||||
* js/rebase-i-opt (Tue Mar 3 10:55:31 2009 +0100) 1 commit
|
||||
+ rebase -i: avoid 'git reset' when possible
|
||||
|
||||
* mv/parseopt-ls-files (Sat Mar 7 20:27:22 2009 -0500) 4 commits
|
||||
+ ls-files: fix broken --no-empty-directory
|
||||
+ t3000: use test_cmp instead of diff
|
||||
+ parse-opt: migrate builtin-ls-files.
|
||||
+ Turn the flags in struct dir_struct into a single variable
|
||||
|
||||
The tip one was a subject for further discussion, but nothing is queued
|
||||
yet.
|
||||
|
||||
* fc/parseopt-config (Sat Mar 7 12:14:05 2009 -0500) 9 commits
|
||||
+ config: set help text for --bool-or-int
|
||||
+ git config: don't allow --get-color* and variable type
|
||||
+ git config: don't allow extra arguments for -e or -l.
|
||||
+ git config: don't allow multiple variable types
|
||||
+ git config: don't allow multiple config file locations
|
||||
+ git config: reorganize to use parseopt
|
||||
+ git config: reorganize get_color*
|
||||
+ git config: trivial rename in preparation for parseopt
|
||||
+ git_config(): not having a per-repo config file is not an error
|
||||
|
||||
* mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits
|
||||
+ Add a test of "git cvsimport"'s handling of tags and branches
|
||||
+ Add some tests of git-cvsimport's handling of vendor branches
|
||||
+ Test contents of entire cvsimported "master" tree contents
|
||||
+ Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
+ Start a library for cvsimport-related tests
|
||||
|
||||
Tests without fixes are of dubious value. Any takers?
|
||||
|
||||
* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits
|
||||
- tests: fix "export var=val"
|
||||
- notes: refuse to edit notes outside refs/notes/
|
||||
- t3301: use test_must_fail instead of !
|
||||
- t3301: fix confusing quoting in test for valid notes ref
|
||||
- notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
|
||||
- notes: only clean up message file when editing
|
||||
- handle empty notes gracefully
|
||||
- git notes show: test empty notes
|
||||
- git-notes: fix printing of multi-line notes
|
||||
- notes: fix core.notesRef documentation
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
Rebased and then kicked back to 'pu' to give the author a chance to
|
||||
rearrange if necessary. Nothing happened yet, but I see Dscho has been
|
||||
busy on msysgit side of the world, so it is understandable.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
@@ -1,318 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Mar 2009, #05; Tue, 17)
|
||||
X-master-at: 642d0844b9795ca7b1424f4afc8d8c86abd7bf34
|
||||
X-next-at: 34201954f04a3f0a1f9457670f24b26704fa31f1
|
||||
|
||||
What's cooking in git.git (Mar 2009, #05; Tue, 17)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* dm/maint-docco (Mon Mar 16 23:16:17 2009 -0700) 4 commits
|
||||
+ Documentation: minor grammatical fixes in git-branch.txt.
|
||||
+ Documentation: minor grammatical fixes in git-blame.txt.
|
||||
+ Documentation: reword the "Description" section of git-bisect.txt.
|
||||
+ Documentation: minor grammatical fixes in git-archive.txt.
|
||||
|
||||
* mg/test-installed (Mon Mar 16 18:03:12 2009 +0100) 2 commits
|
||||
+ test-lib.sh: Allow running the test suite against installed git
|
||||
+ test-lib.sh: Test for presence of git-init in the right path.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* kb/checkout-optim (Tue Mar 17 19:20:29 2009 +0100) 20 commits
|
||||
+ Revert "lstat_cache(): print a warning if doing ping-pong between
|
||||
cache types"
|
||||
+ checkout bugfix: use stat.mtime instead of stat.ctime in two
|
||||
places
|
||||
+ Makefile: Set compiler switch for USE_NSEC
|
||||
+ Create USE_ST_TIMESPEC and turn it on for Darwin
|
||||
+ Not all systems use st_[cm]tim field for ns resolution file
|
||||
timestamp
|
||||
+ Record ns-timestamps if possible, but do not use it without
|
||||
USE_NSEC
|
||||
+ write_index(): update index_state->timestamp after flushing to
|
||||
disk
|
||||
+ verify_uptodate(): add ce_uptodate(ce) test
|
||||
+ make USE_NSEC work as expected
|
||||
+ fix compile error when USE_NSEC is defined
|
||||
+ check_updates(): effective removal of cache entries marked
|
||||
CE_REMOVE
|
||||
+ lstat_cache(): print a warning if doing ping-pong between cache
|
||||
types
|
||||
+ show_patch_diff(): remove a call to fstat()
|
||||
+ write_entry(): use fstat() instead of lstat() when file is open
|
||||
+ write_entry(): cleanup of some duplicated code
|
||||
+ create_directories(): remove some memcpy() and strchr() calls
|
||||
+ unlink_entry(): introduce schedule_dir_for_removal()
|
||||
+ lstat_cache(): swap func(length, string) into func(string, length)
|
||||
+ lstat_cache(): generalise longest_match_lstat_cache()
|
||||
+ lstat_cache(): small cleanup and optimisation
|
||||
|
||||
* tr/maint-1.6.0-send-email-irt (Wed Mar 11 23:40:13 2009 +0100) 2 commits
|
||||
+ send-email: test --no-thread --in-reply-to combination
|
||||
+ send-email: respect in-reply-to regardless of threading
|
||||
|
||||
* js/remote-improvements (Sun Mar 8 00:10:33 2009 -0800) 23 commits
|
||||
+ builtin-remote.c: no "commented out" code, please
|
||||
+ builtin-remote: new show output style for push refspecs
|
||||
+ builtin-remote: new show output style
|
||||
+ remote: make guess_remote_head() use exact HEAD lookup if it is
|
||||
available
|
||||
+ builtin-remote: add set-head subcommand
|
||||
+ builtin-remote: teach show to display remote HEAD
|
||||
+ builtin-remote: fix two inconsistencies in the output of "show
|
||||
<remote>"
|
||||
+ builtin-remote: make get_remote_ref_states() always populate
|
||||
states.tracked
|
||||
+ builtin-remote: rename variables and eliminate redundant function
|
||||
call
|
||||
+ builtin-remote: remove unused code in get_ref_states
|
||||
+ builtin-remote: refactor duplicated cleanup code
|
||||
+ string-list: new for_each_string_list() function
|
||||
+ remote: make match_refs() not short-circuit
|
||||
+ remote: make match_refs() copy src ref before assigning to
|
||||
peer_ref
|
||||
+ remote: let guess_remote_head() optionally return all matches
|
||||
+ remote: make copy_ref() perform a deep copy
|
||||
+ remote: simplify guess_remote_head()
|
||||
+ move locate_head() to remote.c
|
||||
+ move duplicated ref_newer() to remote.c
|
||||
+ move duplicated get_local_heads() to remote.c
|
||||
+ refactor find_ref_by_name() to accept const list
|
||||
+ add basic http clone/fetch tests
|
||||
+ test scripts: refactor start_httpd helper
|
||||
|
||||
* rs/color-grep (Mon Mar 16 13:20:04 2009 +1100) 7 commits
|
||||
+ grep: prefer builtin over external one when coloring results
|
||||
+ grep: cast printf %.*s "precision" argument explicitly to int
|
||||
+ grep: add support for coloring with external greps
|
||||
+ grep: color patterns in output
|
||||
+ grep: add pmatch and eflags arguments to match_one_pattern()
|
||||
+ grep: remove grep_opt argument from match_expr_eval()
|
||||
+ grep: micro-optimize hit collection for AND nodes
|
||||
|
||||
* js/rsync-local (Mon Mar 9 19:44:55 2009 +0100) 1 commit
|
||||
+ rsync transport: allow local paths, and fix tests
|
||||
|
||||
* js/sideband-stderr (Tue Mar 10 22:58:09 2009 +0100) 2 commits
|
||||
+ winansi: support ESC [ K (erase in line)
|
||||
+ recv_sideband: Bands #2 and #3 always go to stderr
|
||||
|
||||
* db/maint-missing-origin (Mon Mar 16 00:35:09 2009 -0700) 2 commits
|
||||
+ Remove total confusion from git-fetch and git-push
|
||||
+ Give error when no remote is configured
|
||||
|
||||
* jc/maint-1.6.0-read-tree-overlay (Thu Mar 12 00:02:12 2009 -0700) 1 commit
|
||||
+ read-tree A B C: do not create a bogus index and do not segfault
|
||||
|
||||
With new test.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to 'master' soon]
|
||||
|
||||
* fc/parseopt-config (Tue Mar 17 10:46:37 2009 +0100) 10 commits
|
||||
+ config: test for --replace-all with one argument and fix
|
||||
documentation.
|
||||
+ config: set help text for --bool-or-int
|
||||
+ git config: don't allow --get-color* and variable type
|
||||
+ git config: don't allow extra arguments for -e or -l.
|
||||
+ git config: don't allow multiple variable types
|
||||
+ git config: don't allow multiple config file locations
|
||||
+ git config: reorganize to use parseopt
|
||||
+ git config: reorganize get_color*
|
||||
+ git config: trivial rename in preparation for parseopt
|
||||
+ git_config(): not having a per-repo config file is not an error
|
||||
|
||||
* js/rebase-i-opt (Tue Mar 3 10:55:31 2009 +0100) 1 commit
|
||||
+ rebase -i: avoid 'git reset' when possible
|
||||
|
||||
* mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits
|
||||
+ Add a test of "git cvsimport"'s handling of tags and branches
|
||||
+ Add some tests of git-cvsimport's handling of vendor branches
|
||||
+ Test contents of entire cvsimported "master" tree contents
|
||||
+ Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
+ Start a library for cvsimport-related tests
|
||||
|
||||
* hv/cvsimport-tests (Mon Mar 2 18:59:36 2009 +0100) 1 commit
|
||||
+ cvsimport: add test illustrating a bug in cvsps
|
||||
|
||||
* jc/clone-branch-rebase (Tue Mar 10 01:20:42 2009 -0700) 2 commits
|
||||
+ Improve "git branch --tracking" output
|
||||
+ Make git-clone respect branch.autosetuprebase
|
||||
|
||||
This is a rewrite of a patch from Pat Notz.
|
||||
|
||||
* xx/db-refspec-vs-js-remote (Sun Mar 8 00:12:33 2009 -0800) 1 commit
|
||||
+ Adjust js/remote-improvements and db/refspec-wildcard-in-the-
|
||||
middle
|
||||
|
||||
* db/refspec-wildcard-in-the-middle (Sat Mar 7 01:11:39 2009 -0500) 5 commits
|
||||
+ Support '*' in the middle of a refspec
|
||||
+ Keep '*' in pattern refspecs
|
||||
+ Use the matching function to generate the match results
|
||||
+ Use a single function to match names against patterns
|
||||
+ Make clone parse the default refspec with the normal code
|
||||
|
||||
* bw/autoconf (Thu Mar 12 15:20:12 2009 -0400) 7 commits
|
||||
+ configure: rework pthread handling to allow for user defined flags
|
||||
+ configure: make iconv tests aware of user arguments
|
||||
+ configure: asciidoc version test cleanup
|
||||
+ configure: wrap some library tests with GIT_STASH_FLAGS
|
||||
+ configure: add macros to stash FLAG variables
|
||||
+ configure: reorganize flow of argument checks
|
||||
+ configure: ensure settings from user are also usable in the script
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one.
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit
|
||||
- archive.c: add support for --submodules[=(all|checkedout)]
|
||||
|
||||
Discussion stalled on the submodule selection criteria.
|
||||
Probably I should discard it and wait for a reroll if needed.
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
Daniel seems to have a plan for going forward with this series.
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I know, I really have to drop everything else and re-read these, but I
|
||||
haven't managed to.
|
||||
|
||||
* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits
|
||||
- tests: fix "export var=val"
|
||||
- notes: refuse to edit notes outside refs/notes/
|
||||
- t3301: use test_must_fail instead of !
|
||||
- t3301: fix confusing quoting in test for valid notes ref
|
||||
- notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
|
||||
- notes: only clean up message file when editing
|
||||
- handle empty notes gracefully
|
||||
- git notes show: test empty notes
|
||||
- git-notes: fix printing of multi-line notes
|
||||
- notes: fix core.notesRef documentation
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* jc/attributes-checkout (Fri Mar 13 21:24:08 2009 -0700) 1 commit
|
||||
- Read attributes from the index that is being checked out
|
||||
|
||||
* fg/push-default (Mon Mar 16 16:42:52 2009 +0100) 2 commits
|
||||
- Display warning for default git push with no push.default config
|
||||
+ New config push.default to decide default behavior for push
|
||||
|
||||
Replaced the old series with the first step to allow a smooth transition.
|
||||
Some might argue that this should not give any warning but just give users
|
||||
this new configuration to play with first, and after we know we are going
|
||||
to switch default some day, start the warning.
|
||||
|
||||
* mg/http-auth (Thu Mar 12 22:34:43 2009 -0700) 4 commits
|
||||
+ http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient
|
||||
versions of cURL
|
||||
+ http authentication via prompts
|
||||
+ http_init(): Fix config file parsing
|
||||
+ http.c: style cleanups
|
||||
|
||||
This does only the fetch side but without any additional configuration
|
||||
variables that looked like band-aid. Support for push side seems to be in
|
||||
the works somewhere.
|
||||
|
||||
* db/push-cleanup (Sun Mar 8 21:06:07 2009 -0400) 2 commits
|
||||
+ Move push matching and reporting logic into transport.c
|
||||
+ Use a common function to get the pretty name of refs
|
||||
|
||||
* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit
|
||||
+ stat_tracking_info(): only count real commits
|
||||
|
||||
This gives the merge commits zero weight when talking about how many
|
||||
commits you have ahead (or behind) of the branch you are tracking. Even
|
||||
though I agree that they should carry much less weight than the "real"
|
||||
commits, because your repeated merge from the other branch does not really
|
||||
add any real value to the end result, giving them absolute zero weight
|
||||
somehow feels wrong. At least it shows that your have been _active_ on the
|
||||
branch. But I do not feel very strongly about it.
|
||||
|
||||
* mv/parseopt-ls-files (Sat Mar 7 20:27:22 2009 -0500) 4 commits
|
||||
+ ls-files: fix broken --no-empty-directory
|
||||
+ t3000: use test_cmp instead of diff
|
||||
+ parse-opt: migrate builtin-ls-files.
|
||||
+ Turn the flags in struct dir_struct into a single variable
|
||||
|
||||
The tip one was a subject for further discussion, but nothing is queued
|
||||
yet.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
@@ -1,282 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Mar 2009, #06; Sat, 21)
|
||||
X-master-at: a797b02f3925c4a6324472e2edaf4a58d4ffc097
|
||||
X-next-at: 5572a388cef2195e61894eec7976411776a95b39
|
||||
|
||||
What's cooking in git.git (Mar 2009, #06; Sat, 21)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jk/reflog-date (Fri Mar 20 02:00:43 2009 -0400) 1 commit
|
||||
- make oneline reflog dates more consistent with multiline format
|
||||
|
||||
* js/maint-1.6.0-exec-path-env (Wed Mar 18 08:42:53 2009 +0100) 1 commit
|
||||
- export GIT_EXEC_PATH when git is run with --exec-path
|
||||
|
||||
* da/difftool (Thu Mar 19 01:25:25 2009 -0700) 1 commit
|
||||
- difftool: move 'git-difftool' out of contrib
|
||||
|
||||
* jc/maint-1.6.0-keep-pack (Thu Mar 19 22:47:54 2009 -0500) 4 commits
|
||||
- Remove --kept-pack-only option and associated infrastructure
|
||||
- pack-objects: only repack or loosen objects residing in "local"
|
||||
packs
|
||||
- git-repack.sh: don't use --kept-pack-only option to pack-objects
|
||||
- t7700-repack: add two new tests demonstrating repacking flaws
|
||||
|
||||
Brandon Casey fixed the regression previous patches introduced; thanks.
|
||||
|
||||
* jc/maint-1.6.0-blame-s (Wed Mar 18 00:13:03 2009 -0700) 1 commit
|
||||
- blame: read custom grafts given by -S before calling
|
||||
setup_revisions()
|
||||
|
||||
The above are all ready for 'next'.
|
||||
|
||||
* hv/cvsps-tests (Wed Mar 18 18:33:41 2009 +0100) 7 commits
|
||||
- cvsimport: extend testcase about patchset order to contain
|
||||
branches
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
- Add a test of "git cvsimport"'s handling of tags and branches
|
||||
- Add some tests of git-cvsimport's handling of vendor branches
|
||||
- Test contents of entire cvsimported "master" tree contents
|
||||
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
- Start a library for cvsimport-related tests
|
||||
|
||||
Two cvsimport test topics were rewound from 'next' and merged into this
|
||||
one. I'll keep this in 'pu' so that people can polish their cvsps skilz
|
||||
to resolve issues these tests identify.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* fc/parseopt-config (Tue Mar 17 10:46:37 2009 +0100) 10 commits
|
||||
+ config: test for --replace-all with one argument and fix
|
||||
documentation.
|
||||
+ config: set help text for --bool-or-int
|
||||
+ git config: don't allow --get-color* and variable type
|
||||
+ git config: don't allow extra arguments for -e or -l.
|
||||
+ git config: don't allow multiple variable types
|
||||
+ git config: don't allow multiple config file locations
|
||||
+ git config: reorganize to use parseopt
|
||||
+ git config: reorganize get_color*
|
||||
+ git config: trivial rename in preparation for parseopt
|
||||
+ git_config(): not having a per-repo config file is not an error
|
||||
|
||||
* js/rebase-i-opt (Tue Mar 3 10:55:31 2009 +0100) 1 commit
|
||||
+ rebase -i: avoid 'git reset' when possible
|
||||
|
||||
* jc/clone-branch-rebase (Tue Mar 10 01:20:42 2009 -0700) 2 commits
|
||||
+ Improve "git branch --tracking" output
|
||||
+ Make git-clone respect branch.autosetuprebase
|
||||
|
||||
This is a rewrite of a patch from Pat Notz.
|
||||
|
||||
* xx/db-refspec-vs-js-remote (Sun Mar 8 00:12:33 2009 -0800) 1 commit
|
||||
+ Adjust js/remote-improvements and db/refspec-wildcard-in-the-
|
||||
middle
|
||||
|
||||
* db/refspec-wildcard-in-the-middle (Sat Mar 7 01:11:39 2009 -0500) 5 commits
|
||||
+ Support '*' in the middle of a refspec
|
||||
+ Keep '*' in pattern refspecs
|
||||
+ Use the matching function to generate the match results
|
||||
+ Use a single function to match names against patterns
|
||||
+ Make clone parse the default refspec with the normal code
|
||||
|
||||
* bw/autoconf (Thu Mar 12 15:20:12 2009 -0400) 7 commits
|
||||
+ configure: rework pthread handling to allow for user defined flags
|
||||
+ configure: make iconv tests aware of user arguments
|
||||
+ configure: asciidoc version test cleanup
|
||||
+ configure: wrap some library tests with GIT_STASH_FLAGS
|
||||
+ configure: add macros to stash FLAG variables
|
||||
+ configure: reorganize flow of argument checks
|
||||
+ configure: ensure settings from user are also usable in the script
|
||||
|
||||
* mv/parseopt-ls-files (Sat Mar 7 20:27:22 2009 -0500) 4 commits
|
||||
+ ls-files: fix broken --no-empty-directory
|
||||
+ t3000: use test_cmp instead of diff
|
||||
+ parse-opt: migrate builtin-ls-files.
|
||||
+ Turn the flags in struct dir_struct into a single variable
|
||||
|
||||
The tip one was a subject for further discussion, but nothing is queued
|
||||
yet.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to 'master' soon]
|
||||
|
||||
* dm/maint-docco (Thu Mar 19 20:35:34 2009 -0700) 6 commits
|
||||
+ Documentation: reword example text in git-bisect.txt.
|
||||
+ Documentation: reworded the "Description" section of git-
|
||||
bisect.txt.
|
||||
+ Documentation: minor grammatical fixes in git-branch.txt.
|
||||
+ Documentation: minor grammatical fixes in git-blame.txt.
|
||||
+ Documentation: reword the "Description" section of git-bisect.txt.
|
||||
+ Documentation: minor grammatical fixes in git-archive.txt.
|
||||
|
||||
* mg/test-installed (Mon Mar 16 18:03:12 2009 +0100) 2 commits
|
||||
+ test-lib.sh: Allow running the test suite against installed git
|
||||
+ test-lib.sh: Test for presence of git-init in the right path.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Discarded]
|
||||
|
||||
* hv/cvsimport-tests (Mon Mar 2 18:59:36 2009 +0100) 1 commit
|
||||
? cvsimport: add test illustrating a bug in cvsps
|
||||
|
||||
* mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits
|
||||
? Add a test of "git cvsimport"'s handling of tags and branches
|
||||
? Add some tests of git-cvsimport's handling of vendor branches
|
||||
? Test contents of entire cvsimported "master" tree contents
|
||||
? Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
? Start a library for cvsimport-related tests
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one.
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit
|
||||
- archive.c: add support for --submodules[=(all|checkedout)]
|
||||
|
||||
Discussion stalled on the submodule selection criteria.
|
||||
Probably I should discard it and wait for a reroll if needed.
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
Daniel seems to have a plan for going forward with this series.
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I know, I really have to drop everything else and re-read these, but I
|
||||
haven't managed to.
|
||||
|
||||
* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits
|
||||
- tests: fix "export var=val"
|
||||
- notes: refuse to edit notes outside refs/notes/
|
||||
- t3301: use test_must_fail instead of !
|
||||
- t3301: fix confusing quoting in test for valid notes ref
|
||||
- notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
|
||||
- notes: only clean up message file when editing
|
||||
- handle empty notes gracefully
|
||||
- git notes show: test empty notes
|
||||
- git-notes: fix printing of multi-line notes
|
||||
- notes: fix core.notesRef documentation
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* jc/attributes-checkout (Fri Mar 20 10:32:09 2009 +0100) 2 commits
|
||||
- Add a test for checking whether gitattributes is honored by
|
||||
checkout.
|
||||
- Read attributes from the index that is being checked out
|
||||
|
||||
Original issue identified, and test provided by Kristian Amlie.
|
||||
|
||||
* fg/push-default (Mon Mar 16 16:42:52 2009 +0100) 2 commits
|
||||
- Display warning for default git push with no push.default config
|
||||
+ New config push.default to decide default behavior for push
|
||||
|
||||
Replaced the old series with the first step to allow a smooth transition.
|
||||
Some might argue that this should not give any warning but just give users
|
||||
this new configuration to play with first, and after we know we are going
|
||||
to switch default some day, start the warning.
|
||||
|
||||
* mg/http-auth (Wed Mar 18 18:46:41 2009 -0500) 6 commits
|
||||
+ http-push.c: use a faux remote to pass to http_init
|
||||
+ Do not name "repo" struct "remote" in push_http.c
|
||||
+ http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient
|
||||
versions of cURL
|
||||
+ http authentication via prompts
|
||||
+ http_init(): Fix config file parsing
|
||||
+ http.c: style cleanups
|
||||
|
||||
Amos King added push side support on top of my fetch side support.
|
||||
|
||||
We may want to also pass --remote parameter from git-push to this backend
|
||||
as Daniel did as an interim solution for the fetch side, so that we can
|
||||
handle the configuration better.
|
||||
|
||||
* db/push-cleanup (Sun Mar 8 21:06:07 2009 -0400) 2 commits
|
||||
+ Move push matching and reporting logic into transport.c
|
||||
+ Use a common function to get the pretty name of refs
|
||||
|
||||
* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit
|
||||
+ stat_tracking_info(): only count real commits
|
||||
|
||||
This gives the merge commits zero weight when talking about how many
|
||||
commits you have ahead (or behind) of the branch you are tracking. Even
|
||||
though I agree that they should carry much less weight than the "real"
|
||||
commits, because your repeated merge from the other branch does not really
|
||||
add any real value to the end result, giving them absolute zero weight
|
||||
somehow feels wrong. At least it shows that your have been _active_ on the
|
||||
branch. But I do not feel very strongly about it.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
@@ -1,318 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Mar 2009, #07; Mon, 30)
|
||||
X-master-at: 442dd42d6d4903640b0dc5561481a77c88dcea90
|
||||
X-next-at: 233382b233530fc38969fd1f31dec27e342c2a9f
|
||||
|
||||
What's cooking in git.git (Mar 2009, #07; Mon, 30)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* cj/doc-format (Fri Mar 27 00:36:47 2009 -0700) 11 commits
|
||||
+ Merge branch 'cj/doc-quiet' into cj/doc-format
|
||||
+ Documentation: option to render literal text as bold for manpages
|
||||
+ Documentation: asciidoc.conf: fix verse block with block titles
|
||||
+ Documentation: asciidoc.conf: always use <literallayout> for
|
||||
[blocktext]
|
||||
+ Documentation: move "spurious .sp" code into manpage-base.xsl
|
||||
+ Documentation: move quieting params into manpage-base.xsl
|
||||
+ Documentation: rename docbook-xsl-172 attribute to git-asciidoc-
|
||||
no-roff
|
||||
+ Documentation: use parametrized manpage-base.xsl with manpage-
|
||||
{1.72,normal}.xsl
|
||||
+ Documentation: move callouts.xsl to manpage-{base,normal}.xsl
|
||||
+ Documentation/Makefile: break up texi pipeline
|
||||
+ Documentation/Makefile: make most operations "quiet"
|
||||
|
||||
* cj/doc-quiet (Fri Mar 27 01:49:39 2009 -0500) 2 commits
|
||||
+ Documentation/Makefile: break up texi pipeline
|
||||
+ Documentation/Makefile: make most operations "quiet"
|
||||
|
||||
I think these are ready for 'master'.
|
||||
|
||||
* jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 3 commits
|
||||
- checkout -: make "-" to mean "previous branch" everywhere
|
||||
- Don't permit ref/branch names to end with ".lock"
|
||||
- check_ref_format(): tighten refname rules
|
||||
|
||||
After all the bottom two are probably not so iffy.
|
||||
|
||||
* jc/name-branch (Sat Mar 21 14:35:51 2009 -0700) 5 commits
|
||||
+ strbuf_check_branch_ref(): a helper to check a refname for a
|
||||
branch
|
||||
+ Fix branch -m @{-1} newname
|
||||
+ check-ref-format --branch: give Porcelain a way to grok branch
|
||||
shorthand
|
||||
+ strbuf_branchname(): a wrapper for branch name shorthands
|
||||
+ Rename interpret/substitute nth_last_branch functions
|
||||
|
||||
* sb/format-patch-patchname (Fri Mar 27 01:13:01 2009 +0100) 7 commits
|
||||
+ log-tree: fix patch filename computation in "git format-patch"
|
||||
+ format-patch: --numbered-files and --stdout aren't mutually
|
||||
exclusive
|
||||
+ format-patch: --attach/inline uses filename instead of SHA1
|
||||
+ format-patch: move get_patch_filename() into log-tree
|
||||
+ format-patch: pass a commit to reopen_stdout()
|
||||
+ format-patch: construct patch filename in one function
|
||||
+ pretty.c: add %f format specifier to format_commit_message()
|
||||
|
||||
* mg/tracked-local-branches (Thu Mar 26 21:53:25 2009 +0100) 2 commits
|
||||
- [Reroll requested] Make local branches behave like remote branches
|
||||
when --tracked
|
||||
- Test for local branches being followed with --track
|
||||
|
||||
* cc/bisect-filter (Mon Mar 30 06:59:59 2009 +0200) 15 commits
|
||||
- bisect--helper: string output variables together with "&&"
|
||||
- rev-list: pass "int flags" as last argument of "show_bisect_vars"
|
||||
- t6030: test bisecting with paths
|
||||
- bisect: use "bisect--helper" and remove "filter_skipped" function
|
||||
- bisect: implement "read_bisect_paths" to read paths in
|
||||
"$GIT_DIR/BISECT_NAMES"
|
||||
- bisect--helper: implement "git bisect--helper"
|
||||
- rev-list: call new "filter_skip" function
|
||||
+ rev-list: pass "revs" to "show_bisect_vars"
|
||||
+ rev-list: make "show_bisect_vars" non static
|
||||
+ rev-list: move code to show bisect vars into its own function
|
||||
+ rev-list: move bisect related code into its own file
|
||||
+ rev-list: make "bisect_list" variable local to "cmd_rev_list"
|
||||
+ refs: add "for_each_ref_in" function to refactor "for_each_*_ref"
|
||||
functions
|
||||
+ quote: add "sq_dequote_to_argv" to put unwrapped args in an argv
|
||||
array
|
||||
+ quote: implement "sq_dequote_many" to unwrap many args in one
|
||||
string
|
||||
|
||||
I've reordered them to make the early three patches independent to the
|
||||
rest of the series. Dscho had a suggestion on the search it internally
|
||||
does, so we might see further reroll of some patches in the series.
|
||||
|
||||
* jc/shared-literally (Fri Mar 27 23:21:00 2009 -0700) 4 commits
|
||||
+ set_shared_perm(): sometimes we know what the final mode bits
|
||||
should look like
|
||||
+ move_temp_to_file(): do not forget to chmod() in "Coda hack"
|
||||
codepath
|
||||
+ Move chmod(foo, 0444) into move_temp_to_file()
|
||||
+ "core.sharedrepository = 0mode" should set, not loosen
|
||||
|
||||
* tr/maint-1.6.1-doc-format-patch--root (Thu Mar 26 18:29:25 2009 +0100) 1 commit
|
||||
+ Documentation: format-patch --root clarifications
|
||||
|
||||
* mh/format-patch-add-header (Thu Mar 26 10:51:05 2009 -0600) 1 commit
|
||||
+ format-patch: add arbitrary email headers
|
||||
|
||||
* ef/fast-export (Mon Mar 23 12:53:09 2009 +0000) 4 commits
|
||||
+ builtin-fast-export.c: handle nested tags
|
||||
+ builtin-fast-export.c: fix crash on tagged trees
|
||||
+ builtin-fast-export.c: turn error into warning
|
||||
+ test-suite: adding a test for fast-export with tag variants
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* jk/reflog-date (Fri Mar 20 02:00:43 2009 -0400) 1 commit
|
||||
+ make oneline reflog dates more consistent with multiline format
|
||||
|
||||
* js/maint-1.6.0-exec-path-env (Wed Mar 18 08:42:53 2009 +0100) 1 commit
|
||||
+ export GIT_EXEC_PATH when git is run with --exec-path
|
||||
|
||||
* jc/maint-1.6.0-blame-s (Wed Mar 18 00:13:03 2009 -0700) 1 commit
|
||||
+ blame: read custom grafts given by -S before calling
|
||||
setup_revisions()
|
||||
|
||||
The above are all ready for 'next'.
|
||||
|
||||
* dm/maint-docco (Thu Mar 19 20:35:34 2009 -0700) 6 commits
|
||||
+ Documentation: reword example text in git-bisect.txt.
|
||||
+ Documentation: reworded the "Description" section of git-
|
||||
bisect.txt.
|
||||
+ Documentation: minor grammatical fixes in git-branch.txt.
|
||||
+ Documentation: minor grammatical fixes in git-blame.txt.
|
||||
+ Documentation: reword the "Description" section of git-bisect.txt.
|
||||
+ Documentation: minor grammatical fixes in git-archive.txt.
|
||||
|
||||
* mg/test-installed (Mon Mar 16 18:03:12 2009 +0100) 2 commits
|
||||
+ test-lib.sh: Allow running the test suite against installed git
|
||||
+ test-lib.sh: Test for presence of git-init in the right path.
|
||||
|
||||
* jc/attributes-checkout (Fri Mar 20 10:32:09 2009 +0100) 2 commits
|
||||
+ Add a test for checking whether gitattributes is honored by
|
||||
checkout.
|
||||
+ Read attributes from the index that is being checked out
|
||||
|
||||
Original issue identified, and test provided by Kristian Amlie.
|
||||
|
||||
* fg/push-default (Mon Mar 16 16:42:52 2009 +0100) 2 commits
|
||||
+ Display warning for default git push with no push.default config
|
||||
+ New config push.default to decide default behavior for push
|
||||
|
||||
* mg/http-auth (Wed Mar 18 18:46:41 2009 -0500) 6 commits
|
||||
+ http-push.c: use a faux remote to pass to http_init
|
||||
+ Do not name "repo" struct "remote" in push_http.c
|
||||
+ http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient
|
||||
versions of cURL
|
||||
+ http authentication via prompts
|
||||
+ http_init(): Fix config file parsing
|
||||
+ http.c: style cleanups
|
||||
|
||||
Amos King added push side support on top of my fetch side support.
|
||||
|
||||
We may want to also pass --remote parameter from git-push to this backend
|
||||
as Daniel did as an interim solution for the fetch side, so that we can
|
||||
handle the configuration better.
|
||||
|
||||
* db/push-cleanup (Sun Mar 8 21:06:07 2009 -0400) 2 commits
|
||||
+ Move push matching and reporting logic into transport.c
|
||||
+ Use a common function to get the pretty name of refs
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to 'master' soon]
|
||||
|
||||
* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit
|
||||
+ stat_tracking_info(): only count real commits
|
||||
|
||||
This gives the merge commits zero weight when talking about how many
|
||||
commits you have ahead (or behind) of the branch you are tracking. Even
|
||||
though I agree that they should carry much less weight than the "real"
|
||||
commits, because your repeated merge from the other branch does not really
|
||||
add any real value to the end result, giving them absolute zero weight
|
||||
somehow feels wrong. At least it shows that your have been _active_ on the
|
||||
branch. But I do not feel very strongly about it.
|
||||
|
||||
* jc/maint-1.6.0-keep-pack (Sat Mar 21 17:26:11 2009 -0500) 6 commits
|
||||
+ pack-objects: don't loosen objects available in alternate or kept
|
||||
packs
|
||||
+ t7700: demonstrate repack flaw which may loosen objects
|
||||
unnecessarily
|
||||
+ Remove --kept-pack-only option and associated infrastructure
|
||||
+ pack-objects: only repack or loosen objects residing in "local"
|
||||
packs
|
||||
+ git-repack.sh: don't use --kept-pack-only option to pack-objects
|
||||
+ t7700-repack: add two new tests demonstrating repacking flaws
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one.
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit
|
||||
- archive.c: add support for --submodules[=(all|checkedout)]
|
||||
|
||||
Discussion stalled on the submodule selection criteria.
|
||||
Probably I should discard it and wait for a reroll if needed.
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I know, I really have to drop everything else and re-read these, but I
|
||||
haven't managed to.
|
||||
|
||||
* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits
|
||||
- tests: fix "export var=val"
|
||||
- notes: refuse to edit notes outside refs/notes/
|
||||
- t3301: use test_must_fail instead of !
|
||||
- t3301: fix confusing quoting in test for valid notes ref
|
||||
- notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
|
||||
- notes: only clean up message file when editing
|
||||
- handle empty notes gracefully
|
||||
- git notes show: test empty notes
|
||||
- git-notes: fix printing of multi-line notes
|
||||
- notes: fix core.notesRef documentation
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
* hv/cvsps-tests (Wed Mar 18 18:33:41 2009 +0100) 7 commits
|
||||
- cvsimport: extend testcase about patchset order to contain
|
||||
branches
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
- Add a test of "git cvsimport"'s handling of tags and branches
|
||||
- Add some tests of git-cvsimport's handling of vendor branches
|
||||
- Test contents of entire cvsimported "master" tree contents
|
||||
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
- Start a library for cvsimport-related tests
|
||||
|
||||
Two cvsimport test topics were rewound from 'next' and merged into this
|
||||
one. I'll keep this in 'pu' so that people can polish their cvsps skilz
|
||||
to resolve issues these tests identify.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* da/difftool (Tue Mar 24 23:29:59 2009 -0700) 5 commits
|
||||
- difftool: add a -y shortcut for --no-prompt
|
||||
- difftool: use perl built-ins when testing for msys
|
||||
- difftool: add various git-difftool tests
|
||||
- difftool: add git-difftool to the list of commands
|
||||
+ difftool: move 'git-difftool' out of contrib
|
||||
|
||||
David has further refactoring which was a bit too early for me to pick
|
||||
up.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
@@ -1,315 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Apr 2009, #01; Mon, 06)
|
||||
X-master-at: fbdc05661d9b732d06c47ccb3d5836d0d1b563e5
|
||||
X-next-at: 5efaefce91ae81a7490893cc6245a3f52998b522
|
||||
|
||||
What's cooking in git.git (Apr 2009, #01; Mon, 06)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* mh/html-path (Sun Apr 5 04:15:16 2009 +0200) 1 commit
|
||||
+ add --html-path to get the location of installed HTML docs
|
||||
|
||||
* lt/reflog-expire (Mon Mar 30 21:34:14 2009 -0700) 2 commits
|
||||
+ Speed up reflog pruning of unreachable commits
|
||||
+ Clean up reflog unreachability pruning decision
|
||||
|
||||
* bs/maint-1.6.0-tree-walk-prefix (Wed Apr 1 19:34:03 2009 -0700) 2 commits
|
||||
+ match_tree_entry(): a pathspec only matches at directory
|
||||
boundaries
|
||||
+ tree_entry_interesting: a pathspec only matches at directory
|
||||
boundary
|
||||
|
||||
* ms/http-auth (Wed Apr 1 19:48:24 2009 +0300) 1 commit
|
||||
+ Allow curl to rewind the read buffers
|
||||
|
||||
* js/maint-submodule-checkout (Thu Apr 2 15:30:25 2009 +0200) 1 commit
|
||||
+ Fix 'git checkout <submodule>' to update the index
|
||||
|
||||
* cb/maint-merge-recursive-submodule-fix (Sun Apr 5 02:47:00 2009 +0200) 3 commits
|
||||
+ simplify output of conflicting merge
|
||||
+ update cache for conflicting submodule entries
|
||||
+ add tests for merging with submodules
|
||||
|
||||
* fg/remote-prune (Fri Apr 3 11:03:44 2009 +0200) 2 commits
|
||||
+ git remote update: New option --prune
|
||||
+ builtin-remote.c: Split out prune_remote as a separate function.
|
||||
|
||||
These should go to 'master' soonish.
|
||||
|
||||
* cc/sha1-bsearch (Mon Apr 6 00:48:49 2009 -0700) 3 commits
|
||||
- sha1-lookup: fix up the assertion message
|
||||
- patch-ids: use the new generic "sha1_pos" function to lookup sha1
|
||||
- sha1-lookup: add new "sha1_pos" function to efficiently lookup
|
||||
sha1
|
||||
|
||||
I think this is Ok for 'next', but somebody might want to prove me wrong
|
||||
by running some benchmarks.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will Discard]
|
||||
|
||||
* jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 1 commit
|
||||
- checkout -: make "-" to mean "previous branch" everywhere
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* cj/doc-format (Fri Mar 27 00:36:47 2009 -0700) 11 commits
|
||||
+ Merge branch 'cj/doc-quiet' into cj/doc-format
|
||||
+ Documentation: option to render literal text as bold for manpages
|
||||
+ Documentation: asciidoc.conf: fix verse block with block titles
|
||||
+ Documentation: asciidoc.conf: always use <literallayout> for
|
||||
[blocktext]
|
||||
+ Documentation: move "spurious .sp" code into manpage-base.xsl
|
||||
+ Documentation: move quieting params into manpage-base.xsl
|
||||
+ Documentation: rename docbook-xsl-172 attribute to git-asciidoc-
|
||||
no-roff
|
||||
+ Documentation: use parametrized manpage-base.xsl with manpage-
|
||||
{1.72,normal}.xsl
|
||||
+ Documentation: move callouts.xsl to manpage-{base,normal}.xsl
|
||||
+ Documentation/Makefile: break up texi pipeline
|
||||
+ Documentation/Makefile: make most operations "quiet"
|
||||
|
||||
* cj/doc-quiet (Fri Mar 27 01:49:39 2009 -0500) 2 commits
|
||||
+ Documentation/Makefile: break up texi pipeline
|
||||
+ Documentation/Makefile: make most operations "quiet"
|
||||
|
||||
* jc/name-branch (Sat Mar 21 14:35:51 2009 -0700) 5 commits
|
||||
+ strbuf_check_branch_ref(): a helper to check a refname for a
|
||||
branch
|
||||
+ Fix branch -m @{-1} newname
|
||||
+ check-ref-format --branch: give Porcelain a way to grok branch
|
||||
shorthand
|
||||
+ strbuf_branchname(): a wrapper for branch name shorthands
|
||||
+ Rename interpret/substitute nth_last_branch functions
|
||||
|
||||
* sb/format-patch-patchname (Fri Mar 27 01:13:01 2009 +0100) 7 commits
|
||||
+ log-tree: fix patch filename computation in "git format-patch"
|
||||
+ format-patch: --numbered-files and --stdout aren't mutually
|
||||
exclusive
|
||||
+ format-patch: --attach/inline uses filename instead of SHA1
|
||||
+ format-patch: move get_patch_filename() into log-tree
|
||||
+ format-patch: pass a commit to reopen_stdout()
|
||||
+ format-patch: construct patch filename in one function
|
||||
+ pretty.c: add %f format specifier to format_commit_message()
|
||||
|
||||
* mg/tracked-local-branches (Thu Mar 26 21:53:25 2009 +0100) 2 commits
|
||||
+ Make local branches behave like remote branches when --tracked
|
||||
+ Test for local branches being followed with --track
|
||||
|
||||
* jc/shared-literally (Fri Mar 27 23:21:00 2009 -0700) 4 commits
|
||||
+ set_shared_perm(): sometimes we know what the final mode bits
|
||||
should look like
|
||||
+ move_temp_to_file(): do not forget to chmod() in "Coda hack"
|
||||
codepath
|
||||
+ Move chmod(foo, 0444) into move_temp_to_file()
|
||||
+ "core.sharedrepository = 0mode" should set, not loosen
|
||||
|
||||
* tr/maint-1.6.1-doc-format-patch--root (Thu Mar 26 18:29:25 2009 +0100) 1 commit
|
||||
+ Documentation: format-patch --root clarifications
|
||||
|
||||
* mh/format-patch-add-header (Thu Mar 26 10:51:05 2009 -0600) 1 commit
|
||||
+ format-patch: add arbitrary email headers
|
||||
|
||||
* ef/fast-export (Mon Mar 23 12:53:09 2009 +0000) 4 commits
|
||||
+ builtin-fast-export.c: handle nested tags
|
||||
+ builtin-fast-export.c: fix crash on tagged trees
|
||||
+ builtin-fast-export.c: turn error into warning
|
||||
+ test-suite: adding a test for fast-export with tag variants
|
||||
|
||||
* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit
|
||||
+ stat_tracking_info(): only count real commits
|
||||
|
||||
* jc/maint-1.6.0-keep-pack (Sat Mar 21 17:26:11 2009 -0500) 6 commits
|
||||
+ pack-objects: don't loosen objects available in alternate or kept
|
||||
packs
|
||||
+ t7700: demonstrate repack flaw which may loosen objects
|
||||
unnecessarily
|
||||
+ Remove --kept-pack-only option and associated infrastructure
|
||||
+ pack-objects: only repack or loosen objects residing in "local"
|
||||
packs
|
||||
+ git-repack.sh: don't use --kept-pack-only option to pack-objects
|
||||
+ t7700-repack: add two new tests demonstrating repacking flaws
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one. I hate to do these minor
|
||||
fix-ups myself, but I may end up doing so...
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit
|
||||
- archive.c: add support for --submodules[=(all|checkedout)]
|
||||
|
||||
Discussion stalled on the submodule selection criteria.
|
||||
Probably I should discard it and wait for a reroll if needed.
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
|
||||
- Support fetching from foreign VCSes
|
||||
- Add specification of git-vcs helpers
|
||||
- Add "vcs" config option in remotes
|
||||
|
||||
* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits
|
||||
- tests: fix "export var=val"
|
||||
- notes: refuse to edit notes outside refs/notes/
|
||||
- t3301: use test_must_fail instead of !
|
||||
- t3301: fix confusing quoting in test for valid notes ref
|
||||
- notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
|
||||
- notes: only clean up message file when editing
|
||||
- handle empty notes gracefully
|
||||
- git notes show: test empty notes
|
||||
- git-notes: fix printing of multi-line notes
|
||||
- notes: fix core.notesRef documentation
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
|
||||
- t/t9600: remove exit after test_done
|
||||
- cvsimport: extend testcase about patchset order to contain
|
||||
branches
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
+ Add a test of "git cvsimport"'s handling of tags and branches
|
||||
+ Add some tests of git-cvsimport's handling of vendor branches
|
||||
+ Test contents of entire cvsimported "master" tree contents
|
||||
+ Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
+ Start a library for cvsimport-related tests
|
||||
|
||||
Two cvsimport test topics were rewound from 'next' and merged into this
|
||||
one. I'll keep this in 'pu' so that people can polish their cvsps skilz
|
||||
to resolve issues these tests identify.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* da/difftool (Sat Apr 4 21:00:24 2009 -0700) 25 commits
|
||||
- mergetool--lib: add new merge tool TortoiseMerge
|
||||
- mergetool--lib: make (g)vimdiff workable under Windows
|
||||
- mergetool--lib: consolidate the last redundant bits in
|
||||
{diff,merge}tool
|
||||
- mergetool-lib: specialize opendiff options when in diff mode
|
||||
- mergetool-lib: refactor run_mergetool and check_unchanged
|
||||
- bash completion: add git-difftool
|
||||
- {diff,merge}tool: rename helpers to remove them from tab-
|
||||
completion
|
||||
- mergetool-lib: add diffuse as merge and diff tool
|
||||
- mergetool-lib: specialize xxdiff options when in diff mode
|
||||
- mergetool-lib: specialize kdiff3 options when in diff mode
|
||||
- mergetool: use run_mergetool from git-mergetool-lib
|
||||
- difftool: use run_mergetool from git-mergetool-lib
|
||||
- mergetool-lib: introduce run_mergetool
|
||||
- difftool: use valid_tool from git-mergetool-lib
|
||||
- mergetool: use valid_tool from git-mergetool-lib
|
||||
- difftool: use get_mergetool_path from git-mergetool-lib
|
||||
- mergetool: use get_mergetool_path from git-mergetool-lib
|
||||
- Add a mergetool-lib scriptlet for holding common merge tool
|
||||
functions
|
||||
- mergetool: use $( ... ) instead of `backticks`
|
||||
- difftool: add support for a difftool.prompt config variable
|
||||
- difftool: add a -y shortcut for --no-prompt
|
||||
- difftool: use perl built-ins when testing for msys
|
||||
- difftool: add various git-difftool tests
|
||||
- difftool: add git-difftool to the list of commands
|
||||
+ difftool: move 'git-difftool' out of contrib
|
||||
|
||||
* cc/bisect-filter (Mon Mar 30 06:59:59 2009 +0200) 19 commits
|
||||
- bisect--helper: string output variables together with "&&"
|
||||
- rev-list: pass "int flags" as last argument of "show_bisect_vars"
|
||||
- t6030: test bisecting with paths
|
||||
- bisect: use "bisect--helper" and remove "filter_skipped" function
|
||||
- bisect: implement "read_bisect_paths" to read paths in
|
||||
"$GIT_DIR/BISECT_NAMES"
|
||||
- bisect--helper: implement "git bisect--helper"
|
||||
- bisect: use the new generic "sha1_pos" function to lookup sha1
|
||||
- rev-list: call new "filter_skip" function
|
||||
- Merge branch 'cc/sha1-bsearch' into HEAD
|
||||
- patch-ids: use the new generic "sha1_pos" function to lookup sha1
|
||||
- sha1-lookup: add new "sha1_pos" function to efficiently lookup
|
||||
sha1
|
||||
+ rev-list: pass "revs" to "show_bisect_vars"
|
||||
+ rev-list: make "show_bisect_vars" non static
|
||||
+ rev-list: move code to show bisect vars into its own function
|
||||
+ rev-list: move bisect related code into its own file
|
||||
+ rev-list: make "bisect_list" variable local to "cmd_rev_list"
|
||||
+ refs: add "for_each_ref_in" function to refactor "for_each_*_ref"
|
||||
functions
|
||||
+ quote: add "sq_dequote_to_argv" to put unwrapped args in an argv
|
||||
array
|
||||
+ quote: implement "sq_dequote_many" to unwrap many args in one
|
||||
string
|
||||
|
||||
Re-rolled and made earlier parts ready for 'master'. I think we should
|
||||
move this to 'next' soonish and aim to have it in 1.6.3
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 13 commits
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
- patch-ids: use the new generic "sha1_pos" function to lookup sha1
|
||||
- sha1-lookup: add new "sha1_pos" function to efficiently lookup
|
||||
sha1
|
||||
|
||||
Re-rolled based on the updated binary search API.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
@@ -1,277 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Apr 2009, #02; Sun, 12)
|
||||
X-master-at: c965c029330b1f81cc107c5d829e7fd79c61d8ea
|
||||
X-next-at: d07d5c8f15ddd1f2569e1778cb82501a201d2f22
|
||||
|
||||
What's cooking in git.git (Apr 2009, #02; Sun, 12)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
We are at 1.6.3-rc0; the tip of 'master' might have some unexpected
|
||||
minor regressions, and I'd appreciate people to test and report so that we
|
||||
can keep this cycle short.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* mm/add-p-quit (Fri Apr 10 16:57:01 2009 +0200) 1 commit
|
||||
- [NEEDS SIGN OFF, DOC, AND REVIEW] git add -p: new "quit" command
|
||||
at the prompt.
|
||||
|
||||
I think this is Ok for 1.6.3, but some duplicated hunks bothered me. I
|
||||
did not read the patch really seriously.
|
||||
|
||||
* lt/bool-on-off (Thu Apr 9 12:40:39 2009 -0700) 1 commit
|
||||
- Allow users to un-configure rename detection
|
||||
|
||||
The commit log message needs to be cleaned up, the patch needs to be
|
||||
signed off, and there probably needs a documentation, but I think
|
||||
otherwise this is a good idea.
|
||||
|
||||
* nd/archive-attribute (Thu Apr 9 17:01:30 2009 +1000) 2 commits
|
||||
- archive: do not read .gitattributes in working directory
|
||||
- attr: add GIT_ATTR_INDEX "direction"
|
||||
|
||||
I think this is Ok for 1.6.3 but it needs new tests to protect the new
|
||||
feature from future breakages.
|
||||
|
||||
* js/add-edit (Wed Apr 8 23:30:24 2009 +0200) 1 commit
|
||||
- git-add: introduce --edit (to edit the diff vs. the index)
|
||||
|
||||
I am Ok with the general idea, but the error detection needs to be more
|
||||
robust than merely relying on --recount.
|
||||
|
||||
* eb/upload-archive-from-git-shell (Thu Apr 9 21:58:52 2009 +0200) 1 commit
|
||||
- git-shell: Add 'git-upload-archive' to allowed commands.
|
||||
|
||||
I think this is Ok for 1.6.3.
|
||||
|
||||
* jc/shared-literally (Sun Apr 12 17:55:18 2009 -0700) 2 commits
|
||||
- Mark t1301 permission test to depend on POSIXPERM
|
||||
- t1301-shared-repo: fix forced modes test
|
||||
|
||||
J6t's updates to fix permission tests and make sure they won't run on
|
||||
systems without permission bits on the filesystem.
|
||||
|
||||
I think this is Ok for 1.6.3.
|
||||
|
||||
* ns/am-to-empty (Fri Apr 10 09:34:42 2009 +0900) 1 commit
|
||||
- git-am: teach git-am to apply a patch to an unborn branch
|
||||
|
||||
I think this is Ok for 1.6.3.
|
||||
|
||||
* bw/short-ref-strict (Sat Apr 11 22:35:18 2009 +0200) 2 commits
|
||||
. for-each-ref: refname:short utilize core.warnAmbiguousRefs
|
||||
. get_short_ref(): add strict mode
|
||||
|
||||
This is an "obviously good thing to do" candidate for 1.6.3 but had
|
||||
serious conflicts with other topics I didn't feel like resolving myself;
|
||||
as the series is coming from TopGit, I'd ask the submitter to rebase it
|
||||
for me ;-)
|
||||
|
||||
* lt/pack-object-memuse (Fri Apr 10 18:15:26 2009 -0700) 2 commits
|
||||
- show_object(): push path_name() call further down
|
||||
- process_{tree,blob}: show objects without buffering
|
||||
|
||||
This had some conflicts with Christian's bisect topic; I think I resolved
|
||||
them correctly, but double-checking would be nice.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* mh/html-path (Sun Apr 5 04:15:16 2009 +0200) 1 commit
|
||||
+ add --html-path to get the location of installed HTML docs
|
||||
|
||||
* lt/reflog-expire (Mon Mar 30 21:34:14 2009 -0700) 2 commits
|
||||
+ Speed up reflog pruning of unreachable commits
|
||||
+ Clean up reflog unreachability pruning decision
|
||||
|
||||
* bs/maint-1.6.0-tree-walk-prefix (Wed Apr 1 19:34:03 2009 -0700) 2 commits
|
||||
+ match_tree_entry(): a pathspec only matches at directory
|
||||
boundaries
|
||||
+ tree_entry_interesting: a pathspec only matches at directory
|
||||
boundary
|
||||
|
||||
* ms/http-auth (Wed Apr 1 19:48:24 2009 +0300) 1 commit
|
||||
+ Allow curl to rewind the read buffers
|
||||
|
||||
* js/maint-submodule-checkout (Thu Apr 2 15:30:25 2009 +0200) 1 commit
|
||||
+ Fix 'git checkout <submodule>' to update the index
|
||||
|
||||
* cb/maint-merge-recursive-submodule-fix (Sun Apr 5 02:47:00 2009 +0200) 3 commits
|
||||
+ simplify output of conflicting merge
|
||||
+ update cache for conflicting submodule entries
|
||||
+ add tests for merging with submodules
|
||||
|
||||
* fg/remote-prune (Fri Apr 3 11:03:44 2009 +0200) 2 commits
|
||||
+ git remote update: New option --prune
|
||||
+ builtin-remote.c: Split out prune_remote as a separate function.
|
||||
|
||||
These should go to 'master' soonish.
|
||||
|
||||
* cc/sha1-bsearch (Mon Apr 6 00:48:49 2009 -0700) 3 commits
|
||||
+ sha1-lookup: fix up the assertion message
|
||||
+ patch-ids: use the new generic "sha1_pos" function to lookup sha1
|
||||
+ sha1-lookup: add new "sha1_pos" function to efficiently lookup
|
||||
sha1
|
||||
|
||||
* jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 1 commit
|
||||
+ checkout -: make "-" to mean "previous branch" everywhere
|
||||
|
||||
* cc/bisect-filter (Mon Mar 30 06:59:59 2009 +0200) 19 commits
|
||||
+ bisect--helper: string output variables together with "&&"
|
||||
+ rev-list: pass "int flags" as last argument of "show_bisect_vars"
|
||||
+ t6030: test bisecting with paths
|
||||
+ bisect: use "bisect--helper" and remove "filter_skipped" function
|
||||
+ bisect: implement "read_bisect_paths" to read paths in
|
||||
"$GIT_DIR/BISECT_NAMES"
|
||||
+ bisect--helper: implement "git bisect--helper"
|
||||
+ bisect: use the new generic "sha1_pos" function to lookup sha1
|
||||
+ rev-list: call new "filter_skip" function
|
||||
+ Merge branch 'cc/sha1-bsearch' into HEAD
|
||||
+ patch-ids: use the new generic "sha1_pos" function to lookup sha1
|
||||
+ sha1-lookup: add new "sha1_pos" function to efficiently lookup
|
||||
sha1
|
||||
+ rev-list: pass "revs" to "show_bisect_vars"
|
||||
+ rev-list: make "show_bisect_vars" non static
|
||||
+ rev-list: move code to show bisect vars into its own function
|
||||
+ rev-list: move bisect related code into its own file
|
||||
+ rev-list: make "bisect_list" variable local to "cmd_rev_list"
|
||||
+ refs: add "for_each_ref_in" function to refactor "for_each_*_ref"
|
||||
functions
|
||||
+ quote: add "sq_dequote_to_argv" to put unwrapped args in an argv
|
||||
array
|
||||
+ quote: implement "sq_dequote_many" to unwrap many args in one
|
||||
string
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one. I hate to do these minor
|
||||
fix-ups myself, but I may end up doing so...
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
|
||||
- Add option for using a foreign VCS
|
||||
- Document details of transport function APIs
|
||||
- Allow late reporting of fetched hashes
|
||||
|
||||
* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits
|
||||
- tests: fix "export var=val"
|
||||
- notes: refuse to edit notes outside refs/notes/
|
||||
- t3301: use test_must_fail instead of !
|
||||
- t3301: fix confusing quoting in test for valid notes ref
|
||||
- notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
|
||||
- notes: only clean up message file when editing
|
||||
- handle empty notes gracefully
|
||||
- git notes show: test empty notes
|
||||
- git-notes: fix printing of multi-line notes
|
||||
- notes: fix core.notesRef documentation
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
|
||||
- t/t9600: remove exit after test_done
|
||||
- cvsimport: extend testcase about patchset order to contain
|
||||
branches
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
+ Add a test of "git cvsimport"'s handling of tags and branches
|
||||
+ Add some tests of git-cvsimport's handling of vendor branches
|
||||
+ Test contents of entire cvsimported "master" tree contents
|
||||
+ Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
+ Start a library for cvsimport-related tests
|
||||
|
||||
Two cvsimport test topics were rewound from 'next' and merged into this
|
||||
one. I'll keep this in 'pu' so that people can polish their cvsps skilz
|
||||
to resolve issues these tests identify.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* da/difftool (Sat Apr 11 20:41:56 2009 -0700) 16 commits
|
||||
- mergetool--lib: simplify API usage by removing more global
|
||||
variables
|
||||
- Fix misspelled mergetool.keepBackup
|
||||
- difftool/mergetool: refactor commands to use git-mergetool--lib
|
||||
- mergetool: use $( ... ) instead of `backticks`
|
||||
- bash completion: add git-difftool
|
||||
- difftool: add support for a difftool.prompt config variable
|
||||
- difftool: add various git-difftool tests
|
||||
- difftool: move 'git-difftool' out of contrib
|
||||
- difftool/mergetool: add diffuse as merge and diff tool
|
||||
- difftool: add a -y shortcut for --no-prompt
|
||||
- difftool: use perl built-ins when testing for msys
|
||||
- difftool: remove the backup file feature
|
||||
- difftool: remove merge options for opendiff, tkdiff, kdiff3 and
|
||||
xxdiff
|
||||
- git-mergetool: add new merge tool TortoiseMerge
|
||||
- git-mergetool/difftool: make (g)vimdiff workable under Windows
|
||||
- doc/merge-config: list ecmerge as a built-in merge tool
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I suspect an attempt to replace an object that is directly listed on the
|
||||
command line would not work very well with this series.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
@@ -1,253 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Apr 2009, #03; Wed, 15)
|
||||
X-master-at: f800b65bea1504299747e7be03ee279508a74e1f
|
||||
X-next-at: 40869ef2c65a11295fc4c83e257fa4564b3e18f5
|
||||
|
||||
What's cooking in git.git (Apr 2009, #03; Wed, 15)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
We are a bit past 1.6.3-rc0, and this report will show pretty much what
|
||||
the final should look like from the feature-set point-of-view.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* ac/color-graph (Mon Apr 13 15:53:41 2009 -0400) 1 commit
|
||||
+ graph API: Added logic for colored edges
|
||||
|
||||
This has been under discussion since before 1.6.3-rc0, hopefully in
|
||||
1.6.3-rc1.
|
||||
|
||||
* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits
|
||||
- send-email: Remove superfluous `my $editor = ...'
|
||||
- send-email: 'References:' should only reference what is sent
|
||||
- send-email: Handle "GIT:" rather than "GIT: " during --compose
|
||||
- Docs: send-email: --smtp-server-port can take symbolic ports
|
||||
- Docs: send-email: Refer to CONFIGURATION section for
|
||||
sendemail.multiedit
|
||||
- Docs: send-email: Put options back into alphabetical order
|
||||
|
||||
Only partially queued, but this is not 1.6.3 material and we are not in a
|
||||
hurry.
|
||||
|
||||
* jk/cobdoc (Mon Apr 13 07:21:04 2009 -0400) 5 commits
|
||||
+ docs/checkout: clarify what "non-branch" means
|
||||
+ doc/checkout: split checkout and branch creation in synopsis
|
||||
+ doc/checkout: refer to git-branch(1) as appropriate
|
||||
+ doc: refer to tracking configuration as "upstream"
|
||||
+ doc: clarify --no-track option
|
||||
|
||||
For 1.6.3
|
||||
|
||||
* mk/apply-swap (Sat Apr 11 21:31:00 2009 +0200) 2 commits
|
||||
+ builtin-apply: keep information about files to be deleted
|
||||
+ tests: test applying criss-cross rename patch
|
||||
|
||||
For 1.6.3; perhaps needs to be cherry-picked to 1.6.2.X series as well.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to 'master' before 1.6.3-rc1]
|
||||
|
||||
* mm/add-p-quit (Fri Apr 10 16:57:01 2009 +0200) 1 commit
|
||||
+ git add -p: new "quit" command at the prompt.
|
||||
|
||||
I did a minimal documentation update myself.
|
||||
|
||||
* eb/upload-archive-from-git-shell (Thu Apr 9 21:58:52 2009 +0200) 1 commit
|
||||
+ git-shell: Add 'git-upload-archive' to allowed commands.
|
||||
|
||||
* jc/shared-literally (Sun Apr 12 17:55:18 2009 -0700) 2 commits
|
||||
+ Mark t1301 permission test to depend on POSIXPERM
|
||||
+ t1301-shared-repo: fix forced modes test
|
||||
|
||||
* jc/maint-shared-literally (Sun Apr 12 21:22:02 2009 +0200) 1 commit
|
||||
+ t1301-shared-repo: fix forced modes test
|
||||
|
||||
J6t's updates to fix permission tests and make sure they won't run on
|
||||
systems without permission bits on the filesystem.
|
||||
|
||||
* ns/am-to-empty (Fri Apr 10 09:34:42 2009 +0900) 1 commit
|
||||
+ git-am: teach git-am to apply a patch to an unborn branch
|
||||
|
||||
* bw/short-ref-strict (Mon Apr 13 13:20:26 2009 +0200) 3 commits
|
||||
+ rev-parse: --abbrev-ref option to shorten ref name
|
||||
+ for-each-ref: utilize core.warnAmbiguousRefs for :short-format
|
||||
+ shorten_unambiguous_ref(): add strict mode
|
||||
|
||||
* da/difftool (Sat Apr 11 20:41:56 2009 -0700) 16 commits
|
||||
+ mergetool--lib: simplify API usage by removing more global
|
||||
variables
|
||||
+ Fix misspelled mergetool.keepBackup
|
||||
+ difftool/mergetool: refactor commands to use git-mergetool--lib
|
||||
+ mergetool: use $( ... ) instead of `backticks`
|
||||
+ bash completion: add git-difftool
|
||||
+ difftool: add support for a difftool.prompt config variable
|
||||
+ difftool: add various git-difftool tests
|
||||
+ difftool: move 'git-difftool' out of contrib
|
||||
+ difftool/mergetool: add diffuse as merge and diff tool
|
||||
+ difftool: add a -y shortcut for --no-prompt
|
||||
+ difftool: use perl built-ins when testing for msys
|
||||
+ difftool: remove the backup file feature
|
||||
+ difftool: remove merge options for opendiff, tkdiff, kdiff3 and
|
||||
xxdiff
|
||||
+ git-mergetool: add new merge tool TortoiseMerge
|
||||
+ git-mergetool/difftool: make (g)vimdiff workable under Windows
|
||||
+ doc/merge-config: list ecmerge as a built-in merge tool
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
(none)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* lt/bool-on-off (Thu Apr 9 12:40:39 2009 -0700) 1 commit
|
||||
+ Allow users to un-configure rename detection
|
||||
|
||||
Still lacks doc updates.
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one. I hate to do these minor
|
||||
fix-ups myself, but I may end up doing so...
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
|
||||
- Add option for using a foreign VCS
|
||||
- Document details of transport function APIs
|
||||
- Allow late reporting of fetched hashes
|
||||
|
||||
* js/notes (Tue Apr 14 00:03:36 2009 +0200) 15 commits
|
||||
- Documentation: fix 'linkgit' macro in "git-notes.txt"
|
||||
- tests: fix "export var=val"
|
||||
- notes: refuse to edit notes outside refs/notes/
|
||||
- t3301: use test_must_fail instead of !
|
||||
- t3301: fix confusing quoting in test for valid notes ref
|
||||
- notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
|
||||
- notes: only clean up message file when editing
|
||||
- handle empty notes gracefully
|
||||
- git notes show: test empty notes
|
||||
- git-notes: fix printing of multi-line notes
|
||||
- notes: fix core.notesRef documentation
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
|
||||
- t/t9600: remove exit after test_done
|
||||
- cvsimport: extend testcase about patchset order to contain
|
||||
branches
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
+ Add a test of "git cvsimport"'s handling of tags and branches
|
||||
+ Add some tests of git-cvsimport's handling of vendor branches
|
||||
+ Test contents of entire cvsimported "master" tree contents
|
||||
+ Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
+ Start a library for cvsimport-related tests
|
||||
|
||||
Two cvsimport test topics were rewound from 'next' and merged into this
|
||||
one. I'll keep this in 'pu' so that people can polish their cvsps skilz
|
||||
to resolve issues these tests identify.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* lt/pack-object-memuse (Fri Apr 10 18:15:26 2009 -0700) 2 commits
|
||||
+ show_object(): push path_name() call further down
|
||||
+ process_{tree,blob}: show objects without buffering
|
||||
|
||||
This had some conflicts with Christian's bisect topic; I think I resolved
|
||||
them correctly, but double-checking would be nice.
|
||||
|
||||
* nd/archive-attribute (Mon Apr 13 14:18:39 2009 +0200) 5 commits
|
||||
+ archive test: test new --fix-attributes feature
|
||||
+ archive: do not read .gitattributes in working directory
|
||||
+ unpack-trees: do not muck with attributes when we are not checking
|
||||
out
|
||||
+ attr: add GIT_ATTR_INDEX "direction"
|
||||
+ archive tests: do not use .gitattributes in working directory
|
||||
|
||||
With fix-ups from René and myself. Perhaps 1.6.3 material, perhaps not.
|
||||
|
||||
* js/add-edit (Wed Apr 8 23:30:24 2009 +0200) 1 commit
|
||||
- git-add: introduce --edit (to edit the diff vs. the index)
|
||||
|
||||
* cc/replace (Tue Apr 14 00:36:59 2009 +0200) 13 commits
|
||||
- Documentation: add documentation for "git replace"
|
||||
- Add git-replace to .gitignore
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I suspect an attempt to replace an object that is directly listed on the
|
||||
command line would not work very well with this series.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Reverted]
|
||||
|
||||
* mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits
|
||||
+ Add a test of "git cvsimport"'s handling of tags and branches
|
||||
+ Add some tests of git-cvsimport's handling of vendor branches
|
||||
+ Test contents of entire cvsimported "master" tree contents
|
||||
+ Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
+ Start a library for cvsimport-related tests
|
||||
|
||||
This has been reverted out of 'next' for some time now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
@@ -1,277 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Apr 2009, #04; Wed, 29)
|
||||
X-master-at: 6ffd567bec439e7809ee0966556bd5e72fb78de4
|
||||
X-next-at: 8c6980a6544dcc03e45b1d63d624544f3bfa1b94
|
||||
|
||||
What's cooking in git.git (Apr 2009, #04; Wed, 29)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* cc/bisect (Fri Apr 24 08:29:01 2009 +0200) 10 commits
|
||||
- am: simplify "sq" function by using "git rev-parse --sq-quote"
|
||||
- bisect: use "git rev-parse --sq-quote" instead of a custom "sq"
|
||||
function
|
||||
- rev-parse: add --sq-quote to shell quote arguments
|
||||
- rev-list: remove stringed output flag from "show_bisect_vars"
|
||||
- bisect--helper: remove "--next-vars" option as it is now useless
|
||||
- bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"
|
||||
- bisect--helper: add "--next-exit" to output bisect results
|
||||
- bisect: move common bisect functionality to "bisect_common"
|
||||
- rev-list: refactor printing bisect vars
|
||||
- rev-list: make "estimate_bisect_steps" non static
|
||||
|
||||
* mh/show-branch-color (Sat Apr 25 13:46:14 2009 +0200) 2 commits
|
||||
+ bash completion: show-branch color support
|
||||
+ show-branch: color the commit status signs
|
||||
|
||||
* ac/graph-horizontal-line (Tue Apr 21 08:47:01 2009 -0400) 1 commit
|
||||
+ graph API: Use horizontal lines for more compact graphs
|
||||
|
||||
* ar/merge-one-file-diag (Wed Apr 29 23:40:50 2009 +0200) 1 commit
|
||||
- Clarify kind of conflict in merge-one-file helper
|
||||
|
||||
* mh/diff-stat-color (Sat Apr 25 00:06:47 2009 +0200) 1 commit
|
||||
- diff: do not color --stat output like patch context
|
||||
|
||||
* rc/http-push (Sat Apr 25 00:35:57 2009 +0800) 3 commits
|
||||
. http-push: send out fetch requests on queue
|
||||
. t5540-http-push: test fetching of packed objects
|
||||
. t5540-http-push: test fetching of loose objects
|
||||
|
||||
Breaks build in a trivial way; which I haven't got around fixing it up.
|
||||
|
||||
* ae/anon-fetch-info (Fri Apr 17 10:20:11 2009 +0200) 1 commit
|
||||
+ fetch: Strip usernames from url's before storing them
|
||||
|
||||
* ar/unlink-err (Wed Apr 29 23:24:52 2009 +0200) 3 commits
|
||||
- print unlink(2) errno in copy_or_link_directory
|
||||
- replace direct calls to unlink(2) with unlink_or_warn
|
||||
- Introduce an unlink(2) wrapper which gives warning if unlink
|
||||
failed
|
||||
|
||||
* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit
|
||||
- git-submodule: add support for --rebase.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
It's been a while since I sent "What's cooking" out, and some of the
|
||||
topics below have fixes on top directly applied since they graduated.
|
||||
|
||||
* ac/color-graph (Mon Apr 13 15:53:41 2009 -0400) 1 commit
|
||||
+ graph API: Added logic for colored edges
|
||||
|
||||
* jk/cobdoc (Mon Apr 13 07:21:04 2009 -0400) 5 commits
|
||||
+ docs/checkout: clarify what "non-branch" means
|
||||
+ doc/checkout: split checkout and branch creation in synopsis
|
||||
+ doc/checkout: refer to git-branch(1) as appropriate
|
||||
+ doc: refer to tracking configuration as "upstream"
|
||||
+ doc: clarify --no-track option
|
||||
|
||||
* mk/apply-swap (Sat Apr 11 21:31:00 2009 +0200) 2 commits
|
||||
+ builtin-apply: keep information about files to be deleted
|
||||
+ tests: test applying criss-cross rename patch
|
||||
|
||||
Perhaps needs to be cherry-picked to 1.6.2.X series as well.
|
||||
|
||||
* mm/add-p-quit (Fri Apr 10 16:57:01 2009 +0200) 1 commit
|
||||
+ git add -p: new "quit" command at the prompt.
|
||||
|
||||
* eb/upload-archive-from-git-shell (Thu Apr 9 21:58:52 2009 +0200) 1 commit
|
||||
+ git-shell: Add 'git-upload-archive' to allowed commands.
|
||||
|
||||
* jc/shared-literally (Sun Apr 12 17:55:18 2009 -0700) 2 commits
|
||||
+ Mark t1301 permission test to depend on POSIXPERM
|
||||
+ t1301-shared-repo: fix forced modes test
|
||||
|
||||
* jc/maint-shared-literally (Sun Apr 12 21:22:02 2009 +0200) 1 commit
|
||||
+ t1301-shared-repo: fix forced modes test
|
||||
|
||||
* ns/am-to-empty (Fri Apr 10 09:34:42 2009 +0900) 1 commit
|
||||
+ git-am: teach git-am to apply a patch to an unborn branch
|
||||
|
||||
* bw/short-ref-strict (Mon Apr 13 13:20:26 2009 +0200) 3 commits
|
||||
+ rev-parse: --abbrev-ref option to shorten ref name
|
||||
+ for-each-ref: utilize core.warnAmbiguousRefs for :short-format
|
||||
+ shorten_unambiguous_ref(): add strict mode
|
||||
|
||||
* da/difftool (Sat Apr 11 20:41:56 2009 -0700) 16 commits
|
||||
+ mergetool--lib: simplify API usage by removing more global
|
||||
variables
|
||||
+ Fix misspelled mergetool.keepBackup
|
||||
+ difftool/mergetool: refactor commands to use git-mergetool--lib
|
||||
+ mergetool: use $( ... ) instead of `backticks`
|
||||
+ bash completion: add git-difftool
|
||||
+ difftool: add support for a difftool.prompt config variable
|
||||
+ difftool: add various git-difftool tests
|
||||
+ difftool: move 'git-difftool' out of contrib
|
||||
+ difftool/mergetool: add diffuse as merge and diff tool
|
||||
+ difftool: add a -y shortcut for --no-prompt
|
||||
+ difftool: use perl built-ins when testing for msys
|
||||
+ difftool: remove the backup file feature
|
||||
+ difftool: remove merge options for opendiff, tkdiff, kdiff3 and
|
||||
xxdiff
|
||||
+ git-mergetool: add new merge tool TortoiseMerge
|
||||
+ git-mergetool/difftool: make (g)vimdiff workable under Windows
|
||||
+ doc/merge-config: list ecmerge as a built-in merge tool
|
||||
|
||||
* lt/bool-on-off (Thu Apr 9 12:40:39 2009 -0700) 1 commit
|
||||
+ Allow users to un-configure rename detection
|
||||
|
||||
* lt/pack-object-memuse (Fri Apr 10 18:15:26 2009 -0700) 2 commits
|
||||
+ show_object(): push path_name() call further down
|
||||
+ process_{tree,blob}: show objects without buffering
|
||||
|
||||
* nd/archive-attribute (Mon Apr 13 14:18:39 2009 +0200) 5 commits
|
||||
+ archive test: test new --fix-attributes feature
|
||||
+ archive: do not read .gitattributes in working directory
|
||||
+ unpack-trees: do not muck with attributes when we are not checking
|
||||
out
|
||||
+ attr: add GIT_ATTR_INDEX "direction"
|
||||
+ archive tests: do not use .gitattributes in working directory
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one. I hate to do these minor
|
||||
fix-ups myself, but I may end up doing so...
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
|
||||
- Add option for using a foreign VCS
|
||||
- Document details of transport function APIs
|
||||
- Allow late reporting of fetched hashes
|
||||
|
||||
* js/notes (Tue Apr 14 00:03:36 2009 +0200) 15 commits
|
||||
- Documentation: fix 'linkgit' macro in "git-notes.txt"
|
||||
- tests: fix "export var=val"
|
||||
- notes: refuse to edit notes outside refs/notes/
|
||||
- t3301: use test_must_fail instead of !
|
||||
- t3301: fix confusing quoting in test for valid notes ref
|
||||
- notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
|
||||
- notes: only clean up message file when editing
|
||||
- handle empty notes gracefully
|
||||
- git notes show: test empty notes
|
||||
- git-notes: fix printing of multi-line notes
|
||||
- notes: fix core.notesRef documentation
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
|
||||
- t/t9600: remove exit after test_done
|
||||
- cvsimport: extend testcase about patchset order to contain
|
||||
branches
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
+ Add a test of "git cvsimport"'s handling of tags and branches
|
||||
+ Add some tests of git-cvsimport's handling of vendor branches
|
||||
+ Test contents of entire cvsimported "master" tree contents
|
||||
+ Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
+ Start a library for cvsimport-related tests
|
||||
|
||||
Two cvsimport test topics were rewound from 'next' and merged into this
|
||||
one. I'll keep this in 'pu' so that people can polish their cvsps skilz
|
||||
to resolve issues these tests identify.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits
|
||||
- send-email: Remove superfluous `my $editor = ...'
|
||||
- send-email: 'References:' should only reference what is sent
|
||||
- send-email: Handle "GIT:" rather than "GIT: " during --compose
|
||||
- Docs: send-email: --smtp-server-port can take symbolic ports
|
||||
- Docs: send-email: Refer to CONFIGURATION section for
|
||||
sendemail.multiedit
|
||||
- Docs: send-email: Put options back into alphabetical order
|
||||
|
||||
Only partially queued, but this is not 1.6.3 material and we are not in a
|
||||
hurry.
|
||||
|
||||
* js/add-edit (Mon Apr 27 19:51:42 2009 +0200) 2 commits
|
||||
+ t3702: fix reliance on SHELL_PATH being '/bin/sh'
|
||||
+ git-add: introduce --edit (to edit the diff vs. the index)
|
||||
|
||||
* cc/replace (Tue Apr 14 00:36:59 2009 +0200) 13 commits
|
||||
- Documentation: add documentation for "git replace"
|
||||
- Add git-replace to .gitignore
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I suspect an attempt to replace an object that is directly listed on the
|
||||
command line would not work very well with this series.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Reverted]
|
||||
|
||||
* mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits
|
||||
+ Add a test of "git cvsimport"'s handling of tags and branches
|
||||
+ Add some tests of git-cvsimport's handling of vendor branches
|
||||
+ Test contents of entire cvsimported "master" tree contents
|
||||
+ Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
+ Start a library for cvsimport-related tests
|
||||
|
||||
This has been reverted out of 'next' for some time now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
@@ -1,259 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (May 2009, #01; Sat, 09)
|
||||
X-master-at: 6345d7a0d151afc3d2a10ada3ecacf54c3fee2d0
|
||||
X-next-at: 99c766e3a22715646df19711aeaf76e0c938bacd
|
||||
|
||||
What's cooking in git.git (May 2009, #01; Sat, 09)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* mt/submodule-reference (Mon May 4 22:30:01 2009 +0300) 1 commit
|
||||
+ Add --reference option to git submodule.
|
||||
|
||||
* rr/forbid-bs-in-ref (Fri May 8 07:32:37 2009 +0200) 1 commit
|
||||
+ Disallow '\' in ref names
|
||||
|
||||
This retroactively forbids use of what people could have been using
|
||||
happily, which, strictly speaking, is a no-no, but makes sense in the
|
||||
longer term.
|
||||
|
||||
* jk/maint-add-empty (Tue Apr 28 23:21:01 2009 -0400) 1 commit
|
||||
- add: don't complain when adding empty project root
|
||||
|
||||
When you say "git add ." in an empty directory, you get "No path matches
|
||||
''", instead of "No path matches '.'", and this "fixes" it by hiding the
|
||||
error and making the command silently succeed. Strictly speaking it
|
||||
introduces inconsistency, but I think an empty directory is so
|
||||
uninteresting special case that not signalling it as an error is Ok.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
* lt/maint-diff-reduce-lstat (Sat May 9 15:11:17 2009 -0700) 2 commits
|
||||
+ Teach 'git checkout' to preload the index contents
|
||||
+ Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
|
||||
|
||||
* jk/maint-1.6.0-trace-argv (Fri May 8 05:06:15 2009 -0400) 1 commit
|
||||
+ fix GIT_TRACE segfault with shell-quoted aliases
|
||||
|
||||
* hv/sample-update (Fri May 8 17:22:30 2009 +0200) 1 commit
|
||||
+ Extend sample update hook, disable modifying of existing tags
|
||||
|
||||
* rs/grep-parseopt (Thu May 7 21:46:48 2009 +0200) 5 commits
|
||||
+ grep: use parseopt
|
||||
+ grep: remove global variable builtin_grep
|
||||
+ parseopt: add PARSE_OPT_NODASH
|
||||
+ parseopt: add OPT_NUMBER_CALLBACK
|
||||
+ parseopt: add OPT_NEGBIT
|
||||
|
||||
* do/maint-merge-recursive-fix (Sat May 9 14:49:59 2009 -0700) 1 commit
|
||||
+ merge-recursive: never leave index unmerged while recursing
|
||||
|
||||
* np/push-delta (Fri May 1 16:56:47 2009 -0400) 1 commit
|
||||
+ allow OFS_DELTA objects during a push
|
||||
|
||||
* jm/format-patch-no-auto-n-when-k-is-given (Sat May 9 10:12:01 2009 +0200) 1 commit
|
||||
+ format-patch let -k override a config-specified format.numbered
|
||||
|
||||
* da/mergetool-lib (Sat May 2 01:57:21 2009 -0700) 1 commit
|
||||
- mergetool--lib: specialize diff options for emerge and ecmerge
|
||||
|
||||
* jk/no-no-no-empty-directory (Fri May 8 01:01:17 2009 -0400) 2 commits
|
||||
+ parseopt: add OPT_NEGBIT
|
||||
+ parseopt: add OPT_NEGBIT
|
||||
|
||||
I somehow botched the commit log message of the top one; it is about
|
||||
fixing "ls-files --no-empty-directory".
|
||||
|
||||
* fl/git-pm (Thu May 7 15:41:28 2009 +0200) 2 commits
|
||||
+ Git.pm: Always set Repository to absolute path if autodetecting
|
||||
+ Git.pm: Set GIT_WORK_TREE if we set GIT_DIR
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one. I hate to do these minor
|
||||
fix-ups myself, but I may end up doing so...
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
|
||||
- Add option for using a foreign VCS
|
||||
- Document details of transport function APIs
|
||||
- Allow late reporting of fetched hashes
|
||||
|
||||
* js/notes (Tue Apr 14 00:03:36 2009 +0200) 15 commits
|
||||
- Documentation: fix 'linkgit' macro in "git-notes.txt"
|
||||
- tests: fix "export var=val"
|
||||
- notes: refuse to edit notes outside refs/notes/
|
||||
- t3301: use test_must_fail instead of !
|
||||
- t3301: fix confusing quoting in test for valid notes ref
|
||||
- notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
|
||||
- notes: only clean up message file when editing
|
||||
- handle empty notes gracefully
|
||||
- git notes show: test empty notes
|
||||
- git-notes: fix printing of multi-line notes
|
||||
- notes: fix core.notesRef documentation
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
|
||||
- t/t9600: remove exit after test_done
|
||||
- cvsimport: extend testcase about patchset order to contain
|
||||
branches
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
- Add a test of "git cvsimport"'s handling of tags and branches
|
||||
- Add some tests of git-cvsimport's handling of vendor branches
|
||||
- Test contents of entire cvsimported "master" tree contents
|
||||
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
- Start a library for cvsimport-related tests
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* cc/bisect (Fri Apr 24 08:29:01 2009 +0200) 10 commits
|
||||
- am: simplify "sq" function by using "git rev-parse --sq-quote"
|
||||
- bisect: use "git rev-parse --sq-quote" instead of a custom "sq"
|
||||
function
|
||||
- rev-parse: add --sq-quote to shell quote arguments
|
||||
- rev-list: remove stringed output flag from "show_bisect_vars"
|
||||
- bisect--helper: remove "--next-vars" option as it is now useless
|
||||
- bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"
|
||||
- bisect--helper: add "--next-exit" to output bisect results
|
||||
- bisect: move common bisect functionality to "bisect_common"
|
||||
- rev-list: refactor printing bisect vars
|
||||
- rev-list: make "estimate_bisect_steps" non static
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
* mh/show-branch-color (Sat Apr 25 13:46:14 2009 +0200) 2 commits
|
||||
+ bash completion: show-branch color support
|
||||
+ show-branch: color the commit status signs
|
||||
|
||||
* ac/graph-horizontal-line (Tue Apr 21 08:47:01 2009 -0400) 1 commit
|
||||
+ graph API: Use horizontal lines for more compact graphs
|
||||
|
||||
* ar/merge-one-file-diag (Wed Apr 29 23:40:50 2009 +0200) 1 commit
|
||||
- Clarify kind of conflict in merge-one-file helper
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
* mh/diff-stat-color (Sat Apr 25 00:06:47 2009 +0200) 1 commit
|
||||
- diff: do not color --stat output like patch context
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
* rc/http-push (Sat Apr 25 00:35:57 2009 +0800) 3 commits
|
||||
- http-push: send out fetch requests on queue
|
||||
- t5540-http-push: test fetching of packed objects
|
||||
- t5540-http-push: test fetching of loose objects
|
||||
|
||||
* ae/anon-fetch-info (Fri Apr 17 10:20:11 2009 +0200) 1 commit
|
||||
+ fetch: Strip usernames from url's before storing them
|
||||
|
||||
* ar/unlink-err (Wed Apr 29 23:24:52 2009 +0200) 3 commits
|
||||
- print unlink(2) errno in copy_or_link_directory
|
||||
- replace direct calls to unlink(2) with unlink_or_warn
|
||||
- Introduce an unlink(2) wrapper which gives warning if unlink
|
||||
failed
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit
|
||||
- git-submodule: add support for --rebase.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits
|
||||
- send-email: Remove superfluous `my $editor = ...'
|
||||
- send-email: 'References:' should only reference what is sent
|
||||
- send-email: Handle "GIT:" rather than "GIT: " during --compose
|
||||
- Docs: send-email: --smtp-server-port can take symbolic ports
|
||||
- Docs: send-email: Refer to CONFIGURATION section for
|
||||
sendemail.multiedit
|
||||
- Docs: send-email: Put options back into alphabetical order
|
||||
|
||||
Only partially queued, but this is not 1.6.3 material and we are not in a
|
||||
hurry.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
* js/add-edit (Mon Apr 27 19:51:42 2009 +0200) 2 commits
|
||||
+ t3702: fix reliance on SHELL_PATH being '/bin/sh'
|
||||
+ git-add: introduce --edit (to edit the diff vs. the index)
|
||||
|
||||
* cc/replace (Tue Apr 14 00:36:59 2009 +0200) 13 commits
|
||||
- Documentation: add documentation for "git replace"
|
||||
- Add git-replace to .gitignore
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I suspect an attempt to replace an object that is directly listed on the
|
||||
command line would not work very well with this series.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought. Will start merging them to 'next' shortly.
|
||||
|
||||
@@ -1,343 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (May 2009, #02; Sun, 17)
|
||||
X-master-at: 55524fcf9d6676ca3840227092bf3a14ba404615
|
||||
X-next-at: 540caa5c275c0ad44c1bc979c37075f58e3459de
|
||||
|
||||
What's cooking in git.git (May 2009, #02; Sun, 17)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/mktree (Thu May 14 15:49:10 2009 -0700) 9 commits
|
||||
- mktree: validate entry type in input
|
||||
- mktree --batch: build more than one tree object
|
||||
- mktree --missing: updated usage message and man page
|
||||
- mktree --missing: allow missing objects
|
||||
- t1010: add mktree test
|
||||
- mktree: do not barf on a submodule commit
|
||||
- builtin-mktree.c: use a helper function to handle one line of
|
||||
input
|
||||
- mktree: use parse-options
|
||||
- build-in git-mktree
|
||||
|
||||
* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
|
||||
- Fix for a merge where a branch has an F->D transition
|
||||
- Add a reminder test case for a merge with F/D transition
|
||||
|
||||
Although the reported breakage is covered with the patch, Alex feels the
|
||||
solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
|
||||
may be long overdue but seems to be a hard problem.
|
||||
|
||||
* jc/maint-add-p-coalesce-fix (Sat May 16 10:48:23 2009 -0700) 2 commits
|
||||
+ Revert "git-add--interactive: remove hunk coalescing"
|
||||
+ Splitting a hunk that adds a line at the top fails in "add -p"
|
||||
|
||||
* sb/format-patch-parseopt (Sat May 16 02:24:46 2009 -0700) 1 commit
|
||||
- format-patch: migrate to parse-options API
|
||||
|
||||
* fc/decorate-tag (Thu May 14 00:32:53 2009 +0300) 2 commits
|
||||
+ Prettify log decorations even more
|
||||
+ Change prettify_ref to prettify_refname
|
||||
|
||||
* mg/track (Mon May 11 16:42:54 2009 +0200) 2 commits
|
||||
+ Fix behavior with non-commit upstream references
|
||||
+ Test tracking of non-commit upstreams
|
||||
|
||||
* jn/gitweb-cleanup (Mon May 11 19:45:11 2009 +0200) 8 commits
|
||||
+ gitweb: Remove unused $hash_base parameter from
|
||||
normalize_link_target
|
||||
+ gitweb: Simplify snapshot format detection logic in
|
||||
evaluate_path_info
|
||||
+ gitweb: Use capturing parentheses only when you intend to capture
|
||||
+ gitweb: Replace wrongly added tabs with spaces
|
||||
+ gitweb: Use block form of map/grep in a few cases more
|
||||
+ gitweb: Always use three argument form of open
|
||||
+ gitweb: Always use three argument form of open
|
||||
+ gitweb: Do not use bareword filehandles
|
||||
|
||||
* js/maint-no-ln-across-libexec-and-bin (Mon May 11 13:02:18 2009 +0200) 1 commit
|
||||
+ Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile
|
||||
|
||||
* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
* tp/send-email-from-config (Tue May 12 15:48:56 2009 -0700) 1 commit
|
||||
+ send-email: Add config option for sender address
|
||||
|
||||
* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits
|
||||
- Add initial support for pathname conversion to UTF-8
|
||||
- read_directory(): infrastructure for pathname character set
|
||||
conversion
|
||||
- Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits
|
||||
+ send-email: Remove superfluous `my $editor = ...'
|
||||
+ send-email: 'References:' should only reference what is sent
|
||||
+ send-email: Handle "GIT:" rather than "GIT: " during --compose
|
||||
+ Docs: send-email: --smtp-server-port can take symbolic ports
|
||||
+ Docs: send-email: Refer to CONFIGURATION section for
|
||||
sendemail.multiedit
|
||||
+ Docs: send-email: Put options back into alphabetical order
|
||||
|
||||
* ae/anon-fetch-info (Fri Apr 17 10:20:11 2009 +0200) 1 commit
|
||||
+ fetch: Strip usernames from url's before storing them
|
||||
|
||||
* ac/graph-horizontal-line (Tue Apr 21 08:47:01 2009 -0400) 1 commit
|
||||
+ graph API: Use horizontal lines for more compact graphs
|
||||
|
||||
* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit
|
||||
+ git-submodule: add support for --rebase.
|
||||
|
||||
* mh/show-branch-color (Sat Apr 25 13:46:14 2009 +0200) 2 commits
|
||||
+ bash completion: show-branch color support
|
||||
+ show-branch: color the commit status signs
|
||||
|
||||
* mh/diff-stat-color (Sat Apr 25 00:06:47 2009 +0200) 1 commit
|
||||
+ diff: do not color --stat output like patch context
|
||||
|
||||
* js/add-edit (Mon Apr 27 19:51:42 2009 +0200) 2 commits
|
||||
+ t3702: fix reliance on SHELL_PATH being '/bin/sh'
|
||||
+ git-add: introduce --edit (to edit the diff vs. the index)
|
||||
|
||||
* jk/maint-add-empty (Tue Apr 28 23:21:01 2009 -0400) 1 commit
|
||||
+ add: don't complain when adding empty project root
|
||||
|
||||
When you say "git add ." in an empty directory, you get "No path matches
|
||||
''", instead of "No path matches '.'", and this "fixes" it by hiding the
|
||||
error and making the command silently succeed. Strictly speaking it
|
||||
introduces inconsistency, but I think an empty directory is so
|
||||
uninteresting special case that not signalling it as an error is Ok.
|
||||
|
||||
* ar/unlink-err (Wed Apr 29 23:24:52 2009 +0200) 3 commits
|
||||
+ print unlink(2) errno in copy_or_link_directory
|
||||
+ replace direct calls to unlink(2) with unlink_or_warn
|
||||
+ Introduce an unlink(2) wrapper which gives warning if unlink
|
||||
failed
|
||||
|
||||
* ar/merge-one-file-diag (Wed Apr 29 23:40:50 2009 +0200) 1 commit
|
||||
+ Clarify kind of conflict in merge-one-file helper
|
||||
|
||||
* np/push-delta (Fri May 1 16:56:47 2009 -0400) 1 commit
|
||||
+ allow OFS_DELTA objects during a push
|
||||
|
||||
* mt/submodule-reference (Mon May 4 22:30:01 2009 +0300) 1 commit
|
||||
+ Add --reference option to git submodule.
|
||||
|
||||
* fl/git-pm (Thu May 7 15:41:28 2009 +0200) 2 commits
|
||||
+ Git.pm: Always set Repository to absolute path if autodetecting
|
||||
+ Git.pm: Set GIT_WORK_TREE if we set GIT_DIR
|
||||
|
||||
* rs/grep-parseopt (Thu May 7 21:46:48 2009 +0200) 5 commits
|
||||
+ grep: use parseopt
|
||||
+ grep: remove global variable builtin_grep
|
||||
+ parseopt: add PARSE_OPT_NODASH
|
||||
+ parseopt: add OPT_NUMBER_CALLBACK
|
||||
+ parseopt: add OPT_NEGBIT
|
||||
|
||||
* jk/no-no-no-empty-directory (Fri May 8 01:01:17 2009 -0400) 2 commits
|
||||
+ parseopt: add OPT_NEGBIT
|
||||
+ parseopt: add OPT_NEGBIT
|
||||
|
||||
I somehow botched the commit log message of the top one; it is about
|
||||
fixing "ls-files --no-empty-directory".
|
||||
|
||||
* jk/maint-1.6.0-trace-argv (Fri May 8 05:06:15 2009 -0400) 1 commit
|
||||
+ fix GIT_TRACE segfault with shell-quoted aliases
|
||||
|
||||
* hv/sample-update (Fri May 8 17:22:30 2009 +0200) 1 commit
|
||||
+ Extend sample update hook, disable modifying of existing tags
|
||||
|
||||
* rr/forbid-bs-in-ref (Fri May 8 07:32:37 2009 +0200) 1 commit
|
||||
+ Disallow '\' in ref names
|
||||
|
||||
This retroactively forbids use of what people could have been using
|
||||
happily, which, strictly speaking, is a no-no, but makes sense in the
|
||||
longer term.
|
||||
|
||||
* do/maint-merge-recursive-fix (Sat May 9 14:49:59 2009 -0700) 1 commit
|
||||
+ merge-recursive: never leave index unmerged while recursing
|
||||
|
||||
* jm/format-patch-no-auto-n-when-k-is-given (Sat May 9 10:12:01 2009 +0200) 1 commit
|
||||
+ format-patch let -k override a config-specified format.numbered
|
||||
|
||||
* lt/maint-diff-reduce-lstat (Sat May 9 15:11:17 2009 -0700) 2 commits
|
||||
+ Teach 'git checkout' to preload the index contents
|
||||
+ Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
|
||||
|
||||
* cc/bisect (Sat May 9 17:55:47 2009 +0200) 20 commits
|
||||
+ bisect: make "git bisect" use new "--next-all" bisect-helper
|
||||
function
|
||||
+ bisect: add "check_good_are_ancestors_of_bad" function
|
||||
+ bisect: implement the "check_merge_bases" function
|
||||
+ bisect: automatically sort sha1_array if needed when looking it up
|
||||
+ bisect: make skipped array functions more generic
|
||||
+ bisect: remove too much function nesting
|
||||
+ bisect: use new "struct argv_array" to prepare argv for
|
||||
"setup_revisions"
|
||||
+ bisect: store good revisions in a "sha1_array"
|
||||
+ bisect: implement "rev_argv_push" to fill an argv with revs
|
||||
+ bisect: use "sha1_array" to store skipped revisions
|
||||
+ am: simplify "sq" function by using "git rev-parse --sq-quote"
|
||||
+ bisect: use "git rev-parse --sq-quote" instead of a custom "sq"
|
||||
function
|
||||
+ rev-parse: add --sq-quote to shell quote arguments
|
||||
+ rev-list: remove stringed output flag from "show_bisect_vars"
|
||||
+ bisect--helper: remove "--next-vars" option as it is now useless
|
||||
+ bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"
|
||||
+ bisect--helper: add "--next-exit" to output bisect results
|
||||
+ bisect: move common bisect functionality to "bisect_common"
|
||||
+ rev-list: refactor printing bisect vars
|
||||
+ rev-list: make "estimate_bisect_steps" non static
|
||||
|
||||
Rewriting major part of "git-bisect" shell script continues. The patches
|
||||
seem to be reasonably clean.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one. I hate to do these minor
|
||||
fix-ups myself, but I may end up doing so...
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
|
||||
- Add option for using a foreign VCS
|
||||
- Document details of transport function APIs
|
||||
- Allow late reporting of fetched hashes
|
||||
|
||||
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
|
||||
- t/t9600: remove exit after test_done
|
||||
- cvsimport: extend testcase about patchset order to contain
|
||||
branches
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
- Add a test of "git cvsimport"'s handling of tags and branches
|
||||
- Add some tests of git-cvsimport's handling of vendor branches
|
||||
- Test contents of entire cvsimported "master" tree contents
|
||||
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
- Start a library for cvsimport-related tests
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* da/mergetool-lib (Sat May 2 01:57:21 2009 -0700) 1 commit
|
||||
- mergetool--lib: specialize diff options for emerge and ecmerge
|
||||
|
||||
Can somebody tell me what the current status of this is? I thought there
|
||||
was some objection, but I lost track...
|
||||
|
||||
* rc/http-push (Sat May 16 11:51:52 2009 +0800) 12 commits
|
||||
- http*: add fetch_http_pack_index
|
||||
- http: create function end_url_with_slash
|
||||
- http*: move common variables and macros to http.[ch]
|
||||
- http-push: do not SEGV after fetching a bad pack idx file
|
||||
- http*: copy string returned by sha1_to_hex
|
||||
- http-walker: verify remote packs
|
||||
- http-push, http-walker: style fixes
|
||||
- t5550-http-fetch: test fetching of packed objects
|
||||
- http-push: fix missing "#ifdef USE_CURL_MULTI" around
|
||||
"is_running_queue"
|
||||
- http-push: send out fetch requests on queue
|
||||
- t5540-http-push: test fetching of packed objects
|
||||
- t5540-http-push: test fetching of loose objects
|
||||
|
||||
There was an 11-patch updates but in the middle there were some
|
||||
compilation breakage issues; only early part of that series is queued.
|
||||
|
||||
* cc/replace (Tue Apr 14 00:36:59 2009 +0200) 13 commits
|
||||
- Documentation: add documentation for "git replace"
|
||||
- Add git-replace to .gitignore
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I suspect an attempt to replace an object that is directly listed on the
|
||||
command line would not work very well with this series.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Discarded]
|
||||
|
||||
* js/notes (Tue Apr 14 00:03:36 2009 +0200) 15 commits
|
||||
. Documentation: fix 'linkgit' macro in "git-notes.txt"
|
||||
. tests: fix "export var=val"
|
||||
. notes: refuse to edit notes outside refs/notes/
|
||||
. t3301: use test_must_fail instead of !
|
||||
. t3301: fix confusing quoting in test for valid notes ref
|
||||
. notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
|
||||
. notes: only clean up message file when editing
|
||||
. handle empty notes gracefully
|
||||
. git notes show: test empty notes
|
||||
. git-notes: fix printing of multi-line notes
|
||||
. notes: fix core.notesRef documentation
|
||||
. Add an expensive test for git-notes
|
||||
. Speed up git notes lookup
|
||||
. Add a script to edit/inspect notes
|
||||
. Introduce commit notes
|
||||
|
||||
This has been replaced by jh/notes series.
|
||||
|
||||
@@ -1,393 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (May 2009, #03; Mon, 25)
|
||||
X-master-at: 9619ff14159ab3401636b9883a715b0f20b051df
|
||||
X-next-at: 2435664148ab70c34750a9f1339d4ca898bd289e
|
||||
|
||||
What's cooking in git.git (May 2009, #03; Mon, 25)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* sb/opt-filename (Sat May 23 11:53:13 2009 -0700) 5 commits
|
||||
- parse-opts: add OPT_FILENAME and transition builtins
|
||||
- parse-opts: prepare for OPT_FILENAME
|
||||
- Merge branch 'jc/mktree' into sb/opt-filename
|
||||
- Merge branch 'sb/format-patch-parseopt' into sb/opt-filename
|
||||
- Merge branch 'sb/show-branch-parse-options' into sb/opt-filename
|
||||
- Merge branch 'master' into sb/opt-filename
|
||||
+ apply, fmt-merge-msg: use relative filenames
|
||||
+ commit: -F overrides -t
|
||||
|
||||
There are quite a few new callers to parse_options() in 'next' and 'pu'
|
||||
that are more likely to graduate before this series, so for now I merged a
|
||||
few of them and adjusted the commit "prepare for OPT_FILENAME". I tried
|
||||
to be careful but extra sets of eyeballs would be helpful.
|
||||
|
||||
* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit
|
||||
+ mergetool--lib: add support for araxis merge
|
||||
|
||||
I admit that I feel certain distaste in supporting a closed tool, but we
|
||||
already make things bearable for people on Windows; Araxis is no worse,
|
||||
right?
|
||||
|
||||
* rs/maint-grep-word-regexp-fix (Sat May 23 13:45:26 2009 +0200) 1 commit
|
||||
+ grep: fix word-regexp at the beginning of lines
|
||||
|
||||
* mm/apply-double-slash (Thu May 21 14:25:11 2009 +0200) 1 commit
|
||||
+ apply: handle filenames with double slashes better
|
||||
|
||||
* bc/old-iconv (Fri May 22 18:47:06 2009 -0500) 10 commits
|
||||
+ t8005: convert CP1251 character set to ISO8859-5
|
||||
+ t8005: use more portable character encoding names
|
||||
+ t5100: use ancient encoding syntax for backwards compatibility
|
||||
+ t9301: use ISO8859-1 rather than ISO-8859-1
|
||||
+ t3901: Use ISO8859-1 instead of ISO-8859-1 for backward
|
||||
compatibility
|
||||
+ t3901: avoid negation on right hand side of '|'
|
||||
+ builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as
|
||||
fallback encoding
|
||||
+ builtin-mailinfo.c: compare character encodings case insensitively
|
||||
+ Use 'UTF-8' rather than 'utf-8' everywhere for backward
|
||||
compatibility
|
||||
+ t3900: use ancient iconv names for backward compatibility
|
||||
|
||||
* sb/show-branch-parse-options (Thu May 21 00:33:18 2009 -0700) 3 commits
|
||||
+ show-branch: migrate to parse-options API
|
||||
+ Merge branch 'mh/show-branch-color' into sb/show-branch-parse-
|
||||
options
|
||||
+ parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated
|
||||
argh's
|
||||
|
||||
* sb/maint-1.6.2-opt-filename-fix (Sat May 23 11:53:11 2009 -0700) 2 commits
|
||||
+ apply, fmt-merge-msg: use relative filenames
|
||||
+ commit: -F overrides -t
|
||||
|
||||
* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits
|
||||
- Avoid "diff-index --cached" optimization under --find-copies-
|
||||
harder
|
||||
- Optimize "diff-index --cached" using cache-tree
|
||||
- t4007: modernize the style
|
||||
- cache-tree.c::cache_tree_find(): simplify inernal API
|
||||
- write-tree --ignore-cache-tree
|
||||
|
||||
* jc/solaris-0811 (Fri May 22 22:55:31 2009 -0700) 2 commits
|
||||
- OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
|
||||
- Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
|
||||
|
||||
* cb/maint-1.6.0-xdl-merge-fix (Mon May 25 01:21:14 2009 +0100) 2 commits
|
||||
- Change xdl_merge to generate output even for null merges
|
||||
- t6023: merge-file fails to output anything for a degenerate merge
|
||||
|
||||
* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
|
||||
- diff: Rename QUIET internal option to QUICK
|
||||
- diff: change semantics of "ignore whitespace" options
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* cc/bisect (Sat May 9 17:55:47 2009 +0200) 20 commits
|
||||
+ bisect: make "git bisect" use new "--next-all" bisect-helper
|
||||
function
|
||||
+ bisect: add "check_good_are_ancestors_of_bad" function
|
||||
+ bisect: implement the "check_merge_bases" function
|
||||
+ bisect: automatically sort sha1_array if needed when looking it up
|
||||
+ bisect: make skipped array functions more generic
|
||||
+ bisect: remove too much function nesting
|
||||
+ bisect: use new "struct argv_array" to prepare argv for
|
||||
"setup_revisions"
|
||||
+ bisect: store good revisions in a "sha1_array"
|
||||
+ bisect: implement "rev_argv_push" to fill an argv with revs
|
||||
+ bisect: use "sha1_array" to store skipped revisions
|
||||
+ am: simplify "sq" function by using "git rev-parse --sq-quote"
|
||||
+ bisect: use "git rev-parse --sq-quote" instead of a custom "sq"
|
||||
function
|
||||
+ rev-parse: add --sq-quote to shell quote arguments
|
||||
+ rev-list: remove stringed output flag from "show_bisect_vars"
|
||||
+ bisect--helper: remove "--next-vars" option as it is now useless
|
||||
+ bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"
|
||||
+ bisect--helper: add "--next-exit" to output bisect results
|
||||
+ bisect: move common bisect functionality to "bisect_common"
|
||||
+ rev-list: refactor printing bisect vars
|
||||
+ rev-list: make "estimate_bisect_steps" non static
|
||||
|
||||
Rewriting major part of "git-bisect" shell script continues. The patches
|
||||
seem to be reasonably clean.
|
||||
|
||||
* fc/decorate-tag (Thu May 14 00:32:53 2009 +0300) 2 commits
|
||||
+ Prettify log decorations even more
|
||||
+ Change prettify_ref to prettify_refname
|
||||
|
||||
* mg/track (Mon May 11 16:42:54 2009 +0200) 2 commits
|
||||
+ Fix behavior with non-commit upstream references
|
||||
+ Test tracking of non-commit upstreams
|
||||
|
||||
* jn/gitweb-cleanup (Mon May 11 19:45:11 2009 +0200) 8 commits
|
||||
+ gitweb: Remove unused $hash_base parameter from
|
||||
normalize_link_target
|
||||
+ gitweb: Simplify snapshot format detection logic in
|
||||
evaluate_path_info
|
||||
+ gitweb: Use capturing parentheses only when you intend to capture
|
||||
+ gitweb: Replace wrongly added tabs with spaces
|
||||
+ gitweb: Use block form of map/grep in a few cases more
|
||||
+ gitweb: Always use three argument form of open
|
||||
+ gitweb: Always use three argument form of open
|
||||
+ gitweb: Do not use bareword filehandles
|
||||
|
||||
* js/maint-no-ln-across-libexec-and-bin (Mon May 11 13:02:18 2009 +0200) 1 commit
|
||||
+ Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile
|
||||
|
||||
* tp/send-email-from-config (Tue May 12 15:48:56 2009 -0700) 1 commit
|
||||
+ send-email: Add config option for sender address
|
||||
|
||||
* ae/anon-fetch-info (Fri Apr 17 10:20:11 2009 +0200) 1 commit
|
||||
+ fetch: Strip usernames from url's before storing them
|
||||
|
||||
* ac/graph-horizontal-line (Tue Apr 21 08:47:01 2009 -0400) 1 commit
|
||||
+ graph API: Use horizontal lines for more compact graphs
|
||||
|
||||
* mh/show-branch-color (Sat Apr 25 13:46:14 2009 +0200) 2 commits
|
||||
+ bash completion: show-branch color support
|
||||
+ show-branch: color the commit status signs
|
||||
|
||||
* mh/diff-stat-color (Sat Apr 25 00:06:47 2009 +0200) 1 commit
|
||||
+ diff: do not color --stat output like patch context
|
||||
|
||||
* js/add-edit (Mon Apr 27 19:51:42 2009 +0200) 2 commits
|
||||
+ t3702: fix reliance on SHELL_PATH being '/bin/sh'
|
||||
+ git-add: introduce --edit (to edit the diff vs. the index)
|
||||
|
||||
* jk/maint-add-empty (Tue Apr 28 23:21:01 2009 -0400) 1 commit
|
||||
+ add: don't complain when adding empty project root
|
||||
|
||||
* ar/unlink-err (Wed Apr 29 23:24:52 2009 +0200) 3 commits
|
||||
+ print unlink(2) errno in copy_or_link_directory
|
||||
+ replace direct calls to unlink(2) with unlink_or_warn
|
||||
+ Introduce an unlink(2) wrapper which gives warning if unlink
|
||||
failed
|
||||
|
||||
* ar/merge-one-file-diag (Wed Apr 29 23:40:50 2009 +0200) 1 commit
|
||||
+ Clarify kind of conflict in merge-one-file helper
|
||||
|
||||
* np/push-delta (Fri May 1 16:56:47 2009 -0400) 1 commit
|
||||
+ allow OFS_DELTA objects during a push
|
||||
|
||||
* mt/submodule-reference (Mon May 4 22:30:01 2009 +0300) 1 commit
|
||||
+ Add --reference option to git submodule.
|
||||
|
||||
* fl/git-pm (Thu May 7 15:41:28 2009 +0200) 2 commits
|
||||
+ Git.pm: Always set Repository to absolute path if autodetecting
|
||||
+ Git.pm: Set GIT_WORK_TREE if we set GIT_DIR
|
||||
|
||||
* rs/grep-parseopt (Thu May 7 21:46:48 2009 +0200) 5 commits
|
||||
+ grep: use parseopt
|
||||
+ grep: remove global variable builtin_grep
|
||||
+ parseopt: add PARSE_OPT_NODASH
|
||||
+ parseopt: add OPT_NUMBER_CALLBACK
|
||||
+ parseopt: add OPT_NEGBIT
|
||||
|
||||
* jk/no-no-no-empty-directory (Fri May 8 01:01:17 2009 -0400) 2 commits
|
||||
+ parseopt: add OPT_NEGBIT
|
||||
+ parseopt: add OPT_NEGBIT
|
||||
|
||||
* jk/maint-1.6.0-trace-argv (Fri May 8 05:06:15 2009 -0400) 1 commit
|
||||
+ fix GIT_TRACE segfault with shell-quoted aliases
|
||||
|
||||
* hv/sample-update (Fri May 8 17:22:30 2009 +0200) 1 commit
|
||||
+ Extend sample update hook, disable modifying of existing tags
|
||||
|
||||
* rr/forbid-bs-in-ref (Fri May 8 07:32:37 2009 +0200) 1 commit
|
||||
+ Disallow '\' in ref names
|
||||
|
||||
* do/maint-merge-recursive-fix (Sat May 9 14:49:59 2009 -0700) 1 commit
|
||||
+ merge-recursive: never leave index unmerged while recursing
|
||||
|
||||
* jm/format-patch-no-auto-n-when-k-is-given (Sat May 9 10:12:01 2009 +0200) 1 commit
|
||||
+ format-patch let -k override a config-specified format.numbered
|
||||
|
||||
* lt/maint-diff-reduce-lstat (Sat May 9 15:11:17 2009 -0700) 2 commits
|
||||
+ Teach 'git checkout' to preload the index contents
|
||||
+ Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
|
||||
|
||||
* da/mergetool-lib (Sat May 2 01:57:21 2009 -0700) 1 commit
|
||||
+ mergetool--lib: specialize diff options for emerge and ecmerge
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits
|
||||
+ send-email: Remove superfluous `my $editor = ...'
|
||||
+ send-email: 'References:' should only reference what is sent
|
||||
+ send-email: Handle "GIT:" rather than "GIT: " during --compose
|
||||
+ Docs: send-email: --smtp-server-port can take symbolic ports
|
||||
+ Docs: send-email: Refer to CONFIGURATION section for
|
||||
sendemail.multiedit
|
||||
+ Docs: send-email: Put options back into alphabetical order
|
||||
|
||||
* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit
|
||||
+ git-submodule: add support for --rebase.
|
||||
|
||||
* cc/bisect (Sun May 17 17:36:46 2009 +0200) 3 commits
|
||||
+ bisect: check ancestors without forking a "git rev-list" process
|
||||
+ commit: add function to unparse a commit and its parents
|
||||
+ bisect: rework some rev related functions to make them more
|
||||
reusable
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits
|
||||
- Add initial support for pathname conversion to UTF-8
|
||||
- read_directory(): infrastructure for pathname character set
|
||||
conversion
|
||||
- Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
Before adding the real "conversion", this needs a few real fixups, I
|
||||
think. For example there is one hardcoded array that is used without
|
||||
bounds check.
|
||||
|
||||
* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
|
||||
- Fix for a merge where a branch has an F->D transition
|
||||
- Add a reminder test case for a merge with F/D transition
|
||||
|
||||
Although the reported breakage is covered with the patch, Alex feels the
|
||||
solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
|
||||
may be long overdue but seems to be a hard problem.
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one. I hate to do these minor
|
||||
fix-ups myself, but I may end up doing so...
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
|
||||
- Add option for using a foreign VCS
|
||||
- Document details of transport function APIs
|
||||
- Allow late reporting of fetched hashes
|
||||
|
||||
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
|
||||
- t/t9600: remove exit after test_done
|
||||
- cvsimport: extend testcase about patchset order to contain
|
||||
branches
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
- Add a test of "git cvsimport"'s handling of tags and branches
|
||||
- Add some tests of git-cvsimport's handling of vendor branches
|
||||
- Test contents of entire cvsimported "master" tree contents
|
||||
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
- Start a library for cvsimport-related tests
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* jc/mktree (Thu May 14 15:49:10 2009 -0700) 9 commits
|
||||
+ mktree: validate entry type in input
|
||||
+ mktree --batch: build more than one tree object
|
||||
+ mktree --missing: updated usage message and man page
|
||||
+ mktree --missing: allow missing objects
|
||||
+ t1010: add mktree test
|
||||
+ mktree: do not barf on a submodule commit
|
||||
+ builtin-mktree.c: use a helper function to handle one line of
|
||||
input
|
||||
+ mktree: use parse-options
|
||||
+ build-in git-mktree
|
||||
|
||||
* jc/maint-add-p-coalesce-fix (Sat May 16 10:48:23 2009 -0700) 2 commits
|
||||
+ Revert "git-add--interactive: remove hunk coalescing"
|
||||
+ Splitting a hunk that adds a line at the top fails in "add -p"
|
||||
|
||||
* sb/format-patch-parseopt (Sat May 16 02:24:46 2009 -0700) 1 commit
|
||||
+ format-patch: migrate to parse-options API
|
||||
|
||||
* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
* rc/http-push (Mon May 18 16:14:24 2009 +0800) 15 commits
|
||||
- http*: add helper methods for fetching objects (loose)
|
||||
- http*: add helper methods for fetching objects/info/packs
|
||||
- http*: add helper methods for fetching packs
|
||||
- http*: add fetch_http_pack_index
|
||||
- http: create function end_url_with_slash
|
||||
- http*: move common variables and macros to http.[ch]
|
||||
- http-push: do not SEGV after fetching a bad pack idx file
|
||||
- http*: copy string returned by sha1_to_hex
|
||||
- http-walker: verify remote packs
|
||||
- http-push, http-walker: style fixes
|
||||
- t5550-http-fetch: test fetching of packed objects
|
||||
- http-push: fix missing "#ifdef USE_CURL_MULTI" around
|
||||
"is_running_queue"
|
||||
- http-push: send out fetch requests on queue
|
||||
- t5540-http-push: test fetching of packed objects
|
||||
- t5540-http-push: test fetching of loose objects
|
||||
|
||||
This is not the re-rolled 18-patch series we discussed yesterday.
|
||||
|
||||
* cc/replace (Tue Apr 14 00:36:59 2009 +0200) 13 commits
|
||||
- Documentation: add documentation for "git replace"
|
||||
- Add git-replace to .gitignore
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
I suspect an attempt to replace an object that is directly listed on the
|
||||
command line would not work very well with this series.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
@@ -1,306 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (May 2009, #04; Sun, 31)
|
||||
X-master-at: f9275c68af58e0f65e1557b5109ccbfdbbbc384a
|
||||
X-next-at: 426b5a935392df623347be0aea16bca045d44b52
|
||||
|
||||
What's cooking in git.git (May 2009, #04; Sun, 31)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
All of these are soon to be in 'next'.
|
||||
|
||||
* bc/solaris (Wed May 27 21:17:08 2009 -0500) 4 commits
|
||||
- Makefile: introduce SANE_TOOL_PATH for prepending required
|
||||
elements to PATH
|
||||
- Makefile: add section for SunOS 5.7
|
||||
- Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile
|
||||
arguments
|
||||
- Makefile: use /usr/ucb/install on SunOS platforms rather than
|
||||
ginstall
|
||||
|
||||
* nw/maint-cvsexportcommit (Fri May 29 00:23:33 2009 +0100) 1 commit
|
||||
- git-cvsexportcommit can't commit files which have been removed
|
||||
from CVS
|
||||
|
||||
* tr/maint-doc-stash-pop (Thu May 28 11:40:15 2009 +0200) 1 commit
|
||||
- Documentation: teach stash/pop workflow instead of stash/apply
|
||||
|
||||
* da/pretty-tempname (Sun May 31 01:35:52 2009 -0700) 3 commits
|
||||
- diff: generate pretty filenames in prep_temp_blob()
|
||||
- compat: add a basename() compatibility function
|
||||
- compat: add a mkstemps() compatibility function
|
||||
|
||||
* ak/maint-for-each-ref-no-lookup (Wed May 27 15:23:12 2009 -0400) 1 commit
|
||||
- for-each-ref: Do not lookup objects when they will not be used
|
||||
|
||||
* cb/match_refs_internal_tail (Wed May 27 22:13:44 2009 +0200) 1 commit
|
||||
- match_refs: search ref list tail internally
|
||||
|
||||
I need to replace this with the new iteration...
|
||||
|
||||
* gb/am-foreign (Wed May 27 11:25:19 2009 +0200) 4 commits
|
||||
- git-am: refactor 'cleaning up and aborting'
|
||||
- git-am foreign patch support: StGIT support
|
||||
- git-am foreign patch support: autodetect some patch formats
|
||||
- git-am foreign patch support: introduce patch_format
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* sb/opt-filename (Sat May 23 11:53:13 2009 -0700) 2 commits
|
||||
+ parse-opts: add OPT_FILENAME and transition builtins
|
||||
+ parse-opts: prepare for OPT_FILENAME
|
||||
|
||||
* rs/maint-grep-word-regexp-fix (Sat May 23 13:45:26 2009 +0200) 1 commit
|
||||
+ grep: fix word-regexp at the beginning of lines
|
||||
|
||||
* mm/apply-double-slash (Thu May 21 14:25:11 2009 +0200) 1 commit
|
||||
+ apply: handle filenames with double slashes better
|
||||
|
||||
* bc/old-iconv (Fri May 22 18:47:06 2009 -0500) 10 commits
|
||||
+ t8005: convert CP1251 character set to ISO8859-5
|
||||
+ t8005: use more portable character encoding names
|
||||
+ t5100: use ancient encoding syntax for backwards compatibility
|
||||
+ t9301: use ISO8859-1 rather than ISO-8859-1
|
||||
+ t3901: Use ISO8859-1 instead of ISO-8859-1 for backward
|
||||
compatibility
|
||||
+ t3901: avoid negation on right hand side of '|'
|
||||
+ builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as
|
||||
fallback encoding
|
||||
+ builtin-mailinfo.c: compare character encodings case insensitively
|
||||
+ Use 'UTF-8' rather than 'utf-8' everywhere for backward
|
||||
compatibility
|
||||
+ t3900: use ancient iconv names for backward compatibility
|
||||
|
||||
* sb/show-branch-parse-options (Thu May 21 00:33:18 2009 -0700) 3 commits
|
||||
+ show-branch: migrate to parse-options API
|
||||
+ Merge branch 'mh/show-branch-color' into sb/show-branch-parse-
|
||||
options
|
||||
+ parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated
|
||||
argh's
|
||||
|
||||
* sb/maint-1.6.2-opt-filename-fix (Sat May 23 11:53:11 2009 -0700) 2 commits
|
||||
+ apply, fmt-merge-msg: use relative filenames
|
||||
+ commit: -F overrides -t
|
||||
|
||||
* jc/solaris-0811 (Fri May 22 22:55:31 2009 -0700) 2 commits
|
||||
- OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
|
||||
- Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
|
||||
|
||||
* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits
|
||||
+ send-email: Remove superfluous `my $editor = ...'
|
||||
+ send-email: 'References:' should only reference what is sent
|
||||
+ send-email: Handle "GIT:" rather than "GIT: " during --compose
|
||||
+ Docs: send-email: --smtp-server-port can take symbolic ports
|
||||
+ Docs: send-email: Refer to CONFIGURATION section for
|
||||
sendemail.multiedit
|
||||
+ Docs: send-email: Put options back into alphabetical order
|
||||
|
||||
* jc/mktree (Thu May 14 15:49:10 2009 -0700) 9 commits
|
||||
+ mktree: validate entry type in input
|
||||
+ mktree --batch: build more than one tree object
|
||||
+ mktree --missing: updated usage message and man page
|
||||
+ mktree --missing: allow missing objects
|
||||
+ t1010: add mktree test
|
||||
+ mktree: do not barf on a submodule commit
|
||||
+ builtin-mktree.c: use a helper function to handle one line of
|
||||
input
|
||||
+ mktree: use parse-options
|
||||
+ build-in git-mktree
|
||||
|
||||
* jc/maint-add-p-coalesce-fix (Sat May 16 10:48:23 2009 -0700) 2 commits
|
||||
+ Revert "git-add--interactive: remove hunk coalescing"
|
||||
+ Splitting a hunk that adds a line at the top fails in "add -p"
|
||||
|
||||
* sb/format-patch-parseopt (Sat May 16 02:24:46 2009 -0700) 1 commit
|
||||
+ format-patch: migrate to parse-options API
|
||||
|
||||
* cc/bisect (Sun May 17 17:36:46 2009 +0200) 3 commits (early part)
|
||||
+ bisect: check ancestors without forking a "git rev-list" process
|
||||
+ commit: add function to unparse a commit and its parents
|
||||
+ bisect: rework some rev related functions to make them more
|
||||
reusable
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
Dscho asked about the performance implications of this; I do not think I
|
||||
saw any progress on that yet...
|
||||
|
||||
* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit
|
||||
+ git-submodule: add support for --rebase.
|
||||
|
||||
There was a discussion on --rebase vs --merge and needs for unified
|
||||
configuration variable handling for this patch...
|
||||
|
||||
* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits
|
||||
- Add initial support for pathname conversion to UTF-8
|
||||
- read_directory(): infrastructure for pathname character set
|
||||
conversion
|
||||
- Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
Before adding the real "conversion", this needs a few real fixups, I
|
||||
think. For example there is one hardcoded array that is used without
|
||||
bounds check.
|
||||
|
||||
* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
|
||||
- Fix for a merge where a branch has an F->D transition
|
||||
- Add a reminder test case for a merge with F/D transition
|
||||
|
||||
Although the reported breakage is covered with the patch, Alex feels the
|
||||
solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
|
||||
may be long overdue but seems to be a hard problem.
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one. I hate to do these minor
|
||||
fix-ups myself, but I may end up doing so...
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
|
||||
- Add option for using a foreign VCS
|
||||
- Document details of transport function APIs
|
||||
- Allow late reporting of fetched hashes
|
||||
|
||||
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
|
||||
- t/t9600: remove exit after test_done
|
||||
- cvsimport: extend testcase about patchset order to contain
|
||||
branches
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
- Add a test of "git cvsimport"'s handling of tags and branches
|
||||
- Add some tests of git-cvsimport's handling of vendor branches
|
||||
- Test contents of entire cvsimported "master" tree contents
|
||||
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
- Start a library for cvsimport-related tests
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit
|
||||
+ mergetool--lib: add support for araxis merge
|
||||
|
||||
* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits
|
||||
+ Avoid "diff-index --cached" optimization under --find-copies-
|
||||
harder
|
||||
+ Optimize "diff-index --cached" using cache-tree
|
||||
+ t4007: modernize the style
|
||||
+ cache-tree.c::cache_tree_find(): simplify internal API
|
||||
+ write-tree --ignore-cache-tree
|
||||
|
||||
* cb/maint-1.6.0-xdl-merge-fix (Mon May 25 01:21:14 2009 +0100) 2 commits
|
||||
- Change xdl_merge to generate output even for null merges
|
||||
- t6023: merge-file fails to output anything for a degenerate merge
|
||||
|
||||
Soon in 'next';
|
||||
|
||||
* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
|
||||
- diff: Rename QUIET internal option to QUICK
|
||||
- diff: change semantics of "ignore whitespace" options
|
||||
|
||||
* cc/bisect (Thu May 28 23:21:16 2009 +0200) 2 commits
|
||||
- bisect: display first bad commit without forking a new process
|
||||
- bisect: drop unparse_commit() and use clear_commit_marks()
|
||||
|
||||
Soon in 'next';
|
||||
|
||||
* rc/http-push (Sat May 30 01:59:50 2009 +0800) 21 commits
|
||||
- http*: add helper methods for fetching objects (loose)
|
||||
- http*: add helper methods for fetching packs
|
||||
- http: use new http API in fetch_index()
|
||||
- http*: add http_get_info_packs
|
||||
- Use the new http API in fetch_symref()
|
||||
- Use the new http API in update_remote_info_refs()
|
||||
- Use the new http API in http_fetch_ref()
|
||||
- Use the new http API in get_refs_via_curl()
|
||||
- Two new functions for the http API
|
||||
- http: create function end_url_with_slash
|
||||
- http*: move common variables and macros to http.[ch]
|
||||
- Some cleanup in get_refs_via_curl()
|
||||
- Don't expect verify_pack() callers to set pack_size
|
||||
- http-push: do not SEGV after fetching a bad pack idx file
|
||||
- http*: copy string returned by sha1_to_hex
|
||||
- http-walker: verify remote packs
|
||||
- http-push, http-walker: style fixes
|
||||
- http-push: fix missing "#ifdef USE_CURL_MULTI" around
|
||||
"is_running_queue"
|
||||
- http-push: send out fetch requests on queue
|
||||
- t5540-http-push: test fetching of packed objects
|
||||
- t5540-http-push: test fetching of loose objects
|
||||
|
||||
Updated (but not yet with the "slot->local = NULL" patch)
|
||||
|
||||
* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
|
||||
- t6050: check pushing something based on a replaced commit
|
||||
- Documentation: add documentation for "git replace"
|
||||
- Add git-replace to .gitignore
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
Rebased to master.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
@@ -1,366 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Jun 2009, #01; Fri, 12)
|
||||
X-master-at: b8364903c3e4cde713102e4a36d3926b020b0f70
|
||||
X-next-at: f0de74fb063e75167a6c218a93cfeae5b8bdaaba
|
||||
|
||||
What's cooking in git.git (Jun 2009, #01; Fri, 12)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
Unfortunately I am unusually short of time these days, and some of the
|
||||
topics unfortunately got less "final review before deciding to merge up"
|
||||
than I would have liked to give them. This message itself has more
|
||||
"please comment/review" requests than usual.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* tr/die_errno (Mon Jun 8 23:02:20 2009 +0200) 4 commits
|
||||
- Use die_errno() instead of die() when checking syscalls
|
||||
- Convert existing die(..., strerror(errno)) to die_errno()
|
||||
- die_errno(): double % in strerror() output just in case
|
||||
- Introduce die_errno() that appends strerror(errno) to die()
|
||||
|
||||
I didn't check the individual conversion from die() to die_errno()
|
||||
in this latest round; comments?
|
||||
|
||||
* cb/maint-no-double-merge (Mon Jun 1 11:20:56 2009 +0200) 1 commit
|
||||
+ refuse to merge during a merge
|
||||
|
||||
Will merge to 'master' soonish.
|
||||
|
||||
* sp/msysgit (Thu Jun 11 22:56:12 2009 +0200) 13 commits
|
||||
+ compat/ has subdirectories: do not omit them in 'make clean'
|
||||
+ Fix typo in nedmalloc warning fix
|
||||
+ MinGW: Teach Makefile to detect msysgit and apply specific
|
||||
settings
|
||||
+ Fix warnings in nedmalloc when compiling with GCC 4.4.0
|
||||
+ Add custom memory allocator to MinGW and MacOS builds
|
||||
+ MinGW readdir reimplementation to support d_type
|
||||
+ connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
|
||||
+ git: browsing paths with spaces when using the start command
|
||||
+ MinGW: fix warning about implicit declaration of _getch()
|
||||
+ test-chmtime: work around Windows limitation
|
||||
+ Work around a regression in Windows 7, causing erase_in_line() to
|
||||
crash sometimes
|
||||
+ Quiet make: do not leave Windows behind
|
||||
+ MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
|
||||
|
||||
A silly typo I failed to spot was fixed by J6t; should be ready for
|
||||
'master' now.
|
||||
|
||||
* mh/master-send-email (Sun Jun 7 23:40:52 2009 +0200) 8 commits
|
||||
- send-email: fix a typo in a comment
|
||||
- Merge branch 'mh/maint-send-email' into mh/master-send-email
|
||||
- Merge branch 'mh/master-send-email-threaded-fix' into mh/master-
|
||||
send-email
|
||||
- add a test for git-send-email for threaded mails without chain-
|
||||
reply-to
|
||||
- send-email: fix threaded mails without chain-reply-to
|
||||
- doc/send-email: clarify the behavior of --in-reply-to with --no-
|
||||
thread
|
||||
- send-email: fix non-threaded mails
|
||||
- add a test for git-send-email for non-threaded mails
|
||||
|
||||
The author seems to have a better organization than the way I queued this
|
||||
topic, so I am holding off merging it to 'next' yet. My goal was to have
|
||||
two topics, one eventually mergeable to 'maint', the other to 'master'.
|
||||
|
||||
* mn/maint-iconv-autoconf (Mon Jun 8 20:46:38 2009 -0700) 1 commit
|
||||
- fix handling of iconv configuration options
|
||||
|
||||
Will merge to 'next' soon.
|
||||
|
||||
* rc/maint-http-local-slot-fix (Sat Jun 6 16:43:26 2009 +0800) 1 commit
|
||||
+ http*: cleanup slot->local after fclose
|
||||
|
||||
* sb/parse-options-integer (Thu Jun 4 16:43:57 2009 -0700) 2 commits
|
||||
+ parse-options: simplify usage argh handling
|
||||
+ parse-options: make OPT_INTEGER's argh explicit
|
||||
|
||||
* sb/pull-rebase (Fri Jun 12 00:39:21 2009 +0200) 3 commits
|
||||
- parse-remote: remove unused functions
|
||||
- parse-remote: support default reflist in get_remote_merge_branch
|
||||
- parse-remote: function to get the tracking branch to be merge
|
||||
|
||||
Will merge to 'next' soon, but it would be nice if we can fix the
|
||||
"currently works only for the default mapping" before it goes to
|
||||
'master'.
|
||||
|
||||
* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit
|
||||
- Shift object enumeration out of upload-pack
|
||||
|
||||
* ml/http (Wed May 27 23:16:03 2009 -0400) 2 commits
|
||||
- http.c: add http.sslCertNoPass option
|
||||
- http.c: prompt for SSL client certificate password
|
||||
|
||||
I think "sslCertNoPass" is a mistake. We should aim for the ideal (i.e.
|
||||
detect when we do not need passphrase), and live with a configuration
|
||||
kludge until the code achives the ideal (i.e. "needPass" to trigger the
|
||||
new codepath to ask for passphrase), _if_ that ideal is achievable. And
|
||||
in this particular case, I think the ideal is not rocket science.
|
||||
|
||||
* mg/pushurl (Tue Jun 9 18:01:38 2009 +0200) 5 commits
|
||||
- builtin-remote: Make "remote -v" display push urls
|
||||
- builtin-remote: Show push urls as well
|
||||
- technical/api-remote: Describe new struct remote member pushurl
|
||||
- t5516: Check pushurl config setting
|
||||
- Allow push and fetch urls to be different
|
||||
|
||||
Will merge to 'next' soon.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* tr/maint-doc-stash-pop (Thu May 28 11:40:15 2009 +0200) 1 commit
|
||||
+ Documentation: teach stash/pop workflow instead of stash/apply
|
||||
|
||||
* da/pretty-tempname (Sun May 31 01:35:52 2009 -0700) 3 commits
|
||||
+ diff: generate pretty filenames in prep_temp_blob()
|
||||
+ compat: add a basename() compatibility function
|
||||
+ compat: add a mkstemps() compatibility function
|
||||
|
||||
* cb/maint-1.6.0-xdl-merge-fix (Mon May 25 01:21:14 2009 +0100) 2 commits
|
||||
+ Change xdl_merge to generate output even for null merges
|
||||
+ t6023: merge-file fails to output anything for a degenerate merge
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* bc/solaris (Sun Jun 7 07:40:29 2009 +0200) 10 commits
|
||||
- configure: test whether -lresolv is needed
|
||||
+ Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/bin
|
||||
+ git-compat-util.h: avoid using c99 flex array feature with Sun
|
||||
compiler 5.8
|
||||
+ Makefile: add section for SunOS 5.7
|
||||
+ Makefile: introduce SANE_TOOL_PATH for prepending required
|
||||
elements to PATH
|
||||
+ Makefile: define __sun__ on SunOS
|
||||
+ git-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris
|
||||
+ On Solaris choose the OLD_ICONV iconv() declaration based on the
|
||||
UNIX spec
|
||||
+ Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile
|
||||
arguments
|
||||
+ Makefile: use /usr/ucb/install on SunOS platforms rather than
|
||||
ginstall
|
||||
|
||||
We saw some success report with Sun's c99 compiler, which would allow us
|
||||
to include the last remaining patch from Brandon with updates. I lost
|
||||
track of the status of the tip patch for autoconf. Is it ready to go?
|
||||
Comments from Solaris folks are appreciated.
|
||||
|
||||
* cb/match_refs_internal_tail (Sun May 31 16:26:48 2009 +0200) 1 commit
|
||||
+ match_refs: search ref list tail internally
|
||||
|
||||
* nw/maint-cvsexportcommit (Fri May 29 00:23:33 2009 +0100) 1 commit
|
||||
+ git-cvsexportcommit can't commit files which have been removed
|
||||
from CVS
|
||||
|
||||
* ak/maint-for-each-ref-no-lookup (Wed May 27 15:23:12 2009 -0400) 1 commit
|
||||
+ for-each-ref: Do not lookup objects when they will not be used
|
||||
|
||||
I think this makes sense, except that I have this nagging feeling that its
|
||||
use of for_each_rawref() where the original used for_each_ref() may have
|
||||
some unintended side effects in corner cases.
|
||||
|
||||
* ph/submodule-rebase (Wed Jun 3 00:59:12 2009 +0200) 3 commits
|
||||
- git-submodule: add support for --merge.
|
||||
+ Rename submodule.<name>.rebase to submodule.<name>.update
|
||||
+ git-submodule: add support for --rebase.
|
||||
|
||||
I think people do not have issues with the first two, even though some
|
||||
might still argue that "update --merge" is not a good mode of
|
||||
operation.
|
||||
|
||||
* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit
|
||||
+ mergetool--lib: add support for araxis merge
|
||||
|
||||
* cc/bisect (Sat Jun 6 06:41:35 2009 +0200) 5 commits
|
||||
+ t6030: test skipping away from an already skipped commit
|
||||
+ bisect: when skipping, choose a commit away from a skipped commit
|
||||
+ bisect: add parameters to "filter_skipped"
|
||||
+ bisect: display first bad commit without forking a new process
|
||||
+ bisect: drop unparse_commit() and use clear_commit_marks()
|
||||
|
||||
Regardless of metrics, this is an improvement from the current one. Will
|
||||
merge to 'master', and let the finer details taken care of later.
|
||||
|
||||
* rc/http-push (Sat Jun 6 16:44:02 2009 +0800) 24 commits
|
||||
+ http*: add helper methods for fetching objects (loose)
|
||||
+ http*: add helper methods for fetching packs
|
||||
+ http: use new http API in fetch_index()
|
||||
+ http*: add http_get_info_packs
|
||||
+ http-push.c::fetch_symref(): use the new http API
|
||||
+ http-push.c::remote_exists(): use the new http API
|
||||
+ http.c::http_fetch_ref(): use the new http API
|
||||
+ transport.c::get_refs_via_curl(): use the new http API
|
||||
+ http.c: new functions for the http API
|
||||
+ http: create function end_url_with_slash
|
||||
+ http*: move common variables and macros to http.[ch]
|
||||
+ transport.c::get_refs_via_curl(): do not leak refs_url
|
||||
+ Don't expect verify_pack() callers to set pack_size
|
||||
+ http-push: do not SEGV after fetching a bad pack idx file
|
||||
+ http*: copy string returned by sha1_to_hex
|
||||
+ http-walker: verify remote packs
|
||||
+ http-push, http-walker: style fixes
|
||||
+ t5550-http-fetch: test fetching of packed objects
|
||||
+ http-push: fix missing "#ifdef USE_CURL_MULTI" around
|
||||
"is_running_queue"
|
||||
+ http-push: send out fetch requests on queue
|
||||
+ t5540-http-push: test fetching of packed objects
|
||||
+ t5540-http-push: test fetching of loose objects
|
||||
+ Merge branch 'rc/maint-http-local-slot-fix' into rc/http-push
|
||||
+ http*: cleanup slot->local after fclose
|
||||
|
||||
I do not use http-push myself, and as I said, I have shortage of git time
|
||||
in recent weeks, so these are not as carefully reviewed as usual; but
|
||||
RCTay is proving to be a very reliable HTTP guy I can trust, so unless
|
||||
there are regression reports from people who actually use http-push, this
|
||||
will be in 'master' soon.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
Dscho asked about the performance implications of this; I do not think I
|
||||
saw any progress on that yet...
|
||||
|
||||
* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits
|
||||
- Add initial support for pathname conversion to UTF-8
|
||||
- read_directory(): infrastructure for pathname character set
|
||||
conversion
|
||||
- Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
Before adding the real "conversion", this needs a few real fixups, I
|
||||
think. For example there is one hardcoded array that is used without
|
||||
bounds check.
|
||||
|
||||
* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
|
||||
- Fix for a merge where a branch has an F->D transition
|
||||
- Add a reminder test case for a merge with F/D transition
|
||||
|
||||
Although the reported breakage is covered with the patch, Alex feels the
|
||||
solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
|
||||
may be long overdue but seems to be a hard problem.
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one.
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
|
||||
- Add option for using a foreign VCS
|
||||
- Document details of transport function APIs
|
||||
- Allow late reporting of fetched hashes
|
||||
|
||||
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
|
||||
- t/t9600: remove exit after test_done
|
||||
- cvsimport: extend testcase about patchset order to contain
|
||||
branches
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
- Add a test of "git cvsimport"'s handling of tags and branches
|
||||
- Add some tests of git-cvsimport's handling of vendor branches
|
||||
- Test contents of entire cvsimported "master" tree contents
|
||||
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
- Start a library for cvsimport-related tests
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* gb/am-foreign (Wed May 27 11:25:19 2009 +0200) 4 commits
|
||||
- git-am: refactor 'cleaning up and aborting'
|
||||
- git-am foreign patch support: StGIT support
|
||||
- git-am foreign patch support: autodetect some patch formats
|
||||
- git-am foreign patch support: introduce patch_format
|
||||
|
||||
Should re-review and merge to 'next' but I am short of time these days.
|
||||
|
||||
* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits
|
||||
+ Avoid "diff-index --cached" optimization under --find-copies-
|
||||
harder
|
||||
+ Optimize "diff-index --cached" using cache-tree
|
||||
+ t4007: modernize the style
|
||||
+ cache-tree.c::cache_tree_find(): simplify internal API
|
||||
+ write-tree --ignore-cache-tree
|
||||
|
||||
I believe the code is right, but this touches a very low-level code with
|
||||
high chance of subtle breakages unless you are really careful. I'll let
|
||||
it simmer a bit longer in 'next'.
|
||||
|
||||
* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
|
||||
- diff: Rename QUIET internal option to QUICK
|
||||
- diff: change semantics of "ignore whitespace" options
|
||||
|
||||
I am not sure if it should wait for a major version bump but this is a
|
||||
good semantics change. Perhaps merge to 'next' soonish, but I am
|
||||
undecided. Comments?
|
||||
|
||||
* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
|
||||
- t6050: check pushing something based on a replaced commit
|
||||
- Documentation: add documentation for "git replace"
|
||||
- Add git-replace to .gitignore
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
@@ -1,380 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Jun 2009, #02; Thu, 18)
|
||||
X-master-at: da4e4a65a27ca912c3f48289acf9ff7a67476c3f
|
||||
X-next-at: 04d09b6708a8fa33788706f00bbf43c80ea6af0e
|
||||
|
||||
What's cooking in git.git (Jun 2009, #02; Thu, 18)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
Unfortunately I am unusually short of time these days, and some of the
|
||||
topics unfortunately got less "final review before deciding to merge up"
|
||||
than I would have liked to give them. This message itself has more
|
||||
"please comment/review" requests than usual.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* ne/maint-1.6.0-diff-tree-t-r-show-directory (Sat Jun 13 17:06:09 2009 -0700) 1 commit
|
||||
- diff-tree -r -t: include added/removed directories in the output
|
||||
|
||||
* sb/maint-1.6.0-add-config-fix (Thu Jun 18 02:17:54 2009 -0700) 2 commits
|
||||
- add: allow configurations to be overriden by command line
|
||||
- use xstrdup, not strdup in ll-merge.c
|
||||
|
||||
* pb/maint-1.6.2-userdiff-fix (Wed Jun 17 12:11:10 2009 +0200) 2 commits
|
||||
- upload-archive: fix infinite loop on Cygwin
|
||||
- avoid exponential regex match for java and objc function names
|
||||
|
||||
* fc/user-manual (Fri May 1 11:44:20 2009 +0300) 2 commits
|
||||
. user-manual: use 'fast-forward' instead of 'fast forward'
|
||||
. user-manual: general quoting improvements
|
||||
|
||||
* uk/rev-parse-parse-opt (Sun Jun 14 01:58:43 2009 +0200) 2 commits
|
||||
- parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-
|
||||
parse
|
||||
- more tests for git rev-parse --parse-opt
|
||||
|
||||
* js/daemon-log (Tue Jun 16 20:41:16 2009 +0200) 2 commits
|
||||
- upload-pack: squelch progress indicator if client cannot see it
|
||||
- daemon: send stderr of service programs to the syslog
|
||||
|
||||
* sb/quiet-porcelains (Wed Jun 17 18:07:37 2009 -0700) 6 commits
|
||||
- stash: teach quiet option
|
||||
- am, rebase: teach quiet option
|
||||
- submodule, repack: migrate to git-sh-setup's say()
|
||||
- git-sh-setup: introduce say() for quiet options
|
||||
- am: suppress apply errors when using 3-way
|
||||
- t4150: test applying with a newline in subject
|
||||
|
||||
* lt/maint-unsigned-left-shift (Wed Jun 17 17:22:27 2009 -0700) 1 commit
|
||||
- Fix big left-shifts of unsigned char
|
||||
|
||||
* jk/use-our-regexp (Tue Jun 16 15:08:21 2009 -0400) 2 commits
|
||||
- Makefile: use compat regex on Solaris
|
||||
- Makefile: refactor regex compat support
|
||||
|
||||
* cb/maint-fetch-refspec-wo-dst (Wed Jun 17 15:38:36 2009 +0200) 1 commit
|
||||
- fetch: do not create ref from empty name
|
||||
|
||||
* pb/send-email-cccmd-fix (Thu Jun 18 14:31:32 2009 +0200) 1 commit
|
||||
- Test cccmd in t9001-send-email.sh and fix some bugs
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* cb/maint-no-double-merge (Mon Jun 1 11:20:56 2009 +0200) 1 commit
|
||||
+ refuse to merge during a merge
|
||||
|
||||
* sp/msysgit (Thu Jun 11 22:56:12 2009 +0200) 13 commits
|
||||
+ compat/ has subdirectories: do not omit them in 'make clean'
|
||||
+ Fix typo in nedmalloc warning fix
|
||||
+ MinGW: Teach Makefile to detect msysgit and apply specific
|
||||
settings
|
||||
+ Fix warnings in nedmalloc when compiling with GCC 4.4.0
|
||||
+ Add custom memory allocator to MinGW and MacOS builds
|
||||
+ MinGW readdir reimplementation to support d_type
|
||||
+ connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
|
||||
+ git: browsing paths with spaces when using the start command
|
||||
+ MinGW: fix warning about implicit declaration of _getch()
|
||||
+ test-chmtime: work around Windows limitation
|
||||
+ Work around a regression in Windows 7, causing erase_in_line() to
|
||||
crash sometimes
|
||||
+ Quiet make: do not leave Windows behind
|
||||
+ MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
|
||||
|
||||
* mh/fix-send-email-threaded (Fri Jun 12 09:23:43 2009 -0700) 7 commits
|
||||
+ Merge branch 'mh/maint-fix-send-email-threaded' into
|
||||
mh/fix-send-email-threaded
|
||||
+ send-email: fix a typo in a comment
|
||||
+ send-email: fix threaded mails without chain-reply-to
|
||||
+ add a test for git-send-email for threaded mails without chain-reply-to
|
||||
+ doc/send-email: clarify the behavior of --in-reply-to with
|
||||
--no-thread
|
||||
+ send-email: fix non-threaded mails
|
||||
+ add a test for git-send-email for non-threaded mails
|
||||
|
||||
* rc/maint-http-local-slot-fix (Sat Jun 6 16:43:26 2009 +0800) 1 commit
|
||||
+ http*: cleanup slot->local after fclose
|
||||
|
||||
* sb/parse-options-integer (Thu Jun 4 16:43:57 2009 -0700) 2 commits
|
||||
+ parse-options: simplify usage argh handling
|
||||
+ parse-options: make OPT_INTEGER's argh explicit
|
||||
|
||||
* bc/solaris (Sun Jun 7 07:40:29 2009 +0200) 10 commits
|
||||
+ configure: test whether -lresolv is needed
|
||||
+ Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/bin
|
||||
+ git-compat-util.h: avoid using c99 flex array feature with Sun
|
||||
compiler 5.8
|
||||
+ Makefile: add section for SunOS 5.7
|
||||
+ Makefile: introduce SANE_TOOL_PATH for prepending required
|
||||
elements to PATH
|
||||
+ Makefile: define __sun__ on SunOS
|
||||
+ git-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris
|
||||
+ On Solaris choose the OLD_ICONV iconv() declaration based on the
|
||||
UNIX spec
|
||||
+ Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile
|
||||
arguments
|
||||
+ Makefile: use /usr/ucb/install on SunOS platforms rather than
|
||||
ginstall
|
||||
|
||||
* cb/match_refs_internal_tail (Sun May 31 16:26:48 2009 +0200) 1 commit
|
||||
+ match_refs: search ref list tail internally
|
||||
|
||||
* nw/maint-cvsexportcommit (Fri May 29 00:23:33 2009 +0100) 1 commit
|
||||
+ git-cvsexportcommit can't commit files which have been removed
|
||||
from CVS
|
||||
|
||||
* ak/maint-for-each-ref-no-lookup (Wed May 27 15:23:12 2009 -0400) 1 commit
|
||||
+ for-each-ref: Do not lookup objects when they will not be used
|
||||
|
||||
I think this makes sense, except that I have this nagging feeling that its
|
||||
use of for_each_rawref() where the original used for_each_ref() may have
|
||||
some unintended side effects in corner cases.
|
||||
|
||||
* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit
|
||||
+ mergetool--lib: add support for araxis merge
|
||||
|
||||
* rc/http-push (Sat Jun 6 16:44:02 2009 +0800) 24 commits
|
||||
+ http*: add helper methods for fetching objects (loose)
|
||||
+ http*: add helper methods for fetching packs
|
||||
+ http: use new http API in fetch_index()
|
||||
+ http*: add http_get_info_packs
|
||||
+ http-push.c::fetch_symref(): use the new http API
|
||||
+ http-push.c::remote_exists(): use the new http API
|
||||
+ http.c::http_fetch_ref(): use the new http API
|
||||
+ transport.c::get_refs_via_curl(): use the new http API
|
||||
+ http.c: new functions for the http API
|
||||
+ http: create function end_url_with_slash
|
||||
+ http*: move common variables and macros to http.[ch]
|
||||
+ transport.c::get_refs_via_curl(): do not leak refs_url
|
||||
+ Don't expect verify_pack() callers to set pack_size
|
||||
+ http-push: do not SEGV after fetching a bad pack idx file
|
||||
+ http*: copy string returned by sha1_to_hex
|
||||
+ http-walker: verify remote packs
|
||||
+ http-push, http-walker: style fixes
|
||||
+ t5550-http-fetch: test fetching of packed objects
|
||||
+ http-push: fix missing "#ifdef USE_CURL_MULTI" around
|
||||
"is_running_queue"
|
||||
+ http-push: send out fetch requests on queue
|
||||
+ t5540-http-push: test fetching of packed objects
|
||||
+ t5540-http-push: test fetching of loose objects
|
||||
+ Merge branch 'rc/maint-http-local-slot-fix' into rc/http-push
|
||||
+ http*: cleanup slot->local after fclose
|
||||
|
||||
* cc/bisect (Sat Jun 6 06:41:35 2009 +0200) 5 commits
|
||||
+ t6030: test skipping away from an already skipped commit
|
||||
+ bisect: when skipping, choose a commit away from a skipped commit
|
||||
+ bisect: add parameters to "filter_skipped"
|
||||
+ bisect: display first bad commit without forking a new process
|
||||
+ bisect: drop unparse_commit() and use clear_commit_marks()
|
||||
|
||||
Regardless of metrics, this is an improvement from the current one. Will
|
||||
merge to 'master', and let the finer details taken care of later, which
|
||||
is already happening.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* ph/submodule-rebase (Wed Jun 3 00:59:12 2009 +0200) 1 commit
|
||||
+ git-submodule: add support for --merge.
|
||||
|
||||
Even though some might still argue that "update --merge" is not a good
|
||||
mode of operation.
|
||||
|
||||
* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits
|
||||
+ Avoid "diff-index --cached" optimization under --find-copies-
|
||||
harder
|
||||
+ Optimize "diff-index --cached" using cache-tree
|
||||
+ t4007: modernize the style
|
||||
+ cache-tree.c::cache_tree_find(): simplify internal API
|
||||
+ write-tree --ignore-cache-tree
|
||||
|
||||
* mn/maint-iconv-autoconf (Mon Jun 8 20:46:38 2009 -0700) 1 commit
|
||||
+ fix handling of iconv configuration options
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
Dscho asked about the performance implications of this; I do not think I
|
||||
saw any progress on that yet...
|
||||
|
||||
* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits
|
||||
- Add initial support for pathname conversion to UTF-8
|
||||
- read_directory(): infrastructure for pathname character set
|
||||
conversion
|
||||
- Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
Before adding the real "conversion", this needs a few real fixups, I
|
||||
think. For example there is one hardcoded array that is used without
|
||||
bounds check.
|
||||
|
||||
* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
|
||||
- Fix for a merge where a branch has an F->D transition
|
||||
- Add a reminder test case for a merge with F/D transition
|
||||
|
||||
Although the reported breakage is covered with the patch, Alex feels the
|
||||
solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
|
||||
may be long overdue but seems to be a hard problem.
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one.
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
|
||||
- Add option for using a foreign VCS
|
||||
- Document details of transport function APIs
|
||||
- Allow late reporting of fetched hashes
|
||||
|
||||
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
|
||||
- t/t9600: remove exit after test_done
|
||||
- cvsimport: extend testcase about patchset order to contain
|
||||
branches
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
- Add a test of "git cvsimport"'s handling of tags and branches
|
||||
- Add some tests of git-cvsimport's handling of vendor branches
|
||||
- Test contents of entire cvsimported "master" tree contents
|
||||
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
- Start a library for cvsimport-related tests
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* tr/die_errno (Fri Jun 12 09:00:59 2009 -0700) 5 commits
|
||||
- DONTMERGE fix double per-cent
|
||||
- Use die_errno() instead of die() when checking syscalls
|
||||
- Convert existing die(..., strerror(errno)) to die_errno()
|
||||
- die_errno(): double % in strerror() output just in case
|
||||
- Introduce die_errno() that appends strerror(errno) to die()
|
||||
|
||||
I didn't check the individual conversion from die() to die_errno()
|
||||
in this latest round; comments?
|
||||
|
||||
Thomas found issues in my "double per-cent hack", so this cannot be merged
|
||||
to yet until either it is fixed up, or drop the "double per-cent" attempt
|
||||
altogether.
|
||||
|
||||
* sb/pull-rebase (Fri Jun 12 00:39:21 2009 +0200) 3 commits
|
||||
+ parse-remote: remove unused functions
|
||||
+ parse-remote: support default reflist in get_remote_merge_branch
|
||||
+ parse-remote: function to get the tracking branch to be merge
|
||||
|
||||
It would be nice if we can fix the "currently works only for the default
|
||||
mapping" before it goes to 'master'. I looked at, but haven't queued any
|
||||
of the recent RFC updates here.
|
||||
|
||||
* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit
|
||||
- Shift object enumeration out of upload-pack
|
||||
|
||||
* ml/http (Wed May 27 23:16:03 2009 -0400) 2 commits
|
||||
- http.c: add http.sslCertPasswordProtected option
|
||||
- http.c: prompt for SSL client certificate password
|
||||
|
||||
I've rewritten these two to (1) move the #ifdef out of the main codepath,
|
||||
and (2) use configuration/environment to make the misfeature of always
|
||||
asking for a passphrase even a key/cert is unencrypted optional. I tried
|
||||
to be careful but extra sets of eyeballs would be nice to check the result.
|
||||
|
||||
* mg/pushurl (Sun Jun 14 21:46:10 2009 +0200) 6 commits
|
||||
+ avoid NULL dereference on failed malloc
|
||||
+ builtin-remote: Make "remote -v" display push urls
|
||||
+ builtin-remote: Show push urls as well
|
||||
+ technical/api-remote: Describe new struct remote member pushurl
|
||||
+ t5516: Check pushurl config setting
|
||||
+ Allow push and fetch urls to be different
|
||||
|
||||
* cc/bisect (Sat Jun 13 13:11:02 2009 +0200) 2 commits
|
||||
- Documentation: remove warning saying that "git bisect skip" may
|
||||
slow bisection
|
||||
- bisect: use a PRNG with a bias when skipping away from untestable
|
||||
commits
|
||||
|
||||
Will be in 'next' shortly.
|
||||
|
||||
* gb/am-foreign (Wed May 27 11:25:19 2009 +0200) 4 commits
|
||||
- git-am: refactor 'cleaning up and aborting'
|
||||
- git-am foreign patch support: StGIT support
|
||||
- git-am foreign patch support: autodetect some patch formats
|
||||
- git-am foreign patch support: introduce patch_format
|
||||
|
||||
Will be in 'next' shortly.
|
||||
|
||||
* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
|
||||
- diff: Rename QUIET internal option to QUICK
|
||||
- diff: change semantics of "ignore whitespace" options
|
||||
|
||||
I am not sure if it should wait for a major version bump but this is a
|
||||
good semantics change. Perhaps merge to 'next' soonish, but I am
|
||||
undecided. Comments?
|
||||
|
||||
* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
|
||||
- t6050: check pushing something based on a replaced commit
|
||||
- Documentation: add documentation for "git replace"
|
||||
- Add git-replace to .gitignore
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
@@ -1,281 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Jun 2009, #03; Sat, 27)
|
||||
X-master-at: 4f2b15ce88b70dd9e269517a9903864393ca873b
|
||||
X-next-at: 98a794b5be3b0696055098d997dc22a127e8cd3d
|
||||
|
||||
What's cooking in git.git (Jun 2009, #03; Sat, 27)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* gb/gitweb-avatar (Tue Jun 23 00:49:59 2009 +0200) 2 commits
|
||||
- gitweb: gravatar support
|
||||
- gitweb: refactor author name insertion
|
||||
|
||||
This was from way earlier round and will be replaced.
|
||||
|
||||
* ld/push-porcelain-out (Mon Jun 22 21:10:01 2009 -0400) 1 commit
|
||||
- add --porcelain option to git-push
|
||||
|
||||
* cf/maint-remote-uploadpack-useconfig-fix (Thu Jun 25 17:21:35 2009 -0400) 1 commit
|
||||
+ git-remote: fix missing .uploadpack usage for show command
|
||||
|
||||
* en/fast-export (Thu Jun 25 22:48:33 2009 -0600) 7 commits
|
||||
- fast-export: Document the fact that git-rev-list arguments are
|
||||
accepted
|
||||
- Add new fast-export testcases
|
||||
- fast-export: Add a --tag-of-filtered-object option for newly
|
||||
dangling tags
|
||||
- fast-export: Do parent rewriting to avoid dropping relevant
|
||||
commits
|
||||
- fast-export: Make sure we show actual ref names instead of
|
||||
"(null)"
|
||||
- fast-export: Omit tags that tag trees
|
||||
- fast-export: Set revs.topo_order before calling setup_revisions
|
||||
|
||||
* sb/read-tree (Thu Jun 25 22:14:10 2009 -0700) 2 commits
|
||||
- read-tree: migrate to parse-options
|
||||
- read-tree: convert unhelpful usage()'s to helpful die()'s
|
||||
|
||||
* sb/show-ref-parse-options (Sat Jun 20 21:40:46 2009 -0700) 1 commit
|
||||
+ show-ref: migrate to parse-options
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* sb/maint-1.6.0-add-config-fix (Thu Jun 18 02:17:54 2009 -0700) 2 commits
|
||||
+ add: allow configurations to be overriden by command line
|
||||
+ use xstrdup, not strdup in ll-merge.c
|
||||
|
||||
* pb/maint-1.6.2-userdiff-fix (Wed Jun 17 12:11:10 2009 +0200) 2 commits
|
||||
+ upload-archive: fix infinite loop on Cygwin
|
||||
+ avoid exponential regex match for java and objc function names
|
||||
|
||||
* lt/maint-unsigned-left-shift (Wed Jun 17 17:22:27 2009 -0700) 1 commit
|
||||
+ Fix big left-shifts of unsigned char
|
||||
|
||||
* pb/send-email-cccmd-fix (Thu Jun 18 14:31:32 2009 +0200) 1 commit
|
||||
+ Test cccmd in t9001-send-email.sh and fix some bugs
|
||||
|
||||
* ph/submodule-rebase (Wed Jun 3 00:59:12 2009 +0200) 1 commit
|
||||
+ git-submodule: add support for --merge.
|
||||
|
||||
* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits
|
||||
+ Avoid "diff-index --cached" optimization under --find-copies-
|
||||
harder
|
||||
+ Optimize "diff-index --cached" using cache-tree
|
||||
+ t4007: modernize the style
|
||||
+ cache-tree.c::cache_tree_find(): simplify internal API
|
||||
+ write-tree --ignore-cache-tree
|
||||
|
||||
* mn/maint-iconv-autoconf (Mon Jun 8 20:46:38 2009 -0700) 1 commit
|
||||
+ fix handling of iconv configuration options
|
||||
|
||||
* sb/pull-rebase (Fri Jun 12 00:39:21 2009 +0200) 3 commits
|
||||
+ parse-remote: remove unused functions
|
||||
+ parse-remote: support default reflist in get_remote_merge_branch
|
||||
+ parse-remote: function to get the tracking branch to be merge
|
||||
|
||||
* mg/pushurl (Sun Jun 14 21:46:10 2009 +0200) 6 commits
|
||||
+ avoid NULL dereference on failed malloc
|
||||
+ builtin-remote: Make "remote -v" display push urls
|
||||
+ builtin-remote: Show push urls as well
|
||||
+ technical/api-remote: Describe new struct remote member pushurl
|
||||
+ t5516: Check pushurl config setting
|
||||
+ Allow push and fetch urls to be different
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
Dscho asked about the performance implications of this; I do not think I
|
||||
saw any progress on that yet...
|
||||
|
||||
* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits
|
||||
- Add initial support for pathname conversion to UTF-8
|
||||
- read_directory(): infrastructure for pathname character set
|
||||
conversion
|
||||
- Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
Before adding the real "conversion", this needs a few real fixups, I
|
||||
think. For example there is one hardcoded array that is used without
|
||||
bounds check.
|
||||
|
||||
* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
|
||||
- Fix for a merge where a branch has an F->D transition
|
||||
- Add a reminder test case for a merge with F/D transition
|
||||
|
||||
Although the reported breakage is covered with the patch, Alex feels the
|
||||
solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
|
||||
may be long overdue but seems to be a hard problem.
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one.
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
|
||||
- Add option for using a foreign VCS
|
||||
- Document details of transport function APIs
|
||||
- Allow late reporting of fetched hashes
|
||||
|
||||
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
|
||||
- t/t9600: remove exit after test_done
|
||||
- cvsimport: extend testcase about patchset order to contain
|
||||
branches
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
- Add a test of "git cvsimport"'s handling of tags and branches
|
||||
- Add some tests of git-cvsimport's handling of vendor branches
|
||||
- Test contents of entire cvsimported "master" tree contents
|
||||
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
- Start a library for cvsimport-related tests
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* ne/maint-1.6.0-diff-tree-t-r-show-directory (Sat Jun 13 17:06:09 2009 -0700) 1 commit
|
||||
+ diff-tree -r -t: include added/removed directories in the output
|
||||
|
||||
This changes the output from "diff-tree -r -t"; it brings more consistency
|
||||
to it, but it is a change and could break scripts.
|
||||
|
||||
* uk/rev-parse-parse-opt (Sun Jun 14 01:58:43 2009 +0200) 2 commits
|
||||
+ parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-
|
||||
parse
|
||||
+ more tests for git rev-parse --parse-opt
|
||||
|
||||
* js/daemon-log (Sun Jun 21 23:16:09 2009 +0200) 3 commits
|
||||
+ receive-pack: do not send error details to the client
|
||||
+ upload-pack: squelch progress indicator if client cannot see it
|
||||
+ daemon: send stderr of service programs to the syslog
|
||||
|
||||
* sb/quiet-porcelains (Wed Jun 17 18:07:37 2009 -0700) 6 commits
|
||||
+ stash: teach quiet option
|
||||
+ am, rebase: teach quiet option
|
||||
+ submodule, repack: migrate to git-sh-setup's say()
|
||||
+ git-sh-setup: introduce say() for quiet options
|
||||
+ am: suppress apply errors when using 3-way
|
||||
+ t4150: test applying with a newline in subject
|
||||
|
||||
* jk/use-our-regexp (Fri Jun 19 10:10:39 2009 -0500) 3 commits
|
||||
+ Makefile: Solaris needs HAVE_ALLOCA_H for alloca()
|
||||
+ Makefile: use compat regex on Solaris
|
||||
+ Makefile: refactor regex compat support
|
||||
|
||||
* cb/maint-fetch-refspec-wo-dst (Wed Jun 17 15:38:36 2009 +0200) 1 commit
|
||||
- fetch: do not create ref from empty name
|
||||
|
||||
* cc/bisect (Sat Jun 13 13:11:02 2009 +0200) 2 commits
|
||||
+ Documentation: remove warning saying that "git bisect skip" may
|
||||
slow bisection
|
||||
+ bisect: use a PRNG with a bias when skipping away from untestable
|
||||
commits
|
||||
|
||||
* tr/die_errno (Sat Jun 27 17:58:47 2009 +0200) 4 commits
|
||||
- Use die_errno() instead of die() when checking syscalls
|
||||
- Convert existing die(..., strerror(errno)) to die_errno()
|
||||
- die_errno(): double % in strerror() output just in case
|
||||
- Introduce die_errno() that appends strerror(errno) to die()
|
||||
|
||||
I didn't check the individual conversion from die() to die_errno()
|
||||
in this latest round; comments?
|
||||
|
||||
* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit
|
||||
- Shift object enumeration out of upload-pack
|
||||
|
||||
* ml/http (Wed May 27 23:16:03 2009 -0400) 2 commits
|
||||
- http.c: add http.sslCertPasswordProtected option
|
||||
- http.c: prompt for SSL client certificate password
|
||||
|
||||
I've rewritten these two to (1) move the #ifdef out of the main codepath,
|
||||
and (2) use configuration/environment to make the misfeature of always
|
||||
asking for a passphrase even a key/cert is unencrypted optional. I tried
|
||||
to be careful but extra sets of eyeballs would be nice to check the result.
|
||||
|
||||
* gb/am-foreign (Wed May 27 11:25:19 2009 +0200) 4 commits
|
||||
- git-am: refactor 'cleaning up and aborting'
|
||||
- git-am foreign patch support: StGIT support
|
||||
- git-am foreign patch support: autodetect some patch formats
|
||||
- git-am foreign patch support: introduce patch_format
|
||||
|
||||
Will be in 'next' shortly.
|
||||
|
||||
* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
|
||||
- diff: Rename QUIET internal option to QUICK
|
||||
- diff: change semantics of "ignore whitespace" options
|
||||
|
||||
I am not sure if it should wait for a major version bump but this is a
|
||||
good semantics change. Perhaps merge to 'next' soonish, but I am
|
||||
undecided. Comments?
|
||||
|
||||
* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
|
||||
- t6050: check pushing something based on a replaced commit
|
||||
- Documentation: add documentation for "git replace"
|
||||
- Add git-replace to .gitignore
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
@@ -1,294 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Jul 2009, #01; Mon, 06)
|
||||
X-master-at: f581de1b7b9d17c83b188bf8ffe536fb8a9dd2a4
|
||||
X-next-at: 8586bb07b181c75e65a39d88128e40a1c3e88e2c
|
||||
|
||||
What's cooking in git.git (Jul 2009, #01; Mon, 06)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
It has been relatively quiet for the past few weeks. The 'next' branch is
|
||||
getting quite thin, and it would be a good time to declare -rc0. I'll do
|
||||
so by my Wednesday.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* ld/push-porcelain-output-format (Mon Jun 22 21:10:01 2009 -0400) 1 commit
|
||||
+ add --porcelain option to git-push
|
||||
|
||||
* js/run-command-updates (Sat Jul 4 21:26:43 2009 +0200) 7 commits
|
||||
- receive-pack: remove unnecessary run_status report
|
||||
- run_command: report failure to execute the program, but optionally
|
||||
don't
|
||||
- run_command: encode deadly signal number in the return value
|
||||
- run_command: report system call errors instead of returning error
|
||||
codes
|
||||
- run_command: return exit code as positive value
|
||||
- MinGW: simplify waitpid() emulation macros
|
||||
- MinGW: truncate exit()'s argument to lowest 8 bits
|
||||
|
||||
A few replacement/squash updates came in before it hit 'pu'; this should
|
||||
be the latest version.
|
||||
|
||||
* cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits
|
||||
- rebase -i: use "git sequencer--helper --make-patch"
|
||||
- sequencer: free memory used in "make_patch" function
|
||||
- sequencer: add "make_patch" function to save a patch
|
||||
- sequencer: add "builtin-sequencer--helper.c"
|
||||
|
||||
* ae/maint-mailinfo-rm-only-one-patch-marker (Mon Jun 29 11:55:51 2009 +0200) 1 commit
|
||||
- mailinfo: Remove only one set of square brackets
|
||||
|
||||
The change needed to the test vector shows the extent of the damage this
|
||||
change may cause in the real world. A handcrafted "Subject: [area] [PATCH] title"
|
||||
will be turned into "[PATCH] title".
|
||||
|
||||
* rs/grep-p (Thu Jul 2 00:06:34 2009 +0200) 7 commits
|
||||
+ grep: simplify -p output
|
||||
+ grep -p: support user defined regular expressions
|
||||
+ grep: add option -p/--show-function
|
||||
+ grep: handle pre context lines on demand
|
||||
+ grep: print context hunk marks between files
|
||||
+ grep: move context hunk mark handling into show_line()
|
||||
+ userdiff: add xdiff_clear_find_func()
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* cf/maint-remote-uploadpack-useconfig-fix (Thu Jun 25 17:21:35 2009 -0400) 1 commit
|
||||
+ git-remote: fix missing .uploadpack usage for show command
|
||||
|
||||
* sb/show-ref-parse-options (Sat Jun 20 21:40:46 2009 -0700) 1 commit
|
||||
+ show-ref: migrate to parse-options
|
||||
|
||||
* ne/maint-1.6.0-diff-tree-t-r-show-directory (Sat Jun 13 17:06:09 2009 -0700) 1 commit
|
||||
+ diff-tree -r -t: include added/removed directories in the output
|
||||
|
||||
This changes the output from "diff-tree -r -t"; it brings more consistency
|
||||
to it, but it is a change and could break scripts.
|
||||
|
||||
* uk/rev-parse-parse-opt (Sun Jun 14 01:58:43 2009 +0200) 2 commits
|
||||
+ parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-
|
||||
parse
|
||||
+ more tests for git rev-parse --parse-opt
|
||||
|
||||
* js/daemon-log (Sun Jun 21 23:16:09 2009 +0200) 3 commits
|
||||
+ receive-pack: do not send error details to the client
|
||||
+ upload-pack: squelch progress indicator if client cannot see it
|
||||
+ daemon: send stderr of service programs to the syslog
|
||||
|
||||
* sb/quiet-porcelains (Wed Jun 17 18:07:37 2009 -0700) 6 commits
|
||||
+ stash: teach quiet option
|
||||
+ am, rebase: teach quiet option
|
||||
+ submodule, repack: migrate to git-sh-setup's say()
|
||||
+ git-sh-setup: introduce say() for quiet options
|
||||
+ am: suppress apply errors when using 3-way
|
||||
+ t4150: test applying with a newline in subject
|
||||
|
||||
* jk/use-our-regexp (Fri Jun 19 10:10:39 2009 -0500) 3 commits
|
||||
+ Makefile: Solaris needs HAVE_ALLOCA_H for alloca()
|
||||
+ Makefile: use compat regex on Solaris
|
||||
+ Makefile: refactor regex compat support
|
||||
|
||||
* cb/maint-fetch-refspec-wo-dst (Wed Jun 17 15:38:36 2009 +0200) 1 commit
|
||||
- fetch: do not create ref from empty name
|
||||
|
||||
* cc/bisect (Sat Jun 13 13:11:02 2009 +0200) 2 commits
|
||||
+ Documentation: remove warning saying that "git bisect skip" may
|
||||
slow bisection
|
||||
+ bisect: use a PRNG with a bias when skipping away from untestable
|
||||
commits
|
||||
|
||||
* tr/die_errno (Sat Jun 27 17:58:47 2009 +0200) 4 commits
|
||||
- Use die_errno() instead of die() when checking syscalls
|
||||
- Convert existing die(..., strerror(errno)) to die_errno()
|
||||
- die_errno(): double % in strerror() output just in case
|
||||
- Introduce die_errno() that appends strerror(errno) to die()
|
||||
|
||||
I didn't check the individual conversion from die() to die_errno()
|
||||
in this latest round; comments?
|
||||
|
||||
* gb/am-foreign (Wed May 27 11:25:19 2009 +0200) 4 commits
|
||||
- git-am: refactor 'cleaning up and aborting'
|
||||
- git-am foreign patch support: StGIT support
|
||||
- git-am foreign patch support: autodetect some patch formats
|
||||
- git-am foreign patch support: introduce patch_format
|
||||
|
||||
Will be in 'next' shortly.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* ml/http (Wed May 27 23:16:03 2009 -0400) 2 commits
|
||||
- http.c: add http.sslCertPasswordProtected option
|
||||
- http.c: prompt for SSL client certificate password
|
||||
|
||||
I've rewritten these two to (1) move the #ifdef out of the main codepath,
|
||||
and (2) use configuration/environment to make the misfeature of always
|
||||
asking for a passphrase even a key/cert is unencrypted optional. I tried
|
||||
to be careful but extra sets of eyeballs would be nice to check the result.
|
||||
|
||||
Nobody seems to be jumping up-and-down asking for this or helping to push
|
||||
this forward. Perhaps it's time to drop it?
|
||||
|
||||
* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
Dscho asked about the performance implications of this; I do not think I
|
||||
saw any progress on that yet...
|
||||
|
||||
* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits
|
||||
- Add initial support for pathname conversion to UTF-8
|
||||
- read_directory(): infrastructure for pathname character set
|
||||
conversion
|
||||
- Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
Before adding the real "conversion", this needs a few real fixups, I
|
||||
think. For example there is one hardcoded array that is used without
|
||||
bounds check.
|
||||
|
||||
* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
|
||||
- Fix for a merge where a branch has an F->D transition
|
||||
- Add a reminder test case for a merge with F/D transition
|
||||
|
||||
Although the reported breakage is covered with the patch, Alex feels the
|
||||
solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
|
||||
may be long overdue but seems to be a hard problem.
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one.
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
|
||||
- Add option for using a foreign VCS
|
||||
- Document details of transport function APIs
|
||||
- Allow late reporting of fetched hashes
|
||||
|
||||
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
|
||||
- t/t9600: remove exit after test_done
|
||||
- cvsimport: extend testcase about patchset order to contain
|
||||
branches
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
- Add a test of "git cvsimport"'s handling of tags and branches
|
||||
- Add some tests of git-cvsimport's handling of vendor branches
|
||||
- Test contents of entire cvsimported "master" tree contents
|
||||
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
- Start a library for cvsimport-related tests
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* gb/gitweb-avatar (Tue Jun 30 00:00:54 2009 +0200) 7 commits
|
||||
- gitweb: add empty alt text to avatar img
|
||||
- gitweb: picon avatar provider
|
||||
- gitweb: gravatar url cache
|
||||
- gitweb: (gr)avatar support
|
||||
- gitweb: use git_print_authorship_rows in 'tag' view too
|
||||
- gitweb: uniform author info for commit and commitdiff
|
||||
- gitweb: refactor author name insertion
|
||||
|
||||
This should be the latest one posted to the list, and I think it is
|
||||
reasonable, and Jakub seemed to concur. Will be in 'next'
|
||||
|
||||
* en/fast-export (Thu Jun 25 22:48:33 2009 -0600) 7 commits
|
||||
- fast-export: Document the fact that git-rev-list arguments are
|
||||
accepted
|
||||
- Add new fast-export testcases
|
||||
- fast-export: Add a --tag-of-filtered-object option for newly
|
||||
dangling tags
|
||||
- fast-export: Do parent rewriting to avoid dropping relevant
|
||||
commits
|
||||
- fast-export: Make sure we show actual ref names instead of
|
||||
"(null)"
|
||||
- fast-export: Omit tags that tag trees
|
||||
- fast-export: Set revs.topo_order before calling setup_revisions
|
||||
|
||||
Shawn? Dscho?
|
||||
|
||||
* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
|
||||
- diff: Rename QUIET internal option to QUICK
|
||||
- diff: change semantics of "ignore whitespace" options
|
||||
|
||||
I am not sure if it should wait for a major version bump but this is a
|
||||
good semantics change. Perhaps merge to 'next' soonish, but I am
|
||||
undecided. Comments?
|
||||
|
||||
For the following three series, I have not managed to convince myself if
|
||||
these changes have real-world needs.
|
||||
|
||||
* sb/read-tree (Thu Jun 25 22:14:10 2009 -0700) 2 commits
|
||||
- read-tree: migrate to parse-options
|
||||
- read-tree: convert unhelpful usage()'s to helpful die()'s
|
||||
|
||||
* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit
|
||||
- Shift object enumeration out of upload-pack
|
||||
|
||||
* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
|
||||
- t6050: check pushing something based on a replaced commit
|
||||
- Documentation: add documentation for "git replace"
|
||||
- Add git-replace to .gitignore
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
- Add new "git replace" command
|
||||
- environment: add global variable to disable replacement
|
||||
- mktag: call "check_sha1_signature" with the replacement sha1
|
||||
- replace_object: add a test case
|
||||
- object: call "check_sha1_signature" with the replacement sha1
|
||||
- sha1_file: add a "read_sha1_file_repl" function
|
||||
- replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
- refs: add a "for_each_replace_ref" function
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought.
|
||||
@@ -1,278 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Jul 2009, #02; Sun, 26)
|
||||
X-master-at: d8f7be2ebcb7e3ec40269080a9ab9a28bc06ba17
|
||||
X-next-at: 2b05f9bd0a9944bbaab9f24d305932a57e4735d4
|
||||
|
||||
What's cooking in git.git (Jul 2009, #02; Sun, 26)
|
||||
--------------------------------------------------
|
||||
|
||||
These topics in 'next' (ones prefixed with '+') and 'pu' (ones prefixed
|
||||
with '.') will not be in 1.6.4 final, and are subject to be rewound once
|
||||
it happens.
|
||||
|
||||
We have quite a few solid topics in 'next', so hopefully the next cycle
|
||||
would be shorter than usual. I'd propose to call it 1.6.5, and then make
|
||||
the one after that 1.7.0, which means that during the 1.6.5 cycle, 'next'
|
||||
will have the two incompatible "push" (actually, receive-pack) changes
|
||||
hitherto kept on hold in 'pu'.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jk/show-tag (Sat Jul 18 06:14:37 2009 -0400) 2 commits
|
||||
+ show: add space between multiple items
|
||||
+ show: suppress extra newline when showing annotated tag
|
||||
|
||||
Didn't look bad at all, but is not pressing either.
|
||||
|
||||
* sb/parse-options (Tue Jul 7 22:15:41 2009 -0700) 4 commits
|
||||
+ prune-packed: migrate to parse-options
|
||||
+ verify-pack: migrate to parse-options
|
||||
+ verify-tag: migrate to parse-options
|
||||
+ write-tree: migrate to parse-options
|
||||
|
||||
* mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit
|
||||
+ grep: Add --max-depth option.
|
||||
|
||||
* jn/gitweb-blame (Sat Jul 25 00:44:10 2009 +0200) 10 commits
|
||||
- gitweb: Create links leading to 'blame_incremental' using
|
||||
JavaScript
|
||||
- gitweb: Incremental blame (proof of concept)
|
||||
- gitweb: Add optional "time to generate page" info in footer
|
||||
- gitweb: Add -partial_query option to href() subroutine
|
||||
- gitweb: Use light/dark for class names also in 'blame' view
|
||||
- gitweb: Add author initials in 'blame' view, a la "git gui blame"
|
||||
- gitweb: Mark commits with no "previous" in 'blame' view
|
||||
- gitweb: Use "previous" header of git-blame -p in 'blame' view
|
||||
- gitweb: Mark boundary commits in 'blame' view
|
||||
- gitweb: Make .error style generic
|
||||
|
||||
Still in flux/rfc.
|
||||
|
||||
* ns/init-mkdir (Sat Jul 25 06:59:28 2009 +0900) 1 commit
|
||||
+ git init: optionally allow a directory argument
|
||||
|
||||
Didn't look bad, but is not pressing either.
|
||||
|
||||
* jc/apply-epoch-patch (Fri Jul 10 18:38:08 2009 -0700) 1 commit
|
||||
+ apply: notice creation/removal patches produced by GNU diff
|
||||
|
||||
* sb/pull-rebase (Sun Jul 19 09:45:16 2009 +0200) 2 commits
|
||||
+ pull: support rebased upstream + fetch + pull --rebase
|
||||
+ t5520-pull: Test for rebased upstream + fetch + pull --rebase
|
||||
|
||||
* db/transport-shim (Sat Jul 25 13:51:40 2009 -0400) 3 commits
|
||||
- git-http-fetch: not a builtin
|
||||
- Use an external program to implement fetching with curl
|
||||
- Add support for external programs for handling native fetches
|
||||
|
||||
Interesting as a concept. I saw its ls-remote segfault on me, though.
|
||||
Hopefully will mature by 1.6.5 final.
|
||||
|
||||
* pb/tracking (Thu Jul 16 16:26:15 2009 -0500) 7 commits
|
||||
+ branch.c: if remote is not config'd for branch, don't try delete
|
||||
push config
|
||||
+ branch, checkout: introduce autosetuppush
|
||||
+ move deletion of merge configuration to branch.c
|
||||
+ remote: add per-remote autosetupmerge and autosetuprebase
|
||||
configuration
|
||||
+ introduce a struct tracking_config
|
||||
+ branch: install_branch_config and struct tracking refactoring
|
||||
+ config: allow false and true values for branch.autosetuprebase
|
||||
|
||||
After some discussion, I suspect we may want to rewind this out of 'next'
|
||||
and start over with a fresh design.
|
||||
|
||||
* mk/init-db-parse-options (Sun Jul 12 12:24:32 2009 +0200) 1 commit
|
||||
+ init-db: migrate to parse-options
|
||||
|
||||
* tr/reset-checkout-patch (Sat Jul 25 23:29:34 2009 +0200) 5 commits
|
||||
- Implement 'git stash save --patch'
|
||||
- Implement 'git checkout --patch'
|
||||
- Implement 'git reset --patch'
|
||||
- builtin-add: refactor the meat of interactive_add()
|
||||
- git-apply--interactive: Refactor patch mode code
|
||||
|
||||
Still in flux/rfc.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* gp/maint-rebase-p-onto (Wed Jul 22 12:38:58 2009 -0400) 1 commit
|
||||
. Fix rebase -p --onto
|
||||
|
||||
I'd say we should take this even if it means Dscho needs his rebase -p
|
||||
rewrite. It is not very pressing, so perhaps do so immediately after
|
||||
1.6.4 final.
|
||||
|
||||
* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
Dscho asked about the performance implications of this; I do not think I
|
||||
saw any progress on that yet...
|
||||
|
||||
Will drop after 1.6.4 unless any further progress is seen.
|
||||
|
||||
* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
|
||||
- Fix for a merge where a branch has an F->D transition
|
||||
- Add a reminder test case for a merge with F/D transition
|
||||
|
||||
Although the reported breakage is covered with the patch, Alex feels the
|
||||
solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
|
||||
may be long overdue but seems to be a hard problem.
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
A few minor point remains in this initial one.
|
||||
|
||||
Will drop after 1.6.4 unless any further progress is seen.
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
The one I posted had a few corner-case bugs that was caught with the test
|
||||
suite; this one has them fixed. People did not like the UI so it is kept
|
||||
out of 'next'
|
||||
|
||||
Will drop after 1.6.4 unless any further progress is seen.
|
||||
|
||||
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
|
||||
- git-merge-file: allow converting the results for the work tree
|
||||
|
||||
This is a feature waiting for a user.
|
||||
|
||||
We did not give scripted Porcelains a way to say "this temporary file I am
|
||||
using for merging is for this path, so use the core.autocrlf and attributes
|
||||
rules for that final path". Instead, merge-file simply wrote out the
|
||||
data in the canonical repository representation.
|
||||
|
||||
rerere has the same issue, but it is a lot worse. It reads the three
|
||||
files (preimage, postimage and thisimage) from the work tree in the work
|
||||
tree representation, merges them without converting them to the canonical
|
||||
representation first but inserts the conflict markers with the canonical
|
||||
representation and writes the resulting mess out. It needs to be fixed to
|
||||
read with convert_to_git(), merge them while they are still in the
|
||||
canonical representation and possibly add conflict markers, and then write
|
||||
the results out after convert_to_working_tree(). It also needs to write
|
||||
in binary mode as well.
|
||||
|
||||
Will drop after 1.6.4 unless any further progress is seen.
|
||||
|
||||
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
|
||||
- Add option for using a foreign VCS
|
||||
- Document details of transport function APIs
|
||||
- Allow late reporting of fetched hashes
|
||||
|
||||
I have a feeling that the recent transport-shim series from the same
|
||||
author could supersede this one.
|
||||
|
||||
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
|
||||
- t/t9600: remove exit after test_done
|
||||
- cvsimport: extend testcase about patchset order to contain
|
||||
branches
|
||||
- cvsimport: add test illustrating a bug in cvsps
|
||||
- Add a test of "git cvsimport"'s handling of tags and branches
|
||||
- Add some tests of git-cvsimport's handling of vendor branches
|
||||
- Test contents of entire cvsimported "master" tree contents
|
||||
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
- Start a library for cvsimport-related tests
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Not actively cooking]
|
||||
|
||||
* js/run-command-updates (Sat Jul 4 21:26:43 2009 +0200) 6 commits
|
||||
+ receive-pack: remove unnecessary run_status report
|
||||
+ run_command: report failure to execute the program, but optionally
|
||||
don't
|
||||
+ run_command: encode deadly signal number in the return value
|
||||
+ run_command: report system call errors instead of returning error
|
||||
codes
|
||||
+ run_command: return exit code as positive value
|
||||
+ MinGW: simplify waitpid() emulation macros
|
||||
|
||||
Will merge after 1.6.4
|
||||
|
||||
* cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits
|
||||
- rebase -i: use "git sequencer--helper --make-patch"
|
||||
- sequencer: free memory used in "make_patch" function
|
||||
- sequencer: add "make_patch" function to save a patch
|
||||
- sequencer: add "builtin-sequencer--helper.c"
|
||||
|
||||
* en/fast-export (Thu Jun 25 22:48:33 2009 -0600) 7 commits
|
||||
+ fast-export: Document the fact that git-rev-list arguments are
|
||||
accepted
|
||||
+ Add new fast-export testcases
|
||||
+ fast-export: Add a --tag-of-filtered-object option for newly
|
||||
dangling tags
|
||||
+ fast-export: Do parent rewriting to avoid dropping relevant
|
||||
commits
|
||||
+ fast-export: Make sure we show actual ref names instead of
|
||||
"(null)"
|
||||
+ fast-export: Omit tags that tag trees
|
||||
+ fast-export: Set revs.topo_order before calling setup_revisions
|
||||
|
||||
Shawn? Dscho?
|
||||
|
||||
* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
Possibly merge during 1.6.5, or 1.7.0 since this is a semantics change.
|
||||
|
||||
* sb/read-tree (Thu Jun 25 22:14:10 2009 -0700) 2 commits
|
||||
+ read-tree: migrate to parse-options
|
||||
+ read-tree: convert unhelpful usage()'s to helpful die()'s
|
||||
|
||||
Will merge after 1.6.4
|
||||
|
||||
* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit
|
||||
+ Shift object enumeration out of upload-pack
|
||||
|
||||
Will merge after 1.6.4
|
||||
|
||||
* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
|
||||
+ t6050: check pushing something based on a replaced commit
|
||||
+ Documentation: add documentation for "git replace"
|
||||
+ Add git-replace to .gitignore
|
||||
+ builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
+ parse-options: add new function "usage_msg_opt"
|
||||
+ builtin-replace: teach "git replace" to actually replace
|
||||
+ Add new "git replace" command
|
||||
+ environment: add global variable to disable replacement
|
||||
+ mktag: call "check_sha1_signature" with the replacement sha1
|
||||
+ replace_object: add a test case
|
||||
+ object: call "check_sha1_signature" with the replacement sha1
|
||||
+ sha1_file: add a "read_sha1_file_repl" function
|
||||
+ replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
+ refs: add a "for_each_replace_ref" function
|
||||
|
||||
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
|
||||
- receive-pack: default receive.denyDeleteCurrent to refuse
|
||||
|
||||
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
|
||||
- Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
These are for 1.7.0, but the messages when they trigger together may need
|
||||
to be rethought. Will be kept in 'next' during 1.6.5 cycle.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Dropped]
|
||||
|
||||
* ae/maint-mailinfo-rm-only-one-patch-marker (Mon Jun 29 11:55:51 2009 +0200) 1 commit
|
||||
- mailinfo: Remove only one set of square brackets
|
||||
|
||||
* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits
|
||||
. Add initial support for pathname conversion to UTF-8
|
||||
. read_directory(): infrastructure for pathname character set
|
||||
conversion
|
||||
. Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
It appears that we may want to settle with a MacOS X specific conversion,
|
||||
if somebody really cares enough.
|
||||
@@ -1,230 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Jul 2009, #03; Wed, 29)
|
||||
X-master-at: e6580020057afd207b7cfb9c96905f99e13cfe4d
|
||||
X-next-at: 4719968c98d7ad8352bb14916c65c094842a980d
|
||||
|
||||
What's cooking in git.git (Jul 2009, #03; Wed, 29)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
In preparation for rewinding 'next' after a major release, one topic was
|
||||
reverted and kicked back to 'pu' to give it a fresh start.
|
||||
|
||||
After the 1.6.5 cycle, the next release will be 1.7.0, and we will push
|
||||
out the planned "push safety" change. 1.7.0 would be a good time to
|
||||
introduce "justifiable" changes that are not strictly backward compatible.
|
||||
|
||||
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
|
||||
I've already merged the "diff --exit-code --ignore-whitespace" change and
|
||||
"push safety" change.
|
||||
|
||||
I'll rewind 'next' sometime this weekend.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[In 'next']
|
||||
|
||||
* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit
|
||||
+ Shift object enumeration out of upload-pack
|
||||
|
||||
* js/run-command-updates (Sat Jul 4 21:26:43 2009 +0200) 6 commits
|
||||
+ receive-pack: remove unnecessary run_status report
|
||||
+ run_command: report failure to execute the program, but optionally
|
||||
don't
|
||||
+ run_command: encode deadly signal number in the return value
|
||||
+ run_command: report system call errors instead of returning error
|
||||
codes
|
||||
+ run_command: return exit code as positive value
|
||||
+ MinGW: simplify waitpid() emulation macros
|
||||
|
||||
* sb/maint-pull-rebase (Sun Jul 19 09:45:16 2009 +0200) 2 commits
|
||||
+ pull: support rebased upstream + fetch + pull --rebase
|
||||
+ t5520-pull: Test for rebased upstream + fetch + pull --rebase
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (Mon Feb 9 00:19:46 2009 -0800) 2 commits
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
This is old 'jc/deny-delete-current-1.7.0' and 'jc/1.7.0-push-safety'
|
||||
topics redone.
|
||||
|
||||
* sb/read-tree (Thu Jun 25 22:14:10 2009 -0700) 2 commits
|
||||
+ read-tree: migrate to parse-options
|
||||
+ read-tree: convert unhelpful usage()'s to helpful die()'s
|
||||
|
||||
* sb/parse-options (Tue Jul 7 22:15:41 2009 -0700) 4 commits
|
||||
+ prune-packed: migrate to parse-options
|
||||
+ verify-pack: migrate to parse-options
|
||||
+ verify-tag: migrate to parse-options
|
||||
+ write-tree: migrate to parse-options
|
||||
|
||||
Parse-options migration; should be in 'master' soonish.
|
||||
|
||||
* mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit
|
||||
+ grep: Add --max-depth option.
|
||||
|
||||
* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
|
||||
+ t6050: check pushing something based on a replaced commit
|
||||
+ Documentation: add documentation for "git replace"
|
||||
+ Add git-replace to .gitignore
|
||||
+ builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
+ parse-options: add new function "usage_msg_opt"
|
||||
+ builtin-replace: teach "git replace" to actually replace
|
||||
+ Add new "git replace" command
|
||||
+ environment: add global variable to disable replacement
|
||||
+ mktag: call "check_sha1_signature" with the replacement sha1
|
||||
+ replace_object: add a test case
|
||||
+ object: call "check_sha1_signature" with the replacement sha1
|
||||
+ sha1_file: add a "read_sha1_file_repl" function
|
||||
+ replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
+ refs: add a "for_each_replace_ref" function
|
||||
|
||||
Does not seem to hurt normal operation without "replace". The basic idea
|
||||
should be easier and safer to use than the graft mechanism. I haven't
|
||||
tried the replacement myself, though.
|
||||
|
||||
* ns/init-mkdir (Sat Jul 25 06:59:28 2009 +0900) 1 commit
|
||||
+ git init: optionally allow a directory argument
|
||||
|
||||
Straightforward usability change. Should be in 'master' soonish.
|
||||
|
||||
* mk/init-db-parse-options (Sun Jul 12 12:24:32 2009 +0200) 1 commit
|
||||
+ init-db: migrate to parse-options
|
||||
|
||||
* jk/maint-show-tag (Sat Jul 18 06:14:37 2009 -0400) 2 commits
|
||||
+ show: add space between multiple items
|
||||
+ show: suppress extra newline when showing annotated tag
|
||||
|
||||
* jc/apply-epoch-patch (Fri Jul 10 18:38:08 2009 -0700) 1 commit
|
||||
+ apply: notice creation/removal patches produced by GNU diff
|
||||
|
||||
Better acceptance of some "GNU patch" output to create or remove files.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[In 'pu']
|
||||
|
||||
* jp/symlink-dirs (Sun Jun 14 15:08:28 2009 +0200) 2 commits
|
||||
- lstat_cache: guard against full match of length of 'name'
|
||||
parameter
|
||||
- Demonstrate bugs when a directory is replaced with a symlink
|
||||
|
||||
James's test scripts to expose corner case bugs in the merge and branch
|
||||
switching machinery.
|
||||
|
||||
* jh/vcs-cvs (Mon Jul 27 03:04:17 2009 +0200) 15 commits
|
||||
- Introduce a 'marks <filename>' feature to the foreign transport
|
||||
code
|
||||
- Teach foreign transport code to perform the "capabilities" command
|
||||
- Preliminary clarifications to git-vcs documentation
|
||||
- fast-import: Add support for importing commit notes
|
||||
- Add a transport implementation using git-vcs-* helpers
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Use a function to determine whether a remote is valid
|
||||
- Add specification of git-vcs-* helper programs
|
||||
- Merge branch 'db/transport-shim' into jh/vcs-cvs
|
||||
- git-http-fetch: not a builtin
|
||||
- Use an external program to implement fetching with curl
|
||||
- Add support for external programs for handling native fetches
|
||||
- Add option for using a foreign VCS
|
||||
- Document details of transport function APIs
|
||||
- Allow late reporting of fetched hashes
|
||||
|
||||
With its 6th patch replaced to keep the pathname syntax of the fast-import
|
||||
language, but without the commits near the tip of the old series.
|
||||
|
||||
* db/transport-shim (Tue Jul 28 02:08:53 2009 -0400) 3 commits
|
||||
- git-http-fetch: not a builtin
|
||||
- Use an external program to implement fetching with curl
|
||||
- Add support for external programs for handling native fetches
|
||||
|
||||
* jh/notes (Wed Jul 29 04:25:26 2009 +0200) 8 commits
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- First draft of notes tree parser with support for fanout subtrees
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
jh/vcs-cvs topic needs to be rebuilt, merging this instead of having its
|
||||
own copy of "fast-import: Add support for importing commit notes".
|
||||
|
||||
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
|
||||
- Add option for using a foreign VCS
|
||||
- Document details of transport function APIs
|
||||
- Allow late reporting of fetched hashes
|
||||
|
||||
* cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits
|
||||
- rebase -i: use "git sequencer--helper --make-patch"
|
||||
- sequencer: free memory used in "make_patch" function
|
||||
- sequencer: add "make_patch" function to save a patch
|
||||
- sequencer: add "builtin-sequencer--helper.c"
|
||||
|
||||
I do not know how this will interact with what Dscho has been doing.
|
||||
|
||||
* jc/mailinfo-remove-brackets (Wed Jul 15 15:31:12 2009 -0700) 1 commit
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a
|
||||
[PATCH] marker
|
||||
|
||||
* jn/gitweb-blame (Sat Jul 25 00:44:10 2009 +0200) 10 commits
|
||||
- gitweb: Create links leading to 'blame_incremental' using
|
||||
JavaScript
|
||||
- gitweb: Incremental blame (proof of concept)
|
||||
- gitweb: Add optional "time to generate page" info in footer
|
||||
- gitweb: Add -partial_query option to href() subroutine
|
||||
- gitweb: Use light/dark for class names also in 'blame' view
|
||||
- gitweb: Add author initials in 'blame' view, a la "git gui blame"
|
||||
- gitweb: Mark commits with no "previous" in 'blame' view
|
||||
- gitweb: Use "previous" header of git-blame -p in 'blame' view
|
||||
- gitweb: Mark boundary commits in 'blame' view
|
||||
- gitweb: Make .error style generic
|
||||
|
||||
There may have been updates during 1.6.4-rc period that I missed.
|
||||
|
||||
* tr/reset-checkout-patch (Tue Jul 28 23:20:11 2009 +0200) 5 commits
|
||||
- Implement 'git stash save --patch'
|
||||
- Implement 'git checkout --patch'
|
||||
- Implement 'git reset --patch'
|
||||
- builtin-add: refactor the meat of interactive_add()
|
||||
- git-apply--interactive: Refactor patch mode code
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
* pb/tracking (Thu Jul 16 16:26:15 2009 -0500) 7 commits
|
||||
- branch.c: if remote is not config'd for branch, don't try delete
|
||||
push config
|
||||
- branch, checkout: introduce autosetuppush
|
||||
- move deletion of merge configuration to branch.c
|
||||
- remote: add per-remote autosetupmerge and autosetuprebase
|
||||
configuration
|
||||
- introduce a struct tracking_config
|
||||
- branch: install_branch_config and struct tracking refactoring
|
||||
- config: allow false and true values for branch.autosetuprebase
|
||||
|
||||
This has been reverted from 'next' for now to give it a fresh start.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Dropped]
|
||||
|
||||
* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
|
||||
. Fix for a merge where a branch has an F->D transition
|
||||
. Add a reminder test case for a merge with F/D transition
|
||||
|
||||
The fix the author hinted iffy is dropped for now, but the test case is
|
||||
already in 'master' to remind us.
|
||||
|
||||
@@ -1,228 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Aug 2009, #01; Wed, 05)
|
||||
X-master-at: 3f55e4107f7906134df029f9a5c44864f9258110
|
||||
X-next-at: 2981fa5b8f20e8ff086aceb252c0e693fa2d0c75
|
||||
|
||||
What's cooking in git.git (Aug 2009, #01; Wed, 05)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
In preparation for rewinding 'next' after a major release, one topic was
|
||||
reverted and kicked back to 'pu' to give it a fresh start.
|
||||
|
||||
After the 1.6.5 cycle, the next release will be 1.7.0, and we will push
|
||||
out the planned "push safety" change. 1.7.0 would be a good time to
|
||||
introduce "justifiable" changes that are not strictly backward compatible.
|
||||
|
||||
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* gb/apply-ignore-whitespace (Tue Aug 4 13:16:49 2009 +0200) 1 commit
|
||||
- git apply: option to ignore whitespace differences
|
||||
|
||||
* db/vcs-helper (Wed Aug 5 01:02:25 2009 -0400) 13 commits
|
||||
- Changes for new vcs-helper series
|
||||
- Add simple test cases of git-vcs-cvs functionality
|
||||
- First draft of CVS importer using the foreign-scm machinery
|
||||
- Allow helpers to request marks for fast-import
|
||||
- Allow helpers to report in "list" command that the ref is
|
||||
unchanged
|
||||
- Add support for "import" helper command
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
- git-http-fetch: not a builtin
|
||||
- Use an external program to implement fetching with curl
|
||||
- Add support for external programs for handling native fetches
|
||||
|
||||
This consolidates various previous rounds from Daniel and Johan.
|
||||
|
||||
* je/send-email-no-subject (Wed Aug 5 18:49:54 2009 +0200) 1 commit
|
||||
- send-email: confirm on empty mail subjects
|
||||
|
||||
* zf/maint-gitweb-acname (Sun Aug 2 09:42:24 2009 +0200) 1 commit
|
||||
- gitweb: parse_commit_text encoding fix
|
||||
|
||||
* jc/maint-clean-nested-dir-safety (Tue Jun 30 15:33:45 2009 -0700) 1 commit
|
||||
- clean: require double -f options to nuke nested git repository and
|
||||
work tree
|
||||
|
||||
* jc/shortstatus (Tue Aug 4 23:55:22 2009 -0700) 5 commits
|
||||
- shortstatus: a new command
|
||||
- status: show worktree status of conflicted paths separately
|
||||
- wt-status.c: rework the way changes to the index and work tree are
|
||||
summarized
|
||||
- diff-index: keep the original index intact
|
||||
- diff-index: report unmerged new entries
|
||||
|
||||
* bc/mailsplit-cr-at-eol (Tue Aug 4 22:31:59 2009 -0500) 4 commits
|
||||
- Allow mailsplit (and hence git-am) to handle mails with CRLF line-
|
||||
endings
|
||||
- builtin-mailsplit.c: remove read_line_with_nul() since it is no
|
||||
longer used
|
||||
- builtin-mailinfo,builtin-mailsplit: use strbufs
|
||||
- strbuf: add new function strbuf_getwholeline()
|
||||
|
||||
* jc/maint-merge-recursive-fix (Thu Jul 30 17:38:15 2009 -0700) 1 commit
|
||||
- merge-recursive: don't segfault while handling rename clashes
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit
|
||||
+ Shift object enumeration out of upload-pack
|
||||
|
||||
* sb/maint-pull-rebase (Sun Jul 19 09:45:16 2009 +0200) 2 commits
|
||||
+ pull: support rebased upstream + fetch + pull --rebase
|
||||
+ t5520-pull: Test for rebased upstream + fetch + pull --rebase
|
||||
|
||||
* sb/read-tree (Thu Jun 25 22:14:10 2009 -0700) 2 commits
|
||||
+ read-tree: migrate to parse-options
|
||||
+ read-tree: convert unhelpful usage()'s to helpful die()'s
|
||||
|
||||
* sb/parse-options (Tue Jul 7 22:15:41 2009 -0700) 4 commits
|
||||
+ prune-packed: migrate to parse-options
|
||||
+ verify-pack: migrate to parse-options
|
||||
+ verify-tag: migrate to parse-options
|
||||
+ write-tree: migrate to parse-options
|
||||
|
||||
* ns/init-mkdir (Sat Jul 25 06:59:28 2009 +0900) 1 commit
|
||||
+ git init: optionally allow a directory argument
|
||||
|
||||
Straightforward usability change.
|
||||
|
||||
* mk/init-db-parse-options (Sun Jul 12 12:24:32 2009 +0200) 1 commit
|
||||
+ init-db: migrate to parse-options
|
||||
|
||||
* jk/maint-show-tag (Sat Jul 18 06:14:37 2009 -0400) 2 commits
|
||||
+ show: add space between multiple items
|
||||
+ show: suppress extra newline when showing annotated tag
|
||||
|
||||
* jc/apply-epoch-patch (Fri Jul 10 18:38:08 2009 -0700) 1 commit
|
||||
+ apply: notice creation/removal patches produced by GNU diff
|
||||
|
||||
----------------------------------------------------------------
|
||||
[In 'next']
|
||||
|
||||
* js/run-command-updates (Tue Aug 4 11:28:40 2009 +0200) 7 commits
|
||||
+ run-command.c: squelch a "use before assignment" warning
|
||||
+ receive-pack: remove unnecessary run_status report
|
||||
+ run_command: report failure to execute the program, but optionally
|
||||
don't
|
||||
+ run_command: encode deadly signal number in the return value
|
||||
+ run_command: report system call errors instead of returning error
|
||||
codes
|
||||
+ run_command: return exit code as positive value
|
||||
+ MinGW: simplify waitpid() emulation macros
|
||||
|
||||
Will merge soon.
|
||||
|
||||
* mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit
|
||||
+ grep: Add --max-depth option.
|
||||
|
||||
Will merge soon.
|
||||
|
||||
* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
|
||||
+ t6050: check pushing something based on a replaced commit
|
||||
+ Documentation: add documentation for "git replace"
|
||||
+ Add git-replace to .gitignore
|
||||
+ builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
+ parse-options: add new function "usage_msg_opt"
|
||||
+ builtin-replace: teach "git replace" to actually replace
|
||||
+ Add new "git replace" command
|
||||
+ environment: add global variable to disable replacement
|
||||
+ mktag: call "check_sha1_signature" with the replacement sha1
|
||||
+ replace_object: add a test case
|
||||
+ object: call "check_sha1_signature" with the replacement sha1
|
||||
+ sha1_file: add a "read_sha1_file_repl" function
|
||||
+ replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
+ refs: add a "for_each_replace_ref" function
|
||||
|
||||
Does not seem to hurt normal operation without "replace". The basic idea
|
||||
should be easier and safer to use than the graft mechanism. I haven't
|
||||
tried the replacement myself, though.
|
||||
|
||||
* jp/symlink-dirs (Wed Jul 29 20:22:25 2009 -0700) 3 commits
|
||||
+ git-checkout: be careful about untracked symlinks
|
||||
+ lstat_cache: guard against full match of length of 'name'
|
||||
parameter
|
||||
+ Demonstrate bugs when a directory is replaced with a symlink
|
||||
|
||||
James's test scripts to expose corner case bugs in the merge and branch
|
||||
switching machinery, and a few fix-ups.
|
||||
|
||||
* jn/gitweb-blame (Sat Jul 25 00:44:10 2009 +0200) 10 commits
|
||||
+ gitweb: Create links leading to 'blame_incremental' using
|
||||
JavaScript
|
||||
+ gitweb: Incremental blame (proof of concept)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
+ gitweb: Add -partial_query option to href() subroutine
|
||||
+ gitweb: Use light/dark for class names also in 'blame' view
|
||||
+ gitweb: Add author initials in 'blame' view, a la "git gui blame"
|
||||
+ gitweb: Mark commits with no "previous" in 'blame' view
|
||||
+ gitweb: Use "previous" header of git-blame -p in 'blame' view
|
||||
+ gitweb: Mark boundary commits in 'blame' view
|
||||
+ gitweb: Make .error style generic
|
||||
|
||||
Will merge soon.
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (Mon Feb 9 00:19:46 2009 -0800) 2 commits
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
----------------------------------------------------------------
|
||||
[In 'pu']
|
||||
|
||||
* jh/notes (Wed Jul 29 04:25:26 2009 +0200) 8 commits
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- First draft of notes tree parser with support for fanout subtrees
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
* cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits
|
||||
- rebase -i: use "git sequencer--helper --make-patch"
|
||||
- sequencer: free memory used in "make_patch" function
|
||||
- sequencer: add "make_patch" function to save a patch
|
||||
- sequencer: add "builtin-sequencer--helper.c"
|
||||
|
||||
* jc/mailinfo-remove-brackets (Wed Jul 15 15:31:12 2009 -0700) 1 commit
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a
|
||||
[PATCH] marker
|
||||
|
||||
* tr/reset-checkout-patch (Tue Jul 28 23:20:12 2009 +0200) 8 commits
|
||||
- DWIM 'git stash save -p' for 'git stash -p'
|
||||
- Merge branch 'js/stash-dwim' into tr/reset-checkout-patch
|
||||
- Make 'git stash -k' a short form for 'git stash save --keep-index'
|
||||
- Implement 'git stash save --patch'
|
||||
- Implement 'git checkout --patch'
|
||||
- Implement 'git reset --patch'
|
||||
- builtin-add: refactor the meat of interactive_add()
|
||||
- git-apply--interactive: Refactor patch mode code
|
||||
|
||||
* js/stash-dwim (Mon Jul 27 20:37:10 2009 +0200) 1 commit
|
||||
- Make 'git stash -k' a short form for 'git stash save --keep-index'
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
@@ -1,319 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Aug 2009, #02; Wed, 12)
|
||||
X-master-at: 6ffd781226f04629eff63a684b47ad7555143312
|
||||
X-next-at: e5cd0abadfa20eaf7a76784ad5802115c75eff2f
|
||||
|
||||
What's cooking in git.git (Aug 2009, #02; Wed, 12)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the branches, but I am still
|
||||
holding onto them.
|
||||
|
||||
After the 1.6.5 cycle, the next release will be 1.7.0, and we will push
|
||||
out the planned "push safety" change. 1.7.0 would be a good time to
|
||||
introduce "justifiable" changes that are not strictly backward compatible.
|
||||
|
||||
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* ld/p4 (Thu Jul 30 00:13:46 2009 +0100) 1 commit
|
||||
- git-p4: stream from perforce to speed up clones
|
||||
|
||||
Waiting for Ack/Nack from stakeholders. Probably I should merge this to
|
||||
'next' soon, keep it there for a week and see if anybody screams, aka
|
||||
"Nack now or forever hold your peace" ;-).
|
||||
|
||||
* mr/gitweb-xz (Thu Aug 6 10:28:25 2009 -0400) 3 commits
|
||||
- gitweb: add support for XZ compressed snapshots
|
||||
- gitweb: update INSTALL regarding specific snapshot settings
|
||||
- gitweb: support to globally disable a snapshot format
|
||||
|
||||
This should be safe as long as it does not silently enable itself for
|
||||
folks who merely updated gitweb to this version without explicitly asking
|
||||
for the new format (but I do not remember if that is what the patch does).
|
||||
|
||||
* jh/cvs-helper (Wed Aug 12 02:13:51 2009 +0200) 4 commits
|
||||
- Add simple selftests of git-remote-cvs functionality
|
||||
- Third draft of CVS remote helper program
|
||||
- Add Python support library for CVS remote helper
|
||||
- Basic build infrastructure for Python scripts
|
||||
|
||||
Builds on db/vcs-helper. The last round failed its own selftest for me,
|
||||
but this one seems to be Ok. Documentation/git-remote-cvs.txt needs to be
|
||||
fixed to build, though.
|
||||
|
||||
* bc/maint-am-email (Thu Aug 6 20:08:13 2009 -0500) 2 commits
|
||||
+ git-am: print fair error message when format detection fails
|
||||
+ am: allow individual e-mail files as input
|
||||
|
||||
It seems that the "not mbox but a single piece of e-mail" format was
|
||||
something many people relied on. I'm cooking this in 'next', and
|
||||
hopefully it can graduate both to 'master' and 'maint'.
|
||||
|
||||
* js/maint-cover-letter-non-ascii (Mon Aug 10 18:22:22 2009 +0200) 2 commits
|
||||
+ Correctly mark cover letters' encodings if they are not pure ASCII
|
||||
+ Expose the has_non_ascii() function
|
||||
|
||||
* jc/verify-pack-stat (Fri Aug 7 15:45:30 2009 -0700) 2 commits
|
||||
+ verify-pack --stat-only: show histogram without verifying
|
||||
+ Merge branch 'maint' into jc/verify-pack-stat
|
||||
|
||||
* lt/block-sha1 (Wed Aug 12 15:47:55 2009 -0400) 15 commits
|
||||
+ block-sha1: support for architectures with memory alignment
|
||||
restrictions
|
||||
+ block-sha1: split the different "hacks" to be individually
|
||||
selected
|
||||
+ block-sha1: move code around
|
||||
+ block-sha1: improve code on large-register-set machines
|
||||
+ block-sha1: improved SHA1 hashing
|
||||
+ block-sha1: perform register rotation using cpp
|
||||
+ block-sha1: get rid of redundant 'lenW' context
|
||||
+ block-sha1: Use '(B&C)+(D&(B^C))' instead of '(B&C)|(D&(B|C))' in
|
||||
round 3
|
||||
+ block-sha1: macroize the rounds a bit further
|
||||
+ block-sha1: re-use the temporary array as we calculate the SHA1
|
||||
+ block-sha1: make the 'ntohl()' part of the first SHA1 loop
|
||||
+ block-sha1: minor fixups
|
||||
+ block-sha1: try to use rol/ror appropriately
|
||||
+ block-sha1: undo ctx->size change
|
||||
+ Add new optimized C 'block-sha1' routines
|
||||
|
||||
Linus's "written in C, faster than handcrafted asm" SHA-1 implementation
|
||||
with clean-up and ARM support from Nico.
|
||||
|
||||
* nd/sparse (Tue Aug 11 22:44:06 2009 +0700) 8 commits
|
||||
. --sparse for porcelains
|
||||
. Support sparse checkout in unpack_trees() and read-tree
|
||||
. unpack-trees.c: generalize verify_* functions
|
||||
. dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
. excluded_1(): support exclude "directories" in index
|
||||
. Read .gitignore from index if it is assume-unchanged
|
||||
. Avoid writing to buffer in add_excludes_from_file_1()
|
||||
. Prevent diff machinery from examining assume-unchanged entries on
|
||||
worktree
|
||||
|
||||
Privately applied but not yet queued to 'pu', expecting a minor reroll
|
||||
near the tip.
|
||||
|
||||
* jk/maint-merge-msg-fix (Sun Aug 9 06:02:51 2009 -0400) 3 commits
|
||||
+ merge: indicate remote tracking branches in merge message
|
||||
+ merge: fix incorrect merge message for ambiguous tag/branch
|
||||
+ add tests for merge message headings
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* zf/maint-gitweb-acname (Sun Aug 2 09:42:24 2009 +0200) 1 commit
|
||||
- gitweb: parse_commit_text encoding fix
|
||||
|
||||
* jc/maint-merge-recursive-fix (Thu Jul 30 17:38:15 2009 -0700) 1 commit
|
||||
- merge-recursive: don't segfault while handling rename clashes
|
||||
|
||||
* js/run-command-updates (Tue Aug 4 11:28:40 2009 +0200) 7 commits
|
||||
+ run-command.c: squelch a "use before assignment" warning
|
||||
+ receive-pack: remove unnecessary run_status report
|
||||
+ run_command: report failure to execute the program, but optionally
|
||||
don't
|
||||
+ run_command: encode deadly signal number in the return value
|
||||
+ run_command: report system call errors instead of returning error
|
||||
codes
|
||||
+ run_command: return exit code as positive value
|
||||
+ MinGW: simplify waitpid() emulation macros
|
||||
|
||||
* mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit
|
||||
+ grep: Add --max-depth option.
|
||||
|
||||
* jp/symlink-dirs (Wed Jul 29 20:22:25 2009 -0700) 3 commits
|
||||
+ git-checkout: be careful about untracked symlinks
|
||||
+ lstat_cache: guard against full match of length of 'name'
|
||||
parameter
|
||||
+ Demonstrate bugs when a directory is replaced with a symlink
|
||||
|
||||
----------------------------------------------------------------
|
||||
[In 'next']
|
||||
|
||||
* bc/mailsplit-cr-at-eol (Tue Aug 4 22:31:59 2009 -0500) 4 commits
|
||||
+ Allow mailsplit (and hence git-am) to handle mails with CRLF line-
|
||||
endings
|
||||
+ builtin-mailsplit.c: remove read_line_with_nul() since it is no
|
||||
longer used
|
||||
+ builtin-mailinfo,builtin-mailsplit: use strbufs
|
||||
+ strbuf: add new function strbuf_getwholeline()
|
||||
|
||||
* gb/apply-ignore-whitespace (Tue Aug 4 13:16:49 2009 +0200) 1 commit
|
||||
+ git apply: option to ignore whitespace differences
|
||||
|
||||
* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
|
||||
+ t6050: check pushing something based on a replaced commit
|
||||
+ Documentation: add documentation for "git replace"
|
||||
+ Add git-replace to .gitignore
|
||||
+ builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
+ parse-options: add new function "usage_msg_opt"
|
||||
+ builtin-replace: teach "git replace" to actually replace
|
||||
+ Add new "git replace" command
|
||||
+ environment: add global variable to disable replacement
|
||||
+ mktag: call "check_sha1_signature" with the replacement sha1
|
||||
+ replace_object: add a test case
|
||||
+ object: call "check_sha1_signature" with the replacement sha1
|
||||
+ sha1_file: add a "read_sha1_file_repl" function
|
||||
+ replace_object: add mechanism to replace objects found in
|
||||
"refs/replace/"
|
||||
+ refs: add a "for_each_replace_ref" function
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (Mon Feb 9 00:19:46 2009 -0800) 2 commits
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via
|
||||
push
|
||||
|
||||
----------------------------------------------------------------
|
||||
[In 'pu']
|
||||
|
||||
* jn/gitweb-blame (Thu Aug 6 19:11:52 2009 +0200) 14 commits
|
||||
- gitweb: Create links leading to 'blame_incremental' using
|
||||
JavaScript
|
||||
- gitweb: Incremental blame (proof of concept)
|
||||
- gitweb: Add optional "time to generate page" info in footer
|
||||
+ Revert the four topmost commits from jn/gitweb-blame topic
|
||||
+ gitweb: Create links leading to 'blame_incremental' using
|
||||
JavaScript
|
||||
+ gitweb: Incremental blame (proof of concept)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
+ gitweb: Add -partial_query option to href() subroutine
|
||||
+ gitweb: Use light/dark for class names also in 'blame' view
|
||||
+ gitweb: Add author initials in 'blame' view, a la "git gui blame"
|
||||
+ gitweb: Mark commits with no "previous" in 'blame' view
|
||||
+ gitweb: Use "previous" header of git-blame -p in 'blame' view
|
||||
+ gitweb: Mark boundary commits in 'blame' view
|
||||
+ gitweb: Make .error style generic
|
||||
|
||||
I haven't picked up Jakub's replacement to the second one from the tip.
|
||||
We probably should merge up to "Use light/dark" (aef3768) to 'master' and
|
||||
start the rest over.
|
||||
|
||||
* jc/maint-clean-nested-dir-safety (Tue Jun 30 15:33:45 2009 -0700) 1 commit
|
||||
+ clean: require double -f options to nuke nested git repository and
|
||||
work tree
|
||||
|
||||
This probably should go in 'master' soonish.
|
||||
|
||||
* jc/shortstatus (Tue Aug 4 23:55:22 2009 -0700) 12 commits
|
||||
- git stat -s: short status output
|
||||
- git stat: pathspec limits, unlike traditional "git status"
|
||||
- git stat: the beginning
|
||||
+ wt-status: collect untracked files in a separate "collect" phase
|
||||
+ Make git_status_config() file scope static to builtin-commit.c
|
||||
+ wt-status: move wt_status_colors[] into wt_status structure
|
||||
+ wt-status: move many global settings to wt_status structure
|
||||
+ commit: --dry-run
|
||||
+ status: show worktree status of conflicted paths separately
|
||||
+ wt-status.c: rework the way changes to the index and work tree are
|
||||
summarized
|
||||
+ diff-index: keep the original index intact
|
||||
+ diff-index: report unmerged new entries
|
||||
|
||||
Slowly progressing. I've addressed issues pointed out by Jeff in his
|
||||
review, and hopefully the whole thing would be ready to go.
|
||||
|
||||
* db/vcs-helper (Sun Aug 9 15:28:28 2009 -0400) 17 commits
|
||||
- Allow helpers to request marks for fast-import
|
||||
- Allow helpers to report in "list" command that the ref is
|
||||
unchanged
|
||||
- Add support for "import" helper command
|
||||
- transport-helper_init(): fix a memory leak in error path
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
- Use a clearer style to issue commands to remote helpers
|
||||
+ Makefile: install hardlinks for git-remote-<scheme> supported by
|
||||
libcurl if possible
|
||||
+ Makefile: do not link three copies of git-remote-* programs
|
||||
+ Makefile: git-http-fetch does not need expat
|
||||
+ http-fetch: Fix Makefile dependancies
|
||||
+ Add transport native helper executables to .gitignore
|
||||
+ git-http-fetch: not a builtin
|
||||
+ Use an external program to implement fetching with curl
|
||||
+ Add support for external programs for handling native fetches
|
||||
|
||||
This consolidates various previous rounds from Daniel and Johan. It seems
|
||||
that the use of colon ':' before vcs helper name needs to be corrected
|
||||
before this series can go further.
|
||||
|
||||
* je/send-email-no-subject (Wed Aug 5 18:49:54 2009 +0200) 1 commit
|
||||
- send-email: confirm on empty mail subjects
|
||||
|
||||
This seems to break t9001. Near the tip of 'pu' I have a iffy workaround.
|
||||
|
||||
* jh/notes (Wed Jul 29 04:25:26 2009 +0200) 8 commits
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- First draft of notes tree parser with support for fanout subtrees
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
* cc/sequencer-rebase-i (Wed Aug 5 22:53:00 2009 +0200) 8 commits
|
||||
- rebase -i: use "git sequencer--helper --reset-hard"
|
||||
- sequencer: add "--reset-hard" option to "git sequencer--helper"
|
||||
- sequencer: add comments about reset_almost_hard()
|
||||
- sequencer: add "reset_almost_hard()" and related functions
|
||||
- rebase -i: use "git sequencer--helper --make-patch"
|
||||
- sequencer: free memory used in "make_patch" function
|
||||
- sequencer: add "make_patch" function to save a patch
|
||||
- sequencer: add "builtin-sequencer--helper.c"
|
||||
|
||||
More sequencer updates. I didn't look at the latest round that had a
|
||||
handful "oops, fix that earlier botch" patches, expecting a cleaner
|
||||
reroll.
|
||||
|
||||
* jc/mailinfo-remove-brackets (Wed Jul 15 15:31:12 2009 -0700) 1 commit
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a
|
||||
[PATCH] marker
|
||||
|
||||
* tr/reset-checkout-patch (Tue Jul 28 23:20:12 2009 +0200) 8 commits
|
||||
- DWIM 'git stash save -p' for 'git stash -p'
|
||||
- Merge branch 'js/stash-dwim' into tr/reset-checkout-patch
|
||||
- Make 'git stash -k' a short form for 'git stash save --keep-index'
|
||||
- Implement 'git stash save --patch'
|
||||
- Implement 'git checkout --patch'
|
||||
- Implement 'git reset --patch'
|
||||
- builtin-add: refactor the meat of interactive_add()
|
||||
- git-apply--interactive: Refactor patch mode code
|
||||
|
||||
Progress?
|
||||
|
||||
* js/stash-dwim (Mon Jul 27 20:37:10 2009 +0200) 1 commit
|
||||
- Make 'git stash -k' a short form for 'git stash save --keep-index'
|
||||
|
||||
This should be merged to 'next' soonish, but I keep forgetting.
|
||||
|
||||
* pb/tracking (Thu Jul 16 16:26:15 2009 -0500) 7 commits
|
||||
. branch.c: if remote is not config'd for branch, don't try delete
|
||||
push config
|
||||
. branch, checkout: introduce autosetuppush
|
||||
. move deletion of merge configuration to branch.c
|
||||
. remote: add per-remote autosetupmerge and autosetuprebase
|
||||
configuration
|
||||
. introduce a struct tracking_config
|
||||
. branch: install_branch_config and struct tracking refactoring
|
||||
. config: allow false and true values for branch.autosetuprebase
|
||||
|
||||
Has been ejected from 'pu' for some time, expecting a reroll.
|
||||
|
||||
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
@@ -1,363 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Aug 2009, #03; Thu, 20)
|
||||
X-master-at: 044239b0a1fbdcccefafe1dab5f9c21e5a2a9150
|
||||
X-next-at: ea167d76afdd01db4b4f4cbd6429abff15cc2ccc
|
||||
|
||||
What's cooking in git.git (Aug 2009, #03; Thu, 20)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
After the 1.6.5 cycle, the next release will be 1.7.0, and we will push
|
||||
out the planned "push safety" change. 1.7.0 would be a good time to
|
||||
introduce "justifiable" changes that are not strictly backward compatible.
|
||||
|
||||
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* aj/fix-read-tree-from-scratch (2009-08-17) 1 commit
|
||||
(merged to 'next' on 2009-08-20 at 7a04133)
|
||||
+ read-tree: Fix regression with creation of a new index file.
|
||||
|
||||
* as/maint-graph-interesting-fix (2009-08-18) 1 commit.
|
||||
- graph API: fix bug in graph_is_interesting()
|
||||
|
||||
* jc/1.7.0-status (2009-08-15) 7 commits
|
||||
- git-status: adjust tests
|
||||
- git status: not "commit --dry-run" anymore
|
||||
- git stat -s: short status output
|
||||
- git stat: pathspec limits, unlike traditional "git status"
|
||||
- git stat: show traditional status headers and trailers as well
|
||||
- git stat: honor relative paths setting
|
||||
- git stat: the beginning
|
||||
(this branch uses jc/shortstatus.)
|
||||
|
||||
* jc/maint-checkout-index-to-prefix (2009-08-16) 1 commit
|
||||
(merged to 'next' on 2009-08-20 at 2f6aea2)
|
||||
+ check_path(): allow symlinked directories to checkout-index --prefix
|
||||
|
||||
* jc/maint-unpack-objects-strict (2009-08-13) 1 commit.
|
||||
- Fix "unpack-objects --strict"
|
||||
|
||||
* jh/submodule-foreach (2009-08-20) 9 commits
|
||||
(merged to 'next' on 2009-08-20 at 671bea4)
|
||||
+ git clone: Add --recursive to automatically checkout (nested) submodules
|
||||
+ t7407: Use 'rev-parse --short' rather than bash's substring expansion notation
|
||||
(merged to 'next' on 2009-08-18 at f4a881d)
|
||||
+ git submodule status: Add --recursive to recurse into nested submodules
|
||||
+ git submodule update: Introduce --recursive to update nested submodules
|
||||
+ git submodule foreach: Add --recursive to recurse into nested submodules
|
||||
+ git submodule foreach: test access to submodule name as '$name'
|
||||
+ Add selftest for 'git submodule foreach'
|
||||
+ git submodule: Cleanup usage string and add option parsing to cmd_foreach()
|
||||
+ git submodule foreach: Provide access to submodule name, as '$name'
|
||||
|
||||
* jl/submodule-summary-diff-files (2009-08-15) 2 commits
|
||||
(merged to 'next' on 2009-08-15 at 165bd8e)
|
||||
+ Documentaqtion/git-submodule.txt: Typofix
|
||||
(merged to 'next' on 2009-08-14 at a702e78)
|
||||
+ git submodule summary: add --files option
|
||||
|
||||
* lh/short-decorate (2009-08-15) 1 commit
|
||||
(merged to 'next' on 2009-08-18 at b8c1d96)
|
||||
+ git-log: allow --decorate[=short|full]
|
||||
|
||||
* oa/stash-na (2009-08-11) 1 commit
|
||||
(merged to 'next' on 2009-08-14 at 12c2e2b)
|
||||
+ git stash: Give friendlier errors when there is nothing to apply
|
||||
|
||||
* sr/gfi-options (2009-08-13) 3 commits
|
||||
- fast-import: test the new option command
|
||||
- fast-import: add option command
|
||||
- fast-import: put option parsing code in seperate functions
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* bc/maint-am-email (Thu Aug 6 20:08:13 2009 -0500) 2 commits
|
||||
+ git-am: print fair error message when format detection fails
|
||||
+ am: allow individual e-mail files as input
|
||||
|
||||
It seems that the "not mbox but a single piece of e-mail" format was
|
||||
something many people relied on. Hopefully this can also be sent
|
||||
to 'maint'.
|
||||
|
||||
* js/maint-cover-letter-non-ascii (Mon Aug 10 18:22:22 2009 +0200) 2 commits
|
||||
+ Correctly mark cover letters' encodings if they are not pure ASCII
|
||||
+ Expose the has_non_ascii() function
|
||||
|
||||
* jk/maint-merge-msg-fix (Sun Aug 9 06:02:51 2009 -0400) 3 commits
|
||||
+ merge: indicate remote tracking branches in merge message
|
||||
+ merge: fix incorrect merge message for ambiguous tag/branch
|
||||
+ add tests for merge message headings
|
||||
|
||||
* jc/maint-clean-nested-dir-safety (Tue Jun 30 15:33:45 2009 -0700) 1 commit
|
||||
+ clean: require double -f options to nuke nested git repository and
|
||||
work tree
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* cc/sequencer-rebase-i (2009-08-05) 8 commits.
|
||||
- rebase -i: use "git sequencer--helper --reset-hard"
|
||||
- sequencer: add "--reset-hard" option to "git sequencer--helper"
|
||||
- sequencer: add comments about reset_almost_hard()
|
||||
- sequencer: add "reset_almost_hard()" and related functions
|
||||
- rebase -i: use "git sequencer--helper --make-patch"
|
||||
- sequencer: free memory used in "make_patch" function
|
||||
- sequencer: add "make_patch" function to save a patch
|
||||
- sequencer: add "builtin-sequencer--helper.c"
|
||||
|
||||
More sequencer updates. I didn't look at the latest round that had a
|
||||
handful "oops, fix that earlier botch" patches, expecting a cleaner
|
||||
reroll (which hasn't happened yet).
|
||||
|
||||
* pb/tracking (2009-07-16) 7 commits.
|
||||
. branch.c: if remote is not config'd for branch, don't try delete push config
|
||||
. branch, checkout: introduce autosetuppush
|
||||
. move deletion of merge configuration to branch.c
|
||||
. remote: add per-remote autosetupmerge and autosetuprebase configuration
|
||||
. introduce a struct tracking_config
|
||||
. branch: install_branch_config and struct tracking refactoring
|
||||
. config: allow false and true values for branch.autosetuprebase
|
||||
|
||||
Has been ejected from 'pu' for some time, expecting a reroll.
|
||||
|
||||
* db/vcs-helper (2009-08-09) 17 commits
|
||||
- Allow helpers to request marks for fast-import
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Add support for "import" helper command
|
||||
- transport-helper_init(): fix a memory leak in error path
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
- Use a clearer style to issue commands to remote helpers
|
||||
(merged to 'next' on 2009-08-07 at f3533ba)
|
||||
+ Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
|
||||
+ Makefile: do not link three copies of git-remote-* programs
|
||||
+ Makefile: git-http-fetch does not need expat
|
||||
(merged to 'next' on 2009-08-06 at 15da79d)
|
||||
+ http-fetch: Fix Makefile dependancies
|
||||
+ Add transport native helper executables to .gitignore
|
||||
(merged to 'next' on 2009-08-05 at 33d491e)
|
||||
+ git-http-fetch: not a builtin
|
||||
+ Use an external program to implement fetching with curl
|
||||
+ Add support for external programs for handling native fetches
|
||||
(this branch is used by jh/cvs-helper.)
|
||||
|
||||
There was a discussion that suggests that the use of colon ':' before vcs
|
||||
helper name needs to be corrected. Nothing happened since.
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit
|
||||
- send-email: confirm on empty mail subjects
|
||||
|
||||
This seems to break t9001. Near the tip of 'pu' I have a iffy
|
||||
workaround.
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* ld/p4 (2009-07-30) 1 commit
|
||||
(merged to 'next' on 2009-08-14 at 36d310d)
|
||||
+ git-p4: stream from perforce to speed up clones
|
||||
|
||||
Should graduate to 'master' soon.
|
||||
|
||||
* mr/gitweb-xz (2009-08-06) 3 commits
|
||||
(merged to 'next' on 2009-08-14 at b63b8e6)
|
||||
+ gitweb: add support for XZ compressed snapshots
|
||||
+ gitweb: update INSTALL regarding specific snapshot settings
|
||||
+ gitweb: support to globally disable a snapshot format
|
||||
|
||||
Should graduate to 'master' soon.
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 7 commits
|
||||
- More fixes to the git-remote-cvs installation procedure
|
||||
- Fix the Makefile-generated path to the git_remote_cvs package
|
||||
in git-remote-cvs
|
||||
- Add simple selftests of git-remote-cvs functionality
|
||||
- git-remote-cvs: Remote helper program for CVS repositories
|
||||
- 2/2: Add Python support library for CVS remote helper
|
||||
- 1/2: Add Python support library for CVS remote helper
|
||||
- Basic build infrastructure for Python scripts
|
||||
(this branch uses db/vcs-helper.)
|
||||
|
||||
Builds on db/vcs-helper. The testing of Python part seemed to be
|
||||
still fragile even with the latest fix on one of my boches with an
|
||||
earlier round already installed, but I didn't look very deeply before
|
||||
removing the older installation.
|
||||
|
||||
* jc/verify-pack-stat (2009-08-07) 1 commit
|
||||
(merged to 'next' on 2009-08-10 at f80d0e9)
|
||||
+ verify-pack --stat-only: show histogram without verifying
|
||||
|
||||
* lt/block-sha1 (2009-08-17) 4 commits
|
||||
(merged to 'next' on 2009-08-18 at 67a1ce8)
|
||||
+ remove ARM and Mozilla SHA1 implementations
|
||||
+ block-sha1: guard gcc extensions with __GNUC__
|
||||
+ make sure byte swapping is optimal for git
|
||||
+ block-sha1: make the size member first in the context struct
|
||||
|
||||
Finishing touches ;-) There were a few Solaris portability patches
|
||||
floated around that I didn't pick up, waiting for them to finalize.
|
||||
|
||||
* nd/sparse (2009-08-11) 8 commits
|
||||
. --sparse for porcelains
|
||||
. Support sparse checkout in unpack_trees() and read-tree
|
||||
. unpack-trees.c: generalize verify_* functions
|
||||
. dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
. excluded_1(): support exclude "directories" in index
|
||||
. Read .gitignore from index if it is assume-unchanged
|
||||
. Avoid writing to buffer in add_excludes_from_file_1()
|
||||
(merged to 'next' on 2009-08-20 at ea167d7)
|
||||
+ Prevent diff machinery from examining assume-unchanged entries on worktree
|
||||
|
||||
The first one was an independent fix; the rest will be discarded and
|
||||
replaced with the "return of no-checkout" series.
|
||||
|
||||
* bc/mailsplit-cr-at-eol (2009-08-04) 4 commits
|
||||
(merged to 'next' on 2009-08-06 at 6bc7c5c)
|
||||
+ Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings
|
||||
+ builtin-mailsplit.c: remove read_line_with_nul() since it is no longer used
|
||||
+ builtin-mailinfo,builtin-mailsplit: use strbufs
|
||||
+ strbuf: add new function strbuf_getwholeline()
|
||||
|
||||
Will merge.
|
||||
|
||||
* gb/apply-ignore-whitespace (2009-08-04) 1 commit
|
||||
(merged to 'next' on 2009-08-06 at 59e2c86)
|
||||
+ git apply: option to ignore whitespace differences
|
||||
|
||||
Will merge.
|
||||
|
||||
* cc/replace (2009-05-27) 14 commits.
|
||||
(merged to 'next' on 2009-08-02 at b9c4bc0)
|
||||
+ t6050: check pushing something based on a replaced commit
|
||||
+ Documentation: add documentation for "git replace"
|
||||
+ Add git-replace to .gitignore
|
||||
+ builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
+ parse-options: add new function "usage_msg_opt"
|
||||
+ builtin-replace: teach "git replace" to actually replace
|
||||
+ Add new "git replace" command
|
||||
+ environment: add global variable to disable replacement
|
||||
+ mktag: call "check_sha1_signature" with the replacement sha1
|
||||
+ replace_object: add a test case
|
||||
+ object: call "check_sha1_signature" with the replacement sha1
|
||||
+ sha1_file: add a "read_sha1_file_repl" function
|
||||
+ replace_object: add mechanism to replace objects found in "refs/replace/"
|
||||
+ refs: add a "for_each_replace_ref" function
|
||||
|
||||
Will merge.
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-05-23) 2 commits.
|
||||
(merged to 'next' on 2009-08-02 at 9c08420)
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
For 1.7.0. This changes exit code from "git diff --ignore-whitespace" and
|
||||
friends when there is no actual output. It is a backward incompatible
|
||||
change, but we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits
|
||||
(merged to 'next' on 2009-08-02 at 38b82fe)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
For 1.7.0.
|
||||
|
||||
* jn/gitweb-blame (2009-08-06) 3 commits
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
- gitweb: Incremental blame (WIP)
|
||||
- gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
* jc/shortstatus (2009-08-15) 11 commits
|
||||
(merged to 'next' on 2009-08-15 at 7e40766)
|
||||
+ git commit --dry-run -v: show diff in color when asked
|
||||
+ Documentation/git-commit.txt: describe --dry-run
|
||||
(merged to 'next' on 2009-08-12 at 53bda17)
|
||||
+ wt-status: collect untracked files in a separate "collect" phase
|
||||
+ Make git_status_config() file scope static to builtin-commit.c
|
||||
+ wt-status: move wt_status_colors[] into wt_status structure
|
||||
+ wt-status: move many global settings to wt_status structure
|
||||
+ commit: --dry-run
|
||||
(merged to 'next' on 2009-08-06 at fe8cb94)
|
||||
+ status: show worktree status of conflicted paths separately
|
||||
+ wt-status.c: rework the way changes to the index and work tree are summarized
|
||||
+ diff-index: keep the original index intact
|
||||
+ diff-index: report unmerged new entries
|
||||
(this branch is used by jc/1.7.0-status.)
|
||||
|
||||
Will cook for a bit more and then merge.
|
||||
|
||||
* jh/notes (2009-07-29) 8 commits.
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- First draft of notes tree parser with support for fanout subtrees
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
The cvs-helper series depends on this one.
|
||||
|
||||
* tr/reset-checkout-patch (2009-08-18) 8 commits.
|
||||
(merged to 'next' on 2009-08-18 at e465bb3)
|
||||
+ tests: disable interactive hunk selection tests if perl is not available
|
||||
(merged to 'next' on 2009-08-16 at 67896c4)
|
||||
+ DWIM 'git stash save -p' for 'git stash -p'
|
||||
+ Implement 'git stash save --patch'
|
||||
+ Implement 'git checkout --patch'
|
||||
+ Implement 'git reset --patch'
|
||||
+ builtin-add: refactor the meat of interactive_add()
|
||||
+ Add a small patch-mode testing library
|
||||
+ git-apply--interactive: Refactor patch mode code
|
||||
(this branch uses js/stash-dwim.)
|
||||
|
||||
There was a discussion on better DWIMmery to (1) forbid "git stash save
|
||||
--anything-with-dash" and (2) redirect with any option "git stash --opt"
|
||||
to "git stash save --opt", to keep it flexible and safe at the same time.
|
||||
I think it is a sane thing to do.
|
||||
|
||||
* js/stash-dwim (2009-07-27) 1 commit.
|
||||
(merged to 'next' on 2009-08-16 at 67896c4)
|
||||
+ Make 'git stash -k' a short form for 'git stash save --keep-index'
|
||||
(this branch is used by tr/reset-checkout-patch.)
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* ar/maint-1.6.2-merge-recursive-d-f (2009-05-11) 2 commits.
|
||||
. Fix for a merge where a branch has an F->D transition
|
||||
. Add a reminder test case for a merge with F/D transition
|
||||
|
||||
* jc/merge-convert (2009-01-26) 1 commit.
|
||||
. git-merge-file: allow converting the results for the work tree
|
||||
|
||||
* lt/read-directory (2009-05-15) 3 commits.
|
||||
. Add initial support for pathname conversion to UTF-8
|
||||
. read_directory(): infrastructure for pathname character set conversion
|
||||
. Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
* ne/rev-cache (2009-08-17) 6 commits
|
||||
. support for path name caching of blobs/trees in rev-cache
|
||||
. full integration of rev-cache into git's revision walker, completed test suite
|
||||
. administrative functions for rev-cache, and start of integration into git
|
||||
. non-commit object support for rev-cache
|
||||
. bare minimum revision cache system, no integration with git
|
||||
. revision caching documentation: man page and technical discussion
|
||||
|
||||
* ps/blame (2009-03-12) 1 commit.
|
||||
. blame.c: start libifying the blame infrastructure
|
||||
@@ -1,393 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Aug 2009, #04; Sun, 23)
|
||||
X-master-at: 2e1176d51ef4fc07f487818acdfcf2fc4b789203
|
||||
X-next-at: 38eb7501aaddd72a8e6007f281d6a3cfa42a2a02
|
||||
|
||||
What's cooking in git.git (Aug 2009, #04; Sun, 23)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
After the 1.6.5 cycle, the next release will be 1.7.0, and we will push
|
||||
out the planned "push safety" change. 1.7.0 would be a good time to
|
||||
introduce "justifiable" changes that are not strictly backward compatible.
|
||||
|
||||
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* bc/mailsplit-cr-at-eol (2009-08-04) 4 commits
|
||||
(merged to 'next' on 2009-08-06 at 6bc7c5c)
|
||||
+ Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings
|
||||
+ builtin-mailsplit.c: remove read_line_with_nul() since it is no longer used
|
||||
+ builtin-mailinfo,builtin-mailsplit: use strbufs
|
||||
+ strbuf: add new function strbuf_getwholeline()
|
||||
|
||||
* gb/apply-ignore-whitespace (2009-08-04) 1 commit
|
||||
(merged to 'next' on 2009-08-06 at 59e2c86)
|
||||
+ git apply: option to ignore whitespace differences
|
||||
|
||||
* cc/replace (2009-05-27) 14 commits.
|
||||
(merged to 'next' on 2009-08-02 at b9c4bc0)
|
||||
+ t6050: check pushing something based on a replaced commit
|
||||
+ Documentation: add documentation for "git replace"
|
||||
+ Add git-replace to .gitignore
|
||||
+ builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
+ parse-options: add new function "usage_msg_opt"
|
||||
+ builtin-replace: teach "git replace" to actually replace
|
||||
+ Add new "git replace" command
|
||||
+ environment: add global variable to disable replacement
|
||||
+ mktag: call "check_sha1_signature" with the replacement sha1
|
||||
+ replace_object: add a test case
|
||||
+ object: call "check_sha1_signature" with the replacement sha1
|
||||
+ sha1_file: add a "read_sha1_file_repl" function
|
||||
+ replace_object: add mechanism to replace objects found in "refs/replace/"
|
||||
+ refs: add a "for_each_replace_ref" function
|
||||
|
||||
* ld/p4 (2009-07-30) 1 commit
|
||||
(merged to 'next' on 2009-08-14 at 36d310d)
|
||||
+ git-p4: stream from perforce to speed up clones
|
||||
|
||||
* mr/gitweb-xz (2009-08-06) 3 commits
|
||||
(merged to 'next' on 2009-08-14 at b63b8e6)
|
||||
+ gitweb: add support for XZ compressed snapshots
|
||||
+ gitweb: update INSTALL regarding specific snapshot settings
|
||||
+ gitweb: support to globally disable a snapshot format
|
||||
|
||||
* jc/verify-pack-stat (2009-08-07) 1 commit
|
||||
(merged to 'next' on 2009-08-10 at f80d0e9)
|
||||
+ verify-pack --stat-only: show histogram without verifying
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/mailinfo-scissors (2009-08-23) 1 commit
|
||||
- Teach mailinfo to ignore everything before -- >8 -- mark
|
||||
|
||||
* tf/diff-whitespace-incomplete-line (2009-08-23) 2 commits.
|
||||
- xutils: Fix xdl_recmatch() on incomplete lines
|
||||
- xutils: Fix hashing an incomplete line with whitespaces at the end
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit
|
||||
(merged to 'next' on 2009-08-22 at 5106de8)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* lt/approxidate (2009-08-22) 2 commits
|
||||
- Further 'approxidate' improvements
|
||||
- Improve on 'approxidate'
|
||||
|
||||
* mm/reset-report (2009-08-21) 2 commits
|
||||
- reset: make the reminder output consistent with "checkout"
|
||||
- Rename REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN.
|
||||
|
||||
* wl/insta-mongoose (2009-08-21) 1 commit
|
||||
- Add support for the Mongoose web server.
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* sr/gfi-options (2009-08-13) 3 commits
|
||||
- fast-import: test the new option command
|
||||
- fast-import: add option command
|
||||
- fast-import: put option parsing code in seperate functions
|
||||
|
||||
What is this used by?
|
||||
|
||||
* lt/block-sha1 (2009-08-17) 4 commits
|
||||
(merged to 'next' on 2009-08-18 at 67a1ce8)
|
||||
+ remove ARM and Mozilla SHA1 implementations
|
||||
+ block-sha1: guard gcc extensions with __GNUC__
|
||||
+ make sure byte swapping is optimal for git
|
||||
+ block-sha1: make the size member first in the context struct
|
||||
|
||||
Finishing touches ;-) There were a few Solaris portability patches
|
||||
floated around that I didn't pick up, waiting for them to finalize.
|
||||
|
||||
* js/stash-dwim (2009-07-27) 1 commit.
|
||||
(merged to 'next' on 2009-08-16 at 67896c4)
|
||||
+ Make 'git stash -k' a short form for 'git stash save --keep-index'
|
||||
(this branch is used by tr/reset-checkout-patch.)
|
||||
|
||||
* tr/reset-checkout-patch (2009-08-18) 8 commits.
|
||||
(merged to 'next' on 2009-08-18 at e465bb3)
|
||||
+ tests: disable interactive hunk selection tests if perl is not available
|
||||
(merged to 'next' on 2009-08-16 at 67896c4)
|
||||
+ DWIM 'git stash save -p' for 'git stash -p'
|
||||
+ Implement 'git stash save --patch'
|
||||
+ Implement 'git checkout --patch'
|
||||
+ Implement 'git reset --patch'
|
||||
+ builtin-add: refactor the meat of interactive_add()
|
||||
+ Add a small patch-mode testing library
|
||||
+ git-apply--interactive: Refactor patch mode code
|
||||
(this branch uses js/stash-dwim.)
|
||||
|
||||
There was a discussion on better DWIMmery for the above two topics to (1)
|
||||
forbid "git stash save --anything-with-dash" and (2) redirect with any
|
||||
option "git stash --opt" to "git stash save --opt", to keep it flexible
|
||||
and safe at the same time. I think it is a sane thing to do, but nothing
|
||||
has happened lately.
|
||||
|
||||
* jn/gitweb-blame (2009-08-06) 3 commits
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
- gitweb: Incremental blame (WIP)
|
||||
- gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame WIP
|
||||
|
||||
* db/vcs-helper (2009-08-09) 17 commits
|
||||
- Allow helpers to request marks for fast-import
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Add support for "import" helper command
|
||||
- transport-helper_init(): fix a memory leak in error path
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
- Use a clearer style to issue commands to remote helpers
|
||||
(merged to 'next' on 2009-08-07 at f3533ba)
|
||||
+ Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
|
||||
+ Makefile: do not link three copies of git-remote-* programs
|
||||
+ Makefile: git-http-fetch does not need expat
|
||||
(merged to 'next' on 2009-08-06 at 15da79d)
|
||||
+ http-fetch: Fix Makefile dependancies
|
||||
+ Add transport native helper executables to .gitignore
|
||||
(merged to 'next' on 2009-08-05 at 33d491e)
|
||||
+ git-http-fetch: not a builtin
|
||||
+ Use an external program to implement fetching with curl
|
||||
+ Add support for external programs for handling native fetches
|
||||
(this branch is used by jh/cvs-helper.)
|
||||
|
||||
There was a discussion that suggests that the use of colon ':' before vcs
|
||||
helper name needs to be corrected. Nothing happened since.
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit
|
||||
- send-email: confirm on empty mail subjects
|
||||
|
||||
This seems to break t9001. Near the tip of 'pu' I have a iffy
|
||||
workaround.
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* cc/sequencer-rebase-i (2009-08-21) 17 commits.
|
||||
- rebase -i: use "git sequencer--helper --cherry-pick"
|
||||
- sequencer: add "--cherry-pick" option to "git sequencer--helper"
|
||||
- sequencer: add "do_commit()" and related functions
|
||||
- pick: libify "pick_help_msg()"
|
||||
- revert: libify pick
|
||||
- rebase -i: use "git sequencer--helper --fast-forward"
|
||||
- sequencer: let "git sequencer--helper" callers set "allow_dirty"
|
||||
- sequencer: add "--fast-forward" option to "git sequencer--helper"
|
||||
- sequencer: add "do_fast_forward()" to perform a fast forward
|
||||
- rebase -i: use "git sequencer--helper --reset-hard"
|
||||
- sequencer: add "--reset-hard" option to "git sequencer--helper"
|
||||
- sequencer: add comments about reset_almost_hard()
|
||||
- sequencer: add "reset_almost_hard()" and related functions
|
||||
- rebase -i: use "git sequencer--helper --make-patch"
|
||||
- sequencer: free memory used in "make_patch" function
|
||||
- sequencer: add "make_patch" function to save a patch
|
||||
- sequencer: add "builtin-sequencer--helper.c"
|
||||
|
||||
Migrating "rebase -i" bit by bit to C. I am inclined to agree with Dscho
|
||||
that maybe this approach forces the migration to follow the structure of
|
||||
the shell script too much, and could force a suboptimal end result, but
|
||||
we'll see.
|
||||
|
||||
* aj/fix-read-tree-from-scratch (2009-08-17) 1 commit
|
||||
(merged to 'next' on 2009-08-20 at 7a04133)
|
||||
+ read-tree: Fix regression with creation of a new index file.
|
||||
|
||||
Will merge.
|
||||
|
||||
* as/maint-graph-interesting-fix (2009-08-18) 1 commit.
|
||||
- graph API: fix bug in graph_is_interesting()
|
||||
|
||||
I need to queue the associated test after getting it signed-off.
|
||||
|
||||
* jc/1.7.0-status (2009-08-15) 3 commits
|
||||
(merged to 'next' on 2009-08-22 at b3507bb)
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
(this branch uses jc/shortstatus.)
|
||||
|
||||
As promised, I squashed incremental "fix-up" into the commits they fix;
|
||||
this will be kept in 'next' until 1.7.0
|
||||
|
||||
* jc/shortstatus (2009-08-15) 11 commits
|
||||
(merged to 'next' on 2009-08-15 at 7e40766)
|
||||
+ git commit --dry-run -v: show diff in color when asked
|
||||
+ Documentation/git-commit.txt: describe --dry-run
|
||||
(merged to 'next' on 2009-08-12 at 53bda17)
|
||||
+ wt-status: collect untracked files in a separate "collect" phase
|
||||
+ Make git_status_config() file scope static to builtin-commit.c
|
||||
+ wt-status: move wt_status_colors[] into wt_status structure
|
||||
+ wt-status: move many global settings to wt_status structure
|
||||
+ commit: --dry-run
|
||||
(merged to 'next' on 2009-08-06 at fe8cb94)
|
||||
+ status: show worktree status of conflicted paths separately
|
||||
+ wt-status.c: rework the way changes to the index and work tree are summarized
|
||||
+ diff-index: keep the original index intact
|
||||
+ diff-index: report unmerged new entries
|
||||
(this branch is used by jc/1.7.0-status.)
|
||||
|
||||
Will cook for a bit more and then merge.
|
||||
|
||||
* jc/maint-checkout-index-to-prefix (2009-08-16) 1 commit
|
||||
(merged to 'next' on 2009-08-20 at 2f6aea2)
|
||||
+ check_path(): allow symlinked directories to checkout-index --prefix
|
||||
|
||||
Will merge.
|
||||
|
||||
* jc/maint-unpack-objects-strict (2009-08-13) 1 commit.
|
||||
(merged to 'next' on 2009-08-23 at 38eb750)
|
||||
+ Fix "unpack-objects --strict"
|
||||
|
||||
* jh/submodule-foreach (2009-08-20) 9 commits
|
||||
(merged to 'next' on 2009-08-20 at 671bea4)
|
||||
+ git clone: Add --recursive to automatically checkout (nested) submodules
|
||||
+ t7407: Use 'rev-parse --short' rather than bash's substring expansion notation
|
||||
(merged to 'next' on 2009-08-18 at f4a881d)
|
||||
+ git submodule status: Add --recursive to recurse into nested submodules
|
||||
+ git submodule update: Introduce --recursive to update nested submodules
|
||||
+ git submodule foreach: Add --recursive to recurse into nested submodules
|
||||
+ git submodule foreach: test access to submodule name as '$name'
|
||||
+ Add selftest for 'git submodule foreach'
|
||||
+ git submodule: Cleanup usage string and add option parsing to cmd_foreach()
|
||||
+ git submodule foreach: Provide access to submodule name, as '$name'
|
||||
|
||||
* jl/submodule-summary-diff-files (2009-08-15) 2 commits
|
||||
(merged to 'next' on 2009-08-15 at 165bd8e)
|
||||
+ Documentaqtion/git-submodule.txt: Typofix
|
||||
(merged to 'next' on 2009-08-14 at a702e78)
|
||||
+ git submodule summary: add --files option
|
||||
|
||||
Will merge.
|
||||
|
||||
* lh/short-decorate (2009-08-15) 1 commit
|
||||
(merged to 'next' on 2009-08-18 at b8c1d96)
|
||||
+ git-log: allow --decorate[=short|full]
|
||||
|
||||
Will merge.
|
||||
|
||||
* oa/stash-na (2009-08-11) 1 commit
|
||||
(merged to 'next' on 2009-08-14 at 12c2e2b)
|
||||
+ git stash: Give friendlier errors when there is nothing to apply
|
||||
|
||||
Will merge.
|
||||
|
||||
* jh/notes (2009-07-29) 8 commits.
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- First draft of notes tree parser with support for fanout subtrees
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
The cvs-helper series depends on this one.
|
||||
|
||||
* ne/rev-cache (2009-08-21) 6 commits
|
||||
. support for path name caching in rev-cache
|
||||
. full integration of rev-cache into git, completed test suite
|
||||
. administrative functions for rev-cache, start of integration into git
|
||||
. support for non-commit object caching in rev-cache
|
||||
. basic revision cache system, no integration or features
|
||||
. man page and technical discussion for rev-cache
|
||||
|
||||
Updated but seems to break tests when merged to 'pu'; didn't look at the
|
||||
issue deeply.
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 7 commits
|
||||
- More fixes to the git-remote-cvs installation procedure
|
||||
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
- Add simple selftests of git-remote-cvs functionality
|
||||
- git-remote-cvs: Remote helper program for CVS repositories
|
||||
- 2/2: Add Python support library for CVS remote helper
|
||||
- 1/2: Add Python support library for CVS remote helper
|
||||
- Basic build infrastructure for Python scripts
|
||||
(this branch uses db/vcs-helper.)
|
||||
|
||||
Builds on db/vcs-helper. The testing of Python part seemed to be
|
||||
still fragile even with the latest fix on one of my boches with an
|
||||
earlier round already installed, but I didn't look very deeply before
|
||||
removing the older installation.
|
||||
|
||||
* nd/sparse (2009-08-20) 20 commits
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
(merged to 'next' on 2009-08-20 at ea167d7)
|
||||
+ Prevent diff machinery from examining assume-unchanged entries on worktree
|
||||
|
||||
The first one was an independent fix; the rest has been replaced with the
|
||||
"return of no-checkout" series.
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-05-23) 2 commits.
|
||||
(merged to 'next' on 2009-08-02 at 9c08420)
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
For 1.7.0. This changes exit code from "git diff --ignore-whitespace" and
|
||||
friends when there is no actual output. It is a backward incompatible
|
||||
change, but we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits
|
||||
(merged to 'next' on 2009-08-02 at 38b82fe)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
For 1.7.0.
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* ar/maint-1.6.2-merge-recursive-d-f (2009-05-11) 2 commits.
|
||||
. Fix for a merge where a branch has an F->D transition
|
||||
. Add a reminder test case for a merge with F/D transition
|
||||
|
||||
* jc/merge-convert (2009-01-26) 1 commit.
|
||||
. git-merge-file: allow converting the results for the work tree
|
||||
|
||||
* lt/read-directory (2009-05-15) 3 commits.
|
||||
. Add initial support for pathname conversion to UTF-8
|
||||
. read_directory(): infrastructure for pathname character set conversion
|
||||
. Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
* ps/blame (2009-03-12) 1 commit.
|
||||
. blame.c: start libifying the blame infrastructure
|
||||
|
||||
* pb/tracking (2009-07-16) 7 commits.
|
||||
. branch.c: if remote is not config'd for branch, don't try delete push config
|
||||
. branch, checkout: introduce autosetuppush
|
||||
. move deletion of merge configuration to branch.c
|
||||
. remote: add per-remote autosetupmerge and autosetuprebase configuration
|
||||
. introduce a struct tracking_config
|
||||
. branch: install_branch_config and struct tracking refactoring
|
||||
. config: allow false and true values for branch.autosetuprebase
|
||||
|
||||
Has been ejected from 'pu' for some time, expecting a reroll.
|
||||
@@ -1,376 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Aug 2009, #05; Wed, 26)
|
||||
X-master-at: 68ea4741643d9e7c4bdac7cbbe6292edc69430ef
|
||||
X-next-at: 4fc77847c70f00e94586150f808d0418ca64bbb8
|
||||
|
||||
What's cooking in git.git (Aug 2009, #05; Wed, 26)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
After the 1.6.5 cycle, the next release will be 1.7.0, and we will push
|
||||
out the planned "push safety" change. 1.7.0 would be a good time to
|
||||
introduce "justifiable" changes that are not strictly backward compatible.
|
||||
|
||||
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* aj/fix-read-tree-from-scratch (2009-08-17) 1 commit
|
||||
(merged to 'next' on 2009-08-20 at 7a04133)
|
||||
+ read-tree: Fix regression with creation of a new index file.
|
||||
|
||||
* jc/maint-checkout-index-to-prefix (2009-08-16) 1 commit
|
||||
(merged to 'next' on 2009-08-20 at 2f6aea2)
|
||||
+ check_path(): allow symlinked directories to checkout-index --prefix
|
||||
|
||||
* jl/submodule-summary-diff-files (2009-08-15) 2 commits
|
||||
(merged to 'next' on 2009-08-15 at 165bd8e)
|
||||
+ Documentaqtion/git-submodule.txt: Typofix
|
||||
(merged to 'next' on 2009-08-14 at a702e78)
|
||||
+ git submodule summary: add --files option
|
||||
|
||||
* lh/short-decorate (2009-08-15) 1 commit
|
||||
(merged to 'next' on 2009-08-18 at b8c1d96)
|
||||
+ git-log: allow --decorate[=short|full]
|
||||
|
||||
* oa/stash-na (2009-08-11) 1 commit
|
||||
(merged to 'next' on 2009-08-14 at 12c2e2b)
|
||||
+ git stash: Give friendlier errors when there is nothing to apply
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* np/maint-1.6.3-deepen (2009-08-24) 1 commit.
|
||||
(merged to 'next' on 2009-08-25 at 8e383d4)
|
||||
+ fix simple deepening of a repo
|
||||
|
||||
* jk/maint-1.6.3-checkout-unborn (2009-08-24) 1 commit.
|
||||
(merged to 'next' on 2009-08-25 at 5f29625)
|
||||
+ checkout: do not imply "-f" on unborn branches
|
||||
|
||||
* mr/gitweb-snapshot (2009-08-25) 3 commits
|
||||
- gitweb: add t9501 tests for checking HTTP status codes
|
||||
- gitweb: split test suite into library and tests
|
||||
- gitweb: improve snapshot error handling
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* js/stash-dwim (2009-07-27) 1 commit.
|
||||
(merged to 'next' on 2009-08-16 at 67896c4)
|
||||
+ Make 'git stash -k' a short form for 'git stash save --keep-index'
|
||||
(this branch is used by tr/reset-checkout-patch.)
|
||||
|
||||
* tr/reset-checkout-patch (2009-08-18) 8 commits.
|
||||
(merged to 'next' on 2009-08-18 at e465bb3)
|
||||
+ tests: disable interactive hunk selection tests if perl is not available
|
||||
(merged to 'next' on 2009-08-16 at 67896c4)
|
||||
+ DWIM 'git stash save -p' for 'git stash -p'
|
||||
+ Implement 'git stash save --patch'
|
||||
+ Implement 'git checkout --patch'
|
||||
+ Implement 'git reset --patch'
|
||||
+ builtin-add: refactor the meat of interactive_add()
|
||||
+ Add a small patch-mode testing library
|
||||
+ git-apply--interactive: Refactor patch mode code
|
||||
(this branch uses js/stash-dwim.)
|
||||
|
||||
There was a discussion on better DWIMmery for the above two topics to (1)
|
||||
forbid "git stash save --anything-with-dash" and (2) redirect with any
|
||||
option "git stash --opt" to "git stash save --opt", to keep it flexible
|
||||
and safe at the same time. I think it is a sane thing to do, but nothing
|
||||
has happened lately.
|
||||
|
||||
* jn/gitweb-blame (2009-08-06) 3 commits
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
- gitweb: Incremental blame (WIP)
|
||||
- gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame WIP
|
||||
|
||||
* db/vcs-helper (2009-08-09) 17 commits
|
||||
- Allow helpers to request marks for fast-import
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Add support for "import" helper command
|
||||
- transport-helper_init(): fix a memory leak in error path
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
- Use a clearer style to issue commands to remote helpers
|
||||
(merged to 'next' on 2009-08-07 at f3533ba)
|
||||
+ Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
|
||||
+ Makefile: do not link three copies of git-remote-* programs
|
||||
+ Makefile: git-http-fetch does not need expat
|
||||
(merged to 'next' on 2009-08-06 at 15da79d)
|
||||
+ http-fetch: Fix Makefile dependancies
|
||||
+ Add transport native helper executables to .gitignore
|
||||
(merged to 'next' on 2009-08-05 at 33d491e)
|
||||
+ git-http-fetch: not a builtin
|
||||
+ Use an external program to implement fetching with curl
|
||||
+ Add support for external programs for handling native fetches
|
||||
(this branch is used by jh/cvs-helper.)
|
||||
|
||||
There was a discussion that suggests that the use of colon ':' before vcs
|
||||
helper name needs to be corrected. Nothing happened since.
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit
|
||||
- send-email: confirm on empty mail subjects
|
||||
|
||||
This seems to break t9001. Near the tip of 'pu' I have a iffy
|
||||
workaround.
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* mm/reset-report (2009-08-21) 2 commits
|
||||
(merged to 'next' on 2009-08-25 at f2a4424)
|
||||
+ reset: make the reminder output consistent with "checkout"
|
||||
+ Rename REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN.
|
||||
|
||||
* wl/insta-mongoose (2009-08-21) 1 commit
|
||||
(merged to 'next' on 2009-08-25 at da1d566)
|
||||
+ Add support for the Mongoose web server.
|
||||
|
||||
* lt/approxidate (2009-08-22) 2 commits
|
||||
(merged to 'next' on 2009-08-26 at 62853f9)
|
||||
+ Further 'approxidate' improvements
|
||||
+ Improve on 'approxidate'
|
||||
|
||||
Fixes a few "reasonably formatted but thus-far misparsed" date strings.
|
||||
As Nico suggested, we would need a test to prevent regression to existing
|
||||
support for date strings that are "reasonably formatted".
|
||||
|
||||
* jc/mailinfo-scissors (2009-08-25) 2 commits
|
||||
- Documentation: describe the scissors mark support of "git am"
|
||||
- Teach mailinfo to ignore everything before -- >8 -- mark
|
||||
|
||||
* tf/diff-whitespace-incomplete-line (2009-08-23) 2 commits.
|
||||
(merged to 'next' on 2009-08-26 at 4fc7784)
|
||||
+ xutils: Fix xdl_recmatch() on incomplete lines
|
||||
+ xutils: Fix hashing an incomplete line with whitespaces at the end
|
||||
|
||||
* cc/sequencer-rebase-i (2009-08-21) 17 commits.
|
||||
- rebase -i: use "git sequencer--helper --cherry-pick"
|
||||
- sequencer: add "--cherry-pick" option to "git sequencer--helper"
|
||||
- sequencer: add "do_commit()" and related functions
|
||||
- pick: libify "pick_help_msg()"
|
||||
- revert: libify pick
|
||||
- rebase -i: use "git sequencer--helper --fast-forward"
|
||||
- sequencer: let "git sequencer--helper" callers set "allow_dirty"
|
||||
- sequencer: add "--fast-forward" option to "git sequencer--helper"
|
||||
- sequencer: add "do_fast_forward()" to perform a fast forward
|
||||
- rebase -i: use "git sequencer--helper --reset-hard"
|
||||
- sequencer: add "--reset-hard" option to "git sequencer--helper"
|
||||
- sequencer: add comments about reset_almost_hard()
|
||||
- sequencer: add "reset_almost_hard()" and related functions
|
||||
- rebase -i: use "git sequencer--helper --make-patch"
|
||||
- sequencer: free memory used in "make_patch" function
|
||||
- sequencer: add "make_patch" function to save a patch
|
||||
- sequencer: add "builtin-sequencer--helper.c"
|
||||
|
||||
Migrating "rebase -i" bit by bit to C. I am inclined to agree with Dscho
|
||||
that maybe this approach forces the migration to follow the structure of
|
||||
the shell script too much, and could force a suboptimal end result, but
|
||||
we'll see.
|
||||
|
||||
* as/maint-graph-interesting-fix (2009-08-21) 2 commits.
|
||||
(merged to 'next' on 2009-08-25 at 9d5e215)
|
||||
+ Add tests for rev-list --graph with options that simplify history
|
||||
+ graph API: fix bug in graph_is_interesting()
|
||||
|
||||
Looked sane.
|
||||
|
||||
* jc/shortstatus (2009-08-15) 11 commits
|
||||
(merged to 'next' on 2009-08-15 at 7e40766)
|
||||
+ git commit --dry-run -v: show diff in color when asked
|
||||
+ Documentation/git-commit.txt: describe --dry-run
|
||||
(merged to 'next' on 2009-08-12 at 53bda17)
|
||||
+ wt-status: collect untracked files in a separate "collect" phase
|
||||
+ Make git_status_config() file scope static to builtin-commit.c
|
||||
+ wt-status: move wt_status_colors[] into wt_status structure
|
||||
+ wt-status: move many global settings to wt_status structure
|
||||
+ commit: --dry-run
|
||||
(merged to 'next' on 2009-08-06 at fe8cb94)
|
||||
+ status: show worktree status of conflicted paths separately
|
||||
+ wt-status.c: rework the way changes to the index and work tree are summarized
|
||||
+ diff-index: keep the original index intact
|
||||
+ diff-index: report unmerged new entries
|
||||
(this branch is used by jc/1.7.0-status.)
|
||||
|
||||
Will cook for a bit more and then merge.
|
||||
|
||||
* jc/maint-unpack-objects-strict (2009-08-13) 1 commit.
|
||||
(merged to 'next' on 2009-08-23 at 38eb750)
|
||||
+ Fix "unpack-objects --strict"
|
||||
|
||||
Will merge.
|
||||
|
||||
* jh/submodule-foreach (2009-08-20) 9 commits
|
||||
(merged to 'next' on 2009-08-20 at 671bea4)
|
||||
+ git clone: Add --recursive to automatically checkout (nested) submodules
|
||||
+ t7407: Use 'rev-parse --short' rather than bash's substring expansion notation
|
||||
(merged to 'next' on 2009-08-18 at f4a881d)
|
||||
+ git submodule status: Add --recursive to recurse into nested submodules
|
||||
+ git submodule update: Introduce --recursive to update nested submodules
|
||||
+ git submodule foreach: Add --recursive to recurse into nested submodules
|
||||
+ git submodule foreach: test access to submodule name as '$name'
|
||||
+ Add selftest for 'git submodule foreach'
|
||||
+ git submodule: Cleanup usage string and add option parsing to cmd_foreach()
|
||||
+ git submodule foreach: Provide access to submodule name, as '$name'
|
||||
|
||||
Will merge.
|
||||
|
||||
* jh/notes (2009-07-29) 8 commits.
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- First draft of notes tree parser with support for fanout subtrees
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
The cvs-helper series depends on this one. I have a recollection
|
||||
that some people were not happy about the fan-out of the notes tree
|
||||
layout, but has the issue been resolved to a concensus?
|
||||
|
||||
* ne/rev-cache (2009-08-21) 6 commits
|
||||
. support for path name caching in rev-cache
|
||||
. full integration of rev-cache into git, completed test suite
|
||||
. administrative functions for rev-cache, start of integration into git
|
||||
. support for non-commit object caching in rev-cache
|
||||
. basic revision cache system, no integration or features
|
||||
. man page and technical discussion for rev-cache
|
||||
|
||||
Updated but seems to break upload-pack tests when merged to 'pu'; given
|
||||
what this series touches, breakages in that area are expected.
|
||||
May discard if a working reroll comes, to give it a fresh start.
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 7 commits
|
||||
- More fixes to the git-remote-cvs installation procedure
|
||||
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
- Add simple selftests of git-remote-cvs functionality
|
||||
- git-remote-cvs: Remote helper program for CVS repositories
|
||||
- 2/2: Add Python support library for CVS remote helper
|
||||
- 1/2: Add Python support library for CVS remote helper
|
||||
- Basic build infrastructure for Python scripts
|
||||
(this branch uses db/vcs-helper.)
|
||||
|
||||
Builds on db/vcs-helper (which is stalled, so this cannot move).
|
||||
|
||||
The testing of Python part seemed to be still fragile even with the latest
|
||||
fix on one of my boches with an earlier round already installed, but I
|
||||
didn't look very deeply before removing the older installation.
|
||||
|
||||
* sr/gfi-options (2009-08-24) 4 commits
|
||||
- fast-import: test the new option command
|
||||
- fast-import: add option command
|
||||
- fast-import: put marks reading in it's own function
|
||||
- fast-import: put option parsing code in seperate functions
|
||||
|
||||
Will merge to 'next' shortly.
|
||||
|
||||
* lt/block-sha1 (2009-08-17) 4 commits
|
||||
(merged to 'next' on 2009-08-18 at 67a1ce8)
|
||||
+ remove ARM and Mozilla SHA1 implementations
|
||||
+ block-sha1: guard gcc extensions with __GNUC__
|
||||
+ make sure byte swapping is optimal for git
|
||||
+ block-sha1: make the size member first in the context struct
|
||||
|
||||
May merge soon; Solaris performance patches that was discussed
|
||||
earlier can happen on 'master', as the series is usable as-is.
|
||||
|
||||
* nd/sparse (2009-08-20) 20 commits
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
(merged to 'next' on 2009-08-20 at ea167d7)
|
||||
+ Prevent diff machinery from examining assume-unchanged entries on worktree
|
||||
|
||||
The first one was an independent fix; the rest has been replaced with the
|
||||
"return of no-checkout" series.
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jc/1.7.0-status (2009-08-15) 3 commits
|
||||
(merged to 'next' on 2009-08-22 at b3507bb)
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
(this branch uses jc/shortstatus.)
|
||||
|
||||
With this, "git status" is no longer "git commit --preview".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit
|
||||
(merged to 'next' on 2009-08-22 at 5106de8)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-05-23) 2 commits.
|
||||
(merged to 'next' on 2009-08-02 at 9c08420)
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits
|
||||
(merged to 'next' on 2009-08-02 at 38b82fe)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* ar/maint-1.6.2-merge-recursive-d-f (2009-05-11) 2 commits.
|
||||
. Fix for a merge where a branch has an F->D transition
|
||||
. Add a reminder test case for a merge with F/D transition
|
||||
|
||||
* jc/merge-convert (2009-01-26) 1 commit.
|
||||
. git-merge-file: allow converting the results for the work tree
|
||||
|
||||
* lt/read-directory (2009-05-15) 3 commits.
|
||||
. Add initial support for pathname conversion to UTF-8
|
||||
. read_directory(): infrastructure for pathname character set conversion
|
||||
. Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
* ps/blame (2009-03-12) 1 commit.
|
||||
. blame.c: start libifying the blame infrastructure
|
||||
|
||||
* pb/tracking (2009-07-16) 7 commits.
|
||||
. branch.c: if remote is not config'd for branch, don't try delete push config
|
||||
. branch, checkout: introduce autosetuppush
|
||||
. move deletion of merge configuration to branch.c
|
||||
. remote: add per-remote autosetupmerge and autosetuprebase configuration
|
||||
. introduce a struct tracking_config
|
||||
. branch: install_branch_config and struct tracking refactoring
|
||||
. config: allow false and true values for branch.autosetuprebase
|
||||
|
||||
Has been ejected from 'pu' for some time, expecting a reroll.
|
||||
@@ -1,407 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Aug 2009, #06; Sun, 30)
|
||||
X-master-at: f324cb50be3d88c6fb6123c85da749695a749f60
|
||||
X-next-at: 5fc6248250e68c3b723efb9b868d8fc27499065a
|
||||
|
||||
What's cooking in git.git (Aug 2009, #06; Sun, 30)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
After the 1.6.5 cycle, the next release will be 1.7.0, and we will push
|
||||
out the planned "push safety" change. 1.7.0 would be a good time to
|
||||
introduce "justifiable" changes that are not strictly backward compatible.
|
||||
|
||||
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* wl/insta-mongoose (2009-08-21) 1 commit
|
||||
(merged to 'next' on 2009-08-25 at da1d566)
|
||||
+ Add support for the Mongoose web server.
|
||||
|
||||
* as/maint-graph-interesting-fix (2009-08-21) 2 commits.
|
||||
(merged to 'next' on 2009-08-25 at 9d5e215)
|
||||
+ Add tests for rev-list --graph with options that simplify history
|
||||
+ graph API: fix bug in graph_is_interesting()
|
||||
|
||||
* jc/maint-unpack-objects-strict (2009-08-13) 1 commit.
|
||||
(merged to 'next' on 2009-08-23 at 38eb750)
|
||||
+ Fix "unpack-objects --strict"
|
||||
|
||||
* jh/submodule-foreach (2009-08-20) 9 commits
|
||||
(merged to 'next' on 2009-08-20 at 671bea4)
|
||||
+ git clone: Add --recursive to automatically checkout (nested) submodules
|
||||
+ t7407: Use 'rev-parse --short' rather than bash's substring expansion notation
|
||||
(merged to 'next' on 2009-08-18 at f4a881d)
|
||||
+ git submodule status: Add --recursive to recurse into nested submodules
|
||||
+ git submodule update: Introduce --recursive to update nested submodules
|
||||
+ git submodule foreach: Add --recursive to recurse into nested submodules
|
||||
+ git submodule foreach: test access to submodule name as '$name'
|
||||
+ Add selftest for 'git submodule foreach'
|
||||
+ git submodule: Cleanup usage string and add option parsing to cmd_foreach()
|
||||
+ git submodule foreach: Provide access to submodule name, as '$name'
|
||||
|
||||
* lt/block-sha1 (2009-08-17) 4 commits
|
||||
(merged to 'next' on 2009-08-18 at 67a1ce8)
|
||||
+ remove ARM and Mozilla SHA1 implementations
|
||||
+ block-sha1: guard gcc extensions with __GNUC__
|
||||
+ make sure byte swapping is optimal for git
|
||||
+ block-sha1: make the size member first in the context struct
|
||||
|
||||
* np/maint-1.6.3-deepen (2009-08-24) 1 commit.
|
||||
(merged to 'next' on 2009-08-25 at 8e383d4)
|
||||
+ fix simple deepening of a repo
|
||||
|
||||
* jk/maint-1.6.3-checkout-unborn (2009-08-24) 1 commit.
|
||||
(merged to 'next' on 2009-08-25 at 5f29625)
|
||||
+ checkout: do not imply "-f" on unborn branches
|
||||
|
||||
* mm/reset-report (2009-08-21) 2 commits
|
||||
(merged to 'next' on 2009-08-25 at f2a4424)
|
||||
+ reset: make the reminder output consistent with "checkout"
|
||||
+ Rename REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN.
|
||||
|
||||
* jc/shortstatus (2009-08-15) 11 commits
|
||||
(merged to 'next' on 2009-08-15 at 7e40766)
|
||||
+ git commit --dry-run -v: show diff in color when asked
|
||||
+ Documentation/git-commit.txt: describe --dry-run
|
||||
(merged to 'next' on 2009-08-12 at 53bda17)
|
||||
+ wt-status: collect untracked files in a separate "collect" phase
|
||||
+ Make git_status_config() file scope static to builtin-commit.c
|
||||
+ wt-status: move wt_status_colors[] into wt_status structure
|
||||
+ wt-status: move many global settings to wt_status structure
|
||||
+ commit: --dry-run
|
||||
(merged to 'next' on 2009-08-06 at fe8cb94)
|
||||
+ status: show worktree status of conflicted paths separately
|
||||
+ wt-status.c: rework the way changes to the index and work tree are summarized
|
||||
+ diff-index: keep the original index intact
|
||||
+ diff-index: report unmerged new entries
|
||||
(this branch is used by jc/1.7.0-status.)
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/upload-pack-hook (2009-08-28) 2 commits
|
||||
- upload-pack: feed "kind [clone|fetch]" to post-upload-pack hook
|
||||
- upload-pack: add a trigger for post-upload-pack hook
|
||||
|
||||
I do not know if the distinction between fetching some but not all refs
|
||||
and fetching full set of refs into an empty repository is something worth
|
||||
making, so in that sense the tip commit is somewhat iffy.
|
||||
|
||||
One reason this series makes me somewhat uneasy is that Tom, the original
|
||||
starter of the discussion went dark after sending a proposed patch. Maybe
|
||||
he has been too busy, but I have been hoping that GitHub as a stakeholder
|
||||
has somebody who monitors the list when he is not available.
|
||||
|
||||
Does anybody from GitHub have any input? Is there something that needs to
|
||||
be improved to fill GitHub's needs? Does GitHub want to stick to its own
|
||||
fork, and were all these discussions for improvements unwanted?
|
||||
|
||||
* jk/clone-b (2009-08-26) 1 commit
|
||||
(merged to 'next' on 2009-08-30 at 10a68d1)
|
||||
+ clone: add --branch option to select a different HEAD
|
||||
|
||||
* pk/import-dirs (2009-08-24) 1 commit
|
||||
- Add script for importing bits-and-pieces to Git.
|
||||
|
||||
This version makes me suspect that the author might regret the choice of
|
||||
the import format that does not allow escaping of paths, nor does not
|
||||
allow leading blanks for readability without changing semantics, both of
|
||||
which make it somewhat limiting and error prone. These issues will be
|
||||
hard to rectify without breaking the backward compatibility, for a tool
|
||||
that could otherwise turn out to be useful.
|
||||
|
||||
As a contrib/ material, I probably shouldn't be too worried about these
|
||||
issues, but I am keeping this out of 'next' for now, just in case the
|
||||
author chooses to polish the usability of the tool for general audience.
|
||||
|
||||
It is a different story if the submission was just throwing out a one-time
|
||||
hack in the open in the hope that some other people might find it useful,
|
||||
but without any intention of maintaining it. But then I do not have a
|
||||
strong reason to keep this in my tree, either. The mailing list archive
|
||||
is a more suitable storage media for such a patch.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* jh/notes (2009-08-27) 12 commits.
|
||||
- Add '%N'-format for pretty-printing commit notes
|
||||
- Add flags to get_commit_notes() to control the format of the note string
|
||||
- notes.c: Implement simple memory pooling of leaf nodes
|
||||
- Selftests verifying semantics when loading notes trees with various fanouts
|
||||
- Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
I heard the cvs-helper series depends on this one. It seems that the
|
||||
fan-out strategy is being rethought?
|
||||
|
||||
* js/stash-dwim (2009-07-27) 1 commit.
|
||||
(merged to 'next' on 2009-08-16 at 67896c4)
|
||||
+ Make 'git stash -k' a short form for 'git stash save --keep-index'
|
||||
(this branch is used by tr/reset-checkout-patch.)
|
||||
|
||||
* tr/reset-checkout-patch (2009-08-27) 9 commits.
|
||||
(merged to 'next' on 2009-08-27 at d314281)
|
||||
+ Make test case number unique
|
||||
(merged to 'next' on 2009-08-18 at e465bb3)
|
||||
+ tests: disable interactive hunk selection tests if perl is not available
|
||||
(merged to 'next' on 2009-08-16 at 67896c4)
|
||||
+ DWIM 'git stash save -p' for 'git stash -p'
|
||||
+ Implement 'git stash save --patch'
|
||||
+ Implement 'git checkout --patch'
|
||||
+ Implement 'git reset --patch'
|
||||
+ builtin-add: refactor the meat of interactive_add()
|
||||
+ Add a small patch-mode testing library
|
||||
+ git-apply--interactive: Refactor patch mode code
|
||||
(this branch uses js/stash-dwim.)
|
||||
|
||||
There was a discussion on better DWIMmery for the above two topics to (1)
|
||||
forbid "git stash save --anything-with-dash" and (2) redirect with any
|
||||
option "git stash --opt" to "git stash save --opt", to keep it flexible
|
||||
and safe at the same time. I think it is a sane thing to do, but nothing
|
||||
has happened lately.
|
||||
|
||||
* db/vcs-helper (2009-08-09) 17 commits
|
||||
- Allow helpers to request marks for fast-import
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Add support for "import" helper command
|
||||
- transport-helper_init(): fix a memory leak in error path
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
- Use a clearer style to issue commands to remote helpers
|
||||
(merged to 'next' on 2009-08-07 at f3533ba)
|
||||
+ Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
|
||||
+ Makefile: do not link three copies of git-remote-* programs
|
||||
+ Makefile: git-http-fetch does not need expat
|
||||
(merged to 'next' on 2009-08-06 at 15da79d)
|
||||
+ http-fetch: Fix Makefile dependancies
|
||||
+ Add transport native helper executables to .gitignore
|
||||
(merged to 'next' on 2009-08-05 at 33d491e)
|
||||
+ git-http-fetch: not a builtin
|
||||
+ Use an external program to implement fetching with curl
|
||||
+ Add support for external programs for handling native fetches
|
||||
(this branch is used by jh/cvs-helper.)
|
||||
|
||||
We had a few messages on what the list consensus was with this series. My
|
||||
impression, after going back to the archive, is that there wasn't.
|
||||
|
||||
* jn/gitweb-blame (2009-08-06) 3 commits
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
- gitweb: Incremental blame (WIP)
|
||||
- gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame WIP
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit
|
||||
(merged to 'next' on 2009-08-30 at b6455c2)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests to covers the positive case (i.e. as long as the user
|
||||
says "yes" to the "do you really want to send this message that lacks
|
||||
subject", the message is sent) of this feature, but the feature itself
|
||||
needs its own test to verify the negative case (i.e. does it correctly
|
||||
stop if the user says "no"?)
|
||||
|
||||
* lt/approxidate (2009-08-30) 6 commits
|
||||
(merged to 'next' on 2009-08-30 at e016e3d)
|
||||
+ fix approxidate parsing of relative months and years
|
||||
+ tests: add date printing and parsing tests
|
||||
+ refactor test-date interface
|
||||
+ Add date formatting and parsing functions relative to a given time
|
||||
(merged to 'next' on 2009-08-26 at 62853f9)
|
||||
+ Further 'approxidate' improvements
|
||||
+ Improve on 'approxidate'
|
||||
|
||||
Fixes a few "reasonably formatted but thus-far misparsed" date strings.
|
||||
With tests by Peff, this should be ready for -rc0.
|
||||
|
||||
* mr/gitweb-snapshot (2009-08-25) 3 commits
|
||||
(merged to 'next' on 2009-08-30 at e4edd0b)
|
||||
+ gitweb: add t9501 tests for checking HTTP status codes
|
||||
+ gitweb: split test suite into library and tests
|
||||
+ gitweb: improve snapshot error handling
|
||||
|
||||
* jc/mailinfo-scissors (2009-08-26) 5 commits
|
||||
(merged to 'next' on 2009-08-30 at 5fc6248)
|
||||
+ mailinfo.scissors: new configuration
|
||||
+ am/mailinfo: Disable scissors processing by default
|
||||
+ Documentation: describe the scissors mark support of "git am"
|
||||
+ Teach mailinfo to ignore everything before -- >8 -- mark
|
||||
+ builtin-mailinfo.c: fix confusing internal API to mailinfo()
|
||||
|
||||
I didn't pick up the patch to simplify the definition of scissors. I do
|
||||
not have strong opinion on it either way, but the list would hopefully
|
||||
decide it before too long.
|
||||
|
||||
* tf/diff-whitespace-incomplete-line (2009-08-23) 2 commits.
|
||||
(merged to 'next' on 2009-08-26 at 4fc7784)
|
||||
+ xutils: Fix xdl_recmatch() on incomplete lines
|
||||
+ xutils: Fix hashing an incomplete line with whitespaces at the end
|
||||
|
||||
Will merge.
|
||||
|
||||
* cc/sequencer-rebase-i (2009-08-28) 15 commits
|
||||
- rebase -i: use "git sequencer--helper --cherry-pick"
|
||||
- sequencer: add "--cherry-pick" option to "git sequencer--helper"
|
||||
- sequencer: add "do_commit()" and related functions working on "next_commit"
|
||||
- pick: libify "pick_help_msg()"
|
||||
- revert: libify cherry-pick and revert functionnality
|
||||
- rebase -i: use "git sequencer--helper --fast-forward"
|
||||
- sequencer: let "git sequencer--helper" callers set "allow_dirty"
|
||||
- sequencer: add "--fast-forward" option to "git sequencer--helper"
|
||||
- sequencer: add "do_fast_forward()" to perform a fast forward
|
||||
- rebase -i: use "git sequencer--helper --reset-hard"
|
||||
- sequencer: add "--reset-hard" option to "git sequencer--helper"
|
||||
- sequencer: add "reset_almost_hard()" and related functions
|
||||
- rebase -i: use "git sequencer--helper --make-patch"
|
||||
- sequencer: add "make_patch" function to save a patch
|
||||
- sequencer: add "builtin-sequencer--helper.c"
|
||||
|
||||
Migrating "rebase -i" bit by bit to C.
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 7 commits
|
||||
- More fixes to the git-remote-cvs installation procedure
|
||||
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
- Add simple selftests of git-remote-cvs functionality
|
||||
- git-remote-cvs: Remote helper program for CVS repositories
|
||||
- 2/2: Add Python support library for CVS remote helper
|
||||
- 1/2: Add Python support library for CVS remote helper
|
||||
- Basic build infrastructure for Python scripts
|
||||
(this branch uses db/vcs-helper.)
|
||||
|
||||
Builds on db/vcs-helper (which is stalled, so this cannot move further at
|
||||
the moment). There is a re-roll planned, so I did not pick up test fixes
|
||||
from Brandon myself.
|
||||
|
||||
* sr/gfi-options (2009-08-27) 6 commits
|
||||
- fast-import: test the new option command
|
||||
- fast-import: add option command
|
||||
- fast-import: test the new feature command
|
||||
- fast-import: add feature command
|
||||
- fast-import: put marks reading in it's own function
|
||||
- fast-import: put option parsing code in separate functions
|
||||
|
||||
Re-rolled, based on an off-list discussion I was/am not aware of.
|
||||
Looked ready for 'next'.
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jc/1.7.0-status (2009-08-15) 3 commits
|
||||
(merged to 'next' on 2009-08-22 at b3507bb)
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
|
||||
With this, "git status" is no longer "git commit --preview".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit
|
||||
(merged to 'next' on 2009-08-22 at 5106de8)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
|
||||
(merged to 'next' on 2009-08-30 at 0623572)
|
||||
+ diff.c: fix typoes in comments
|
||||
(merged to 'next' on 2009-08-27 at 81fb2bd)
|
||||
+ Make test case number unique
|
||||
(merged to 'next' on 2009-08-02 at 9c08420)
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits
|
||||
(merged to 'next' on 2009-08-02 at 38b82fe)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* ar/maint-1.6.2-merge-recursive-d-f (2009-05-11) 2 commits.
|
||||
. Fix for a merge where a branch has an F->D transition
|
||||
. Add a reminder test case for a merge with F/D transition
|
||||
|
||||
* jc/merge-convert (2009-01-26) 1 commit.
|
||||
. git-merge-file: allow converting the results for the work tree
|
||||
|
||||
* lt/read-directory (2009-05-15) 3 commits.
|
||||
. Add initial support for pathname conversion to UTF-8
|
||||
. read_directory(): infrastructure for pathname character set conversion
|
||||
. Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
* ps/blame (2009-03-12) 1 commit.
|
||||
. blame.c: start libifying the blame infrastructure
|
||||
|
||||
* pb/tracking (2009-07-16) 7 commits.
|
||||
. branch.c: if remote is not config'd for branch, don't try delete push config
|
||||
. branch, checkout: introduce autosetuppush
|
||||
. move deletion of merge configuration to branch.c
|
||||
. remote: add per-remote autosetupmerge and autosetuprebase configuration
|
||||
. introduce a struct tracking_config
|
||||
. branch: install_branch_config and struct tracking refactoring
|
||||
. config: allow false and true values for branch.autosetuprebase
|
||||
|
||||
Has been ejected from 'pu' for some time, expecting a reroll.
|
||||
|
||||
* ne/rev-cache (2009-08-21) 6 commits
|
||||
. support for path name caching in rev-cache
|
||||
. full integration of rev-cache into git, completed test suite
|
||||
. administrative functions for rev-cache, start of integration into git
|
||||
. support for non-commit object caching in rev-cache
|
||||
. basic revision cache system, no integration or features
|
||||
. man page and technical discussion for rev-cache
|
||||
|
||||
Updated but seems to break upload-pack tests when merged to 'pu'; given
|
||||
what this series touches, breakages in that area are expected.
|
||||
May discard if a working reroll comes, to give it a fresh start.
|
||||
@@ -1,326 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Sep 2009, #01; Sat, 05)
|
||||
X-master-at: 79b4fde573eb5e86a8109d100ad182be1eb5fc54
|
||||
X-next-at: 85dc3ec32928a03c0f4996b00d7a74f5a8f9045e
|
||||
|
||||
What's cooking in git.git (Sep 2009, #01; Sat, 05)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
After the 1.6.5 cycle, the next release will be 1.7.0, and we will push
|
||||
out the planned "push safety" change. 1.7.0 would be a good time to
|
||||
introduce "justifiable" changes that are not strictly backward compatible.
|
||||
|
||||
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
|
||||
|
||||
I will probably do 1.6.5-rc0 this weekend, leaving some topics still
|
||||
cooking in 'next'.
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* lt/approxidate (2009-08-30) 6 commits
|
||||
(merged to 'next' on 2009-08-30 at e016e3d)
|
||||
+ fix approxidate parsing of relative months and years
|
||||
+ tests: add date printing and parsing tests
|
||||
+ refactor test-date interface
|
||||
+ Add date formatting and parsing functions relative to a given time
|
||||
(merged to 'next' on 2009-08-26 at 62853f9)
|
||||
+ Further 'approxidate' improvements
|
||||
+ Improve on 'approxidate'
|
||||
|
||||
* mr/gitweb-snapshot (2009-08-25) 3 commits
|
||||
(merged to 'next' on 2009-08-30 at e4edd0b)
|
||||
+ gitweb: add t9501 tests for checking HTTP status codes
|
||||
+ gitweb: split test suite into library and tests
|
||||
+ gitweb: improve snapshot error handling
|
||||
|
||||
* tf/diff-whitespace-incomplete-line (2009-08-23) 2 commits.
|
||||
(merged to 'next' on 2009-08-26 at 4fc7784)
|
||||
+ xutils: Fix xdl_recmatch() on incomplete lines
|
||||
+ xutils: Fix hashing an incomplete line with whitespaces at the end
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* pk/fast-import-tars (2009-09-03) 1 commit
|
||||
- import-tars: Allow per-tar author and commit message.
|
||||
|
||||
* jc/maint-1.6.0-blank-at-eof (2009-09-04) 9 commits.
|
||||
- diff --color: color blank-at-eof
|
||||
- diff --whitespace=warn/error: fix blank-at-eof check
|
||||
- diff --whitespace=warn/error: obey blank-at-eof
|
||||
- diff.c: the builtin_diff() deals with only two-file comparison
|
||||
- apply --whitespace: warn blank but not necessarily empty lines at EOF
|
||||
- apply --whitespace=warn/error: diagnose blank at EOF
|
||||
- apply.c: split check_whitespace() into two
|
||||
- apply --whitespace=fix: detect new blank lines at eof correctly
|
||||
- apply --whitespace=fix: fix handling of blank lines at the eof
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* jh/notes (2009-08-27) 12 commits.
|
||||
- Add '%N'-format for pretty-printing commit notes
|
||||
- Add flags to get_commit_notes() to control the format of the note string
|
||||
- notes.c: Implement simple memory pooling of leaf nodes
|
||||
- Selftests verifying semantics when loading notes trees with various fanouts
|
||||
- Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
I heard the cvs-helper series depends on this one. It seems that the
|
||||
fan-out strategy is being rethought?
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* db/vcs-helper (2009-09-03) 16 commits
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Add support for "import" helper command
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
- Use a clearer style to issue commands to remote helpers
|
||||
- Make the "traditionally-supported" URLs a special case
|
||||
(merged to 'next' on 2009-08-07 at f3533ba)
|
||||
+ Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
|
||||
+ Makefile: do not link three copies of git-remote-* programs
|
||||
+ Makefile: git-http-fetch does not need expat
|
||||
(merged to 'next' on 2009-08-06 at 15da79d)
|
||||
+ http-fetch: Fix Makefile dependancies
|
||||
+ Add transport native helper executables to .gitignore
|
||||
(merged to 'next' on 2009-08-05 at 33d491e)
|
||||
+ git-http-fetch: not a builtin
|
||||
+ Use an external program to implement fetching with curl
|
||||
+ Add support for external programs for handling native fetches
|
||||
(this branch is used by jh/cvs-helper)
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 8 commits
|
||||
- More fixes to the git-remote-cvs installation procedure
|
||||
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
- Add simple selftests of git-remote-cvs functionality
|
||||
- git-remote-cvs: Remote helper program for CVS repositories
|
||||
- 2/2: Add Python support library for CVS remote helper
|
||||
- 1/2: Add Python support library for CVS remote helper
|
||||
- Basic build infrastructure for Python scripts
|
||||
- Allow helpers to request marks for fast-import
|
||||
(this branch uses db/vcs-helper)
|
||||
|
||||
Builds on db/vcs-helper. There is a re-roll planned.
|
||||
|
||||
* pk/fast-import-dirs (2009-09-03) 1 commit
|
||||
- Add script for importing bits-and-pieces to Git.
|
||||
|
||||
With an updated key-value quoting rules, which I haven't carefully looked
|
||||
at. Aren't there standard libraries to do this sort of thing without us
|
||||
having to hand-roll these logic every time, I have to wonder...
|
||||
|
||||
* jn/gitweb-blame (2009-09-01) 5 commits
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
- gitweb: Colorize 'blame_incremental' view during processing
|
||||
- gitweb: Incremental blame (using JavaScript)
|
||||
- gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame. The first part should be in 'next' shortly.
|
||||
|
||||
* js/stash-dwim (2009-07-27) 1 commit.
|
||||
(merged to 'next' on 2009-08-16 at 67896c4)
|
||||
+ Make 'git stash -k' a short form for 'git stash save --keep-index'
|
||||
(this branch is used by tr/reset-checkout-patch.)
|
||||
|
||||
* tr/reset-checkout-patch (2009-08-18) 10 commits.
|
||||
(merged to 'next' on 2009-09-03 at d4f2ed7)
|
||||
+ stash: simplify defaulting to "save" and reject unknown options
|
||||
(merged to 'next' on 2009-08-27 at d314281)
|
||||
+ Make test case number unique
|
||||
(merged to 'next' on 2009-08-18 at e465bb3)
|
||||
+ tests: disable interactive hunk selection tests if perl is not available
|
||||
(merged to 'next' on 2009-08-16 at 67896c4)
|
||||
+ DWIM 'git stash save -p' for 'git stash -p'
|
||||
+ Implement 'git stash save --patch'
|
||||
+ Implement 'git checkout --patch'
|
||||
+ Implement 'git reset --patch'
|
||||
+ builtin-add: refactor the meat of interactive_add()
|
||||
+ Add a small patch-mode testing library
|
||||
+ git-apply--interactive: Refactor patch mode code
|
||||
(this branch uses js/stash-dwim.)
|
||||
|
||||
DWIMmery of the two series tightened for safety. This should be ready for
|
||||
1.6.5.
|
||||
|
||||
* jc/upload-pack-hook (2009-08-28) 2 commits
|
||||
(merged to 'next' on 2009-08-31 at f9933a5)
|
||||
+ upload-pack: feed "kind [clone|fetch]" to post-upload-pack hook
|
||||
+ upload-pack: add a trigger for post-upload-pack hook
|
||||
|
||||
* jk/clone-b (2009-08-26) 1 commit
|
||||
(merged to 'next' on 2009-08-30 at 10a68d1)
|
||||
+ clone: add --branch option to select a different HEAD
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit
|
||||
(merged to 'next' on 2009-08-30 at b6455c2)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests to covers the positive case (i.e. as long as the user
|
||||
says "yes" to the "do you really want to send this message that lacks
|
||||
subject", the message is sent) of this feature, but the feature itself
|
||||
needs its own test to verify the negative case (i.e. does it correctly
|
||||
stop if the user says "no"?)
|
||||
|
||||
* jc/mailinfo-scissors (2009-08-26) 5 commits
|
||||
(merged to 'next' on 2009-08-30 at 5fc6248)
|
||||
+ mailinfo.scissors: new configuration
|
||||
+ am/mailinfo: Disable scissors processing by default
|
||||
+ Documentation: describe the scissors mark support of "git am"
|
||||
+ Teach mailinfo to ignore everything before -- >8 -- mark
|
||||
+ builtin-mailinfo.c: fix confusing internal API to mailinfo()
|
||||
|
||||
I didn't pick up the patch to simplify the definition of scissors. I do
|
||||
not have strong opinion on it either way, but the list would hopefully
|
||||
decide it before too long.
|
||||
|
||||
* cc/sequencer-rebase-i (2009-08-28) 15 commits
|
||||
- rebase -i: use "git sequencer--helper --cherry-pick"
|
||||
- sequencer: add "--cherry-pick" option to "git sequencer--helper"
|
||||
- sequencer: add "do_commit()" and related functions working on "next_commit"
|
||||
- pick: libify "pick_help_msg()"
|
||||
- revert: libify cherry-pick and revert functionnality
|
||||
- rebase -i: use "git sequencer--helper --fast-forward"
|
||||
- sequencer: let "git sequencer--helper" callers set "allow_dirty"
|
||||
- sequencer: add "--fast-forward" option to "git sequencer--helper"
|
||||
- sequencer: add "do_fast_forward()" to perform a fast forward
|
||||
- rebase -i: use "git sequencer--helper --reset-hard"
|
||||
- sequencer: add "--reset-hard" option to "git sequencer--helper"
|
||||
- sequencer: add "reset_almost_hard()" and related functions
|
||||
- rebase -i: use "git sequencer--helper --make-patch"
|
||||
- sequencer: add "make_patch" function to save a patch
|
||||
- sequencer: add "builtin-sequencer--helper.c"
|
||||
|
||||
Migrating "rebase -i" bit by bit to C.
|
||||
|
||||
* sr/gfi-options (2009-09-02) 6 commits
|
||||
- fast-import: test the new option command
|
||||
- fast-import: add option command
|
||||
- fast-import: test the new feature command
|
||||
- fast-import: add feature command
|
||||
- fast-import: put marks reading in it's own function
|
||||
- fast-import: put option parsing code in separate functions
|
||||
|
||||
Re-rolled again.
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jc/1.7.0-status (2009-08-15) 3 commits
|
||||
(merged to 'next' on 2009-08-22 at b3507bb)
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
|
||||
With this, "git status" is no longer "git commit --preview".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit
|
||||
(merged to 'next' on 2009-08-22 at 5106de8)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
|
||||
(merged to 'next' on 2009-08-30 at 0623572)
|
||||
+ diff.c: fix typoes in comments
|
||||
(merged to 'next' on 2009-08-27 at 81fb2bd)
|
||||
+ Make test case number unique
|
||||
(merged to 'next' on 2009-08-02 at 9c08420)
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits
|
||||
(merged to 'next' on 2009-08-02 at 38b82fe)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* ar/maint-1.6.2-merge-recursive-d-f (2009-05-11) 2 commits.
|
||||
. Fix for a merge where a branch has an F->D transition
|
||||
. Add a reminder test case for a merge with F/D transition
|
||||
|
||||
* jc/merge-convert (2009-01-26) 1 commit.
|
||||
. git-merge-file: allow converting the results for the work tree
|
||||
|
||||
* lt/read-directory (2009-05-15) 3 commits.
|
||||
. Add initial support for pathname conversion to UTF-8
|
||||
. read_directory(): infrastructure for pathname character set conversion
|
||||
. Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
* ps/blame (2009-03-12) 1 commit.
|
||||
. blame.c: start libifying the blame infrastructure
|
||||
|
||||
* pb/tracking (2009-07-16) 7 commits.
|
||||
. branch.c: if remote is not config'd for branch, don't try delete push config
|
||||
. branch, checkout: introduce autosetuppush
|
||||
. move deletion of merge configuration to branch.c
|
||||
. remote: add per-remote autosetupmerge and autosetuprebase configuration
|
||||
. introduce a struct tracking_config
|
||||
. branch: install_branch_config and struct tracking refactoring
|
||||
. config: allow false and true values for branch.autosetuprebase
|
||||
|
||||
Has been ejected from 'pu' for some time, expecting a reroll.
|
||||
|
||||
* ne/rev-cache (2009-08-21) 6 commits
|
||||
. support for path name caching in rev-cache
|
||||
. full integration of rev-cache into git, completed test suite
|
||||
. administrative functions for rev-cache, start of integration into git
|
||||
. support for non-commit object caching in rev-cache
|
||||
. basic revision cache system, no integration or features
|
||||
. man page and technical discussion for rev-cache
|
||||
|
||||
Updated but seems to break upload-pack tests when merged to 'pu'; given
|
||||
what this series touches, breakages in that area are expected.
|
||||
May discard if a working reroll comes, to give it a fresh start.
|
||||
@@ -1,397 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Sep 2009, #02; Mon, 07)
|
||||
X-master-at: 5ad9dce7e691106fecde413de8cc321b937367a6
|
||||
X-next-at: 5f6b0ffff13f5cd762d0a5a4e1c4dede58e8a537
|
||||
|
||||
What's cooking in git.git (Sep 2009, #02; Mon, 07)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
|
||||
agrees that they were mistakes. The resulting system may not be strictly
|
||||
backward compatible. Currently planeed changes are:
|
||||
|
||||
* refuse push to update the checked out branch in a non-bare repo by
|
||||
default
|
||||
|
||||
Make "git push" into a repository to update the branch that is checked
|
||||
out fail by default. You can countermand this default by setting a
|
||||
configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
|
||||
|
||||
* refuse push to delete the current branch by default
|
||||
|
||||
Make "git push $there :$killed" to delete the branch that is pointed at
|
||||
by its HEAD fail by default. You can countermand this default by
|
||||
setting a configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
|
||||
|
||||
* git-send-email won't make deep threads by default
|
||||
|
||||
Many people said that by default when sending more than 2 patches the
|
||||
threading git-send-email makes by default is hard to read, and they
|
||||
prefer the default be one cover letter and each patch as a direct
|
||||
follow-up to the cover letter. You can countermand this by setting a
|
||||
configuration variable.
|
||||
|
||||
http://article.gmane.org/gmane.comp.version-control.git/109790
|
||||
|
||||
* git-status won't be "git-commit --dry-run" anymore
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
|
||||
|
||||
* "git-diff -w --exit-code" will exit success if only differences it
|
||||
found are whitespace changes that are stripped away from the output.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
|
||||
|
||||
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
|
||||
|
||||
I tagged and pushed out 1.6.5-rc0. There are still some topics cooking in
|
||||
'next' I would rather not leave out, but I've been hoping to keep this
|
||||
cycle short, and I'm also hoping to tag the real 1.6.5 before I vanish for
|
||||
about a week and half later in the month. so in the worst case there may
|
||||
have to be a 1.6.6 to include the leftover topics.
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* np/maint-1.6.3-deepen (2009-09-03) 2 commits
|
||||
(merged to 'next' on 2009-09-06 at d597fba)
|
||||
+ pack-objects: free preferred base memory after usage
|
||||
+ make shallow repository deepening more network efficient
|
||||
|
||||
Further optimization and fixing of the object transfer around the "shallow
|
||||
repository" codepaths.
|
||||
|
||||
* js/stash-dwim (2009-07-27) 1 commit.
|
||||
(merged to 'next' on 2009-08-16 at 67896c4)
|
||||
+ Make 'git stash -k' a short form for 'git stash save --keep-index'
|
||||
(this branch is used by tr/reset-checkout-patch.)
|
||||
|
||||
* tr/reset-checkout-patch (2009-08-18) 10 commits.
|
||||
(merged to 'next' on 2009-09-03 at d4f2ed7)
|
||||
+ stash: simplify defaulting to "save" and reject unknown options
|
||||
(merged to 'next' on 2009-08-27 at d314281)
|
||||
+ Make test case number unique
|
||||
(merged to 'next' on 2009-08-18 at e465bb3)
|
||||
+ tests: disable interactive hunk selection tests if perl is not available
|
||||
(merged to 'next' on 2009-08-16 at 67896c4)
|
||||
+ DWIM 'git stash save -p' for 'git stash -p'
|
||||
+ Implement 'git stash save --patch'
|
||||
+ Implement 'git checkout --patch'
|
||||
+ Implement 'git reset --patch'
|
||||
+ builtin-add: refactor the meat of interactive_add()
|
||||
+ Add a small patch-mode testing library
|
||||
+ git-apply--interactive: Refactor patch mode code
|
||||
(this branch uses js/stash-dwim.)
|
||||
|
||||
DWIMmery of the two series tightened for safety a few days ago. Otherwise
|
||||
the same as what have been cooking in 'next' for a few weeks.
|
||||
|
||||
* jc/upload-pack-hook (2009-08-28) 2 commits
|
||||
(merged to 'next' on 2009-08-31 at f9933a5)
|
||||
+ upload-pack: feed "kind [clone|fetch]" to post-upload-pack hook
|
||||
+ upload-pack: add a trigger for post-upload-pack hook
|
||||
|
||||
* jk/clone-b (2009-08-26) 1 commit
|
||||
(merged to 'next' on 2009-08-30 at 10a68d1)
|
||||
+ clone: add --branch option to select a different HEAD
|
||||
|
||||
* jc/mailinfo-scissors (2009-08-26) 5 commits
|
||||
(merged to 'next' on 2009-08-30 at 5fc6248)
|
||||
+ mailinfo.scissors: new configuration
|
||||
+ am/mailinfo: Disable scissors processing by default
|
||||
+ Documentation: describe the scissors mark support of "git am"
|
||||
+ Teach mailinfo to ignore everything before -- >8 -- mark
|
||||
+ builtin-mailinfo.c: fix confusing internal API to mailinfo()
|
||||
|
||||
I didn't pick up the patch to simplify the definition of scissors. I do
|
||||
not have strong opinion on it either way, and nobody on the list seemed to
|
||||
care too much either.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* cb/maint-1.6.3-grep-relative-up (2009-09-05) 2 commits.
|
||||
(merged to 'next' on 2009-09-07 at f9b5b48)
|
||||
+ grep: accept relative paths outside current working directory
|
||||
+ grep: fix exit status if external_grep() punts
|
||||
|
||||
1.6.5 material.
|
||||
|
||||
* jk/1.7.0-status (2009-09-05) 5 commits
|
||||
- docs: note that status configuration affects only long format
|
||||
(merged to 'next' on 2009-09-07 at 8a7c563)
|
||||
+ commit: support alternate status formats
|
||||
+ status: add --porcelain output format
|
||||
+ status: refactor format option parsing
|
||||
+ status: refactor short-mode printing to its own function
|
||||
(this branch uses jc/1.7.0-status.)
|
||||
|
||||
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
|
||||
is similar to that of post 1.7.0 "git status".
|
||||
|
||||
It might be a good idea to make the --short format part of 1.6.6 without
|
||||
waiting for 1.7.0; it would require some branch shuffling to bring the
|
||||
short-status patch earlier than the one that makes "status" different from
|
||||
"commit --dry-run", though.
|
||||
|
||||
* jk/unwanted-advices (2009-09-06) 2 commits
|
||||
- status: make "how to stage" messages optional
|
||||
- push: make non-fast-forward help message configurable
|
||||
|
||||
Post 1.3.0 "newbie friendliness drive" introduced a lot of "helpful"
|
||||
advice messages that are sometimes found to be irritating once the user
|
||||
got used to working with git. This series introduces a general mechanism
|
||||
to allow us to make them less loud using the config mechanism. The config
|
||||
option hierarchy in these two are "message.*" but it is planned to be
|
||||
renamed to "advice.*".
|
||||
|
||||
* jn/gitweb-show-size (2009-09-07) 1 commit
|
||||
- gitweb: Add 'show-sizes' feature to show blob sizes in tree view
|
||||
|
||||
* jt/pushinsteadof (2009-09-07) 2 commits
|
||||
- Add url.<base>.pushInsteadOf: URL rewriting for push only
|
||||
- Wrap rewrite globals in a struct in preparation for adding another set
|
||||
|
||||
Probably 1.6.5 material.
|
||||
|
||||
* lt/maint-traverse-trees-fix (2009-09-06) 1 commit.
|
||||
- Prepare 'traverse_trees()' for D/F conflict lookahead
|
||||
|
||||
Beginning of the fix to a rather nasty longstanding issue of merging trees
|
||||
with ("a" "a-b"), ("a/b" "a-b") and just ("a-b").
|
||||
|
||||
* ne/rev-cache (2009-09-07) 7 commits
|
||||
. support for commit grafts, slight change to general mechanism
|
||||
. support for path name caching in rev-cache
|
||||
. full integration of rev-cache into git, completed test suite
|
||||
. administrative functions for rev-cache, start of integration into git
|
||||
. support for non-commit object caching in rev-cache
|
||||
. basic revision cache system, no integration or features
|
||||
. man page and technical discussion for rev-cache
|
||||
|
||||
Replaced but I do not think this is ready for 'pu' yet.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* jh/notes (2009-08-27) 12 commits.
|
||||
- Add '%N'-format for pretty-printing commit notes
|
||||
- Add flags to get_commit_notes() to control the format of the note string
|
||||
- notes.c: Implement simple memory pooling of leaf nodes
|
||||
- Selftests verifying semantics when loading notes trees with various fanouts
|
||||
- Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
I heard the cvs-helper series depends on this one. It seems that the
|
||||
fan-out strategy is being rethought?
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit
|
||||
(merged to 'next' on 2009-08-30 at b6455c2)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests to covers the positive case (i.e. as long as the user
|
||||
says "yes" to the "do you really want to send this message that lacks
|
||||
subject", the message is sent) of this feature, but the feature itself
|
||||
needs its own test to verify the negative case (i.e. does it correctly
|
||||
stop if the user says "no"?)
|
||||
|
||||
* db/vcs-helper (2009-09-03) 16 commits
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Add support for "import" helper command
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
- Use a clearer style to issue commands to remote helpers
|
||||
- Make the "traditionally-supported" URLs a special case
|
||||
(merged to 'next' on 2009-08-07 at f3533ba)
|
||||
+ Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
|
||||
+ Makefile: do not link three copies of git-remote-* programs
|
||||
+ Makefile: git-http-fetch does not need expat
|
||||
(merged to 'next' on 2009-08-06 at 15da79d)
|
||||
+ http-fetch: Fix Makefile dependancies
|
||||
+ Add transport native helper executables to .gitignore
|
||||
(merged to 'next' on 2009-08-05 at 33d491e)
|
||||
+ git-http-fetch: not a builtin
|
||||
+ Use an external program to implement fetching with curl
|
||||
+ Add support for external programs for handling native fetches
|
||||
(this branch is used by jh/cvs-helper.)
|
||||
|
||||
I'd really want to have this in 1.6.5 so that we can eject -lcurl from the
|
||||
main "git" binary. The patches in 'pu' got some review comments, and I
|
||||
thought Daniel's responses were sensible. Comments?
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 8 commits
|
||||
- More fixes to the git-remote-cvs installation procedure
|
||||
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
- Add simple selftests of git-remote-cvs functionality
|
||||
- git-remote-cvs: Remote helper program for CVS repositories
|
||||
- 2/2: Add Python support library for CVS remote helper
|
||||
- 1/2: Add Python support library for CVS remote helper
|
||||
- Basic build infrastructure for Python scripts
|
||||
- Allow helpers to request marks for fast-import
|
||||
(this branch uses db/vcs-helper.)
|
||||
|
||||
Builds on db/vcs-helper. There is a re-roll planned.
|
||||
|
||||
* cc/sequencer-rebase-i (2009-08-28) 15 commits
|
||||
- rebase -i: use "git sequencer--helper --cherry-pick"
|
||||
- sequencer: add "--cherry-pick" option to "git sequencer--helper"
|
||||
- sequencer: add "do_commit()" and related functions working on "next_commit"
|
||||
- pick: libify "pick_help_msg()"
|
||||
- revert: libify cherry-pick and revert functionnality
|
||||
- rebase -i: use "git sequencer--helper --fast-forward"
|
||||
- sequencer: let "git sequencer--helper" callers set "allow_dirty"
|
||||
- sequencer: add "--fast-forward" option to "git sequencer--helper"
|
||||
- sequencer: add "do_fast_forward()" to perform a fast forward
|
||||
- rebase -i: use "git sequencer--helper --reset-hard"
|
||||
- sequencer: add "--reset-hard" option to "git sequencer--helper"
|
||||
- sequencer: add "reset_almost_hard()" and related functions
|
||||
- rebase -i: use "git sequencer--helper --make-patch"
|
||||
- sequencer: add "make_patch" function to save a patch
|
||||
- sequencer: add "builtin-sequencer--helper.c"
|
||||
|
||||
Migrating "rebase -i" bit by bit to C.
|
||||
Not a 1.6.5 material yet.
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* pk/fast-import-tars (2009-09-03) 1 commit
|
||||
(merged to 'next' on 2009-09-07 at 8fbf027)
|
||||
+ import-tars: Allow per-tar author and commit message.
|
||||
|
||||
* jc/maint-1.6.0-blank-at-eof (2009-09-05) 10 commits.
|
||||
(merged to 'next' on 2009-09-07 at 165dc3c)
|
||||
+ core.whitespace: split trailing-space into blank-at-{eol,eof}
|
||||
+ diff --color: color blank-at-eof
|
||||
+ diff --whitespace=warn/error: fix blank-at-eof check
|
||||
+ diff --whitespace=warn/error: obey blank-at-eof
|
||||
+ diff.c: the builtin_diff() deals with only two-file comparison
|
||||
+ apply --whitespace: warn blank but not necessarily empty lines at EOF
|
||||
+ apply --whitespace=warn/error: diagnose blank at EOF
|
||||
+ apply.c: split check_whitespace() into two
|
||||
+ apply --whitespace=fix: detect new blank lines at eof correctly
|
||||
+ apply --whitespace=fix: fix handling of blank lines at the eof
|
||||
|
||||
Hopefully in 1.6.5
|
||||
|
||||
* pk/fast-import-dirs (2009-09-03) 1 commit
|
||||
(merged to 'next' on 2009-09-07 at 836cba2)
|
||||
+ Add script for importing bits-and-pieces to Git.
|
||||
|
||||
With an updated key-value quoting rules, which I haven't carefully looked
|
||||
at. I have to wonder if there are standard libraries to do this sort of
|
||||
thing without having to hand-roll these logic every time. But perhaps I
|
||||
shouldn't be too picky on contrib/ material.
|
||||
|
||||
* jn/gitweb-blame (2009-09-01) 5 commits
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
(merged to 'next' on 2009-09-07 at 3622199)
|
||||
+ gitweb: Colorize 'blame_incremental' view during processing
|
||||
+ gitweb: Incremental blame (using JavaScript)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame.
|
||||
|
||||
* sr/gfi-options (2009-09-06) 6 commits
|
||||
(merged to 'next' on 2009-09-07 at 5f6b0ff)
|
||||
+ fast-import: test the new option command
|
||||
+ fast-import: add option command
|
||||
+ fast-import: test the new feature command
|
||||
+ fast-import: add feature command
|
||||
+ fast-import: put marks reading in it's own function
|
||||
+ fast-import: put option parsing code in separate functions
|
||||
|
||||
Perhaps 1.6.5 material but I wasn't sure.
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jc/1.7.0-status (2009-09-05) 4 commits
|
||||
(merged to 'next' on 2009-09-06 at 19d4beb)
|
||||
+ status: typo fix in usage
|
||||
(merged to 'next' on 2009-08-22 at b3507bb)
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
(this branch is used by jk/1.7.0-status.)
|
||||
|
||||
With this, "git status" is no longer "git commit --dry-run".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit
|
||||
(merged to 'next' on 2009-08-22 at 5106de8)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
|
||||
(merged to 'next' on 2009-08-30 at 0623572)
|
||||
+ diff.c: fix typoes in comments
|
||||
(merged to 'next' on 2009-08-27 at 81fb2bd)
|
||||
+ Make test case number unique
|
||||
(merged to 'next' on 2009-08-02 at 9c08420)
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits
|
||||
(merged to 'next' on 2009-08-02 at 38b82fe)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* lt/read-directory (2009-05-15) 3 commits.
|
||||
. Add initial support for pathname conversion to UTF-8
|
||||
. read_directory(): infrastructure for pathname character set conversion
|
||||
. Add 'fill_directory()' helper function for directory traversal
|
||||
@@ -1,336 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Sep 2009, #03; Sun, 13)
|
||||
X-master-at: eaf1c941bbc10f5aa67fcf64e316fb548b910cfe
|
||||
X-next-at: ad50cbaea8afd009cb843c743b248c53ed6285ee
|
||||
|
||||
What's cooking in git.git (Sep 2009, #03; Sun, 13)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
|
||||
agrees that they were mistakes. The resulting system may not be strictly
|
||||
backward compatible. Currently planeed changes are:
|
||||
|
||||
* refuse push to update the checked out branch in a non-bare repo by
|
||||
default
|
||||
|
||||
Make "git push" into a repository to update the branch that is checked
|
||||
out fail by default. You can countermand this default by setting a
|
||||
configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
|
||||
|
||||
* refuse push to delete the current branch by default
|
||||
|
||||
Make "git push $there :$killed" to delete the branch that is pointed at
|
||||
by its HEAD fail by default. You can countermand this default by
|
||||
setting a configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
|
||||
|
||||
* git-send-email won't make deep threads by default
|
||||
|
||||
Many people said that by default when sending more than 2 patches the
|
||||
threading git-send-email makes by default is hard to read, and they
|
||||
prefer the default be one cover letter and each patch as a direct
|
||||
follow-up to the cover letter. You can countermand this by setting a
|
||||
configuration variable.
|
||||
|
||||
http://article.gmane.org/gmane.comp.version-control.git/109790
|
||||
|
||||
* git-status won't be "git-commit --dry-run" anymore
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
|
||||
|
||||
* "git-diff -w --exit-code" will exit success if only differences it
|
||||
found are whitespace changes that are stripped away from the output.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
|
||||
|
||||
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
|
||||
|
||||
I tagged and pushed out 1.6.5-rc1. As far as I am concered, all the big
|
||||
topics eligible for 1.6.5 are now in, except for possibly gfi-options
|
||||
series from Sverre. Updates to subsystems (svn, gitk, gui, and gitweb)
|
||||
may still need to be merged in.
|
||||
|
||||
I've been hoping to keep this cycle short, and I'm also hoping to tag the
|
||||
real 1.6.5 before I vanish for about a week and half later in the
|
||||
month. so it looks like there may have to be a 1.6.6 to include the
|
||||
leftover topics.
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* jc/merge-saner-messages (2009-09-07) 1 commit
|
||||
+ merge-recursive: give less scary messages when merge did not start
|
||||
|
||||
* rc/maint-http-no-head-pack-check (2009-09-09) 1 commit.
|
||||
+ http.c: remove verification of remote packs
|
||||
|
||||
* db/vcs-helper (2009-09-03) 16 commits
|
||||
+ Use a clearer style to issue commands to remote helpers
|
||||
+ Make the "traditionally-supported" URLs a special case
|
||||
(merged to 'next' on 2009-08-07 at f3533ba)
|
||||
+ Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
|
||||
+ Makefile: do not link three copies of git-remote-* programs
|
||||
+ Makefile: git-http-fetch does not need expat
|
||||
+ http-fetch: Fix Makefile dependancies
|
||||
+ Add transport native helper executables to .gitignore
|
||||
+ git-http-fetch: not a builtin
|
||||
+ Use an external program to implement fetching with curl
|
||||
+ Add support for external programs for handling native fetches
|
||||
|
||||
Up to the part that eject -lcurl from the main "git" binary cleanly are
|
||||
now in 'master', with a few fix-ups from Jim Mayering.
|
||||
|
||||
* cb/maint-1.6.3-grep-relative-up (2009-09-05) 2 commits.
|
||||
+ grep: accept relative paths outside current working directory
|
||||
+ grep: fix exit status if external_grep() punts
|
||||
|
||||
* jk/unwanted-advices (2009-09-09) 2 commits
|
||||
+ status: make "how to stage" messages optional
|
||||
+ push: make non-fast-forward help message configurable
|
||||
|
||||
* jt/pushinsteadof (2009-09-07) 2 commits
|
||||
+ Add url.<base>.pushInsteadOf: URL rewriting for push only
|
||||
+ Wrap rewrite globals in a struct in preparation for adding another set
|
||||
|
||||
* pk/fast-import-tars (2009-09-03) 1 commit
|
||||
+ import-tars: Allow per-tar author and commit message.
|
||||
|
||||
* pk/fast-import-dirs (2009-09-03) 1 commit
|
||||
+ Add script for importing bits-and-pieces to Git.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* db/vcs-helper-rest (2009-09-03) 6 commits
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Add support for "import" helper command
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
(this branch is used by jh/cvs-helper.)
|
||||
|
||||
This is not exactly new. It holds the remainder of the db/vcs-helper
|
||||
topic.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit
|
||||
(merged to 'next' on 2009-08-30 at b6455c2)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests to covers the positive case (i.e. as long as the user
|
||||
says "yes" to the "do you really want to send this message that lacks
|
||||
subject", the message is sent) of this feature, but the feature itself
|
||||
needs its own test to verify the negative case (i.e. does it correctly
|
||||
stop if the user says "no"?)
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 8 commits
|
||||
- More fixes to the git-remote-cvs installation procedure
|
||||
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
- Add simple selftests of git-remote-cvs functionality
|
||||
- git-remote-cvs: Remote helper program for CVS repositories
|
||||
- 2/2: Add Python support library for CVS remote helper
|
||||
- 1/2: Add Python support library for CVS remote helper
|
||||
- Basic build infrastructure for Python scripts
|
||||
- Allow helpers to request marks for fast-import
|
||||
(this branch uses db/vcs-helper-rest.)
|
||||
|
||||
Builds on db/vcs-helper. There is a re-roll planned.
|
||||
|
||||
* ne/rev-cache (2009-09-07) 7 commits
|
||||
. support for commit grafts, slight change to general mechanism
|
||||
. support for path name caching in rev-cache
|
||||
. full integration of rev-cache into git, completed test suite
|
||||
. administrative functions for rev-cache, start of integration into git
|
||||
. support for non-commit object caching in rev-cache
|
||||
. basic revision cache system, no integration or features
|
||||
. man page and technical discussion for rev-cache
|
||||
|
||||
Replaced but I do not think this is ready for 'pu' yet.
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* jh/notes (2009-09-12) 13 commits
|
||||
- Selftests verifying semantics when loading notes trees with various fanouts
|
||||
- Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
- notes.[ch] fixup: avoid old-style declaration
|
||||
- Teach notes code to free its internal data structures on request.
|
||||
- Add '%N'-format for pretty-printing commit notes
|
||||
- Add flags to get_commit_notes() to control the format of the note string
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
(this branch uses sr/gfi-options.)
|
||||
|
||||
Rerolled and queued.
|
||||
|
||||
* jn/gitweb-show-size (2009-09-07) 1 commit
|
||||
- gitweb: Add 'show-sizes' feature to show blob sizes in tree view
|
||||
|
||||
* lt/maint-traverse-trees-fix (2009-09-06) 1 commit.
|
||||
- Prepare 'traverse_trees()' for D/F conflict lookahead
|
||||
|
||||
Beginning of the fix to a rather nasty longstanding issue of merging trees
|
||||
with ("a" "a-b"), ("a/b" "a-b") and just ("a-b"), but my reading of it is
|
||||
that it is just the first step to demonstrate one-entry lookahead and not
|
||||
a full solution yet.
|
||||
|
||||
* jc/maint-1.6.0-blank-at-eof (2009-09-05) 10 commits.
|
||||
(merged to 'next' on 2009-09-07 at 165dc3c)
|
||||
+ core.whitespace: split trailing-space into blank-at-{eol,eof}
|
||||
+ diff --color: color blank-at-eof
|
||||
+ diff --whitespace=warn/error: fix blank-at-eof check
|
||||
+ diff --whitespace=warn/error: obey blank-at-eof
|
||||
+ diff.c: the builtin_diff() deals with only two-file comparison
|
||||
+ apply --whitespace: warn blank but not necessarily empty lines at EOF
|
||||
+ apply --whitespace=warn/error: diagnose blank at EOF
|
||||
+ apply.c: split check_whitespace() into two
|
||||
+ apply --whitespace=fix: detect new blank lines at eof correctly
|
||||
+ apply --whitespace=fix: fix handling of blank lines at the eof
|
||||
|
||||
This started a bit late in the cycle, and I'd rather hold it back during
|
||||
this feature freeze and push it out after 1.6.5 final.
|
||||
|
||||
* jn/gitweb-blame (2009-09-01) 5 commits
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
(merged to 'next' on 2009-09-07 at 3622199)
|
||||
+ gitweb: Colorize 'blame_incremental' view during processing
|
||||
+ gitweb: Incremental blame (using JavaScript)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame.
|
||||
|
||||
* sr/gfi-options (2009-09-06) 6 commits
|
||||
(merged to 'next' on 2009-09-07 at 5f6b0ff)
|
||||
+ fast-import: test the new option command
|
||||
+ fast-import: add option command
|
||||
+ fast-import: test the new feature command
|
||||
+ fast-import: add feature command
|
||||
+ fast-import: put marks reading in it's own function
|
||||
+ fast-import: put option parsing code in separate functions
|
||||
(this branch is used by jh/notes.)
|
||||
|
||||
Perhaps 1.6.5 material but I wasn't sure.
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jk/1.7.0-status (2009-09-05) 5 commits
|
||||
- docs: note that status configuration affects only long format
|
||||
(merged to 'next' on 2009-09-07 at 8a7c563)
|
||||
+ commit: support alternate status formats
|
||||
+ status: add --porcelain output format
|
||||
+ status: refactor format option parsing
|
||||
+ status: refactor short-mode printing to its own function
|
||||
(this branch uses jc/1.7.0-status.)
|
||||
|
||||
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
|
||||
is similar to that of post 1.7.0 "git status".
|
||||
|
||||
* jc/1.7.0-status (2009-09-05) 4 commits
|
||||
(merged to 'next' on 2009-09-06 at 19d4beb)
|
||||
+ status: typo fix in usage
|
||||
(merged to 'next' on 2009-08-22 at b3507bb)
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
(this branch is used by jk/1.7.0-status.)
|
||||
|
||||
With this, "git status" is no longer "git commit --dry-run".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit
|
||||
(merged to 'next' on 2009-08-22 at 5106de8)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
|
||||
(merged to 'next' on 2009-08-30 at 0623572)
|
||||
+ diff.c: fix typoes in comments
|
||||
(merged to 'next' on 2009-08-27 at 81fb2bd)
|
||||
+ Make test case number unique
|
||||
(merged to 'next' on 2009-08-02 at 9c08420)
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits
|
||||
(merged to 'next' on 2009-08-02 at 38b82fe)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* lt/read-directory (2009-05-15) 3 commits.
|
||||
. Add initial support for pathname conversion to UTF-8
|
||||
. read_directory(): infrastructure for pathname character set conversion
|
||||
. Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
* cc/sequencer-rebase-i (2009-08-28) 15 commits
|
||||
- rebase -i: use "git sequencer--helper --cherry-pick"
|
||||
- sequencer: add "--cherry-pick" option to "git sequencer--helper"
|
||||
- sequencer: add "do_commit()" and related functions working on "next_commit"
|
||||
- pick: libify "pick_help_msg()"
|
||||
- revert: libify cherry-pick and revert functionnality
|
||||
- rebase -i: use "git sequencer--helper --fast-forward"
|
||||
- sequencer: let "git sequencer--helper" callers set "allow_dirty"
|
||||
- sequencer: add "--fast-forward" option to "git sequencer--helper"
|
||||
- sequencer: add "do_fast_forward()" to perform a fast forward
|
||||
- rebase -i: use "git sequencer--helper --reset-hard"
|
||||
- sequencer: add "--reset-hard" option to "git sequencer--helper"
|
||||
- sequencer: add "reset_almost_hard()" and related functions
|
||||
- rebase -i: use "git sequencer--helper --make-patch"
|
||||
- sequencer: add "make_patch" function to save a patch
|
||||
- sequencer: add "builtin-sequencer--helper.c"
|
||||
|
||||
This was to be replaced with multiple bite-sized smaller topics. We've
|
||||
seen one such topic for "git reset" on the list.
|
||||
@@ -1,301 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Sep 2009, #04; Wed, 16)
|
||||
X-master-at: 8426f672fc65239135b1f1580bb79ecb16fd05f0
|
||||
X-next-at: 63b02d52a162438e5262062b3e6768beb3962be8
|
||||
|
||||
What's cooking in git.git (Sep 2009, #04; Wed, 16)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
|
||||
agrees that they were mistakes. The resulting system may not be strictly
|
||||
backward compatible. Currently planeed changes are:
|
||||
|
||||
* refuse push to update the checked out branch in a non-bare repo by
|
||||
default
|
||||
|
||||
Make "git push" into a repository to update the branch that is checked
|
||||
out fail by default. You can countermand this default by setting a
|
||||
configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
|
||||
|
||||
* refuse push to delete the current branch by default
|
||||
|
||||
Make "git push $there :$killed" to delete the branch that is pointed at
|
||||
by its HEAD fail by default. You can countermand this default by
|
||||
setting a configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
|
||||
|
||||
* git-send-email won't make deep threads by default
|
||||
|
||||
Many people said that by default when sending more than 2 patches the
|
||||
threading git-send-email makes by default is hard to read, and they
|
||||
prefer the default be one cover letter and each patch as a direct
|
||||
follow-up to the cover letter. You can countermand this by setting a
|
||||
configuration variable.
|
||||
|
||||
http://article.gmane.org/gmane.comp.version-control.git/109790
|
||||
|
||||
* git-status won't be "git-commit --dry-run" anymore
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
|
||||
|
||||
* "git-diff -w --exit-code" will exit success if only differences it
|
||||
found are whitespace changes that are stripped away from the output.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
|
||||
|
||||
We are in pre-release feature freeze. 'next' will hold topics meant for
|
||||
1.6.6 and 1.7.0.
|
||||
|
||||
Except for possibly gfi-options series from Sverre, and updates to
|
||||
subsystems (svn, gitk, gui, and gitweb) may still need to be merged in,
|
||||
but otherwise 'master' is ready for -rc2. I am still hoping that I can
|
||||
tag the final before I take a vacation starting on 24th for a week, but we
|
||||
may have to give the final -rc a week to shake out any possible last
|
||||
minute regressions and release 1.6.5 at the beginning of next month.
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* rc/maint-http-no-head-pack-check (2009-09-14) 2 commits.
|
||||
+ http.c: avoid freeing an uninitialized pointer
|
||||
+ http.c: remove verification of remote packs
|
||||
|
||||
Graduated to master and maint but then needed a small fixup.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/maint-blank-at-eof (2009-09-15) 0 commits.
|
||||
(this branch uses jc/maint-1.6.0-blank-at-eof.)
|
||||
|
||||
The series does not have a commit of its own but is a preparation for
|
||||
merging the original jc/1.6.0-maint-blank-at-eof topic to 'maint' and then
|
||||
'master'. It is a fix for longstanding bug and 1.6.5 will likely to ship
|
||||
without this topic.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit
|
||||
(merged to 'next' on 2009-08-30 at b6455c2)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests to covers the positive case (i.e. as long as the user
|
||||
says "yes" to the "do you really want to send this message that lacks
|
||||
subject", the message is sent) of this feature, but the feature itself
|
||||
needs its own test to verify the negative case (i.e. does it correctly
|
||||
stop if the user says "no"?)
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 8 commits
|
||||
- More fixes to the git-remote-cvs installation procedure
|
||||
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
- Add simple selftests of git-remote-cvs functionality
|
||||
- git-remote-cvs: Remote helper program for CVS repositories
|
||||
- 2/2: Add Python support library for CVS remote helper
|
||||
- 1/2: Add Python support library for CVS remote helper
|
||||
- Basic build infrastructure for Python scripts
|
||||
- Allow helpers to request marks for fast-import
|
||||
(this branch uses db/vcs-helper-rest.)
|
||||
|
||||
Builds on db/vcs-helper. There is a re-roll planned.
|
||||
|
||||
* ne/rev-cache (2009-09-07) 7 commits
|
||||
. support for commit grafts, slight change to general mechanism
|
||||
. support for path name caching in rev-cache
|
||||
. full integration of rev-cache into git, completed test suite
|
||||
. administrative functions for rev-cache, start of integration into git
|
||||
. support for non-commit object caching in rev-cache
|
||||
. basic revision cache system, no integration or features
|
||||
. man page and technical discussion for rev-cache
|
||||
|
||||
Replaced but I do not think this is ready for 'pu' yet.
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* db/vcs-helper-rest (2009-09-03) 6 commits
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Add support for "import" helper command
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
(this branch is used by jh/cvs-helper.)
|
||||
|
||||
This holds the remainder of the db/vcs-helper topic that has already
|
||||
merged for 1.6.5.
|
||||
|
||||
* jh/notes (2009-09-12) 13 commits
|
||||
- Selftests verifying semantics when loading notes trees with various fanouts
|
||||
- Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
- notes.[ch] fixup: avoid old-style declaration
|
||||
- Teach notes code to free its internal data structures on request.
|
||||
- Add '%N'-format for pretty-printing commit notes
|
||||
- Add flags to get_commit_notes() to control the format of the note string
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
(this branch uses sr/gfi-options.)
|
||||
|
||||
Rerolled and queued.
|
||||
|
||||
* jn/gitweb-show-size (2009-09-07) 1 commit
|
||||
- gitweb: Add 'show-sizes' feature to show blob sizes in tree view
|
||||
|
||||
* lt/maint-traverse-trees-fix (2009-09-06) 1 commit.
|
||||
- Prepare 'traverse_trees()' for D/F conflict lookahead
|
||||
|
||||
Beginning of the fix to a rather nasty longstanding issue of merging trees
|
||||
with ("a" "a-b"), ("a/b" "a-b") and just ("a-b"), but my reading of it is
|
||||
that it is just the first step to demonstrate one-entry lookahead and not
|
||||
a full solution yet.
|
||||
|
||||
I started writing a replacement series but the progress is a bit slower
|
||||
than I would have liked.
|
||||
|
||||
* jc/maint-1.6.0-blank-at-eof (2009-09-14) 15 commits.
|
||||
(merged to 'next' on 2009-09-15 at 9cbfa00)
|
||||
+ diff -B: colour whitespace errors
|
||||
+ diff.c: emit_add_line() takes only the rest of the line
|
||||
+ diff.c: split emit_line() from the first char and the rest of the line
|
||||
+ diff.c: shuffling code around
|
||||
+ diff --whitespace: fix blank lines at end
|
||||
(merged to 'next' on 2009-09-07 at 165dc3c)
|
||||
+ core.whitespace: split trailing-space into blank-at-{eol,eof}
|
||||
+ diff --color: color blank-at-eof
|
||||
+ diff --whitespace=warn/error: fix blank-at-eof check
|
||||
+ diff --whitespace=warn/error: obey blank-at-eof
|
||||
+ diff.c: the builtin_diff() deals with only two-file comparison
|
||||
+ apply --whitespace: warn blank but not necessarily empty lines at EOF
|
||||
+ apply --whitespace=warn/error: diagnose blank at EOF
|
||||
+ apply.c: split check_whitespace() into two
|
||||
+ apply --whitespace=fix: detect new blank lines at eof correctly
|
||||
+ apply --whitespace=fix: fix handling of blank lines at the eof
|
||||
(this branch is used by jc/maint-blank-at-eof.)
|
||||
|
||||
This is a fix for an ancient bug (or inconsistent set of features); the
|
||||
topic is based on an ancient codebase and is designed to be merged
|
||||
upwards. jc/maint-blank-at-eof serves that purpose.
|
||||
|
||||
Will not be in 1.6.5.
|
||||
|
||||
* jn/gitweb-blame (2009-09-01) 5 commits
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
(merged to 'next' on 2009-09-07 at 3622199)
|
||||
+ gitweb: Colorize 'blame_incremental' view during processing
|
||||
+ gitweb: Incremental blame (using JavaScript)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame.
|
||||
|
||||
* sr/gfi-options (2009-09-06) 6 commits
|
||||
(merged to 'next' on 2009-09-07 at 5f6b0ff)
|
||||
+ fast-import: test the new option command
|
||||
+ fast-import: add option command
|
||||
+ fast-import: test the new feature command
|
||||
+ fast-import: add feature command
|
||||
+ fast-import: put marks reading in it's own function
|
||||
+ fast-import: put option parsing code in separate functions
|
||||
(this branch is used by jh/notes.)
|
||||
|
||||
Ping?
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jk/1.7.0-status (2009-09-05) 5 commits
|
||||
- docs: note that status configuration affects only long format
|
||||
(merged to 'next' on 2009-09-07 at 8a7c563)
|
||||
+ commit: support alternate status formats
|
||||
+ status: add --porcelain output format
|
||||
+ status: refactor format option parsing
|
||||
+ status: refactor short-mode printing to its own function
|
||||
(this branch uses jc/1.7.0-status.)
|
||||
|
||||
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
|
||||
is similar to that of post 1.7.0 "git status".
|
||||
|
||||
* jc/1.7.0-status (2009-09-05) 4 commits
|
||||
(merged to 'next' on 2009-09-06 at 19d4beb)
|
||||
+ status: typo fix in usage
|
||||
(merged to 'next' on 2009-08-22 at b3507bb)
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
(this branch is used by jk/1.7.0-status.)
|
||||
|
||||
With this, "git status" is no longer "git commit --dry-run".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit
|
||||
(merged to 'next' on 2009-08-22 at 5106de8)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
|
||||
(merged to 'next' on 2009-08-30 at 0623572)
|
||||
+ diff.c: fix typoes in comments
|
||||
(merged to 'next' on 2009-08-27 at 81fb2bd)
|
||||
+ Make test case number unique
|
||||
(merged to 'next' on 2009-08-02 at 9c08420)
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits
|
||||
(merged to 'next' on 2009-08-02 at 38b82fe)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* lt/read-directory (2009-05-15) 3 commits.
|
||||
. Add initial support for pathname conversion to UTF-8
|
||||
. read_directory(): infrastructure for pathname character set conversion
|
||||
. Add 'fill_directory()' helper function for directory traversal
|
||||
@@ -1,345 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Sep 2009, #05; Wed, 23)
|
||||
X-master-at: a6dbf8814f433a7fbfa9cde6333c98019f6db1e4
|
||||
X-next-at: a9dd6c4e8ab38f5c4af9c0710381d3844f1d904f
|
||||
|
||||
What's cooking in git.git (Sep 2009, #05; Wed, 23)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
|
||||
agrees that they were mistakes. The resulting system may not be strictly
|
||||
backward compatible. Currently planeed changes are:
|
||||
|
||||
* refuse push to update the checked out branch in a non-bare repo by
|
||||
default
|
||||
|
||||
Make "git push" into a repository to update the branch that is checked
|
||||
out fail by default. You can countermand this default by setting a
|
||||
configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
|
||||
|
||||
* refuse push to delete the current branch by default
|
||||
|
||||
Make "git push $there :$killed" to delete the branch that is pointed at
|
||||
by its HEAD fail by default. You can countermand this default by
|
||||
setting a configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
|
||||
|
||||
* git-send-email won't make deep threads by default
|
||||
|
||||
Many people said that by default when sending more than 2 patches the
|
||||
threading git-send-email makes by default is hard to read, and they
|
||||
prefer the default be one cover letter and each patch as a direct
|
||||
follow-up to the cover letter. You can countermand this by setting a
|
||||
configuration variable.
|
||||
|
||||
http://article.gmane.org/gmane.comp.version-control.git/109790
|
||||
|
||||
* git-status won't be "git-commit --dry-run" anymore
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
|
||||
|
||||
* "git-diff -w --exit-code" will exit success if only differences it
|
||||
found are whitespace changes that are stripped away from the output.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
|
||||
|
||||
We are in pre-release feature freeze. 'next' will hold topics meant for
|
||||
1.6.6 and 1.7.0.
|
||||
|
||||
Tonight's tip of 'master' is 1.6.5-rc2, and I'll disappear for about a
|
||||
week. Hopefully when I come back in early October all the regressions are
|
||||
found and already squashed ;-)
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/fix-tree-walk (2009-09-14) 9 commits
|
||||
- read-tree --debug-unpack
|
||||
- unpack-trees.c: look ahead in the index
|
||||
- unpack-trees.c: prepare for looking ahead in the index
|
||||
- traverse_trees(): handle D/F conflict case sanely
|
||||
- more D/F conflict tests
|
||||
- tests: move convenience regexp to match object names to test-lib.sh
|
||||
- unpack_callback(): use unpack_failed() consistently
|
||||
- unpack-trees: typofix
|
||||
- diff-lib.c: fix misleading comments on oneway_diff()
|
||||
|
||||
This is my replacement for Linus's lt/maint-traverse-trees-fix patch. It
|
||||
is not so much as a counter-proposal; I originally thought it might make
|
||||
sense to walk the index and drive the walker to return the entries from
|
||||
trees to match entries from the index, but I ended up doing pretty much
|
||||
what Linus outlined --- walk the trees, and have the index walker follow
|
||||
it. It turned out that the index side also needed some hairy look-ahead,
|
||||
and I am only half satisfied with the current status of the series.
|
||||
|
||||
To fix the resolve merge regression seen in t6035, git-merge-resolve needs
|
||||
to be rewritten not to use the one-path-at-a-time "git merge-index".
|
||||
|
||||
* jp/fetch-tag-match (2009-09-17) 1 commit
|
||||
- fetch: Speed up fetch by rewriting find_non_local_tags
|
||||
|
||||
I did not have much energy left while dealing with the "fix-tree-walk"
|
||||
series, so I just queued this without reading nor thinking about it very
|
||||
much. I personally liked my version that had far smaller number of lines
|
||||
changed (which means I can be fairly certain that it did not introduce any
|
||||
regression), but perhaps the majorly rewritten logic this patch gives us
|
||||
may be easier to follow and maintain. We'll see.
|
||||
|
||||
* jg/log-format-body-indent (2009-09-19) 1 commit
|
||||
- [NEEDSWORK: tests] git-log --format: Add %B tag with %B(x) option
|
||||
|
||||
* jl/submodule-add-noname (2009-09-22) 1 commit
|
||||
- git submodule add: make the <path> parameter optional
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit
|
||||
(merged to 'next' on 2009-08-30 at b6455c2)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests cover the positive case (i.e. as long as the user says
|
||||
"yes" to the "do you really want to send this message that lacks subject",
|
||||
the message is sent) of this feature, but the feature itself needs its own
|
||||
test to verify the negative case (i.e. does it correctly stop if the user
|
||||
says "no"?)
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 8 commits
|
||||
- More fixes to the git-remote-cvs installation procedure
|
||||
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
- Add simple selftests of git-remote-cvs functionality
|
||||
- git-remote-cvs: Remote helper program for CVS repositories
|
||||
- 2/2: Add Python support library for CVS remote helper
|
||||
- 1/2: Add Python support library for CVS remote helper
|
||||
- Basic build infrastructure for Python scripts
|
||||
- Allow helpers to request marks for fast-import
|
||||
(this branch uses db/vcs-helper-rest.)
|
||||
|
||||
Builds on db/vcs-helper. There is a re-roll planned.
|
||||
|
||||
* ne/rev-cache (2009-09-07) 7 commits
|
||||
- support for commit grafts, slight change to general mechanism
|
||||
- support for path name caching in rev-cache
|
||||
- full integration of rev-cache into git, completed test suite
|
||||
- administrative functions for rev-cache, start of integration into git
|
||||
- support for non-commit object caching in rev-cache
|
||||
- basic revision cache system, no integration or features
|
||||
- man page and technical discussion for rev-cache
|
||||
|
||||
Tonight's 'pu' ships with this and this series seems to break a few
|
||||
tests. I didn't debug.
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* jc/maint-blank-at-eof (2009-09-15) 0 commits.
|
||||
(this branch uses jc/maint-1.6.0-blank-at-eof.)
|
||||
|
||||
The series does not have a commit of its own but is a preparation for
|
||||
merging the original jc/1.6.0-maint-blank-at-eof topic to 'maint' and then
|
||||
'master'. It is a fix for longstanding bug and 1.6.5 will not contain
|
||||
this topic.
|
||||
|
||||
* db/vcs-helper-rest (2009-09-03) 6 commits
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Add support for "import" helper command
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
(this branch is used by jh/cvs-helper.)
|
||||
|
||||
This holds the remainder of the db/vcs-helper topic that has already
|
||||
merged for 1.6.5.
|
||||
|
||||
* jh/notes (2009-09-12) 13 commits
|
||||
- Selftests verifying semantics when loading notes trees with various fanouts
|
||||
- Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
- notes.[ch] fixup: avoid old-style declaration
|
||||
- Teach notes code to free its internal data structures on request.
|
||||
- Add '%N'-format for pretty-printing commit notes
|
||||
- Add flags to get_commit_notes() to control the format of the note string
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
(this branch uses sr/gfi-options.)
|
||||
|
||||
Rerolled and queued.
|
||||
|
||||
* jn/gitweb-show-size (2009-09-07) 1 commit
|
||||
- gitweb: Add 'show-sizes' feature to show blob sizes in tree view
|
||||
|
||||
* lt/maint-traverse-trees-fix (2009-09-06) 1 commit.
|
||||
. Prepare 'traverse_trees()' for D/F conflict lookahead
|
||||
|
||||
Ejected from 'pu' (see jc/fix-tree-walk above).
|
||||
|
||||
* jc/maint-1.6.0-blank-at-eof (2009-09-14) 15 commits.
|
||||
(merged to 'next' on 2009-09-15 at 9cbfa00)
|
||||
+ diff -B: colour whitespace errors
|
||||
+ diff.c: emit_add_line() takes only the rest of the line
|
||||
+ diff.c: split emit_line() from the first char and the rest of the line
|
||||
+ diff.c: shuffling code around
|
||||
+ diff --whitespace: fix blank lines at end
|
||||
(merged to 'next' on 2009-09-07 at 165dc3c)
|
||||
+ core.whitespace: split trailing-space into blank-at-{eol,eof}
|
||||
+ diff --color: color blank-at-eof
|
||||
+ diff --whitespace=warn/error: fix blank-at-eof check
|
||||
+ diff --whitespace=warn/error: obey blank-at-eof
|
||||
+ diff.c: the builtin_diff() deals with only two-file comparison
|
||||
+ apply --whitespace: warn blank but not necessarily empty lines at EOF
|
||||
+ apply --whitespace=warn/error: diagnose blank at EOF
|
||||
+ apply.c: split check_whitespace() into two
|
||||
+ apply --whitespace=fix: detect new blank lines at eof correctly
|
||||
+ apply --whitespace=fix: fix handling of blank lines at the eof
|
||||
(this branch is used by jc/maint-blank-at-eof.)
|
||||
|
||||
This is a fix for an ancient bug (or inconsistent set of features); the
|
||||
topic is based on an ancient codebase and is designed to be merged
|
||||
upwards. jc/maint-blank-at-eof serves that purpose.
|
||||
|
||||
Will not be in 1.6.5.
|
||||
|
||||
* jn/gitweb-blame (2009-09-01) 5 commits
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
(merged to 'next' on 2009-09-07 at 3622199)
|
||||
+ gitweb: Colorize 'blame_incremental' view during processing
|
||||
+ gitweb: Incremental blame (using JavaScript)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame.
|
||||
|
||||
* sr/gfi-options (2009-09-06) 6 commits
|
||||
(merged to 'next' on 2009-09-07 at 5f6b0ff)
|
||||
+ fast-import: test the new option command
|
||||
+ fast-import: add option command
|
||||
+ fast-import: test the new feature command
|
||||
+ fast-import: add feature command
|
||||
+ fast-import: put marks reading in it's own function
|
||||
+ fast-import: put option parsing code in separate functions
|
||||
(this branch is used by jh/notes.)
|
||||
|
||||
Ping?
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jk/1.7.0-status (2009-09-05) 5 commits
|
||||
- docs: note that status configuration affects only long format
|
||||
(merged to 'next' on 2009-09-07 at 8a7c563)
|
||||
+ commit: support alternate status formats
|
||||
+ status: add --porcelain output format
|
||||
+ status: refactor format option parsing
|
||||
+ status: refactor short-mode printing to its own function
|
||||
(this branch uses jc/1.7.0-status.)
|
||||
|
||||
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
|
||||
is similar to that of post 1.7.0 "git status".
|
||||
|
||||
* jc/1.7.0-status (2009-09-05) 4 commits
|
||||
(merged to 'next' on 2009-09-06 at 19d4beb)
|
||||
+ status: typo fix in usage
|
||||
(merged to 'next' on 2009-08-22 at b3507bb)
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
(this branch is used by jk/1.7.0-status.)
|
||||
|
||||
With this, "git status" is no longer "git commit --dry-run".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit
|
||||
(merged to 'next' on 2009-08-22 at 5106de8)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
|
||||
(merged to 'next' on 2009-08-30 at 0623572)
|
||||
+ diff.c: fix typoes in comments
|
||||
(merged to 'next' on 2009-08-27 at 81fb2bd)
|
||||
+ Make test case number unique
|
||||
(merged to 'next' on 2009-08-02 at 9c08420)
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits
|
||||
(merged to 'next' on 2009-08-02 at 38b82fe)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* lt/read-directory (2009-05-15) 3 commits.
|
||||
. Add initial support for pathname conversion to UTF-8
|
||||
. read_directory(): infrastructure for pathname character set conversion
|
||||
. Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
* cc/reset-merge (2009-09-16) 4 commits
|
||||
. reset: add test cases for "--merge-safe" option
|
||||
. reset: add option "--merge-safe" to "git reset"
|
||||
. reset: use "unpack_trees()" directly instead of "git read-tree"
|
||||
. reset: add a few tests for "git reset --merge"
|
||||
|
||||
* cc/sequencer-rebase-i (2009-08-28) 15 commits
|
||||
. rebase -i: use "git sequencer--helper --cherry-pick"
|
||||
. sequencer: add "--cherry-pick" option to "git sequencer--helper"
|
||||
. sequencer: add "do_commit()" and related functions working on "next_commit"
|
||||
. pick: libify "pick_help_msg()"
|
||||
. revert: libify cherry-pick and revert functionnality
|
||||
. rebase -i: use "git sequencer--helper --fast-forward"
|
||||
. sequencer: let "git sequencer--helper" callers set "allow_dirty"
|
||||
. sequencer: add "--fast-forward" option to "git sequencer--helper"
|
||||
. sequencer: add "do_fast_forward()" to perform a fast forward
|
||||
. rebase -i: use "git sequencer--helper --reset-hard"
|
||||
. sequencer: add "--reset-hard" option to "git sequencer--helper"
|
||||
. sequencer: add "reset_almost_hard()" and related functions
|
||||
. rebase -i: use "git sequencer--helper --make-patch"
|
||||
. sequencer: add "make_patch" function to save a patch
|
||||
. sequencer: add "builtin-sequencer--helper.c"
|
||||
@@ -1,444 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Oct 2009, #01; Wed, 07)
|
||||
X-master-at: 8fd2cfa7accd6b8f877014bf3e4bf8547b8e0d2a
|
||||
X-next-at: df7ac2094d6cd7280e3254a772061a64edac2d37
|
||||
|
||||
What's cooking in git.git (Oct 2009, #01; Wed, 07)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
|
||||
agrees that they were mistakes. The resulting system may not be strictly
|
||||
backward compatible. Currently planeed changes are:
|
||||
|
||||
* refuse push to update the checked out branch in a non-bare repo by
|
||||
default
|
||||
|
||||
Make "git push" into a repository to update the branch that is checked
|
||||
out fail by default. You can countermand this default by setting a
|
||||
configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
|
||||
|
||||
* refuse push to delete the current branch by default
|
||||
|
||||
Make "git push $there :$killed" to delete the branch that is pointed at
|
||||
by its HEAD fail by default. You can countermand this default by
|
||||
setting a configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
|
||||
|
||||
* git-send-email won't make deep threads by default
|
||||
|
||||
Many people said that by default when sending more than 2 patches the
|
||||
threading git-send-email makes by default is hard to read, and they
|
||||
prefer the default be one cover letter and each patch as a direct
|
||||
follow-up to the cover letter. You can countermand this by setting a
|
||||
configuration variable.
|
||||
|
||||
http://article.gmane.org/gmane.comp.version-control.git/109790
|
||||
|
||||
* git-status won't be "git-commit --dry-run" anymore
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
|
||||
|
||||
* "git-diff -w --exit-code" will exit success if only differences it
|
||||
found are whitespace changes that are stripped away from the output.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
|
||||
|
||||
We are in pre-release feature freeze. 'next' will hold topics meant for
|
||||
1.6.6 and 1.7.0.
|
||||
|
||||
Tonight's tip of 'master' is 1.6.5-rc3.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* ch/am-header (2009-09-25) 2 commits
|
||||
(merged to 'next' on 2009-09-25 at f86e197)
|
||||
+ git-am: force egrep to use correct characters set
|
||||
+ git-am: fixed patch_format detection according to RFC2822
|
||||
|
||||
* dk/blame-el (2009-09-29) 1 commit
|
||||
- git-blame.el: Change how blame information is shown.
|
||||
|
||||
* ef/msvc-noreturn (2009-09-30) 2 commits
|
||||
(merged to 'next' on 2009-10-07 at 66137a0)
|
||||
+ add NORETURN_PTR for function pointers
|
||||
+ increase portability of NORETURN declarations
|
||||
|
||||
jk: This is the latest round and I think should be ready for at least
|
||||
'next' (maybe even 'master' as it is really about the build and not about
|
||||
functionality).
|
||||
|
||||
* ef/msys-imap (2009-10-03) 7 commits
|
||||
- mingw: enable OpenSSL
|
||||
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
|
||||
- imap-send: provide fall-back random-source
|
||||
- imap-send: build imap-send on Windows
|
||||
- imap-send: fix compilation-error on Windows
|
||||
- imap-send: use run-command API for tunneling
|
||||
- imap-send: use separate read and write fds
|
||||
|
||||
jk: This is from an RFC which has generated some comments. He should be
|
||||
posting another round soon. 'pu' at best.
|
||||
|
||||
* fc/mutt-alias (2009-09-30) 1 commit
|
||||
(merged to 'next' on 2009-10-07 at df7ac20)
|
||||
+ send-email: fix mutt regex for grouped aliases
|
||||
|
||||
jk: Latest round that addressed comments. Ready for 'next' if not
|
||||
'master'.
|
||||
|
||||
* jk/reflog-date (2009-09-24) 1 commit
|
||||
(merged to 'next' on 2009-09-29 at 43d444a)
|
||||
+ improve reflog date/number heuristic
|
||||
|
||||
* jn/gitweb-patch (2009-09-30) 1 commit
|
||||
- gitweb: Do not show 'patch' link in 'commit' view for merges
|
||||
|
||||
jk: After some comments with Jakub, I think the code is right but he
|
||||
promised a re-roll with more in the commit message.
|
||||
|
||||
* mr/gitweb-snapshot (2009-09-26) 2 commits
|
||||
- gitweb: append short hash ids to snapshot files
|
||||
- gitweb: check given hash before trying to create snapshot
|
||||
|
||||
jk: He posted a v5 of his series. I didn't look at it closely, but Jakub
|
||||
ack'd it.
|
||||
|
||||
* mr/instaweb-cgid (2009-09-26) 1 commit
|
||||
(merged to 'next' on 2009-09-29 at 3524604)
|
||||
+ instaweb: support mod_cgid for apache2
|
||||
|
||||
* tf/doc-pt-br (2009-09-23) 1 commit
|
||||
- Documentation: update pt-BR
|
||||
|
||||
The current AsciiDoc may barf on NOME and SINOPSE, as pt_BR language
|
||||
definition is not widely distributed yet (it just hit the development
|
||||
tree). Need to revert these headings (or change the length of the section
|
||||
underlines to match the length of translated names).
|
||||
|
||||
* jc/pretty-lf (2009-10-04) 1 commit
|
||||
- Pretty-format: %[+-]x to tweak inter-item newlines
|
||||
|
||||
I am not happy with this one yet. I am contemplating to introduce a new
|
||||
syntax "%[magic(param)<anything>%]" to generalize expressions of this and
|
||||
line wrapping features in an extensible way.
|
||||
|
||||
* js/log-rewrap (2008-11-10) 3 commits
|
||||
. Add "%w" to pretty formats, which rewraps the commit message
|
||||
- Add strbuf_add_wrapped_text() to utf8.[ch]
|
||||
- print_wrapped_text(): allow hard newlines
|
||||
|
||||
... and the first two from this series will be useful to implement an
|
||||
example magic "wrap", e.g. "%{wrap(i,j,w)%s%+b%]".
|
||||
|
||||
* jg/log-format-body-indent (2009-09-19) 1 commit
|
||||
. git-log --format: Add %B tag with %B(x) option
|
||||
|
||||
I think we should redo this on top of the first two patches from
|
||||
js/log-rewrap series; %B(x) is just a special case %B(x,x,0), no? If a
|
||||
magic value 0 (or negative) given to wrap-width does not disable wrapping,
|
||||
we probably should make it so. I merged this to 'pu' but then ejected it
|
||||
because it seems to break at least t6006.
|
||||
|
||||
* bg/rebase-reword (2009-10-07) 1 commit
|
||||
- Teach 'rebase -i' the command "reword"
|
||||
|
||||
* js/diff-verbose-submodule (2009-10-04) 1 commit
|
||||
- Add the --submodule-summary option to the diff option family
|
||||
|
||||
Dscho sounded like he has some corrections after list comments, but I did
|
||||
not pick up his interdiff in the middle.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit
|
||||
(merged to 'next' on 2009-08-30 at b6455c2)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests cover the positive case (i.e. as long as the user says
|
||||
"yes" to the "do you really want to send this message that lacks subject",
|
||||
the message is sent) of this feature, but the feature itself needs its own
|
||||
test to verify the negative case (i.e. does it correctly stop if the user
|
||||
says "no"?)
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 8 commits
|
||||
- More fixes to the git-remote-cvs installation procedure
|
||||
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
- Add simple selftests of git-remote-cvs functionality
|
||||
- git-remote-cvs: Remote helper program for CVS repositories
|
||||
- 2/2: Add Python support library for CVS remote helper
|
||||
- 1/2: Add Python support library for CVS remote helper
|
||||
- Basic build infrastructure for Python scripts
|
||||
- Allow helpers to request marks for fast-import
|
||||
(this branch uses db/vcs-helper-rest.)
|
||||
|
||||
Builds on db/vcs-helper. There is a re-roll planned.
|
||||
|
||||
* ne/rev-cache (2009-09-07) 7 commits
|
||||
- support for commit grafts, slight change to general mechanism
|
||||
- support for path name caching in rev-cache
|
||||
- full integration of rev-cache into git, completed test suite
|
||||
- administrative functions for rev-cache, start of integration into git
|
||||
- support for non-commit object caching in rev-cache
|
||||
- basic revision cache system, no integration or features
|
||||
- man page and technical discussion for rev-cache
|
||||
|
||||
I merged this to 'pu' but then ejected it because it seems to break at
|
||||
least t6001.
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* jl/submodule-add-noname (2009-09-22) 1 commit
|
||||
- git submodule add: make the <path> parameter optional
|
||||
|
||||
Dscho started an interesting discussion regarding the larger workflow in
|
||||
which the "submodule add" is used. I think the patch itself makes sense
|
||||
but at the same time it probably makes sense to also take the <path> and
|
||||
infer the <repository> as Dscho suggested, probably in "git submodule
|
||||
add", not in "git add" proper, at least initially.
|
||||
|
||||
* jc/fix-tree-walk (2009-09-14) 9 commits
|
||||
- read-tree --debug-unpack
|
||||
- unpack-trees.c: look ahead in the index
|
||||
- unpack-trees.c: prepare for looking ahead in the index
|
||||
- traverse_trees(): handle D/F conflict case sanely
|
||||
- more D/F conflict tests
|
||||
- tests: move convenience regexp to match object names to test-lib.sh
|
||||
- unpack_callback(): use unpack_failed() consistently
|
||||
- unpack-trees: typofix
|
||||
- diff-lib.c: fix misleading comments on oneway_diff()
|
||||
|
||||
This is my replacement for Linus's lt/maint-traverse-trees-fix patch. It
|
||||
is not so much as a counter-proposal; I originally thought it might make
|
||||
sense to walk the index and drive the walker to return the entries from
|
||||
trees to match entries from the index, but I ended up doing pretty much
|
||||
what Linus outlined --- walk the trees, and have the index walker follow
|
||||
it. It turned out that the index side also needed some hairy look-ahead,
|
||||
and I am only half satisfied with the current status of the series.
|
||||
|
||||
To fix the resolve merge regression seen in t6035, git-merge-resolve needs
|
||||
to be rewritten not to use the one-path-at-a-time "git merge-index".
|
||||
|
||||
* jp/fetch-tag-match (2009-09-17) 1 commit
|
||||
- fetch: Speed up fetch by rewriting find_non_local_tags
|
||||
|
||||
I did not have much energy left while dealing with the "fix-tree-walk"
|
||||
series, so I just queued this without reading nor thinking about it very
|
||||
much. I personally liked my version that had far smaller number of lines
|
||||
changed (which means I can be fairly certain that it did not introduce any
|
||||
regression), but perhaps the majorly rewritten logic this patch gives us
|
||||
may be easier to follow and maintain. We'll see.
|
||||
|
||||
* jc/maint-blank-at-eof (2009-09-15) 0 commits.
|
||||
(this branch uses jc/maint-1.6.0-blank-at-eof.)
|
||||
|
||||
The series does not have a commit of its own but is a preparation for
|
||||
merging the original jc/1.6.0-maint-blank-at-eof topic to 'maint' and then
|
||||
'master'. It is a fix for longstanding bug and 1.6.5 will not contain
|
||||
this topic.
|
||||
|
||||
* db/vcs-helper-rest (2009-09-03) 6 commits
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Add support for "import" helper command
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
(this branch is used by jh/cvs-helper.)
|
||||
|
||||
This holds the remainder of the db/vcs-helper topic that has already
|
||||
merged for 1.6.5.
|
||||
|
||||
* jh/notes (2009-09-12) 13 commits
|
||||
- Selftests verifying semantics when loading notes trees with various fanouts
|
||||
- Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
- notes.[ch] fixup: avoid old-style declaration
|
||||
- Teach notes code to free its internal data structures on request.
|
||||
- Add '%N'-format for pretty-printing commit notes
|
||||
- Add flags to get_commit_notes() to control the format of the note string
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
(this branch uses sr/gfi-options.)
|
||||
|
||||
Rerolled and queued.
|
||||
|
||||
* jn/gitweb-show-size (2009-09-07) 1 commit
|
||||
- gitweb: Add 'show-sizes' feature to show blob sizes in tree view
|
||||
|
||||
* lt/maint-traverse-trees-fix (2009-09-06) 1 commit.
|
||||
. Prepare 'traverse_trees()' for D/F conflict lookahead
|
||||
|
||||
Ejected from 'pu' (see jc/fix-tree-walk above).
|
||||
|
||||
* jc/maint-1.6.0-blank-at-eof (2009-09-14) 15 commits.
|
||||
(merged to 'next' on 2009-09-15 at 9cbfa00)
|
||||
+ diff -B: colour whitespace errors
|
||||
+ diff.c: emit_add_line() takes only the rest of the line
|
||||
+ diff.c: split emit_line() from the first char and the rest of the line
|
||||
+ diff.c: shuffling code around
|
||||
+ diff --whitespace: fix blank lines at end
|
||||
(merged to 'next' on 2009-09-07 at 165dc3c)
|
||||
+ core.whitespace: split trailing-space into blank-at-{eol,eof}
|
||||
+ diff --color: color blank-at-eof
|
||||
+ diff --whitespace=warn/error: fix blank-at-eof check
|
||||
+ diff --whitespace=warn/error: obey blank-at-eof
|
||||
+ diff.c: the builtin_diff() deals with only two-file comparison
|
||||
+ apply --whitespace: warn blank but not necessarily empty lines at EOF
|
||||
+ apply --whitespace=warn/error: diagnose blank at EOF
|
||||
+ apply.c: split check_whitespace() into two
|
||||
+ apply --whitespace=fix: detect new blank lines at eof correctly
|
||||
+ apply --whitespace=fix: fix handling of blank lines at the eof
|
||||
(this branch is used by jc/maint-blank-at-eof.)
|
||||
|
||||
This is a fix for an ancient bug (or inconsistent set of features); the
|
||||
topic is based on an ancient codebase and is designed to be merged
|
||||
upwards. jc/maint-blank-at-eof serves that purpose.
|
||||
|
||||
Will not be in 1.6.5.
|
||||
|
||||
* jn/gitweb-blame (2009-09-01) 5 commits
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
(merged to 'next' on 2009-09-07 at 3622199)
|
||||
+ gitweb: Colorize 'blame_incremental' view during processing
|
||||
+ gitweb: Incremental blame (using JavaScript)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame.
|
||||
|
||||
* sr/gfi-options (2009-09-06) 6 commits
|
||||
(merged to 'next' on 2009-09-07 at 5f6b0ff)
|
||||
+ fast-import: test the new option command
|
||||
+ fast-import: add option command
|
||||
+ fast-import: test the new feature command
|
||||
+ fast-import: add feature command
|
||||
+ fast-import: put marks reading in it's own function
|
||||
+ fast-import: put option parsing code in separate functions
|
||||
(this branch is used by jh/notes.)
|
||||
|
||||
Ping?
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jk/1.7.0-status (2009-09-05) 5 commits
|
||||
- docs: note that status configuration affects only long format
|
||||
(merged to 'next' on 2009-09-07 at 8a7c563)
|
||||
+ commit: support alternate status formats
|
||||
+ status: add --porcelain output format
|
||||
+ status: refactor format option parsing
|
||||
+ status: refactor short-mode printing to its own function
|
||||
(this branch uses jc/1.7.0-status.)
|
||||
|
||||
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
|
||||
is similar to that of post 1.7.0 "git status".
|
||||
|
||||
* jc/1.7.0-status (2009-09-05) 4 commits
|
||||
(merged to 'next' on 2009-09-06 at 19d4beb)
|
||||
+ status: typo fix in usage
|
||||
(merged to 'next' on 2009-08-22 at b3507bb)
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
(this branch is used by jk/1.7.0-status.)
|
||||
|
||||
With this, "git status" is no longer "git commit --dry-run".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit
|
||||
(merged to 'next' on 2009-08-22 at 5106de8)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
|
||||
(merged to 'next' on 2009-08-30 at 0623572)
|
||||
+ diff.c: fix typoes in comments
|
||||
(merged to 'next' on 2009-08-27 at 81fb2bd)
|
||||
+ Make test case number unique
|
||||
(merged to 'next' on 2009-08-02 at 9c08420)
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits
|
||||
(merged to 'next' on 2009-08-02 at 38b82fe)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* lt/read-directory (2009-05-15) 3 commits.
|
||||
. Add initial support for pathname conversion to UTF-8
|
||||
. read_directory(): infrastructure for pathname character set conversion
|
||||
. Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
* cc/reset-merge (2009-09-16) 4 commits
|
||||
. reset: add test cases for "--merge-safe" option
|
||||
. reset: add option "--merge-safe" to "git reset"
|
||||
. reset: use "unpack_trees()" directly instead of "git read-tree"
|
||||
. reset: add a few tests for "git reset --merge"
|
||||
|
||||
* cc/sequencer-rebase-i (2009-08-28) 15 commits
|
||||
. rebase -i: use "git sequencer--helper --cherry-pick"
|
||||
. sequencer: add "--cherry-pick" option to "git sequencer--helper"
|
||||
. sequencer: add "do_commit()" and related functions working on "next_commit"
|
||||
. pick: libify "pick_help_msg()"
|
||||
. revert: libify cherry-pick and revert functionnality
|
||||
. rebase -i: use "git sequencer--helper --fast-forward"
|
||||
. sequencer: let "git sequencer--helper" callers set "allow_dirty"
|
||||
. sequencer: add "--fast-forward" option to "git sequencer--helper"
|
||||
. sequencer: add "do_fast_forward()" to perform a fast forward
|
||||
. rebase -i: use "git sequencer--helper --reset-hard"
|
||||
. sequencer: add "--reset-hard" option to "git sequencer--helper"
|
||||
. sequencer: add "reset_almost_hard()" and related functions
|
||||
. rebase -i: use "git sequencer--helper --make-patch"
|
||||
. sequencer: add "make_patch" function to save a patch
|
||||
. sequencer: add "builtin-sequencer--helper.c"
|
||||
@@ -1,457 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Oct 2009, #02; Sun, 11)
|
||||
X-master-at: 78d553b7d7b269bb22ebd8b1198657c37484a3a0
|
||||
X-next-at: 0ff2e96835a8890f86b5b69d8967d350fe89e9e8
|
||||
|
||||
What's cooking in git.git (Oct 2009, #02; Sun, 11)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
|
||||
agrees that they were mistakes. The resulting system may not be strictly
|
||||
backward compatible. Currently planeed changes are:
|
||||
|
||||
* refuse push to update the checked out branch in a non-bare repo by
|
||||
default
|
||||
|
||||
Make "git push" into a repository to update the branch that is checked
|
||||
out fail by default. You can countermand this default by setting a
|
||||
configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
|
||||
|
||||
* refuse push to delete the current branch by default
|
||||
|
||||
Make "git push $there :$killed" to delete the branch that is pointed at
|
||||
by its HEAD fail by default. You can countermand this default by
|
||||
setting a configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
|
||||
|
||||
* git-send-email won't make deep threads by default
|
||||
|
||||
Many people said that by default when sending more than 2 patches the
|
||||
threading git-send-email makes by default is hard to read, and they
|
||||
prefer the default be one cover letter and each patch as a direct
|
||||
follow-up to the cover letter. You can countermand this by setting a
|
||||
configuration variable.
|
||||
|
||||
http://article.gmane.org/gmane.comp.version-control.git/109790
|
||||
|
||||
* git-status won't be "git-commit --dry-run" anymore
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
|
||||
|
||||
* "git-diff -w --exit-code" will exit success if only differences it
|
||||
found are whitespace changes that are stripped away from the output.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
|
||||
|
||||
As a post-release ritual, I've rebuilt 'next' on top of 'master'.
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* ch/am-header (2009-09-25) 2 commits
|
||||
(merged to 'next' on 2009-09-25 at f86e197)
|
||||
+ git-am: force egrep to use correct characters set
|
||||
+ git-am: fixed patch_format detection according to RFC2822
|
||||
|
||||
* ef/msvc-noreturn (2009-09-30) 2 commits
|
||||
(merged to 'next' on 2009-10-07 at 66137a0)
|
||||
+ add NORETURN_PTR for function pointers
|
||||
+ increase portability of NORETURN declarations
|
||||
|
||||
jk: This is the latest round and I think should be ready for at least
|
||||
'next' (maybe even 'master' as it is really about the build and not about
|
||||
functionality).
|
||||
|
||||
* fc/mutt-alias (2009-09-30) 1 commit
|
||||
(merged to 'next' on 2009-10-07 at df7ac20)
|
||||
+ send-email: fix mutt regex for grouped aliases
|
||||
|
||||
jk: Latest round that addressed comments. Ready for 'next' if not
|
||||
'master'.
|
||||
|
||||
* jk/reflog-date (2009-09-24) 1 commit
|
||||
(merged to 'next' on 2009-09-29 at 43d444a)
|
||||
+ improve reflog date/number heuristic
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jp/maint-send-email-fold (2009-10-08) 1 commit.
|
||||
- git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
|
||||
|
||||
* ks/precompute-completion (2009-10-05) 1 commit.
|
||||
- Speedup bash completion loading
|
||||
|
||||
* pv/maint-add-p-no-exclude (2009-10-10) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 0ff2e96)
|
||||
+ git-add--interactive: never skip files included in index
|
||||
|
||||
* sp/smart-http (2009-10-08) 4 commits.
|
||||
- Smart fetch and push over HTTP: server side
|
||||
- Add smart-http options to upload-pack, receive-pack
|
||||
- Git-aware CGI to provide dumb HTTP transport
|
||||
- Document the HTTP transport protocol
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* sr/gfi-options (2009-09-06) 6 commits.
|
||||
- fast-import: test the new option command
|
||||
- fast-import: add option command
|
||||
- fast-import: test the new feature command
|
||||
- fast-import: add feature command
|
||||
- fast-import: put marks reading in it's own function
|
||||
- fast-import: put option parsing code in separate functions
|
||||
|
||||
Ejected from 'next' as fast-import folks still seem to be discussing with
|
||||
how to proceed.
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 1b99c56)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests cover the positive case (i.e. as long as the user says
|
||||
"yes" to the "do you really want to send this message that lacks subject",
|
||||
the message is sent) of this feature, but the feature itself needs its own
|
||||
test to verify the negative case (i.e. does it correctly stop if the user
|
||||
says "no"?)
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 8 commits.
|
||||
- More fixes to the git-remote-cvs installation procedure
|
||||
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
- Add simple selftests of git-remote-cvs functionality
|
||||
- git-remote-cvs: Remote helper program for CVS repositories
|
||||
- 2/2: Add Python support library for CVS remote helper
|
||||
- 1/2: Add Python support library for CVS remote helper
|
||||
- Basic build infrastructure for Python scripts
|
||||
- Allow helpers to request marks for fast-import
|
||||
(this branch uses db/vcs-helper-rest.)
|
||||
|
||||
Builds on db/vcs-helper. There is a re-roll planned.
|
||||
|
||||
* ne/rev-cache (2009-09-07) 7 commits.
|
||||
. support for commit grafts, slight change to general mechanism
|
||||
. support for path name caching in rev-cache
|
||||
. full integration of rev-cache into git, completed test suite
|
||||
. administrative functions for rev-cache, start of integration into git
|
||||
. support for non-commit object caching in rev-cache
|
||||
. basic revision cache system, no integration or features
|
||||
. man page and technical discussion for rev-cache
|
||||
|
||||
This seems to break at least t6001 when merged to 'pu'.
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* dk/blame-el (2009-09-29) 1 commit.
|
||||
- git-blame.el: Change how blame information is shown.
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* ef/msys-imap (2009-10-09) 8 commits.
|
||||
- MSVC: Enable OpenSSL, and translate -lcrypto
|
||||
- mingw: enable OpenSSL
|
||||
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
|
||||
- imap-send: build imap-send on Windows
|
||||
- imap-send: fix compilation-error on Windows
|
||||
- imap-send: use run-command API for tunneling
|
||||
- imap-send: use separate read and write fds
|
||||
- imap-send: remove useless uid code
|
||||
|
||||
* jn/gitweb-patch (2009-10-09) 1 commit.
|
||||
- gitweb: Do not show 'patch' link for merge commits
|
||||
|
||||
Soon in 'next'
|
||||
|
||||
* mr/gitweb-snapshot (2009-09-26) 2 commits.
|
||||
- gitweb: append short hash ids to snapshot files
|
||||
(merged to 'next' on 2009-10-11 at 22ba047)
|
||||
+ gitweb: check given hash before trying to create snapshot
|
||||
|
||||
* mr/instaweb-cgid (2009-09-26) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 99bcfaf)
|
||||
+ instaweb: support mod_cgid for apache2
|
||||
|
||||
* tf/doc-pt-br (2009-09-23) 1 commit.
|
||||
- Documentation: update pt-BR
|
||||
|
||||
The current AsciiDoc may barf on NOME and SINOPSE, as pt_BR language
|
||||
definition is not widely distributed yet (it just hit the development
|
||||
tree). Need to revert these headings (or change the length of the section
|
||||
underlines to match the length of translated names).
|
||||
|
||||
* jc/pretty-lf (2009-10-04) 1 commit.
|
||||
- Pretty-format: %[+-]x to tweak inter-item newlines
|
||||
|
||||
I am not happy with this one yet. I am contemplating to introduce a new
|
||||
syntax "%[magic(param)<anything>%]" to generalize expressions of this and
|
||||
line wrapping features in an extensible way.
|
||||
|
||||
* js/log-rewrap (2008-11-10) 3 commits.
|
||||
. Add "%w" to pretty formats, which rewraps the commit message
|
||||
- Add strbuf_add_wrapped_text() to utf8.[ch]
|
||||
- print_wrapped_text(): allow hard newlines
|
||||
... and the first two from this series will be useful to implement an
|
||||
example magic "wrap", e.g. "%[wrap(i,j,w)%s%+b%]".
|
||||
|
||||
* jg/log-format-body-indent (2009-09-19) 1 commit.
|
||||
- git-log --format: Add %B tag with %B(x) option
|
||||
|
||||
I think we should redo this on top of the first two patches from
|
||||
js/log-rewrap series; %B(x) is just a special case %B(x,x,0), no? If a
|
||||
magic value 0 (or negative) given to wrap-width does not disable wrapping,
|
||||
we probably should make it so.
|
||||
|
||||
* bg/rebase-reword (2009-10-07) 1 commit.
|
||||
- Teach 'rebase -i' the command "reword"
|
||||
|
||||
Soon in 'next'
|
||||
|
||||
* js/diff-verbose-submodule (2009-10-04) 1 commit.
|
||||
- Add the --submodule-summary option to the diff option family
|
||||
|
||||
Dscho sounded like he has some corrections after list comments, but I did
|
||||
not pick up his interdiff in the middle.
|
||||
|
||||
* jl/submodule-add-noname (2009-09-22) 1 commit.
|
||||
- git submodule add: make the <path> parameter optional
|
||||
|
||||
Dscho started an interesting discussion regarding the larger workflow in
|
||||
which the "submodule add" is used. I think the patch itself makes sense
|
||||
but at the same time it probably makes sense to also take the <path> and
|
||||
infer the <repository> as Dscho suggested, probably in "git submodule
|
||||
add", not in "git add" proper, at least initially.
|
||||
|
||||
* jc/fix-tree-walk (2009-09-14) 10 commits.
|
||||
- read-tree --debug-unpack
|
||||
- unpack-trees.c: look ahead in the index
|
||||
- unpack-trees.c: prepare for looking ahead in the index
|
||||
- Aggressive three-way merge: fix D/F case
|
||||
- traverse_trees(): handle D/F conflict case sanely
|
||||
- more D/F conflict tests
|
||||
- tests: move convenience regexp to match object names to test-lib.sh
|
||||
- unpack_callback(): use unpack_failed() consistently
|
||||
- unpack-trees: typofix
|
||||
- diff-lib.c: fix misleading comments on oneway_diff()
|
||||
|
||||
This is my replacement for Linus's lt/maint-traverse-trees-fix patch. It
|
||||
is not so much as a counter-proposal; I originally thought it might make
|
||||
sense to walk the index and drive the walker to return the entries from
|
||||
trees to match entries from the index, but I ended up doing pretty much
|
||||
what Linus outlined --- walk the trees, and have the index walker follow
|
||||
it. It turned out that the index side also needed some hairy look-ahead,
|
||||
|
||||
This includes the fix to aggressive mode of three-way merge used by the
|
||||
resolve strategy. I think the series is Ok for 'next'.
|
||||
|
||||
* jp/fetch-tag-match (2009-09-17) 1 commit.
|
||||
- fetch: Speed up fetch by rewriting find_non_local_tags
|
||||
|
||||
I just queued this without reading nor thinking about it very much. I
|
||||
personally liked my version that had far smaller number of lines changed
|
||||
(which means I can be fairly certain that it did not introduce any
|
||||
regression), but perhaps the majorly rewritten logic this patch gives us
|
||||
may be easier to follow and maintain.
|
||||
|
||||
* jc/maint-blank-at-eof (2009-09-15) 0 commits.
|
||||
(this branch uses jc/maint-1.6.0-blank-at-eof.)
|
||||
|
||||
The series does not have a commit of its own but is a preparation for
|
||||
merging the original jc/1.6.0-maint-blank-at-eof topic to 'maint' and then
|
||||
'master'
|
||||
|
||||
Soon in 'next'
|
||||
|
||||
* db/vcs-helper-rest (2009-09-03) 6 commits.
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Add support for "import" helper command
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
(this branch is used by jh/cvs-helper.)
|
||||
|
||||
This holds the remainder of the db/vcs-helper topic that has already
|
||||
merged in 1.6.5.
|
||||
|
||||
* jh/notes (2009-10-09) 22 commits.
|
||||
- fast-import: Proper notes tree manipulation using the notes API
|
||||
- Refactor notes concatenation into a flexible interface for combining notes
|
||||
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
|
||||
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
|
||||
- Notes API: get_note(): Return the note annotating the given object
|
||||
- Notes API: add_note(): Add note objects to the internal notes tree structure
|
||||
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
|
||||
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
|
||||
- Add selftests verifying concatenation of multiple notes for the same commit
|
||||
- Refactor notes code to concatenate multiple notes annotating the same object
|
||||
- Add selftests verifying that we can parse notes trees with various fanouts
|
||||
- Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
- Teach notes code to free its internal data structures on request
|
||||
- Add '%N'-format for pretty-printing commit notes
|
||||
- Add flags to get_commit_notes() to control the format of the note string
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
Rerolled and queued.
|
||||
|
||||
* jn/gitweb-show-size (2009-09-07) 1 commit.
|
||||
- gitweb: Add 'show-sizes' feature to show blob sizes in tree view
|
||||
|
||||
Soon in 'next'
|
||||
|
||||
* jc/maint-1.6.0-blank-at-eof (2009-09-14) 15 commits.
|
||||
(merged to 'next' on 2009-10-11 at 7f34fb3)
|
||||
+ diff -B: colour whitespace errors
|
||||
+ diff.c: emit_add_line() takes only the rest of the line
|
||||
+ diff.c: split emit_line() from the first char and the rest of the line
|
||||
+ diff.c: shuffling code around
|
||||
+ diff --whitespace: fix blank lines at end
|
||||
+ core.whitespace: split trailing-space into blank-at-{eol,eof}
|
||||
+ diff --color: color blank-at-eof
|
||||
+ diff --whitespace=warn/error: fix blank-at-eof check
|
||||
+ diff --whitespace=warn/error: obey blank-at-eof
|
||||
+ diff.c: the builtin_diff() deals with only two-file comparison
|
||||
+ apply --whitespace: warn blank but not necessarily empty lines at EOF
|
||||
+ apply --whitespace=warn/error: diagnose blank at EOF
|
||||
+ apply.c: split check_whitespace() into two
|
||||
+ apply --whitespace=fix: detect new blank lines at eof correctly
|
||||
+ apply --whitespace=fix: fix handling of blank lines at the eof
|
||||
(this branch is used by jc/maint-blank-at-eof.)
|
||||
|
||||
This is a fix for an ancient bug (or inconsistent set of features); the
|
||||
topic is based on an ancient codebase and is designed to be merged
|
||||
upwards. jc/maint-blank-at-eof serves that purpose.
|
||||
|
||||
* jn/gitweb-blame (2009-09-01) 5 commits.
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
(merged to 'next' on 2009-10-11 at 73c4a83)
|
||||
+ gitweb: Colorize 'blame_incremental' view during processing
|
||||
+ gitweb: Incremental blame (using JavaScript)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame.
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits.
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jk/1.7.0-status (2009-09-05) 5 commits.
|
||||
- docs: note that status configuration affects only long format
|
||||
(merged to 'next' on 2009-10-11 at 65c8513)
|
||||
+ commit: support alternate status formats
|
||||
+ status: add --porcelain output format
|
||||
+ status: refactor format option parsing
|
||||
+ status: refactor short-mode printing to its own function
|
||||
(this branch uses jc/1.7.0-status.)
|
||||
|
||||
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
|
||||
is similar to that of post 1.7.0 "git status".
|
||||
|
||||
* jc/1.7.0-status (2009-09-05) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 9558627)
|
||||
+ status: typo fix in usage
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
(this branch is used by jk/1.7.0-status.)
|
||||
|
||||
With this, "git status" is no longer "git commit --dry-run".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 043acdf)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 546c74d)
|
||||
+ diff.c: fix typoes in comments
|
||||
+ Make test case number unique
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
|
||||
(merged to 'next' on 2009-10-11 at 81b8128)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* lt/read-directory (2009-05-15) 3 commits.
|
||||
. Add initial support for pathname conversion to UTF-8
|
||||
. read_directory(): infrastructure for pathname character set conversion
|
||||
. Add 'fill_directory()' helper function for directory traversal
|
||||
|
||||
* cc/reset-merge (2009-09-16) 4 commits.
|
||||
. reset: add test cases for "--merge-safe" option
|
||||
. reset: add option "--merge-safe" to "git reset"
|
||||
. reset: use "unpack_trees()" directly instead of "git read-tree"
|
||||
. reset: add a few tests for "git reset --merge"
|
||||
|
||||
* cc/sequencer-rebase-i (2009-08-28) 15 commits.
|
||||
. rebase -i: use "git sequencer--helper --cherry-pick"
|
||||
. sequencer: add "--cherry-pick" option to "git sequencer--helper"
|
||||
. sequencer: add "do_commit()" and related functions working on "next_commit"
|
||||
. pick: libify "pick_help_msg()"
|
||||
. revert: libify cherry-pick and revert functionnality
|
||||
. rebase -i: use "git sequencer--helper --fast-forward"
|
||||
. sequencer: let "git sequencer--helper" callers set "allow_dirty"
|
||||
. sequencer: add "--fast-forward" option to "git sequencer--helper"
|
||||
. sequencer: add "do_fast_forward()" to perform a fast forward
|
||||
. rebase -i: use "git sequencer--helper --reset-hard"
|
||||
. sequencer: add "--reset-hard" option to "git sequencer--helper"
|
||||
. sequencer: add "reset_almost_hard()" and related functions
|
||||
. rebase -i: use "git sequencer--helper --make-patch"
|
||||
. sequencer: add "make_patch" function to save a patch
|
||||
. sequencer: add "builtin-sequencer--helper.c"
|
||||
|
||||
* lt/maint-traverse-trees-fix (2009-09-06) 1 commit.
|
||||
. Prepare 'traverse_trees()' for D/F conflict lookahead
|
||||
@@ -1,440 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Oct 2009, #03; Mon, 19)
|
||||
X-master-at: e79999b1a285d4dcf1d84bc893c864516a390cfa
|
||||
X-next-at: e01f7ce260cd5923cc9a088b74793a58379b5cc0
|
||||
|
||||
What's cooking in git.git (Oct 2009, #03; Mon, 19)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
|
||||
agrees that they were mistakes. The resulting system may not be strictly
|
||||
backward compatible. Currently planeed changes are:
|
||||
|
||||
* refuse push to update the checked out branch in a non-bare repo by
|
||||
default
|
||||
|
||||
Make "git push" into a repository to update the branch that is checked
|
||||
out fail by default. You can countermand this default by setting a
|
||||
configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
|
||||
|
||||
* refuse push to delete the current branch by default
|
||||
|
||||
Make "git push $there :$killed" to delete the branch that is pointed at
|
||||
by its HEAD fail by default. You can countermand this default by
|
||||
setting a configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
|
||||
|
||||
* git-send-email won't make deep threads by default
|
||||
|
||||
Many people said that by default when sending more than 2 patches the
|
||||
threading git-send-email makes by default is hard to read, and they
|
||||
prefer the default be one cover letter and each patch as a direct
|
||||
follow-up to the cover letter. You can countermand this by setting a
|
||||
configuration variable.
|
||||
|
||||
http://article.gmane.org/gmane.comp.version-control.git/109790
|
||||
|
||||
* git-status won't be "git-commit --dry-run" anymore
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
|
||||
|
||||
* "git-diff -w --exit-code" will exit success if only differences it
|
||||
found are whitespace changes that are stripped away from the output.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* jp/maint-send-email-fold (2009-10-08) 1 commit.
|
||||
+ git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
|
||||
|
||||
* pv/maint-add-p-no-exclude (2009-10-10) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 0ff2e96)
|
||||
+ git-add--interactive: never skip files included in index
|
||||
|
||||
* dk/blame-el (2009-09-29) 1 commit.
|
||||
+ git-blame.el: Change how blame information is shown.
|
||||
|
||||
* jn/gitweb-patch (2009-10-09) 1 commit.
|
||||
+ gitweb: Do not show 'patch' link for merge commits
|
||||
|
||||
* mr/instaweb-cgid (2009-09-26) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 99bcfaf)
|
||||
+ instaweb: support mod_cgid for apache2
|
||||
|
||||
* tf/doc-pt-br (2009-09-23) 1 commit.
|
||||
+ Documentation: update pt-BR
|
||||
|
||||
The current AsciiDoc may barf on NOME and SINOPSE, as pt_BR language
|
||||
definition is not widely distributed yet (it just hit the development
|
||||
tree).
|
||||
|
||||
* bg/rebase-reword (2009-10-07) 2 commits.
|
||||
+ rebase-i: fix reword when using a terminal editor
|
||||
+ Teach 'rebase -i' the command "reword"
|
||||
|
||||
* jp/fetch-tag-match (2009-09-17) 1 commit.
|
||||
+ fetch: Speed up fetch by rewriting find_non_local_tags
|
||||
|
||||
* jn/gitweb-show-size (2009-09-07) 1 commit.
|
||||
+ gitweb: Add 'show-sizes' feature to show blob sizes in tree view
|
||||
|
||||
* jc/maint-1.6.0-blank-at-eof (2009-09-14) 15 commits.
|
||||
(merged to 'next' on 2009-10-11 at 7f34fb3)
|
||||
+ diff -B: colour whitespace errors
|
||||
+ diff.c: emit_add_line() takes only the rest of the line
|
||||
+ diff.c: split emit_line() from the first char and the rest of the line
|
||||
+ diff.c: shuffling code around
|
||||
+ diff --whitespace: fix blank lines at end
|
||||
+ core.whitespace: split trailing-space into blank-at-{eol,eof}
|
||||
+ diff --color: color blank-at-eof
|
||||
+ diff --whitespace=warn/error: fix blank-at-eof check
|
||||
+ diff --whitespace=warn/error: obey blank-at-eof
|
||||
+ diff.c: the builtin_diff() deals with only two-file comparison
|
||||
+ apply --whitespace: warn blank but not necessarily empty lines at EOF
|
||||
+ apply --whitespace=warn/error: diagnose blank at EOF
|
||||
+ apply.c: split check_whitespace() into two
|
||||
+ apply --whitespace=fix: detect new blank lines at eof correctly
|
||||
+ apply --whitespace=fix: fix handling of blank lines at the eof
|
||||
(this branch is used by jc/maint-blank-at-eof.)
|
||||
|
||||
This is a fix for an ancient bug (or inconsistent set of features); the
|
||||
topic is based on an ancient codebase and is designed to be merged
|
||||
upwards. jc/maint-blank-at-eof serves that purpose.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
|
||||
- bisect reset: Allow resetting to any commit, not just a branch
|
||||
|
||||
* fc/doc-fast-forward (2009-10-11) 1 commit.
|
||||
- user-manual: use 'fast-forward'
|
||||
|
||||
* gb/maint-gitweb-esc-param (2009-10-13) 1 commit.
|
||||
(merged to 'next' on 2009-10-14 at 105f997)
|
||||
+ gitweb: fix esc_param
|
||||
(this branch is used by sb/gitweb-link-author.)
|
||||
|
||||
* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
|
||||
- info/grafts: allow trailing whitespaces at the end of line
|
||||
|
||||
* jc/strbuf-nested-expand (2009-10-18) 5 commits
|
||||
- Teach --wrap to only indent without wrapping
|
||||
- Add %[wrap(width,in1,in2)<<any-string>>%] implementation
|
||||
- strbuf_nested_expand(): allow expansion to interrupt in the middle
|
||||
- Add strbuf_add_wrapped_text() to utf8.[ch]
|
||||
- print_wrapped_text(): allow hard newlines
|
||||
(this branch uses js/log-rewrap.)
|
||||
|
||||
* jk/maint-cvsimport-pathname (2009-10-19) 1 commit.
|
||||
(merged to 'next' on 2009-10-19 at 77824f2)
|
||||
+ cvsimport: fix relative argument filenames
|
||||
|
||||
* jn/show-normalized-refs (2009-10-12) 3 commits.
|
||||
- check-ref-format: simplify --print implementation
|
||||
- git check-ref-format --print
|
||||
- Add tests for git check-ref-format
|
||||
|
||||
* sb/gitweb-link-author (2009-10-14) 1 commit.
|
||||
- gitweb: linkify author/committer names with search
|
||||
(this branch uses gb/maint-gitweb-esc-param.)
|
||||
|
||||
* jc/checkout-auto-track (2009-10-18) 3 commits
|
||||
- git checkout --nodwim
|
||||
- DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
|
||||
- check_filename(): make verify_filename() callable without dying
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* db/vcs-helper-rest (2009-09-03) 6 commits.
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Add support for "import" helper command
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
(this branch is used by jh/cvs-helper.)
|
||||
|
||||
This holds the remainder of the db/vcs-helper topic that has already
|
||||
merged in 1.6.5. If people want to replace this with improvements it
|
||||
would be a good time to do so.
|
||||
|
||||
* jl/submodule-add-noname (2009-09-22) 1 commit.
|
||||
- git submodule add: make the <path> parameter optional
|
||||
|
||||
Dscho started an interesting discussion regarding the larger workflow in
|
||||
which the "submodule add" is used. I think the patch itself makes sense
|
||||
but at the same time it probably makes sense to also take the <path> and
|
||||
infer the <repository> as Dscho suggested, probably in "git submodule
|
||||
add", not in "git add" proper, at least initially.
|
||||
|
||||
* sr/gfi-options (2009-09-06) 6 commits.
|
||||
- fast-import: test the new option command
|
||||
- fast-import: add option command
|
||||
- fast-import: test the new feature command
|
||||
- fast-import: add feature command
|
||||
- fast-import: put marks reading in it's own function
|
||||
- fast-import: put option parsing code in separate functions
|
||||
(this branch is used by jh/notes.)
|
||||
|
||||
Ejected from 'next' as fast-import folks still seem to be discussing with
|
||||
how to proceed.
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 1b99c56)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests cover the positive case (i.e. as long as the user says
|
||||
"yes" to the "do you really want to send this message that lacks subject",
|
||||
the message is sent) of this feature, but the feature itself needs its own
|
||||
test to verify the negative case (i.e. does it correctly stop if the user
|
||||
says "no"?)
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 8 commits.
|
||||
- More fixes to the git-remote-cvs installation procedure
|
||||
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
- Add simple selftests of git-remote-cvs functionality
|
||||
- git-remote-cvs: Remote helper program for CVS repositories
|
||||
- 2/2: Add Python support library for CVS remote helper
|
||||
- 1/2: Add Python support library for CVS remote helper
|
||||
- Basic build infrastructure for Python scripts
|
||||
- Allow helpers to request marks for fast-import
|
||||
(this branch uses db/vcs-helper-rest.)
|
||||
|
||||
Builds on db/vcs-helper.
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* tr/stash-format (2009-10-16) 5 commits
|
||||
. stash list: drop the default limit of 10 stashes
|
||||
. stash list: use new %g formats instead of sed
|
||||
. Introduce new pretty formats %g[sdD] for reflog information
|
||||
. reflog-walk: refactor the branch@{num} formatting
|
||||
. Refactor pretty_print_commit arguments into a struct
|
||||
|
||||
Expecting a re-roll.
|
||||
|
||||
* ks/precompute-completion (2009-10-05) 1 commit.
|
||||
(merged to 'next' on 2009-10-14 at adf722a)
|
||||
+ Speedup bash completion loading
|
||||
|
||||
* sp/smart-http (2009-10-14) 17 commits
|
||||
- Smart HTTP fetch: gzip requests
|
||||
- Smart fetch over HTTP: client side
|
||||
- Smart push over HTTP: client side
|
||||
- Discover refs via smart HTTP server when available
|
||||
- Smart fetch and push over HTTP: server side
|
||||
- Add stateless RPC options to upload-pack, receive-pack
|
||||
- Git-aware CGI to provide dumb HTTP transport
|
||||
- Move WebDAV HTTP push under remote-curl
|
||||
- remote-helpers: Support custom transport options
|
||||
- remote-helpers: Fetch more than one ref in a batch
|
||||
- fetch: Allow transport -v -v -v to set verbosity to 3
|
||||
- remote-curl: Refactor walker initialization
|
||||
- Add multi_ack_detailed capability to fetch-pack/upload-pack
|
||||
- Move "get_ack()" back to fetch-pack
|
||||
- fetch-pack: Use a strbuf to compose the want list
|
||||
- pkt-line: Make packet_read_line easier to debug
|
||||
- pkt-line: Add strbuf based functions
|
||||
|
||||
* ef/msys-imap (2009-10-13) 8 commits.
|
||||
- MSVC: Enable OpenSSL, and translate -lcrypto
|
||||
- mingw: enable OpenSSL
|
||||
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
|
||||
- imap-send: build imap-send on Windows
|
||||
- imap-send: fix compilation-error on Windows
|
||||
- imap-send: use run-command API for tunneling
|
||||
- imap-send: use separate read and write fds
|
||||
- imap-send: remove useless uid code
|
||||
|
||||
Is this good to go yet?
|
||||
|
||||
* mr/gitweb-snapshot (2009-09-26) 2 commits.
|
||||
- gitweb: append short hash ids to snapshot files
|
||||
(merged to 'next' on 2009-10-11 at 22ba047)
|
||||
+ gitweb: check given hash before trying to create snapshot
|
||||
|
||||
* jc/pretty-lf (2009-10-04) 1 commit.
|
||||
- Pretty-format: %[+-]x to tweak inter-item newlines
|
||||
|
||||
* js/log-rewrap (2008-11-10) 2 commits
|
||||
- Add strbuf_add_wrapped_text() to utf8.[ch]
|
||||
- print_wrapped_text(): allow hard newlines
|
||||
(this branch is used by jc/strbuf-nested-expand.)
|
||||
|
||||
* js/diff-verbose-submodule (2009-10-14) 4 commits.
|
||||
- add tests for git diff --submodule-summary
|
||||
- fix output for deleted submodules in git diff --submodule-summary
|
||||
- fix indentation depth for git diff --submodule-summary
|
||||
- Add the --submodule-summary option to the diff option family
|
||||
|
||||
There was an attempted re-roll and it looked very promising with a minor
|
||||
fix-up, but I ran out of time to pick it up and unilaterally tweaking it.
|
||||
Waiting for a response.
|
||||
|
||||
* jc/fix-tree-walk (2009-09-14) 10 commits.
|
||||
- read-tree --debug-unpack
|
||||
(merged to 'next' on 2009-10-11 at 0b058e2)
|
||||
+ unpack-trees.c: look ahead in the index
|
||||
+ unpack-trees.c: prepare for looking ahead in the index
|
||||
+ Aggressive three-way merge: fix D/F case
|
||||
+ traverse_trees(): handle D/F conflict case sanely
|
||||
+ more D/F conflict tests
|
||||
+ tests: move convenience regexp to match object names to test-lib.sh
|
||||
+ unpack_callback(): use unpack_failed() consistently
|
||||
+ unpack-trees: typofix
|
||||
+ diff-lib.c: fix misleading comments on oneway_diff()
|
||||
|
||||
This is my replacement for Linus's lt/maint-traverse-trees-fix patch. It
|
||||
is not so much as a counter-proposal; I originally thought it might make
|
||||
sense to walk the index and drive the walker to return the entries from
|
||||
trees to match entries from the index, but I ended up doing pretty much
|
||||
what Linus outlined --- walk the trees, and have the index walker follow
|
||||
it. It turned out that the index side also needed some hairy look-ahead,
|
||||
|
||||
This includes the fix to aggressive mode of three-way merge used by the
|
||||
resolve strategy.
|
||||
|
||||
* jh/notes (2009-10-09) 22 commits.
|
||||
- fast-import: Proper notes tree manipulation using the notes API
|
||||
- Refactor notes concatenation into a flexible interface for combining notes
|
||||
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
|
||||
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
|
||||
- Notes API: get_note(): Return the note annotating the given object
|
||||
- Notes API: add_note(): Add note objects to the internal notes tree structure
|
||||
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
|
||||
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
|
||||
- Add selftests verifying concatenation of multiple notes for the same commit
|
||||
- Refactor notes code to concatenate multiple notes annotating the same object
|
||||
- Add selftests verifying that we can parse notes trees with various fanouts
|
||||
- Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
- Teach notes code to free its internal data structures on request
|
||||
- Add '%N'-format for pretty-printing commit notes
|
||||
- Add flags to get_commit_notes() to control the format of the note string
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
(this branch uses sr/gfi-options.)
|
||||
|
||||
Is this good for 'next' now?
|
||||
|
||||
* jn/gitweb-blame (2009-09-01) 5 commits.
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
(merged to 'next' on 2009-10-11 at 73c4a83)
|
||||
+ gitweb: Colorize 'blame_incremental' view during processing
|
||||
+ gitweb: Incremental blame (using JavaScript)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame.
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits.
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jk/1.7.0-status (2009-09-05) 5 commits.
|
||||
- docs: note that status configuration affects only long format
|
||||
(merged to 'next' on 2009-10-11 at 65c8513)
|
||||
+ commit: support alternate status formats
|
||||
+ status: add --porcelain output format
|
||||
+ status: refactor format option parsing
|
||||
+ status: refactor short-mode printing to its own function
|
||||
(this branch uses jc/1.7.0-status.)
|
||||
|
||||
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
|
||||
is similar to that of post 1.7.0 "git status".
|
||||
|
||||
* jc/1.7.0-status (2009-09-05) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 9558627)
|
||||
+ status: typo fix in usage
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
(this branch is used by jk/1.7.0-status.)
|
||||
|
||||
With this, "git status" is no longer "git commit --dry-run".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 043acdf)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 546c74d)
|
||||
+ diff.c: fix typoes in comments
|
||||
+ Make test case number unique
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
|
||||
(merged to 'next' on 2009-10-11 at 81b8128)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* ne/rev-cache (2009-09-07) 7 commits.
|
||||
. support for commit grafts, slight change to general mechanism
|
||||
. support for path name caching in rev-cache
|
||||
. full integration of rev-cache into git, completed test suite
|
||||
. administrative functions for rev-cache, start of integration into git
|
||||
. support for non-commit object caching in rev-cache
|
||||
. basic revision cache system, no integration or features
|
||||
. man page and technical discussion for rev-cache
|
||||
|
||||
This seems to break at least t6001 when merged to 'pu'.
|
||||
|
||||
* jg/log-format-body-indent (2009-09-19) 1 commit.
|
||||
. git-log --format: Add %B tag with %B(x) option
|
||||
|
||||
Ejected from 'pu' as this is merely a short-hand for %[wrap(0,x,x)%b%].
|
||||
@@ -1,496 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Oct 2009, #04; Wed, 21)
|
||||
X-master-at: 3694209ca16c033fb4c539cc23b0b370e48952dd
|
||||
X-next-at: fef13efd27479ba3d90fd511ea198445ed434a73
|
||||
|
||||
What's cooking in git.git (Oct 2009, #04; Wed, 21)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
|
||||
agrees that they were mistakes. The resulting system may not be strictly
|
||||
backward compatible. Currently planeed changes are:
|
||||
|
||||
* refuse push to update the checked out branch in a non-bare repo by
|
||||
default
|
||||
|
||||
Make "git push" into a repository to update the branch that is checked
|
||||
out fail by default. You can countermand this default by setting a
|
||||
configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
|
||||
|
||||
* refuse push to delete the current branch by default
|
||||
|
||||
Make "git push $there :$killed" to delete the branch that is pointed at
|
||||
by its HEAD fail by default. You can countermand this default by
|
||||
setting a configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
|
||||
|
||||
* git-send-email won't make deep threads by default
|
||||
|
||||
Many people said that by default when sending more than 2 patches the
|
||||
threading git-send-email makes by default is hard to read, and they
|
||||
prefer the default be one cover letter and each patch as a direct
|
||||
follow-up to the cover letter. You can countermand this by setting a
|
||||
configuration variable.
|
||||
|
||||
http://article.gmane.org/gmane.comp.version-control.git/109790
|
||||
|
||||
* git-status won't be "git-commit --dry-run" anymore
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
|
||||
|
||||
* "git-diff -w --exit-code" will exit success if only differences it
|
||||
found are whitespace changes that are stripped away from the output.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* gb/maint-gitweb-esc-param (2009-10-13) 1 commit.
|
||||
(merged to 'next' on 2009-10-14 at 105f997)
|
||||
+ gitweb: fix esc_param
|
||||
(this branch is used by sb/gitweb-link-author.)
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* vl/git-gui (2009-10-16) 1 commit.
|
||||
- git-gui: adjust the minimum height of diff pane for shorter screen height
|
||||
|
||||
Shawn?
|
||||
|
||||
* cb/doc-fetch-pull-merge (2009-10-21) 1 commit.
|
||||
(merged to 'next' on 2009-10-21 at 1d9190d)
|
||||
+ modernize fetch/merge/pull examples
|
||||
|
||||
* ja/fetch-doc (2009-10-21) 1 commit.
|
||||
(merged to 'next' on 2009-10-21 at bf09f62)
|
||||
+ Documentation/fetch-options.txt: order options alphabetically
|
||||
|
||||
Helps 'git-fetch.{1,html}' without helping 'git-pull.{1,html}'.
|
||||
|
||||
* jc/1.7.0-no-commit-no-ff-2 (2009-10-21) 1 commit.
|
||||
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
|
||||
|
||||
This makes "git merge --no-commit" fail when it results in fast-forward or
|
||||
up-to-date. I haven't described this at the beginning of this message
|
||||
yet, as it is not clear if this is even necessary, but since I already
|
||||
wrote it and many people seem to be interested in UI and behaviour
|
||||
warts,...
|
||||
|
||||
Some tests expect the traditional behaviour of silently ignoring --no-commit
|
||||
upon fast-forward, and tonight's 'pu' does not pass them.
|
||||
|
||||
* jc/1.7.0-no-commit-no-ff (2009-10-21) 1 commit.
|
||||
. git-merge: imply --no-ff when --no-commit is given
|
||||
|
||||
This is an alternative patch to the same issue.
|
||||
|
||||
* jc/fsck-default-full (2009-10-20) 1 commit
|
||||
(merged to 'next' on 2009-10-21 at 1375192)
|
||||
+ fsck: default to "git fsck --full"
|
||||
|
||||
Should be safe enough to be in 'master' soon.
|
||||
|
||||
* jc/maint-fix-unpack-zlib-check (2009-10-21) 1 commit.
|
||||
- Fix incorrect error check while reading deflated pack data
|
||||
|
||||
This is the final round from 2009-10-21, not my earlier botched attempts.
|
||||
|
||||
* jc/receive-pack-auto (2009-10-20) 2 commits.
|
||||
(merged to 'next' on 2009-10-21 at fef13ef)
|
||||
+ receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
|
||||
+ gc --auto --quiet: make the notice a bit less verboase
|
||||
|
||||
* jp/dirty-describe (2009-10-21) 1 commit.
|
||||
- Teach "git describe" --dirty option
|
||||
|
||||
Ack?
|
||||
|
||||
* tr/filter-branch (2009-10-21) 2 commits.
|
||||
- filter-branch: nearest-ancestor rewriting outside subdir filter
|
||||
- filter-branch: stop special-casing $filter_subdir argument
|
||||
|
||||
J6t already has some comments on this.
|
||||
|
||||
* tr/maint-roff-quote (2009-10-21) 2 commits.
|
||||
- Document GNU_ROFF in Makefile
|
||||
- Quote ' as \(aq in manpages
|
||||
|
||||
The doc may need to be clarified a bit more.
|
||||
|
||||
* bg/clone-doc (2009-10-20) 1 commit.
|
||||
(merged to 'next' on 2009-10-21 at 3016736)
|
||||
+ git-clone.txt: Fix grammar and formatting
|
||||
|
||||
Should be correct enough to be in 'master' soon.
|
||||
|
||||
* iv/tar-lzma-xz (2009-10-20) 1 commit.
|
||||
(merged to 'next' on 2009-10-21 at cb0df8a)
|
||||
+ import-tars: Add support for tarballs compressed with lzma, xz
|
||||
|
||||
Should be safe enough to be in 'master' soon.
|
||||
|
||||
* rs/pretty-wrap (2009-10-17) 1 commit
|
||||
- Implement wrap format %w() as if it is a mode switch
|
||||
(this branch uses js/log-rewrap; is related to jc/strbuf-nested-expand.)
|
||||
|
||||
When it comes to design issues to keep unnecessary complexity out, I tend
|
||||
to trust Réne (and Nico) a lot more than I trust myself. Tonight's 'pu'
|
||||
queues this series instead of my "nested" one.
|
||||
|
||||
* sr/blame-incomplete (2009-10-19) 1 commit.
|
||||
- blame: make sure that the last line ends in an LF
|
||||
|
||||
I think this is _good enough_ as-is; although it would be better if we
|
||||
added some hint to the output for Porcelain implementations, that can be
|
||||
done as a follow-up fix.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* mr/gitweb-snapshot (2009-09-26) 2 commits.
|
||||
- gitweb: append short hash ids to snapshot files
|
||||
(merged to 'next' on 2009-10-11 at 22ba047)
|
||||
+ gitweb: check given hash before trying to create snapshot
|
||||
|
||||
I lost track of the discussion around the tip commit. The bottom one may
|
||||
better go to 'master' regardless.
|
||||
|
||||
* db/vcs-helper-rest (2009-09-03) 6 commits.
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Add support for "import" helper command
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
(this branch is used by jh/cvs-helper.)
|
||||
|
||||
This holds the remainder of the db/vcs-helper topic that has already
|
||||
merged in 1.6.5. If people want to replace this with improvements it
|
||||
would be a good time to do so.
|
||||
|
||||
* jl/submodule-add-noname (2009-09-22) 1 commit.
|
||||
- git submodule add: make the <path> parameter optional
|
||||
|
||||
Dscho started an interesting discussion regarding the larger workflow in
|
||||
which the "submodule add" is used. I think the patch itself makes sense
|
||||
but at the same time it probably makes sense to also take the <path> and
|
||||
infer the <repository> as Dscho suggested, probably in "git submodule
|
||||
add", not in "git add" proper, at least initially.
|
||||
|
||||
* sr/gfi-options (2009-09-06) 6 commits.
|
||||
- fast-import: test the new option command
|
||||
- fast-import: add option command
|
||||
- fast-import: test the new feature command
|
||||
- fast-import: add feature command
|
||||
- fast-import: put marks reading in it's own function
|
||||
- fast-import: put option parsing code in separate functions
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 1b99c56)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests cover the positive case (i.e. as long as the user says
|
||||
"yes" to the "do you really want to send this message that lacks subject",
|
||||
the message is sent) of this feature, but the feature itself needs its own
|
||||
test to verify the negative case (i.e. does it correctly stop if the user
|
||||
says "no"?)
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 8 commits.
|
||||
. More fixes to the git-remote-cvs installation procedure
|
||||
. Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
. Add simple selftests of git-remote-cvs functionality
|
||||
. git-remote-cvs: Remote helper program for CVS repositories
|
||||
. 2/2: Add Python support library for CVS remote helper
|
||||
. 1/2: Add Python support library for CVS remote helper
|
||||
. Basic build infrastructure for Python scripts
|
||||
. Allow helpers to request marks for fast-import
|
||||
(this branch uses db/vcs-helper-rest.)
|
||||
|
||||
* jc/strbuf-nested-expand (2009-10-18) 3 commits
|
||||
. Teach --wrap to only indent without wrapping
|
||||
. Add %[wrap(width,in1,in2)<<any-string>>%] implementation
|
||||
. strbuf_nested_expand(): allow expansion to interrupt in the middle
|
||||
(this branch uses js/log-rewrap; is related to rs/pretty-wrap.)
|
||||
|
||||
Ejected from 'pu' to let rs/pretty-wrap in as described above.
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* ne/rev-cache (2009-10-19) 7 commits.
|
||||
- support for commit grafts, slight change to general mechanism
|
||||
- support for path name caching in rev-cache
|
||||
- full integration of rev-cache into git, completed test suite
|
||||
- administrative functions for rev-cache, start of integration into git
|
||||
- support for non-commit object caching in rev-cache
|
||||
- basic revision cache system, no integration or features
|
||||
- man page and technical discussion for rev-cache
|
||||
|
||||
Still unstable? Has an extra test squashed in; tonight's 'pu' does not
|
||||
pass tests.
|
||||
|
||||
* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
|
||||
- bisect reset: Allow resetting to any commit, not just a branch
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* fc/doc-fast-forward (2009-10-11) 1 commit.
|
||||
- user-manual: use 'fast-forward'
|
||||
|
||||
* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
|
||||
- info/grafts: allow trailing whitespaces at the end of line
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* jk/maint-cvsimport-pathname (2009-10-19) 1 commit.
|
||||
(merged to 'next' on 2009-10-19 at 77824f2)
|
||||
+ cvsimport: fix relative argument filenames
|
||||
|
||||
Should be safe enough to be in 'master' soon.
|
||||
|
||||
* jn/show-normalized-refs (2009-10-12) 3 commits.
|
||||
- check-ref-format: simplify --print implementation
|
||||
- git check-ref-format --print
|
||||
- Add tests for git check-ref-format
|
||||
|
||||
This was for helping Porcelains like git-gui to sanely cope with user
|
||||
input that has redundant // in refnames. Are potential users happy with
|
||||
the series? I think this is ready for 'next'.
|
||||
|
||||
* sb/gitweb-link-author (2009-10-15) 1 commit
|
||||
- gitweb: linkify author/committer names with search
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* jc/checkout-auto-track (2009-10-18) 3 commits
|
||||
- git checkout --no-guess
|
||||
- DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
|
||||
- check_filename(): make verify_filename() callable without dying
|
||||
|
||||
The final shape of this series ended up to be more or less exactly what
|
||||
Dscho hinted he wanted to have in one of the discussion. Is everybody
|
||||
happy with this kind of new user-friendliness? I think it is safe enough
|
||||
to be queued to 'next'.
|
||||
|
||||
* tr/stash-format (2009-10-19) 5 commits
|
||||
- stash list: drop the default limit of 10 stashes
|
||||
- stash list: use new %g formats instead of sed
|
||||
- Introduce new pretty formats %g[sdD] for reflog information
|
||||
- reflog-walk: refactor the branch@{num} formatting
|
||||
- Refactor pretty_print_commit arguments into a struct
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* ks/precompute-completion (2009-10-05) 1 commit.
|
||||
(merged to 'next' on 2009-10-14 at adf722a)
|
||||
+ Speedup bash completion loading
|
||||
|
||||
Are people happy with this?
|
||||
|
||||
* sp/smart-http (2009-10-14) 17 commits
|
||||
- Smart HTTP fetch: gzip requests
|
||||
- Smart fetch over HTTP: client side
|
||||
- Smart push over HTTP: client side
|
||||
- Discover refs via smart HTTP server when available
|
||||
- Smart fetch and push over HTTP: server side
|
||||
- Add stateless RPC options to upload-pack, receive-pack
|
||||
- Git-aware CGI to provide dumb HTTP transport
|
||||
- Move WebDAV HTTP push under remote-curl
|
||||
- remote-helpers: Support custom transport options
|
||||
- remote-helpers: Fetch more than one ref in a batch
|
||||
- fetch: Allow transport -v -v -v to set verbosity to 3
|
||||
- remote-curl: Refactor walker initialization
|
||||
- Add multi_ack_detailed capability to fetch-pack/upload-pack
|
||||
- Move "get_ack()" back to fetch-pack
|
||||
- fetch-pack: Use a strbuf to compose the want list
|
||||
- pkt-line: Make packet_read_line easier to debug
|
||||
- pkt-line: Add strbuf based functions
|
||||
|
||||
What's the doneness of this series?
|
||||
|
||||
* ef/msys-imap (2009-10-21) 8 commits.
|
||||
- MSVC: Enable OpenSSL, and translate -lcrypto
|
||||
- mingw: enable OpenSSL
|
||||
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
|
||||
- imap-send: build imap-send on Windows
|
||||
- imap-send: fix compilation-error on Windows
|
||||
- imap-send: use run-command API for tunneling
|
||||
- imap-send: use separate read and write fds
|
||||
- imap-send: remove useless uid code
|
||||
|
||||
Another re-roll. Waiting for an Ack from MSVC folks but otherwise it is
|
||||
ready for 'next', I think.
|
||||
|
||||
* jc/pretty-lf (2009-10-04) 1 commit.
|
||||
- Pretty-format: %[+-]x to tweak inter-item newlines
|
||||
|
||||
* js/log-rewrap (2008-11-10) 2 commits
|
||||
- Add strbuf_add_wrapped_text() to utf8.[ch]
|
||||
- print_wrapped_text(): allow hard newlines
|
||||
(this branch is used by jc/strbuf-nested-expand and rs/pretty-wrap.)
|
||||
|
||||
Soon in 'next'; regardless of how wrapping is exposed to --pretty=format,
|
||||
this code will be used, and it seems to be leak-free and reasonably done.
|
||||
|
||||
We _might_ want to cherry-pick the tip of jc/strbuf-nested-expand to this
|
||||
series, though.
|
||||
|
||||
* js/diff-verbose-submodule (2009-10-14) 2 commits.
|
||||
- add tests for git diff --submodule-summary
|
||||
- Add the --submodule option to the diff option family
|
||||
|
||||
I should retitle and fix some comments in the tip commit (the tests have
|
||||
already been adjusted to use the real option name), but otherwise I think
|
||||
this is ready for 'next'.
|
||||
|
||||
* jc/fix-tree-walk (2009-09-14) 10 commits.
|
||||
- read-tree --debug-unpack
|
||||
(merged to 'next' on 2009-10-11 at 0b058e2)
|
||||
+ unpack-trees.c: look ahead in the index
|
||||
+ unpack-trees.c: prepare for looking ahead in the index
|
||||
+ Aggressive three-way merge: fix D/F case
|
||||
+ traverse_trees(): handle D/F conflict case sanely
|
||||
+ more D/F conflict tests
|
||||
+ tests: move convenience regexp to match object names to test-lib.sh
|
||||
+ unpack_callback(): use unpack_failed() consistently
|
||||
+ unpack-trees: typofix
|
||||
+ diff-lib.c: fix misleading comments on oneway_diff()
|
||||
|
||||
This is my replacement for Linus's lt/maint-traverse-trees-fix patch. It
|
||||
is not so much as a counter-proposal; I originally thought it might make
|
||||
sense to walk the index and drive the walker to return the entries from
|
||||
trees to match entries from the index, but I ended up doing pretty much
|
||||
what Linus outlined --- walk the trees, and have the index walker follow
|
||||
it. It turned out that the index side also needed some hairy look-ahead,
|
||||
|
||||
This includes the fix to aggressive mode of three-way merge used by the
|
||||
resolve strategy.
|
||||
|
||||
* jh/notes (2009-10-09) 22 commits.
|
||||
- fast-import: Proper notes tree manipulation using the notes API
|
||||
- Refactor notes concatenation into a flexible interface for combining notes
|
||||
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
|
||||
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
|
||||
- Notes API: get_note(): Return the note annotating the given object
|
||||
- Notes API: add_note(): Add note objects to the internal notes tree structure
|
||||
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
|
||||
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
|
||||
- Add selftests verifying concatenation of multiple notes for the same commit
|
||||
- Refactor notes code to concatenate multiple notes annotating the same object
|
||||
- Add selftests verifying that we can parse notes trees with various fanouts
|
||||
- Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
- Teach notes code to free its internal data structures on request
|
||||
- Add '%N'-format for pretty-printing commit notes
|
||||
- Add flags to get_commit_notes() to control the format of the note string
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
Rebased so that it does not pull in anything else. Presumably it is ready
|
||||
for next?
|
||||
|
||||
* jn/gitweb-blame (2009-09-01) 5 commits.
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
(merged to 'next' on 2009-10-11 at 73c4a83)
|
||||
+ gitweb: Colorize 'blame_incremental' view during processing
|
||||
+ gitweb: Incremental blame (using JavaScript)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame. Probably the first three should go to 'master' by now?
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits.
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jk/1.7.0-status (2009-09-05) 5 commits.
|
||||
- docs: note that status configuration affects only long format
|
||||
(merged to 'next' on 2009-10-11 at 65c8513)
|
||||
+ commit: support alternate status formats
|
||||
+ status: add --porcelain output format
|
||||
+ status: refactor format option parsing
|
||||
+ status: refactor short-mode printing to its own function
|
||||
(this branch uses jc/1.7.0-status.)
|
||||
|
||||
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
|
||||
is similar to that of post 1.7.0 "git status".
|
||||
|
||||
* jc/1.7.0-status (2009-09-05) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 9558627)
|
||||
+ status: typo fix in usage
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
(this branch is used by jk/1.7.0-status.)
|
||||
|
||||
With this, "git status" is no longer "git commit --dry-run".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 043acdf)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 546c74d)
|
||||
+ diff.c: fix typoes in comments
|
||||
+ Make test case number unique
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
|
||||
(merged to 'next' on 2009-10-11 at 81b8128)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jg/log-format-body-indent (2009-09-19) 1 commit.
|
||||
. git-log --format: Add %B tag with %B(x) option
|
||||
@@ -1,492 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Oct 2009, #05; Wed, 28)
|
||||
X-master-at: cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea
|
||||
X-next-at: 66178218961cb7484d46bd48df7da7318180b6b7
|
||||
|
||||
What's cooking in git.git (Oct 2009, #05; Wed, 28)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
|
||||
agrees that they were mistakes. The resulting system may not be strictly
|
||||
backward compatible. Currently planeed changes are:
|
||||
|
||||
* refuse push to update the checked out branch in a non-bare repo by
|
||||
default
|
||||
|
||||
Make "git push" into a repository to update the branch that is checked
|
||||
out fail by default. You can countermand this default by setting a
|
||||
configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
|
||||
|
||||
* refuse push to delete the current branch by default
|
||||
|
||||
Make "git push $there :$killed" to delete the branch that is pointed at
|
||||
by its HEAD fail by default. You can countermand this default by
|
||||
setting a configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
|
||||
|
||||
* git-send-email won't make deep threads by default
|
||||
|
||||
Many people said that by default when sending more than 2 patches the
|
||||
threading git-send-email makes by default is hard to read, and they
|
||||
prefer the default be one cover letter and each patch as a direct
|
||||
follow-up to the cover letter. You can countermand this by setting a
|
||||
configuration variable.
|
||||
|
||||
http://article.gmane.org/gmane.comp.version-control.git/109790
|
||||
|
||||
* git-status won't be "git-commit --dry-run" anymore
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
|
||||
|
||||
* "git-diff -w --exit-code" will exit success if only differences it
|
||||
found are whitespace changes that are stripped away from the output.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* jc/fsck-default-full (2009-10-20) 1 commit
|
||||
+ fsck: default to "git fsck --full"
|
||||
|
||||
* jc/maint-fix-unpack-zlib-check (2009-10-21) 1 commit.
|
||||
+ Fix incorrect error check while reading deflated pack data
|
||||
|
||||
* jc/receive-pack-auto (2009-10-20) 2 commits.
|
||||
+ receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
|
||||
+ gc --auto --quiet: make the notice a bit less verboase
|
||||
|
||||
* bg/clone-doc (2009-10-20) 1 commit.
|
||||
+ git-clone.txt: Fix grammar and formatting
|
||||
|
||||
* iv/tar-lzma-xz (2009-10-20) 1 commit.
|
||||
+ import-tars: Add support for tarballs compressed with lzma, xz
|
||||
|
||||
* jk/maint-cvsimport-pathname (2009-10-19) 1 commit.
|
||||
+ cvsimport: fix relative argument filenames
|
||||
|
||||
* sb/gitweb-link-author (2009-10-15) 1 commit
|
||||
+ gitweb: linkify author/committer names with search
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jp/dirty-describe (2009-10-21) 1 commit.
|
||||
- Teach "git describe" --dirty option
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* jp/fetch-cull-many-refs (2009-10-25) 2 commits
|
||||
- fetch: Speed up fetch of large numbers of refs
|
||||
- remote: Make ref_remove_duplicates faster for large numbers of refs
|
||||
|
||||
* bg/format-patch-p-noop (2009-10-25) 3 commits.
|
||||
- format-patch documentation: Fix formatting
|
||||
- format-patch documentation: Remove diff options that are not useful
|
||||
- format-patch: Make implementation and documentation agree
|
||||
|
||||
* jk/gitignore-anchored (2009-10-26) 1 commit
|
||||
- gitignore: root most patterns at the top-level directory
|
||||
|
||||
* jk/maint-add-p-empty (2009-10-27) 1 commit.
|
||||
- add-interactive: handle deletion of empty files
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* jk/maint-push-config (2009-10-25) 1 commit.
|
||||
- push: always load default config
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* lt/revision-bisect (2009-10-27) 1 commit.
|
||||
- Add '--bisect' revision machinery argument
|
||||
|
||||
* mh/maint-diff-color-words (2009-10-28) 3 commits
|
||||
- diff: fix the location of hunk headers for "git diff --color-words -U0"
|
||||
- diff: move the handling of the hunk header after the changed lines
|
||||
- t4034-diff-words: add a test for word diff without context
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* tr/filter-branch (2009-10-21) 2 commits.
|
||||
- filter-branch: nearest-ancestor rewriting outside subdir filter
|
||||
- filter-branch: stop special-casing $filter_subdir argument
|
||||
|
||||
J6t already has some comments on this.
|
||||
|
||||
* mr/gitweb-snapshot (2009-09-26) 2 commits.
|
||||
- gitweb: append short hash ids to snapshot files
|
||||
(merged to 'next' on 2009-10-11 at 22ba047)
|
||||
+ gitweb: check given hash before trying to create snapshot
|
||||
|
||||
Jakub says the tip one needs updates.
|
||||
|
||||
* ne/rev-cache (2009-10-19) 7 commits.
|
||||
- support for commit grafts, slight change to general mechanism
|
||||
- support for path name caching in rev-cache
|
||||
- full integration of rev-cache into git, completed test suite
|
||||
- administrative functions for rev-cache, start of integration into git
|
||||
- support for non-commit object caching in rev-cache
|
||||
- basic revision cache system, no integration or features
|
||||
- man page and technical discussion for rev-cache
|
||||
|
||||
The author indicated that there is another round coming.
|
||||
|
||||
* jl/submodule-add-noname (2009-09-22) 1 commit.
|
||||
- git submodule add: make the <path> parameter optional
|
||||
|
||||
Dscho started an interesting discussion regarding the larger workflow in
|
||||
which the "submodule add" is used. I think the patch itself makes sense
|
||||
but at the same time it probably makes sense to also take the <path> and
|
||||
infer the <repository> as Dscho suggested, probably in "git submodule
|
||||
add", not in "git add" proper, at least initially.
|
||||
|
||||
* sr/gfi-options (2009-09-06) 6 commits.
|
||||
- fast-import: test the new option command
|
||||
- fast-import: add option command
|
||||
- fast-import: test the new feature command
|
||||
- fast-import: add feature command
|
||||
- fast-import: put marks reading in it's own function
|
||||
- fast-import: put option parsing code in separate functions
|
||||
|
||||
???
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 1b99c56)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests cover the positive case (i.e. as long as the user says
|
||||
"yes" to the "do you really want to send this message that lacks subject",
|
||||
the message is sent) of this feature, but the feature itself needs its own
|
||||
test to verify the negative case (i.e. does it correctly stop if the user
|
||||
says "no"?)
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* db/vcs-helper-rest (2009-10-27) 7 commits.
|
||||
- Fix memory leak in helper method for disconnect
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Add support for "import" helper command
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
(this branch is used by jh/cvs-helper.)
|
||||
|
||||
Queued a fix-up.
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 8 commits.
|
||||
- More fixes to the git-remote-cvs installation procedure
|
||||
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
- Add simple selftests of git-remote-cvs functionality
|
||||
- git-remote-cvs: Remote helper program for CVS repositories
|
||||
- 2/2: Add Python support library for CVS remote helper
|
||||
- 1/2: Add Python support library for CVS remote helper
|
||||
- Basic build infrastructure for Python scripts
|
||||
- Allow helpers to request marks for fast-import
|
||||
(this branch uses db/vcs-helper-rest.)
|
||||
|
||||
This depends on the above.
|
||||
|
||||
* cb/doc-fetch-pull-merge (2009-10-21) 1 commit.
|
||||
(merged to 'next' on 2009-10-21 at 1d9190d)
|
||||
+ modernize fetch/merge/pull examples
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* ja/fetch-doc (2009-10-22) 3 commits.
|
||||
(merged to 'next' on 2009-10-22 at 8868407)
|
||||
+ Documentation/merge-options.txt: order options in alphabetical groups
|
||||
+ Documentation/git-pull.txt: Add subtitles above included option files
|
||||
(merged to 'next' on 2009-10-21 at bf09f62)
|
||||
+ Documentation/fetch-options.txt: order options alphabetically
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* tr/maint-roff-quote (2009-10-22) 1 commit.
|
||||
(merged to 'next' on 2009-10-22 at 14c5631)
|
||||
+ Quote ' as \(aq in manpages
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* rs/pretty-wrap (2009-10-17) 1 commit
|
||||
- Implement wrap format %w() as if it is a mode switch
|
||||
(this branch uses js/log-rewrap.)
|
||||
|
||||
* jc/pretty-lf (2009-10-04) 1 commit.
|
||||
- Pretty-format: %[+-]x to tweak inter-item newlines
|
||||
|
||||
* js/log-rewrap (2009-10-18) 3 commits
|
||||
- Teach --wrap to only indent without wrapping
|
||||
- Add strbuf_add_wrapped_text() to utf8.[ch]
|
||||
- print_wrapped_text(): allow hard newlines
|
||||
(this branch is used by rs/pretty-wrap.)
|
||||
|
||||
Before discarding jc/strbuf-nested-expand, I cherry-picked the tip of it
|
||||
to this series.
|
||||
|
||||
* sr/blame-incomplete (2009-10-19) 1 commit.
|
||||
(merged to 'next' on 2009-10-22 at 133e0ce)
|
||||
+ blame: make sure that the last line ends in an LF
|
||||
|
||||
I think this is _good enough_ as-is; although it would be better if we
|
||||
added some hint to the output for Porcelain implementations, that can be
|
||||
done as a follow-up fix.
|
||||
|
||||
* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
|
||||
(merged to 'next' on 2009-10-22 at 592fff3)
|
||||
+ bisect reset: Allow resetting to any commit, not just a branch
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* fc/doc-fast-forward (2009-10-24) 1 commit.
|
||||
- Use 'fast-forward' all over the place
|
||||
|
||||
* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
|
||||
(merged to 'next' on 2009-10-22 at 90ccac6)
|
||||
+ info/grafts: allow trailing whitespaces at the end of line
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* jn/show-normalized-refs (2009-10-12) 3 commits.
|
||||
(merged to 'next' on 2009-10-23 at 332aad3)
|
||||
+ check-ref-format: simplify --print implementation
|
||||
+ git check-ref-format --print
|
||||
+ Add tests for git check-ref-format
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* jc/checkout-auto-track (2009-10-18) 3 commits
|
||||
(merged to 'next' on 2009-10-23 at ff7e8f3)
|
||||
+ git checkout --no-guess
|
||||
+ DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
|
||||
+ check_filename(): make verify_filename() callable without dying
|
||||
|
||||
The final shape of this series ended up to be more or less exactly what
|
||||
Dscho hinted he wanted to have in one of the discussion.
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* tr/stash-format (2009-10-19) 5 commits
|
||||
(merged to 'next' on 2009-10-23 at 6c551c3)
|
||||
+ stash list: drop the default limit of 10 stashes
|
||||
+ stash list: use new %g formats instead of sed
|
||||
+ Introduce new pretty formats %g[sdD] for reflog information
|
||||
+ reflog-walk: refactor the branch@{num} formatting
|
||||
+ Refactor pretty_print_commit arguments into a struct
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* ks/precompute-completion (2009-10-26) 3 commits.
|
||||
(merged to 'next' on 2009-10-28 at cd5177f)
|
||||
+ completion: ignore custom merge strategies when pre-generating
|
||||
(merged to 'next' on 2009-10-22 at f46a28a)
|
||||
+ bug: precomputed completion includes scripts sources
|
||||
(merged to 'next' on 2009-10-14 at adf722a)
|
||||
+ Speedup bash completion loading
|
||||
|
||||
* sp/smart-http (2009-10-25) 24 commits
|
||||
- remote-helpers: return successfully if everything up-to-date
|
||||
- update http tests according to remote-curl capabilities
|
||||
- http-backend: more explict LocationMatch
|
||||
- http-backend: add example for gitweb on same URL
|
||||
- http-backend: use mod_alias instead of mod_rewrite
|
||||
- http-backend: reword some documentation
|
||||
- http-backend: add GIT_PROJECT_ROOT environment var
|
||||
- Smart HTTP fetch: gzip requests
|
||||
- Smart fetch over HTTP: client side
|
||||
- Smart push over HTTP: client side
|
||||
- Discover refs via smart HTTP server when available
|
||||
- Smart fetch and push over HTTP: server side
|
||||
- Add stateless RPC options to upload-pack, receive-pack
|
||||
- Git-aware CGI to provide dumb HTTP transport
|
||||
- Move WebDAV HTTP push under remote-curl
|
||||
- remote-helpers: Support custom transport options
|
||||
- remote-helpers: Fetch more than one ref in a batch
|
||||
- fetch: Allow transport -v -v -v to set verbosity to 3
|
||||
- remote-curl: Refactor walker initialization
|
||||
- Add multi_ack_detailed capability to fetch-pack/upload-pack
|
||||
- Move "get_ack()" back to fetch-pack
|
||||
- fetch-pack: Use a strbuf to compose the want list
|
||||
- pkt-line: Make packet_read_line easier to debug
|
||||
- pkt-line: Add strbuf based functions
|
||||
|
||||
Shawn plans another round of re-roll.
|
||||
|
||||
* ef/msys-imap (2009-10-22) 9 commits.
|
||||
- Windows: use BLK_SHA1 again
|
||||
- MSVC: Enable OpenSSL, and translate -lcrypto
|
||||
- mingw: enable OpenSSL
|
||||
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
|
||||
- imap-send: build imap-send on Windows
|
||||
- imap-send: fix compilation-error on Windows
|
||||
- imap-send: use run-command API for tunneling
|
||||
- imap-send: use separate read and write fds
|
||||
- imap-send: remove useless uid code
|
||||
|
||||
This is pulled from J6t; I'll merge it to 'next' if Dscho is Ok with it.
|
||||
|
||||
* js/diff-verbose-submodule (2009-10-23) 2 commits.
|
||||
(merged to 'next' on 2009-10-23 at e479773)
|
||||
+ add tests for git diff --submodule
|
||||
+ Add the --submodule option to the diff option family
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* jc/fix-tree-walk (2009-10-22) 11 commits.
|
||||
(merged to 'next' on 2009-10-22 at 10c0c8f)
|
||||
+ Revert failed attempt since 353c5ee
|
||||
+ read-tree --debug-unpack
|
||||
(merged to 'next' on 2009-10-11 at 0b058e2)
|
||||
+ unpack-trees.c: look ahead in the index
|
||||
+ unpack-trees.c: prepare for looking ahead in the index
|
||||
+ Aggressive three-way merge: fix D/F case
|
||||
+ traverse_trees(): handle D/F conflict case sanely
|
||||
+ more D/F conflict tests
|
||||
+ tests: move convenience regexp to match object names to test-lib.sh
|
||||
+ unpack_callback(): use unpack_failed() consistently
|
||||
+ unpack-trees: typofix
|
||||
+ diff-lib.c: fix misleading comments on oneway_diff()
|
||||
|
||||
This has some stupid bugs and temporarily reverted from 'next' until I can
|
||||
fix it.
|
||||
|
||||
* jh/notes (2009-10-09) 22 commits.
|
||||
- fast-import: Proper notes tree manipulation using the notes API
|
||||
- Refactor notes concatenation into a flexible interface for combining notes
|
||||
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
|
||||
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
|
||||
- Notes API: get_note(): Return the note annotating the given object
|
||||
- Notes API: add_note(): Add note objects to the internal notes tree structure
|
||||
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
|
||||
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
|
||||
- Add selftests verifying concatenation of multiple notes for the same commit
|
||||
- Refactor notes code to concatenate multiple notes annotating the same object
|
||||
- Add selftests verifying that we can parse notes trees with various fanouts
|
||||
- Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
- Teach notes code to free its internal data structures on request
|
||||
- Add '%N'-format for pretty-printing commit notes
|
||||
- Add flags to get_commit_notes() to control the format of the note string
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
I think Johan indicated that early parts of it is ready for 'next', so I
|
||||
may do so up to "Add selftests" one.
|
||||
|
||||
* jn/gitweb-blame (2009-09-01) 5 commits.
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
(merged to 'next' on 2009-10-11 at 73c4a83)
|
||||
+ gitweb: Colorize 'blame_incremental' view during processing
|
||||
+ gitweb: Incremental blame (using JavaScript)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame. Probably the first three should go to 'master' by now?
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits.
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
|
||||
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
|
||||
|
||||
This makes "git merge --no-commit" fail when it results in fast-forward or
|
||||
up-to-date. I haven't described this at the beginning of this message
|
||||
yet, as it is not clear if this change is even necessary. Opinions?
|
||||
|
||||
* jk/1.7.0-status (2009-09-05) 5 commits.
|
||||
- docs: note that status configuration affects only long format
|
||||
(merged to 'next' on 2009-10-11 at 65c8513)
|
||||
+ commit: support alternate status formats
|
||||
+ status: add --porcelain output format
|
||||
+ status: refactor format option parsing
|
||||
+ status: refactor short-mode printing to its own function
|
||||
(this branch uses jc/1.7.0-status.)
|
||||
|
||||
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
|
||||
is similar to that of post 1.7.0 "git status".
|
||||
|
||||
The tip one is not in 'next' as I have been hoping that somebody may want
|
||||
to change the code to make it unnecessary, but it does not seem to be
|
||||
happening, so probably it should also go to 'next'.
|
||||
|
||||
* jc/1.7.0-status (2009-09-05) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 9558627)
|
||||
+ status: typo fix in usage
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
(this branch is used by jk/1.7.0-status.)
|
||||
|
||||
With this, "git status" is no longer "git commit --dry-run".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 043acdf)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 546c74d)
|
||||
+ diff.c: fix typoes in comments
|
||||
+ Make test case number unique
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
|
||||
(merged to 'next' on 2009-10-11 at 81b8128)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jg/log-format-body-indent (2009-09-19) 1 commit.
|
||||
. git-log --format: Add %B tag with %B(x) option
|
||||
@@ -1,527 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Oct 2009, #06; Fri, 30)
|
||||
X-master-at: 5f809ff50921bee44bbf88c49056e7d145c0c35f
|
||||
X-next-at: 2bd302fd09c48ca7e1ec0032a6fdecf21f5f1994
|
||||
|
||||
What's cooking in git.git (Oct 2009, #06; Fri, 30)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
|
||||
agrees that they were mistakes. The resulting system may not be strictly
|
||||
backward compatible. Currently planeed changes are:
|
||||
|
||||
* refuse push to update the checked out branch in a non-bare repo by
|
||||
default
|
||||
|
||||
Make "git push" into a repository to update the branch that is checked
|
||||
out fail by default. You can countermand this default by setting a
|
||||
configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
|
||||
|
||||
* refuse push to delete the current branch by default
|
||||
|
||||
Make "git push $there :$killed" to delete the branch that is pointed at
|
||||
by its HEAD fail by default. You can countermand this default by
|
||||
setting a configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
|
||||
|
||||
* git-send-email won't make deep threads by default
|
||||
|
||||
Many people said that by default when sending more than 2 patches the
|
||||
threading git-send-email makes by default is hard to read, and they
|
||||
prefer the default be one cover letter and each patch as a direct
|
||||
follow-up to the cover letter. You can countermand this by setting a
|
||||
configuration variable.
|
||||
|
||||
http://article.gmane.org/gmane.comp.version-control.git/109790
|
||||
|
||||
* git-status won't be "git-commit --dry-run" anymore
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
|
||||
|
||||
* "git-diff -w --exit-code" will exit success if only differences it
|
||||
found are whitespace changes that are stripped away from the output.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* cb/doc-fetch-pull-merge (2009-10-21) 1 commit.
|
||||
(merged to 'next' on 2009-10-21 at 1d9190d)
|
||||
+ modernize fetch/merge/pull examples
|
||||
|
||||
* ja/fetch-doc (2009-10-22) 3 commits.
|
||||
(merged to 'next' on 2009-10-22 at 8868407)
|
||||
+ Documentation/merge-options.txt: order options in alphabetical groups
|
||||
+ Documentation/git-pull.txt: Add subtitles above included option files
|
||||
(merged to 'next' on 2009-10-21 at bf09f62)
|
||||
+ Documentation/fetch-options.txt: order options alphabetically
|
||||
|
||||
* tr/maint-roff-quote (2009-10-22) 1 commit.
|
||||
(merged to 'next' on 2009-10-22 at 14c5631)
|
||||
+ Quote ' as \(aq in manpages
|
||||
|
||||
* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
|
||||
(merged to 'next' on 2009-10-22 at 592fff3)
|
||||
+ bisect reset: Allow resetting to any commit, not just a branch
|
||||
|
||||
* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
|
||||
(merged to 'next' on 2009-10-22 at 90ccac6)
|
||||
+ info/grafts: allow trailing whitespaces at the end of line
|
||||
|
||||
* jn/show-normalized-refs (2009-10-12) 3 commits.
|
||||
(merged to 'next' on 2009-10-23 at 332aad3)
|
||||
+ check-ref-format: simplify --print implementation
|
||||
+ git check-ref-format --print
|
||||
+ Add tests for git check-ref-format
|
||||
|
||||
* jc/checkout-auto-track (2009-10-18) 3 commits
|
||||
(merged to 'next' on 2009-10-23 at ff7e8f3)
|
||||
+ git checkout --no-guess
|
||||
+ DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
|
||||
+ check_filename(): make verify_filename() callable without dying
|
||||
|
||||
The final shape of this series ended up to be more or less exactly what
|
||||
Dscho hinted he wanted to have in one of the discussion.
|
||||
|
||||
* tr/stash-format (2009-10-19) 5 commits
|
||||
(merged to 'next' on 2009-10-23 at 6c551c3)
|
||||
+ stash list: drop the default limit of 10 stashes
|
||||
+ stash list: use new %g formats instead of sed
|
||||
+ Introduce new pretty formats %g[sdD] for reflog information
|
||||
+ reflog-walk: refactor the branch@{num} formatting
|
||||
+ Refactor pretty_print_commit arguments into a struct
|
||||
|
||||
* js/diff-verbose-submodule (2009-10-23) 2 commits.
|
||||
(merged to 'next' on 2009-10-23 at e479773)
|
||||
+ add tests for git diff --submodule
|
||||
+ Add the --submodule option to the diff option family
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* bg/merge-ff-only (2009-10-29) 1 commit
|
||||
- Teach 'git merge' and 'git pull' the option --ff-only
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
|
||||
- ls-files: unbreak "ls-files -i"
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* jn/editor-pager (2009-10-30) 8 commits
|
||||
- Provide a build time default-pager setting
|
||||
- Provide a build time default-editor setting
|
||||
- am -i, git-svn: use "git var GIT_PAGER"
|
||||
- add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
|
||||
- Teach git var about GIT_PAGER
|
||||
- Teach git var about GIT_EDITOR
|
||||
- Do not use VISUAL editor on dumb terminals
|
||||
- Handle more shell metacharacters in editor names
|
||||
|
||||
Does not seem to pass t3404 by itself.
|
||||
|
||||
* js/maint-diff-color-words (2009-10-30) 3 commits.
|
||||
- (pu) cleanup with diff_words_flush()
|
||||
- diff --color-words -U0: fix the location of hunk headers
|
||||
- t4034-diff-words: add a test for word diff without context
|
||||
|
||||
Replaces mh/maint-diff-color-words. The tip one is my "at least it would
|
||||
be a bit more readable this way" patch without proper commit log message.
|
||||
|
||||
* sc/difftool-p4merge (2009-10-28) 1 commit
|
||||
- mergetool--lib: add p4merge as a pre-configured mergetool option
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* sc/protocol-doc (2009-10-29) 1 commit
|
||||
- Update packfile transfer protocol documentation
|
||||
|
||||
Expecting replacement.
|
||||
|
||||
* sr/vcs-helper (2009-10-29) 19 commits
|
||||
- .gitignore: add git-remote-cvs
|
||||
- Refactor git_remote_cvs to a more generic git_remote_helpers
|
||||
- More fixes to the git-remote-cvs installation procedure
|
||||
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
- Add simple selftests of git-remote-cvs functionality
|
||||
- git-remote-cvs: Remote helper program for CVS repositories
|
||||
- 2/2: Add Python support library for CVS remote helper
|
||||
- 1/2: Add Python support library for CVS remote helper
|
||||
- Basic build infrastructure for Python scripts
|
||||
- Allow helpers to request marks for fast-import
|
||||
- Introduce <vcs>::<url> syntax for remote url
|
||||
- Fix memory leak in helper method for disconnect
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Factor ref updating out of fetch_with_import
|
||||
- Add support for "import" helper command
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
|
||||
Supposed to replace db/vcs-helper-rest and jh/cvs-helper but expecting
|
||||
replacement. Does not pass selftest yet (e.g. t9801).
|
||||
|
||||
* tr/describe-advice (2009-10-28) 1 commit
|
||||
- describe: when failing, tell the user about options that work
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* tr/filter-branch (2009-10-28) 2 commits.
|
||||
- filter-branch: nearest-ancestor rewriting outside subdir filter
|
||||
- filter-branch: stop special-casing $filter_subdir argument
|
||||
|
||||
J6t has some comments on this.
|
||||
|
||||
* ne/rev-cache (2009-10-19) 7 commits.
|
||||
- support for commit grafts, slight change to general mechanism
|
||||
- support for path name caching in rev-cache
|
||||
- full integration of rev-cache into git, completed test suite
|
||||
- administrative functions for rev-cache, start of integration into git
|
||||
- support for non-commit object caching in rev-cache
|
||||
- basic revision cache system, no integration or features
|
||||
- man page and technical discussion for rev-cache
|
||||
|
||||
The author indicated that there is another round coming. Does not seem to
|
||||
pass the tests when merged to 'pu'.
|
||||
|
||||
* jl/submodule-add-noname (2009-09-22) 1 commit.
|
||||
- git submodule add: make the <path> parameter optional
|
||||
|
||||
Dscho started an interesting discussion regarding the larger workflow in
|
||||
which the "submodule add" is used. I think the patch itself makes sense
|
||||
but at the same time it probably makes sense to also take the <path> and
|
||||
infer the <repository> as Dscho suggested, probably in "git submodule
|
||||
add", not in "git add" proper, at least initially.
|
||||
|
||||
* sr/gfi-options (2009-09-06) 6 commits.
|
||||
- fast-import: test the new option command
|
||||
- fast-import: add option command
|
||||
- fast-import: test the new feature command
|
||||
- fast-import: add feature command
|
||||
- fast-import: put marks reading in it's own function
|
||||
- fast-import: put option parsing code in separate functions
|
||||
|
||||
Seems to be moving again soon.
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 1b99c56)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests cover the positive case (i.e. as long as the user says
|
||||
"yes" to the "do you really want to send this message that lacks subject",
|
||||
the message is sent) of this feature, but the feature itself needs its own
|
||||
test to verify the negative case (i.e. does it correctly stop if the user
|
||||
says "no"?)
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* mr/gitweb-snapshot (2009-10-29) 3 commits.
|
||||
- gitweb: Smarter snapshot names
|
||||
- t/gitweb-lib.sh: Split gitweb output into headers and body
|
||||
(merged to 'next' on 2009-10-11 at 22ba047)
|
||||
+ gitweb: check given hash before trying to create snapshot
|
||||
|
||||
Replaced the tip with Jakub's updates.
|
||||
|
||||
* jp/dirty-describe (2009-10-21) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 19c7fc7)
|
||||
+ Teach "git describe" --dirty option
|
||||
|
||||
* jp/fetch-cull-many-refs (2009-10-25) 2 commits
|
||||
- fetch: Speed up fetch of large numbers of refs
|
||||
- remote: Make ref_remove_duplicates faster for large numbers of refs
|
||||
|
||||
* bg/format-patch-p-noop (2009-10-25) 3 commits.
|
||||
(merged to 'next' on 2009-10-30 at e34a3db)
|
||||
+ format-patch documentation: Fix formatting
|
||||
+ format-patch documentation: Remove diff options that are not useful
|
||||
+ format-patch: Make implementation and documentation agree
|
||||
|
||||
* jk/gitignore-anchored (2009-10-26) 1 commit
|
||||
(merged to 'next' on 2009-10-30 at 9391a93)
|
||||
+ gitignore: root most patterns at the top-level directory
|
||||
|
||||
* jk/maint-add-p-empty (2009-10-27) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 2bd302f)
|
||||
+ add-interactive: handle deletion of empty files
|
||||
|
||||
* jk/maint-push-config (2009-10-25) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 934e3c5)
|
||||
+ push: always load default config
|
||||
|
||||
* lt/revision-bisect (2009-10-27) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 81ee52b)
|
||||
+ Add '--bisect' revision machinery argument
|
||||
|
||||
* jc/pretty-lf (2009-10-04) 1 commit.
|
||||
- Pretty-format: %[+-]x to tweak inter-item newlines
|
||||
|
||||
* rs/pretty-wrap (2009-10-17) 1 commit
|
||||
(merged to 'next' on 2009-10-30 at 403bbfe)
|
||||
+ Implement wrap format %w() as if it is a mode switch
|
||||
(this branch uses js/log-rewrap.)
|
||||
|
||||
* js/log-rewrap (2009-10-18) 3 commits
|
||||
(merged to 'next' on 2009-10-30 at 403bbfe)
|
||||
+ Teach --wrap to only indent without wrapping
|
||||
+ Add strbuf_add_wrapped_text() to utf8.[ch]
|
||||
+ print_wrapped_text(): allow hard newlines
|
||||
(this branch is used by rs/pretty-wrap.)
|
||||
|
||||
* sr/blame-incomplete (2009-10-19) 1 commit.
|
||||
(merged to 'next' on 2009-10-22 at 133e0ce)
|
||||
+ blame: make sure that the last line ends in an LF
|
||||
|
||||
I think this is _good enough_ as-is; although it would be better if we
|
||||
added some hint to the output for Porcelain implementations, that can be
|
||||
done as a follow-up fix.
|
||||
|
||||
* fc/doc-fast-forward (2009-10-24) 1 commit.
|
||||
- Use 'fast-forward' all over the place
|
||||
|
||||
* ks/precompute-completion (2009-10-26) 3 commits.
|
||||
(merged to 'next' on 2009-10-28 at cd5177f)
|
||||
+ completion: ignore custom merge strategies when pre-generating
|
||||
(merged to 'next' on 2009-10-22 at f46a28a)
|
||||
+ bug: precomputed completion includes scripts sources
|
||||
(merged to 'next' on 2009-10-14 at adf722a)
|
||||
+ Speedup bash completion loading
|
||||
|
||||
* sp/smart-http (2009-10-30) 28 commits
|
||||
- test smart http fetch and push
|
||||
- http tests: use /dumb/ URL prefix
|
||||
- set httpd port before sourcing lib-httpd
|
||||
- t5540-http-push: remove redundant fetches
|
||||
- Smart HTTP fetch: gzip requests
|
||||
- Smart fetch over HTTP: client side
|
||||
- Smart push over HTTP: client side
|
||||
- Discover refs via smart HTTP server when available
|
||||
- http-backend: more explict LocationMatch
|
||||
- http-backend: add example for gitweb on same URL
|
||||
- http-backend: use mod_alias instead of mod_rewrite
|
||||
- http-backend: reword some documentation
|
||||
- http-backend: add GIT_PROJECT_ROOT environment var
|
||||
- Smart fetch and push over HTTP: server side
|
||||
- Add stateless RPC options to upload-pack, receive-pack
|
||||
- Git-aware CGI to provide dumb HTTP transport
|
||||
- remote-helpers: return successfully if everything up-to-date
|
||||
- Move WebDAV HTTP push under remote-curl
|
||||
- remote-helpers: Support custom transport options
|
||||
- remote-helpers: Fetch more than one ref in a batch
|
||||
- fetch: Allow transport -v -v -v to set verbosity to 3
|
||||
- remote-curl: Refactor walker initialization
|
||||
- Add multi_ack_detailed capability to fetch-pack/upload-pack
|
||||
- Move "get_ack()" back to fetch-pack
|
||||
- fetch-pack: Use a strbuf to compose the want list
|
||||
- pkt-line: Make packet_read_line easier to debug
|
||||
- pkt-line: Add strbuf based functions
|
||||
- http-push: fix check condition on http.c::finish_http_pack_request()
|
||||
|
||||
v5
|
||||
|
||||
* ef/msys-imap (2009-10-22) 9 commits.
|
||||
- Windows: use BLK_SHA1 again
|
||||
- MSVC: Enable OpenSSL, and translate -lcrypto
|
||||
- mingw: enable OpenSSL
|
||||
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
|
||||
- imap-send: build imap-send on Windows
|
||||
- imap-send: fix compilation-error on Windows
|
||||
- imap-send: use run-command API for tunneling
|
||||
- imap-send: use separate read and write fds
|
||||
- imap-send: remove useless uid code
|
||||
|
||||
This is pulled from J6t; I'll merge it to 'next' if Dscho is Ok with it.
|
||||
|
||||
* jc/fix-tree-walk (2009-10-22) 11 commits.
|
||||
(merged to 'next' on 2009-10-22 at 10c0c8f)
|
||||
+ Revert failed attempt since 353c5ee
|
||||
+ read-tree --debug-unpack
|
||||
(merged to 'next' on 2009-10-11 at 0b058e2)
|
||||
+ unpack-trees.c: look ahead in the index
|
||||
+ unpack-trees.c: prepare for looking ahead in the index
|
||||
+ Aggressive three-way merge: fix D/F case
|
||||
+ traverse_trees(): handle D/F conflict case sanely
|
||||
+ more D/F conflict tests
|
||||
+ tests: move convenience regexp to match object names to test-lib.sh
|
||||
+ unpack_callback(): use unpack_failed() consistently
|
||||
+ unpack-trees: typofix
|
||||
+ diff-lib.c: fix misleading comments on oneway_diff()
|
||||
|
||||
This has some stupid bugs and temporarily reverted from 'next' until I can
|
||||
fix it.
|
||||
|
||||
* jh/notes (2009-10-09) 22 commits.
|
||||
- fast-import: Proper notes tree manipulation using the notes API
|
||||
- Refactor notes concatenation into a flexible interface for combining notes
|
||||
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
|
||||
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
|
||||
- Notes API: get_note(): Return the note annotating the given object
|
||||
- Notes API: add_note(): Add note objects to the internal notes tree structure
|
||||
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
|
||||
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
|
||||
- Add selftests verifying concatenation of multiple notes for the same commit
|
||||
- Refactor notes code to concatenate multiple notes annotating the same object
|
||||
- Add selftests verifying that we can parse notes trees with various fanouts
|
||||
- Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
- Teach notes code to free its internal data structures on request
|
||||
- Add '%N'-format for pretty-printing commit notes
|
||||
- Add flags to get_commit_notes() to control the format of the note string
|
||||
- t3302-notes-index-expensive: Speed up create_repo()
|
||||
- fast-import: Add support for importing commit notes
|
||||
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
- Add an expensive test for git-notes
|
||||
- Speed up git notes lookup
|
||||
- Add a script to edit/inspect notes
|
||||
- Introduce commit notes
|
||||
|
||||
I think Johan indicated that early parts of it is ready for 'next', so I
|
||||
may do so up to "Add selftests" one.
|
||||
|
||||
* jn/gitweb-blame (2009-09-01) 5 commits.
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
(merged to 'next' on 2009-10-11 at 73c4a83)
|
||||
+ gitweb: Colorize 'blame_incremental' view during processing
|
||||
+ gitweb: Incremental blame (using JavaScript)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame.
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits.
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
|
||||
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
|
||||
|
||||
This makes "git merge --no-commit" fail when it results in fast-forward or
|
||||
up-to-date. I haven't described this at the beginning of this message
|
||||
yet, as it is not clear if this change is even necessary. Opinions?
|
||||
|
||||
* jk/1.7.0-status (2009-09-05) 5 commits.
|
||||
- docs: note that status configuration affects only long format
|
||||
(merged to 'next' on 2009-10-11 at 65c8513)
|
||||
+ commit: support alternate status formats
|
||||
+ status: add --porcelain output format
|
||||
+ status: refactor format option parsing
|
||||
+ status: refactor short-mode printing to its own function
|
||||
(this branch uses jc/1.7.0-status.)
|
||||
|
||||
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
|
||||
is similar to that of post 1.7.0 "git status".
|
||||
|
||||
The tip one is not in 'next' as I have been hoping that somebody may want
|
||||
to change the code to make it unnecessary, but it does not seem to be
|
||||
happening, so probably it should also go to 'next'.
|
||||
|
||||
* jc/1.7.0-status (2009-09-05) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 9558627)
|
||||
+ status: typo fix in usage
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
(this branch is used by jk/1.7.0-status.)
|
||||
|
||||
With this, "git status" is no longer "git commit --dry-run".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 043acdf)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 546c74d)
|
||||
+ diff.c: fix typoes in comments
|
||||
+ Make test case number unique
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
|
||||
(merged to 'next' on 2009-10-11 at 81b8128)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jg/log-format-body-indent (2009-09-19) 1 commit.
|
||||
. git-log --format: Add %B tag with %B(x) option
|
||||
|
||||
* mh/maint-diff-color-words (2009-10-28) 3 commits
|
||||
. diff: fix the location of hunk headers for "git diff --color-words -U0"
|
||||
. diff: move the handling of the hunk header after the changed lines
|
||||
. t4034-diff-words: add a test for word diff without context
|
||||
|
||||
Ejected; js/maint-diff-color-words replaces this.
|
||||
|
||||
* db/vcs-helper-rest (2009-10-27) 7 commits.
|
||||
. Fix memory leak in helper method for disconnect
|
||||
. Allow helpers to report in "list" command that the ref is unchanged
|
||||
. Add support for "import" helper command
|
||||
. Add a config option for remotes to specify a foreign vcs
|
||||
. Allow programs to not depend on remotes having urls
|
||||
. Allow fetch to modify refs
|
||||
. Use a function to determine whether a remote is valid
|
||||
(this branch is used by jh/cvs-helper.)
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 8 commits.
|
||||
. More fixes to the git-remote-cvs installation procedure
|
||||
. Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
. Add simple selftests of git-remote-cvs functionality
|
||||
. git-remote-cvs: Remote helper program for CVS repositories
|
||||
. 2/2: Add Python support library for CVS remote helper
|
||||
. 1/2: Add Python support library for CVS remote helper
|
||||
. Basic build infrastructure for Python scripts
|
||||
. Allow helpers to request marks for fast-import
|
||||
(this branch uses db/vcs-helper-rest.)
|
||||
|
||||
Ejected; sr/vcs-helper is supposed to replace these two.
|
||||
|
||||
@@ -1,462 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Nov 2009, #01; Wed, 04)
|
||||
X-master-at: 1b52ac5935c3773596fa41f6cf83578ab86b6b83
|
||||
X-next-at: 13162391f0c3d2cbb810fc00a877496042919b10
|
||||
|
||||
What's cooking in git.git (Nov 2009, #01; Wed, 04)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
|
||||
agrees that they were mistakes. The resulting system may not be strictly
|
||||
backward compatible. Currently planeed changes are:
|
||||
|
||||
* refuse push to update the checked out branch in a non-bare repo by
|
||||
default
|
||||
|
||||
Make "git push" into a repository to update the branch that is checked
|
||||
out fail by default. You can countermand this default by setting a
|
||||
configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
|
||||
|
||||
* refuse push to delete the current branch by default
|
||||
|
||||
Make "git push $there :$killed" to delete the branch that is pointed at
|
||||
by its HEAD fail by default. You can countermand this default by
|
||||
setting a configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
|
||||
|
||||
* git-send-email won't make deep threads by default
|
||||
|
||||
Many people said that by default when sending more than 2 patches the
|
||||
threading git-send-email makes by default is hard to read, and they
|
||||
prefer the default be one cover letter and each patch as a direct
|
||||
follow-up to the cover letter. You can countermand this by setting a
|
||||
configuration variable.
|
||||
|
||||
http://article.gmane.org/gmane.comp.version-control.git/109790
|
||||
|
||||
* git-status won't be "git-commit --dry-run" anymore
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
|
||||
|
||||
* "git-diff -w --exit-code" will exit success if only differences it
|
||||
found are whitespace changes that are stripped away from the output.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* bw/autoconf-more (2009-11-04) 2 commits
|
||||
- configure: add settings for gitconfig, editor and pager
|
||||
- configure: add macro to set arbitrary make variables
|
||||
|
||||
* em/commit-claim (2009-11-04) 1 commit
|
||||
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
|
||||
|
||||
I just picked better bits from both versions.
|
||||
|
||||
* jk/maint-format-patch-p-suppress-stat (2009-11-04) 2 commits.
|
||||
- format-patch: make "-p" suppress diffstat
|
||||
- Revert "format-patch -p is now a no-op" series
|
||||
(this branch uses bg/format-patch-p-noop.)
|
||||
|
||||
This corrects a mistake made soon after 1.6.0.
|
||||
|
||||
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
|
||||
- Makefile: merge two Cygwin configuration sections into one
|
||||
|
||||
This is one of the most obviously correct bit from "Compiling on Cygwin
|
||||
using MSVC fails" topic I didn't really look at. If J6t is Ok with the
|
||||
series, I don't mind queueing the whole thing myself.
|
||||
|
||||
* vl/maint-openssl-signature-change (2009-10-31) 1 commit.
|
||||
(merged to 'next' on 2009-10-31 at 0e1ce6b)
|
||||
+ imap-send.c: fix compiler warnings for OpenSSL 1.0
|
||||
|
||||
Prepare ourselves before newer versions of OpenSSL hits more platforms.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* tr/filter-branch (2009-10-28) 2 commits.
|
||||
- filter-branch: nearest-ancestor rewriting outside subdir filter
|
||||
- filter-branch: stop special-casing $filter_subdir argument
|
||||
|
||||
J6t had some comments on this.
|
||||
|
||||
* ne/rev-cache (2009-10-19) 7 commits.
|
||||
- support for commit grafts, slight change to general mechanism
|
||||
- support for path name caching in rev-cache
|
||||
- full integration of rev-cache into git, completed test suite
|
||||
- administrative functions for rev-cache, start of integration into git
|
||||
- support for non-commit object caching in rev-cache
|
||||
- basic revision cache system, no integration or features
|
||||
- man page and technical discussion for rev-cache
|
||||
|
||||
The author indicated that there is another round coming. Does not seem to
|
||||
pass the tests when merged to 'pu'.
|
||||
|
||||
* jl/submodule-add-noname (2009-09-22) 1 commit.
|
||||
- git submodule add: make the <path> parameter optional
|
||||
|
||||
Dscho started an interesting discussion regarding the larger workflow in
|
||||
which the "submodule add" is used. I think the patch itself makes sense
|
||||
but at the same time it probably makes sense to also take the <path> and
|
||||
infer the <repository> as Dscho suggested, probably in "git submodule
|
||||
add", not in "git add" proper, at least initially.
|
||||
|
||||
* sr/gfi-options (2009-09-06) 6 commits.
|
||||
- fast-import: test the new option command
|
||||
- fast-import: add option command
|
||||
- fast-import: test the new feature command
|
||||
- fast-import: add feature command
|
||||
- fast-import: put marks reading in it's own function
|
||||
- fast-import: put option parsing code in separate functions
|
||||
|
||||
Seems to be moving again soon.
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 1b99c56)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests cover the positive case (i.e. as long as the user says
|
||||
"yes" to the "do you really want to send this message that lacks subject",
|
||||
the message is sent) of this feature, but the feature itself needs its own
|
||||
test to verify the negative case (i.e. does it correctly stop if the user
|
||||
says "no"?)
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* bg/merge-ff-only (2009-10-29) 1 commit
|
||||
(merged to 'next' on 2009-10-31 at b6b49aa)
|
||||
+ Teach 'git merge' and 'git pull' the option --ff-only
|
||||
|
||||
* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
|
||||
(merged to 'next' on 2009-10-31 at 3a31fcc)
|
||||
+ ls-files: unbreak "ls-files -i"
|
||||
|
||||
* jn/editor-pager (2009-10-30) 8 commits
|
||||
- Provide a build time default-pager setting
|
||||
- Provide a build time default-editor setting
|
||||
- am -i, git-svn: use "git var GIT_PAGER"
|
||||
- add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
|
||||
- Teach git var about GIT_PAGER
|
||||
- Teach git var about GIT_EDITOR
|
||||
- Do not use VISUAL editor on dumb terminals
|
||||
- Handle more shell metacharacters in editor names
|
||||
|
||||
* js/maint-diff-color-words (2009-10-30) 3 commits.
|
||||
- diff --color-words: bit of clean-up
|
||||
- diff --color-words -U0: fix the location of hunk headers
|
||||
- t4034-diff-words: add a test for word diff without context
|
||||
|
||||
Fixes a corner case of running --color-words with -U0.
|
||||
|
||||
* sc/difftool-p4merge (2009-10-28) 1 commit
|
||||
(merged to 'next' on 2009-10-31 at 194b5c5)
|
||||
+ mergetool--lib: add p4merge as a pre-configured mergetool option
|
||||
|
||||
* sc/protocol-doc (2009-10-29) 1 commit
|
||||
- Update packfile transfer protocol documentation
|
||||
|
||||
There is the final draft posted, but I haven't picked it up yet.
|
||||
|
||||
* sr/vcs-helper (2009-11-04) 13 commits
|
||||
- Add Python support library for remote helpers
|
||||
- Basic build infrastructure for Python scripts
|
||||
- Allow helpers to request the path to the .git directory
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Honour the refspec when updating refs after import
|
||||
- Write local refs written by the "import" helper command only once
|
||||
- Add support for "import" helper command
|
||||
- Allow specifying the remote helper in the url
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Fix memory leak in helper method for disconnect
|
||||
|
||||
Supposed to replace db/vcs-helper-rest. Still does not pass tests in
|
||||
'pu'.
|
||||
|
||||
* tr/describe-advice (2009-10-28) 1 commit
|
||||
(merged to 'next' on 2009-10-31 at 8084850)
|
||||
+ describe: when failing, tell the user about options that work
|
||||
|
||||
* mr/gitweb-snapshot (2009-10-29) 3 commits.
|
||||
- gitweb: Smarter snapshot names
|
||||
- t/gitweb-lib.sh: Split gitweb output into headers and body
|
||||
(merged to 'next' on 2009-10-11 at 22ba047)
|
||||
+ gitweb: check given hash before trying to create snapshot
|
||||
|
||||
Replaced the tip with Jakub's updates.
|
||||
|
||||
* jp/dirty-describe (2009-10-21) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 19c7fc7)
|
||||
+ Teach "git describe" --dirty option
|
||||
|
||||
* jp/fetch-cull-many-refs (2009-10-25) 2 commits
|
||||
(merged to 'next' on 2009-11-01 at 1f09ce9)
|
||||
+ fetch: Speed up fetch of large numbers of refs
|
||||
+ remote: Make ref_remove_duplicates faster for large numbers of refs
|
||||
|
||||
* bg/format-patch-p-noop (2009-10-25) 3 commits.
|
||||
(merged to 'next' on 2009-10-30 at e34a3db)
|
||||
+ format-patch documentation: Fix formatting
|
||||
+ format-patch documentation: Remove diff options that are not useful
|
||||
+ format-patch: Make implementation and documentation agree
|
||||
(this branch is used by jk/maint-format-patch-p-suppress-stat.)
|
||||
|
||||
Will revert from 'next' by merging Peff's fix.
|
||||
|
||||
* jk/gitignore-anchored (2009-10-26) 1 commit
|
||||
(merged to 'next' on 2009-10-30 at 9391a93)
|
||||
+ gitignore: root most patterns at the top-level directory
|
||||
|
||||
* jk/maint-add-p-empty (2009-10-27) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 2bd302f)
|
||||
+ add-interactive: handle deletion of empty files
|
||||
|
||||
* jk/maint-push-config (2009-10-25) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 934e3c5)
|
||||
+ push: always load default config
|
||||
|
||||
* lt/revision-bisect (2009-10-27) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 81ee52b)
|
||||
+ Add '--bisect' revision machinery argument
|
||||
|
||||
* jc/pretty-lf (2009-10-04) 1 commit.
|
||||
- Pretty-format: %[+-]x to tweak inter-item newlines
|
||||
|
||||
* rs/pretty-wrap (2009-10-17) 1 commit
|
||||
(merged to 'next' on 2009-10-30 at 403bbfe)
|
||||
+ Implement wrap format %w() as if it is a mode switch
|
||||
(this branch uses js/log-rewrap.)
|
||||
|
||||
* js/log-rewrap (2009-10-18) 3 commits
|
||||
(merged to 'next' on 2009-10-30 at 403bbfe)
|
||||
+ Teach --wrap to only indent without wrapping
|
||||
+ Add strbuf_add_wrapped_text() to utf8.[ch]
|
||||
+ print_wrapped_text(): allow hard newlines
|
||||
(this branch is used by rs/pretty-wrap.)
|
||||
|
||||
* sr/blame-incomplete (2009-10-19) 1 commit.
|
||||
(merged to 'next' on 2009-10-22 at 133e0ce)
|
||||
+ blame: make sure that the last line ends in an LF
|
||||
|
||||
I think this is _good enough_ as-is; although it would be better if we
|
||||
added some hint to the output for Porcelain implementations, that can be
|
||||
done as a follow-up fix.
|
||||
|
||||
* fc/doc-fast-forward (2009-10-24) 1 commit.
|
||||
(merged to 'next' on 2009-11-01 at faaad90)
|
||||
+ Use 'fast-forward' all over the place
|
||||
|
||||
* ks/precompute-completion (2009-10-26) 3 commits.
|
||||
(merged to 'next' on 2009-10-28 at cd5177f)
|
||||
+ completion: ignore custom merge strategies when pre-generating
|
||||
(merged to 'next' on 2009-10-22 at f46a28a)
|
||||
+ bug: precomputed completion includes scripts sources
|
||||
(merged to 'next' on 2009-10-14 at adf722a)
|
||||
+ Speedup bash completion loading
|
||||
|
||||
* sp/smart-http (2009-11-04) 30 commits
|
||||
- http-backend: Test configuration options
|
||||
- http-backend: Use http.getanyfile to disable dumb HTTP serving
|
||||
- test smart http fetch and push
|
||||
- http tests: use /dumb/ URL prefix
|
||||
- set httpd port before sourcing lib-httpd
|
||||
- t5540-http-push: remove redundant fetches
|
||||
- Smart HTTP fetch: gzip requests
|
||||
- Smart fetch over HTTP: client side
|
||||
- Smart push over HTTP: client side
|
||||
- Discover refs via smart HTTP server when available
|
||||
- http-backend: more explict LocationMatch
|
||||
- http-backend: add example for gitweb on same URL
|
||||
- http-backend: use mod_alias instead of mod_rewrite
|
||||
- http-backend: reword some documentation
|
||||
- http-backend: add GIT_PROJECT_ROOT environment var
|
||||
- Smart fetch and push over HTTP: server side
|
||||
- Add stateless RPC options to upload-pack, receive-pack
|
||||
- Git-aware CGI to provide dumb HTTP transport
|
||||
- remote-helpers: return successfully if everything up-to-date
|
||||
- Move WebDAV HTTP push under remote-curl
|
||||
- remote-helpers: Support custom transport options
|
||||
- remote-helpers: Fetch more than one ref in a batch
|
||||
- fetch: Allow transport -v -v -v to set verbosity to 3
|
||||
- remote-curl: Refactor walker initialization
|
||||
- Add multi_ack_detailed capability to fetch-pack/upload-pack
|
||||
- Move "get_ack()" back to fetch-pack
|
||||
- fetch-pack: Use a strbuf to compose the want list
|
||||
- pkt-line: Make packet_read_line easier to debug
|
||||
- pkt-line: Add strbuf based functions
|
||||
- http-push: fix check condition on http.c::finish_http_pack_request()
|
||||
|
||||
v5 plus 3 more fix-up patches from today.
|
||||
|
||||
* ef/msys-imap (2009-10-22) 9 commits.
|
||||
(merged to 'next' on 2009-10-31 at 8630603)
|
||||
+ Windows: use BLK_SHA1 again
|
||||
+ MSVC: Enable OpenSSL, and translate -lcrypto
|
||||
+ mingw: enable OpenSSL
|
||||
+ mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
|
||||
+ imap-send: build imap-send on Windows
|
||||
+ imap-send: fix compilation-error on Windows
|
||||
+ imap-send: use run-command API for tunneling
|
||||
+ imap-send: use separate read and write fds
|
||||
+ imap-send: remove useless uid code
|
||||
|
||||
* jc/fix-tree-walk (2009-10-22) 11 commits.
|
||||
(merged to 'next' on 2009-10-22 at 10c0c8f)
|
||||
+ Revert failed attempt since 353c5ee
|
||||
+ read-tree --debug-unpack
|
||||
(merged to 'next' on 2009-10-11 at 0b058e2)
|
||||
+ unpack-trees.c: look ahead in the index
|
||||
+ unpack-trees.c: prepare for looking ahead in the index
|
||||
+ Aggressive three-way merge: fix D/F case
|
||||
+ traverse_trees(): handle D/F conflict case sanely
|
||||
+ more D/F conflict tests
|
||||
+ tests: move convenience regexp to match object names to test-lib.sh
|
||||
+ unpack_callback(): use unpack_failed() consistently
|
||||
+ unpack-trees: typofix
|
||||
+ diff-lib.c: fix misleading comments on oneway_diff()
|
||||
|
||||
This has some stupid bugs and temporarily reverted from 'next' until I can
|
||||
fix it, but the "temporarily" turned out to be very loooong. Sigh...
|
||||
|
||||
* jh/notes (2009-10-09) 22 commits.
|
||||
- fast-import: Proper notes tree manipulation using the notes API
|
||||
- Refactor notes concatenation into a flexible interface for combining notes
|
||||
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
|
||||
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
|
||||
- Notes API: get_note(): Return the note annotating the given object
|
||||
- Notes API: add_note(): Add note objects to the internal notes tree structure
|
||||
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
|
||||
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
|
||||
(merged to 'next' on 2009-11-01 at 948327a)
|
||||
+ Add selftests verifying concatenation of multiple notes for the same commit
|
||||
+ Refactor notes code to concatenate multiple notes annotating the same object
|
||||
+ Add selftests verifying that we can parse notes trees with various fanouts
|
||||
+ Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
+ Teach notes code to free its internal data structures on request
|
||||
+ Add '%N'-format for pretty-printing commit notes
|
||||
+ Add flags to get_commit_notes() to control the format of the note string
|
||||
+ t3302-notes-index-expensive: Speed up create_repo()
|
||||
+ fast-import: Add support for importing commit notes
|
||||
+ Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
+ Add an expensive test for git-notes
|
||||
+ Speed up git notes lookup
|
||||
+ Add a script to edit/inspect notes
|
||||
+ Introduce commit notes
|
||||
|
||||
* jn/gitweb-blame (2009-09-01) 5 commits.
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
(merged to 'next' on 2009-10-11 at 73c4a83)
|
||||
+ gitweb: Colorize 'blame_incremental' view during processing
|
||||
+ gitweb: Incremental blame (using JavaScript)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame.
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits.
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
|
||||
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
|
||||
|
||||
This makes "git merge --no-commit" fail when it results in fast-forward or
|
||||
up-to-date. I haven't described this at the beginning of this message
|
||||
yet, as it is not clear if this change is even necessary. Opinions?
|
||||
|
||||
* jk/1.7.0-status (2009-09-05) 5 commits.
|
||||
- docs: note that status configuration affects only long format
|
||||
(merged to 'next' on 2009-10-11 at 65c8513)
|
||||
+ commit: support alternate status formats
|
||||
+ status: add --porcelain output format
|
||||
+ status: refactor format option parsing
|
||||
+ status: refactor short-mode printing to its own function
|
||||
(this branch uses jc/1.7.0-status.)
|
||||
|
||||
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
|
||||
is similar to that of post 1.7.0 "git status".
|
||||
|
||||
The tip one is not in 'next' as I have been hoping that somebody may want
|
||||
to change the code to make it unnecessary, but it does not seem to be
|
||||
happening, so probably it should also go to 'next'.
|
||||
|
||||
* jc/1.7.0-status (2009-09-05) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 9558627)
|
||||
+ status: typo fix in usage
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
(this branch is used by jk/1.7.0-status.)
|
||||
|
||||
With this, "git status" is no longer "git commit --dry-run".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 043acdf)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 546c74d)
|
||||
+ diff.c: fix typoes in comments
|
||||
+ Make test case number unique
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
|
||||
(merged to 'next' on 2009-10-11 at 81b8128)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jg/log-format-body-indent (2009-09-19) 1 commit.
|
||||
. git-log --format: Add %B tag with %B(x) option
|
||||
@@ -1,534 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Nov 2009, #02; Sun, 08)
|
||||
X-master-at: bb471bf74fdff4e6e93e39677e9dab36e716b6f1
|
||||
X-next-at: 0943296449b78c52223791a99498a308364fe99b
|
||||
|
||||
What's cooking in git.git (Nov 2009, #02; Sun, 08)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
|
||||
agrees that they were mistakes. The resulting system may not be strictly
|
||||
backward compatible. Currently planeed changes are:
|
||||
|
||||
* refuse push to update the checked out branch in a non-bare repo by
|
||||
default
|
||||
|
||||
Make "git push" into a repository to update the branch that is checked
|
||||
out fail by default. You can countermand this default by setting a
|
||||
configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
|
||||
|
||||
* refuse push to delete the current branch by default
|
||||
|
||||
Make "git push $there :$killed" to delete the branch that is pointed at
|
||||
by its HEAD fail by default. You can countermand this default by
|
||||
setting a configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
|
||||
|
||||
* git-send-email won't make deep threads by default
|
||||
|
||||
Many people said that by default when sending more than 2 patches the
|
||||
threading git-send-email makes by default is hard to read, and they
|
||||
prefer the default be one cover letter and each patch as a direct
|
||||
follow-up to the cover letter. You can countermand this by setting a
|
||||
configuration variable.
|
||||
|
||||
http://article.gmane.org/gmane.comp.version-control.git/109790
|
||||
|
||||
* git-status won't be "git-commit --dry-run" anymore
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
|
||||
|
||||
* "git-diff -w --exit-code" will exit success if only differences it
|
||||
found are whitespace changes that are stripped away from the output.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* bw/autoconf-more (2009-11-04) 2 commits
|
||||
- configure: add settings for gitconfig, editor and pager
|
||||
- configure: add macro to set arbitrary make variables
|
||||
|
||||
* em/commit-claim (2009-11-04) 1 commit
|
||||
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
|
||||
|
||||
I just picked better bits from both versions.
|
||||
|
||||
* jk/maint-format-patch-p-suppress-stat (2009-11-04) 1 commit.
|
||||
(merged to 'next' on 2009-11-08 at 0943296)
|
||||
+ format-patch: make "-p" suppress diffstat
|
||||
(this branch is used by bg/format-patch-doc-update.)
|
||||
|
||||
* bg/format-patch-doc-update (2009-11-07) 3 commits.
|
||||
- format-patch documentation: Fix formatting
|
||||
- format-patch documentation: Remove diff options that are not useful
|
||||
- format-patch: Always generate a patch
|
||||
(this branch uses jk/maint-format-patch-p-suppress-stat.)
|
||||
|
||||
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
|
||||
- Makefile: merge two Cygwin configuration sections into one
|
||||
(this branch is used by rj/cygwin-msvc.)
|
||||
|
||||
This is one of the most obviously correct bit from "Compiling on Cygwin
|
||||
using MSVC fails" topic.
|
||||
|
||||
* rj/cygwin-msvc (2009-11-07) 3 commits.
|
||||
- Add explicit Cygwin check to guard WIN32 header inclusion
|
||||
- MSVC: Add support for building with NO_MMAP
|
||||
- Makefile: keep MSVC and Cygwin configuration separate
|
||||
(this branch uses rj/maint-simplify-cygwin-makefile.)
|
||||
|
||||
* vl/maint-openssl-signature-change (2009-10-31) 1 commit.
|
||||
(merged to 'next' on 2009-10-31 at 0e1ce6b)
|
||||
+ imap-send.c: fix compiler warnings for OpenSSL 1.0
|
||||
|
||||
Prepare ourselves before newer versions of OpenSSL hits more platforms.
|
||||
|
||||
* bg/fetch-multi (2009-11-08) 4 commits.
|
||||
- Re-implement 'git remote update' using 'git fetch'
|
||||
- Add the configure variable skipFetchAll
|
||||
- Teach the --multiple option to 'git fetch'
|
||||
- Teach the --all option to 'git fetch'
|
||||
|
||||
* bs/maint-pre-commit-hook-sample (2009-11-05) 1 commit.
|
||||
(merged to 'next' on 2009-11-06 at d70f646)
|
||||
+ pre-commit.sample: Diff against the empty tree when HEAD is invalid
|
||||
|
||||
* cc/bisect-doc (2009-11-08) 1 commit
|
||||
- Documentation: add "Fighting regressions with git bisect" article
|
||||
|
||||
* jn/add-h-to-all-commands (2009-11-08) 1 commit.
|
||||
- Show usage string for 'git grep -h'
|
||||
|
||||
* pb/maint-gitweb-blob-lineno (2009-11-06) 1 commit.
|
||||
(merged to 'next' on 2009-11-06 at 27b86ec)
|
||||
+ gitweb: Fix blob linenr links in pathinfo mode
|
||||
|
||||
* sb/tutorial-test (2009-11-06) 4 commits
|
||||
- t1200: prepare for merging with Fast-forward bikeshedding
|
||||
- t1200: further modernize test script style
|
||||
- t1200: Make documentation and test agree
|
||||
- t1200: cleanup and modernize test style
|
||||
|
||||
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
|
||||
. gitweb: Polish the content tags support
|
||||
. gitweb: Support for no project list on gitweb front page
|
||||
. gitweb: Refactor project list routines
|
||||
|
||||
I picked these up but didn't queue as Warthog9's comments made certain
|
||||
amount of sense to me.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* tr/filter-branch (2009-10-28) 2 commits.
|
||||
- filter-branch: nearest-ancestor rewriting outside subdir filter
|
||||
- filter-branch: stop special-casing $filter_subdir argument
|
||||
|
||||
J6t had some comments on this.
|
||||
|
||||
* jl/submodule-add-noname (2009-09-22) 1 commit.
|
||||
- git submodule add: make the <path> parameter optional
|
||||
|
||||
Dscho started an interesting discussion regarding the larger workflow in
|
||||
which the "submodule add" is used. I think the patch itself makes sense
|
||||
but at the same time it probably makes sense to also take the <path> and
|
||||
infer the <repository> as Dscho suggested, probably in "git submodule
|
||||
add", not in "git add" proper, at least initially.
|
||||
|
||||
* sr/gfi-options (2009-09-06) 6 commits.
|
||||
- fast-import: test the new option command
|
||||
- fast-import: add option command
|
||||
- fast-import: test the new feature command
|
||||
- fast-import: add feature command
|
||||
- fast-import: put marks reading in it's own function
|
||||
- fast-import: put option parsing code in separate functions
|
||||
|
||||
Seems to be moving again soon.
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 1b99c56)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests cover the positive case (i.e. as long as the user says
|
||||
"yes" to the "do you really want to send this message that lacks subject",
|
||||
the message is sent) of this feature, but the feature itself needs its own
|
||||
test to verify the negative case (i.e. does it correctly stop if the user
|
||||
says "no"?)
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* bg/merge-ff-only (2009-10-29) 1 commit
|
||||
(merged to 'next' on 2009-10-31 at b6b49aa)
|
||||
+ Teach 'git merge' and 'git pull' the option --ff-only
|
||||
|
||||
* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
|
||||
(merged to 'next' on 2009-10-31 at 3a31fcc)
|
||||
+ ls-files: unbreak "ls-files -i"
|
||||
|
||||
* jn/editor-pager (2009-10-30) 8 commits
|
||||
- Provide a build time default-pager setting
|
||||
- Provide a build time default-editor setting
|
||||
- am -i, git-svn: use "git var GIT_PAGER"
|
||||
- add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
|
||||
- Teach git var about GIT_PAGER
|
||||
- Teach git var about GIT_EDITOR
|
||||
- Do not use VISUAL editor on dumb terminals
|
||||
- Handle more shell metacharacters in editor names
|
||||
|
||||
* js/maint-diff-color-words (2009-10-30) 3 commits.
|
||||
- diff --color-words: bit of clean-up
|
||||
- diff --color-words -U0: fix the location of hunk headers
|
||||
- t4034-diff-words: add a test for word diff without context
|
||||
|
||||
Fixes a corner case of running --color-words with -U0.
|
||||
|
||||
* sc/difftool-p4merge (2009-10-28) 1 commit
|
||||
(merged to 'next' on 2009-10-31 at 194b5c5)
|
||||
+ mergetool--lib: add p4merge as a pre-configured mergetool option
|
||||
|
||||
* sc/protocol-doc (2009-10-29) 1 commit
|
||||
- Update packfile transfer protocol documentation
|
||||
|
||||
There is the final draft posted, but I haven't picked it up yet.
|
||||
|
||||
* sr/vcs-helper (2009-11-06) 12 commits
|
||||
- Add Python support library for remote helpers
|
||||
- Basic build infrastructure for Python scripts
|
||||
- Allow helpers to request the path to the .git directory
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Allow helper to map private ref names into normal names
|
||||
- Add support for "import" helper command
|
||||
- Allow specifying the remote helper in the url
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Fix memory leak in helper method for disconnect
|
||||
|
||||
Re-rolled series that contains Daniel's and Johan's.
|
||||
|
||||
* tr/describe-advice (2009-10-28) 1 commit
|
||||
(merged to 'next' on 2009-10-31 at 8084850)
|
||||
+ describe: when failing, tell the user about options that work
|
||||
|
||||
* mr/gitweb-snapshot (2009-11-07) 4 commits.
|
||||
- gitweb: Smarter snapshot names
|
||||
- gitweb: Document current snapshot rules via new tests
|
||||
- t/gitweb-lib.sh: Split gitweb output into headers and body
|
||||
(merged to 'next' on 2009-10-11 at 22ba047)
|
||||
+ gitweb: check given hash before trying to create snapshot
|
||||
|
||||
Replaced commits near the tip with recent updates.
|
||||
|
||||
* jp/dirty-describe (2009-10-21) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 19c7fc7)
|
||||
+ Teach "git describe" --dirty option
|
||||
|
||||
* jp/fetch-cull-many-refs (2009-10-25) 2 commits
|
||||
(merged to 'next' on 2009-11-01 at 1f09ce9)
|
||||
+ fetch: Speed up fetch of large numbers of refs
|
||||
+ remote: Make ref_remove_duplicates faster for large numbers of refs
|
||||
|
||||
* bg/format-patch-p-noop (2009-11-04) 4 commits.
|
||||
(merged to 'next' on 2009-11-08 at 6220d55)
|
||||
+ Revert "format-patch -p is now a no-op" series
|
||||
(merged to 'next' on 2009-10-30 at e34a3db)
|
||||
+ format-patch documentation: Fix formatting
|
||||
+ format-patch documentation: Remove diff options that are not useful
|
||||
+ format-patch: Make implementation and documentation agree
|
||||
|
||||
This is now a no-op; jk/maint-format-patch-p-suppress-stat and
|
||||
bg/format-patch-doc-update topics will replace this.
|
||||
|
||||
* jk/gitignore-anchored (2009-10-26) 1 commit
|
||||
(merged to 'next' on 2009-10-30 at 9391a93)
|
||||
+ gitignore: root most patterns at the top-level directory
|
||||
|
||||
* jk/maint-add-p-empty (2009-10-27) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 2bd302f)
|
||||
+ add-interactive: handle deletion of empty files
|
||||
|
||||
* jk/maint-push-config (2009-10-25) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 934e3c5)
|
||||
+ push: always load default config
|
||||
|
||||
* lt/revision-bisect (2009-10-27) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 81ee52b)
|
||||
+ Add '--bisect' revision machinery argument
|
||||
|
||||
* jc/pretty-lf (2009-10-04) 1 commit.
|
||||
- Pretty-format: %[+-]x to tweak inter-item newlines
|
||||
|
||||
* rs/pretty-wrap (2009-11-08) 2 commits
|
||||
(merged to 'next' on 2009-11-08 at 8973fd8)
|
||||
+ log --format: don't ignore %w() at the start of format string
|
||||
(merged to 'next' on 2009-10-30 at 403bbfe)
|
||||
+ Implement wrap format %w() as if it is a mode switch
|
||||
(this branch uses js/log-rewrap.)
|
||||
|
||||
* js/log-rewrap (2009-10-18) 3 commits
|
||||
(merged to 'next' on 2009-10-30 at 403bbfe)
|
||||
+ Teach --wrap to only indent without wrapping
|
||||
+ Add strbuf_add_wrapped_text() to utf8.[ch]
|
||||
+ print_wrapped_text(): allow hard newlines
|
||||
(this branch is used by rs/pretty-wrap.)
|
||||
|
||||
* sr/blame-incomplete (2009-10-19) 1 commit.
|
||||
(merged to 'next' on 2009-10-22 at 133e0ce)
|
||||
+ blame: make sure that the last line ends in an LF
|
||||
|
||||
I think this is _good enough_ as-is; although it would be better if we
|
||||
added some hint to the output for Porcelain implementations, that can be
|
||||
done as a follow-up fix.
|
||||
|
||||
* fc/doc-fast-forward (2009-10-24) 1 commit.
|
||||
(merged to 'next' on 2009-11-01 at faaad90)
|
||||
+ Use 'fast-forward' all over the place
|
||||
|
||||
* ks/precompute-completion (2009-10-26) 3 commits.
|
||||
(merged to 'next' on 2009-10-28 at cd5177f)
|
||||
+ completion: ignore custom merge strategies when pre-generating
|
||||
(merged to 'next' on 2009-10-22 at f46a28a)
|
||||
+ bug: precomputed completion includes scripts sources
|
||||
(merged to 'next' on 2009-10-14 at adf722a)
|
||||
+ Speedup bash completion loading
|
||||
|
||||
* sp/smart-http (2009-11-04) 30 commits
|
||||
(merged to 'next' on 2009-11-06 at 666837c)
|
||||
+ http-backend: Test configuration options
|
||||
+ http-backend: Use http.getanyfile to disable dumb HTTP serving
|
||||
+ test smart http fetch and push
|
||||
+ http tests: use /dumb/ URL prefix
|
||||
+ set httpd port before sourcing lib-httpd
|
||||
+ t5540-http-push: remove redundant fetches
|
||||
+ Smart HTTP fetch: gzip requests
|
||||
+ Smart fetch over HTTP: client side
|
||||
+ Smart push over HTTP: client side
|
||||
+ Discover refs via smart HTTP server when available
|
||||
+ http-backend: more explict LocationMatch
|
||||
+ http-backend: add example for gitweb on same URL
|
||||
+ http-backend: use mod_alias instead of mod_rewrite
|
||||
+ http-backend: reword some documentation
|
||||
+ http-backend: add GIT_PROJECT_ROOT environment var
|
||||
+ Smart fetch and push over HTTP: server side
|
||||
+ Add stateless RPC options to upload-pack, receive-pack
|
||||
+ Git-aware CGI to provide dumb HTTP transport
|
||||
+ remote-helpers: return successfully if everything up-to-date
|
||||
+ Move WebDAV HTTP push under remote-curl
|
||||
+ remote-helpers: Support custom transport options
|
||||
+ remote-helpers: Fetch more than one ref in a batch
|
||||
+ fetch: Allow transport -v -v -v to set verbosity to 3
|
||||
+ remote-curl: Refactor walker initialization
|
||||
+ Add multi_ack_detailed capability to fetch-pack/upload-pack
|
||||
+ Move "get_ack()" back to fetch-pack
|
||||
+ fetch-pack: Use a strbuf to compose the want list
|
||||
+ pkt-line: Make packet_read_line easier to debug
|
||||
+ pkt-line: Add strbuf based functions
|
||||
+ http-push: fix check condition on http.c::finish_http_pack_request()
|
||||
|
||||
v5 plus 3 more fix-up patches, started cooking in 'next'.
|
||||
|
||||
* ef/msys-imap (2009-10-22) 9 commits.
|
||||
(merged to 'next' on 2009-10-31 at 8630603)
|
||||
+ Windows: use BLK_SHA1 again
|
||||
+ MSVC: Enable OpenSSL, and translate -lcrypto
|
||||
+ mingw: enable OpenSSL
|
||||
+ mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
|
||||
+ imap-send: build imap-send on Windows
|
||||
+ imap-send: fix compilation-error on Windows
|
||||
+ imap-send: use run-command API for tunneling
|
||||
+ imap-send: use separate read and write fds
|
||||
+ imap-send: remove useless uid code
|
||||
|
||||
* jc/fix-tree-walk (2009-10-22) 11 commits.
|
||||
(merged to 'next' on 2009-10-22 at 10c0c8f)
|
||||
+ Revert failed attempt since 353c5ee
|
||||
+ read-tree --debug-unpack
|
||||
(merged to 'next' on 2009-10-11 at 0b058e2)
|
||||
+ unpack-trees.c: look ahead in the index
|
||||
+ unpack-trees.c: prepare for looking ahead in the index
|
||||
+ Aggressive three-way merge: fix D/F case
|
||||
+ traverse_trees(): handle D/F conflict case sanely
|
||||
+ more D/F conflict tests
|
||||
+ tests: move convenience regexp to match object names to test-lib.sh
|
||||
+ unpack_callback(): use unpack_failed() consistently
|
||||
+ unpack-trees: typofix
|
||||
+ diff-lib.c: fix misleading comments on oneway_diff()
|
||||
|
||||
This has some stupid bugs and temporarily reverted from 'next' until I can
|
||||
fix it, but the "temporarily" turned out to be very loooong. Sigh...
|
||||
|
||||
* jh/notes (2009-10-09) 22 commits.
|
||||
- fast-import: Proper notes tree manipulation using the notes API
|
||||
- Refactor notes concatenation into a flexible interface for combining notes
|
||||
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
|
||||
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
|
||||
- Notes API: get_note(): Return the note annotating the given object
|
||||
- Notes API: add_note(): Add note objects to the internal notes tree structure
|
||||
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
|
||||
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
|
||||
(merged to 'next' on 2009-11-01 at 948327a)
|
||||
+ Add selftests verifying concatenation of multiple notes for the same commit
|
||||
+ Refactor notes code to concatenate multiple notes annotating the same object
|
||||
+ Add selftests verifying that we can parse notes trees with various fanouts
|
||||
+ Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
+ Teach notes code to free its internal data structures on request
|
||||
+ Add '%N'-format for pretty-printing commit notes
|
||||
+ Add flags to get_commit_notes() to control the format of the note string
|
||||
+ t3302-notes-index-expensive: Speed up create_repo()
|
||||
+ fast-import: Add support for importing commit notes
|
||||
+ Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
+ Add an expensive test for git-notes
|
||||
+ Speed up git notes lookup
|
||||
+ Add a script to edit/inspect notes
|
||||
+ Introduce commit notes
|
||||
|
||||
* jn/gitweb-blame (2009-09-01) 5 commits.
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
(merged to 'next' on 2009-10-11 at 73c4a83)
|
||||
+ gitweb: Colorize 'blame_incremental' view during processing
|
||||
+ gitweb: Incremental blame (using JavaScript)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame.
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits.
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
|
||||
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
|
||||
|
||||
This makes "git merge --no-commit" fail when it results in fast-forward or
|
||||
up-to-date. I haven't described this at the beginning of this message
|
||||
yet, as it is not clear if this change is even necessary. Opinions?
|
||||
|
||||
* jk/1.7.0-status (2009-09-05) 5 commits.
|
||||
- docs: note that status configuration affects only long format
|
||||
(merged to 'next' on 2009-10-11 at 65c8513)
|
||||
+ commit: support alternate status formats
|
||||
+ status: add --porcelain output format
|
||||
+ status: refactor format option parsing
|
||||
+ status: refactor short-mode printing to its own function
|
||||
(this branch uses jc/1.7.0-status.)
|
||||
|
||||
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
|
||||
is similar to that of post 1.7.0 "git status".
|
||||
|
||||
The tip one is not in 'next' as I have been hoping that somebody may want
|
||||
to change the code to make it unnecessary, but it does not seem to be
|
||||
happening, so probably it should also go to 'next'.
|
||||
|
||||
* jc/1.7.0-status (2009-09-05) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 9558627)
|
||||
+ status: typo fix in usage
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
(this branch is used by jk/1.7.0-status.)
|
||||
|
||||
With this, "git status" is no longer "git commit --dry-run".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 043acdf)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 546c74d)
|
||||
+ diff.c: fix typoes in comments
|
||||
+ Make test case number unique
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
|
||||
(merged to 'next' on 2009-10-11 at 81b8128)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* ne/rev-cache (2009-10-19) 7 commits.
|
||||
. support for commit grafts, slight change to general mechanism
|
||||
. support for path name caching in rev-cache
|
||||
. full integration of rev-cache into git, completed test suite
|
||||
. administrative functions for rev-cache, start of integration into git
|
||||
. support for non-commit object caching in rev-cache
|
||||
. basic revision cache system, no integration or features
|
||||
. man page and technical discussion for rev-cache
|
||||
|
||||
The author indicated that there is another round coming. Does not seem to
|
||||
pass the tests when merged to 'pu', so it has been ejected for now.
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jg/log-format-body-indent (2009-09-19) 1 commit.
|
||||
. git-log --format: Add %B tag with %B(x) option
|
||||
|
||||
* db/vcs-helper-rest (2009-10-27) 7 commits.
|
||||
. Fix memory leak in helper method for disconnect
|
||||
. Allow helpers to report in "list" command that the ref is unchanged
|
||||
. Add support for "import" helper command
|
||||
. Add a config option for remotes to specify a foreign vcs
|
||||
. Allow programs to not depend on remotes having urls
|
||||
. Allow fetch to modify refs
|
||||
. Use a function to determine whether a remote is valid
|
||||
(this branch is used by jh/cvs-helper.)
|
||||
|
||||
* jc/log-stdin (2009-11-03) 1 commit
|
||||
. Teach --stdin option to "log" family
|
||||
|
||||
* jh/cvs-helper (2009-08-18) 8 commits.
|
||||
. More fixes to the git-remote-cvs installation procedure
|
||||
. Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
|
||||
. Add simple selftests of git-remote-cvs functionality
|
||||
. git-remote-cvs: Remote helper program for CVS repositories
|
||||
. 2/2: Add Python support library for CVS remote helper
|
||||
. 1/2: Add Python support library for CVS remote helper
|
||||
. Basic build infrastructure for Python scripts
|
||||
. Allow helpers to request marks for fast-import
|
||||
(this branch uses db/vcs-helper-rest.)
|
||||
@@ -1,636 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Nov 2009, #03; Sun, 15)
|
||||
X-master-at: b7fba061e05d16fd2c61db5c279b6ad4db98aba4
|
||||
X-next-at: 2a326b29e43e05e9ccc1bcf1af09cb27ff606193
|
||||
|
||||
What's cooking in git.git (Nov 2009, #03; Sun, 15)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
|
||||
agrees that they were mistakes. The resulting system may not be strictly
|
||||
backward compatible. Currently planned changes are:
|
||||
|
||||
* refuse push to update the checked out branch in a non-bare repo by
|
||||
default
|
||||
|
||||
Make "git push" into a repository to update the branch that is checked
|
||||
out fail by default. You can countermand this default by setting a
|
||||
configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
|
||||
|
||||
* refuse push to delete the current branch by default
|
||||
|
||||
Make "git push $there :$killed" to delete the branch that is pointed at
|
||||
by its HEAD fail by default. You can countermand this default by
|
||||
setting a configuration variable in the receiving repository.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
|
||||
|
||||
* git-send-email won't make deep threads by default
|
||||
|
||||
Many people said that by default when sending more than 2 patches the
|
||||
threading git-send-email makes by default is hard to read, and they
|
||||
prefer the default be one cover letter and each patch as a direct
|
||||
follow-up to the cover letter. You can countermand this by setting a
|
||||
configuration variable.
|
||||
|
||||
http://article.gmane.org/gmane.comp.version-control.git/109790
|
||||
|
||||
* git-status won't be "git-commit --dry-run" anymore
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
|
||||
|
||||
* "git-diff -w --exit-code" will exit success if only differences it
|
||||
found are whitespace changes that are stripped away from the output.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
|
||||
|
||||
I wasn't fully functioning for the past few days, so this round we have
|
||||
only added new topics and new patches to existing ones, without changing
|
||||
the status of individual topics very much.
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* jk/maint-format-patch-p-suppress-stat (2009-11-04) 1 commit.
|
||||
(merged to 'next' on 2009-11-08 at 0943296)
|
||||
+ format-patch: make "-p" suppress diffstat
|
||||
(this branch is used by bg/format-patch-doc-update.)
|
||||
|
||||
* vl/maint-openssl-signature-change (2009-10-31) 1 commit.
|
||||
(merged to 'next' on 2009-10-31 at 0e1ce6b)
|
||||
+ imap-send.c: fix compiler warnings for OpenSSL 1.0
|
||||
|
||||
Prepare ourselves before newer versions of OpenSSL hits more platforms.
|
||||
|
||||
* pb/maint-gitweb-blob-lineno (2009-11-06) 1 commit.
|
||||
(merged to 'next' on 2009-11-06 at 27b86ec)
|
||||
+ gitweb: Fix blob linenr links in pathinfo mode
|
||||
|
||||
* bg/merge-ff-only (2009-10-29) 1 commit
|
||||
(merged to 'next' on 2009-10-31 at b6b49aa)
|
||||
+ Teach 'git merge' and 'git pull' the option --ff-only
|
||||
|
||||
* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
|
||||
(merged to 'next' on 2009-10-31 at 3a31fcc)
|
||||
+ ls-files: unbreak "ls-files -i"
|
||||
|
||||
* tr/describe-advice (2009-10-28) 1 commit
|
||||
(merged to 'next' on 2009-10-31 at 8084850)
|
||||
+ describe: when failing, tell the user about options that work
|
||||
|
||||
* jp/dirty-describe (2009-10-21) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 19c7fc7)
|
||||
+ Teach "git describe" --dirty option
|
||||
|
||||
* jk/gitignore-anchored (2009-10-26) 1 commit
|
||||
(merged to 'next' on 2009-10-30 at 9391a93)
|
||||
+ gitignore: root most patterns at the top-level directory
|
||||
|
||||
* jk/maint-push-config (2009-10-25) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 934e3c5)
|
||||
+ push: always load default config
|
||||
|
||||
* sr/blame-incomplete (2009-10-19) 1 commit.
|
||||
(merged to 'next' on 2009-10-22 at 133e0ce)
|
||||
+ blame: make sure that the last line ends in an LF
|
||||
|
||||
I think this is _good enough_ as-is; although it would be better if we
|
||||
added some hint to the output for Porcelain implementations, that can be
|
||||
done as a follow-up fix.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jn/help-everywhere (2009-11-09) 21 commits
|
||||
- diff --no-index: make the usage string less scary
|
||||
- merge-{recursive,subtree}: use usagef() to print usage
|
||||
- Introduce usagef() that takes a printf-style format
|
||||
- Let 'git <command> -h' show usage without a git dir
|
||||
- Show usage string for 'git http-push -h'
|
||||
- Let 'git http-fetch -h' show usage outside any git repository
|
||||
- Show usage string for 'git stripspace -h'
|
||||
- Show usage string for 'git unpack-file -h'
|
||||
- Show usage string for 'git show-index -h'
|
||||
- Show usage string for 'git rev-parse -h'
|
||||
- Show usage string for 'git merge-one-file -h'
|
||||
- Show usage string for 'git mailsplit -h'
|
||||
- Show usage string for 'git imap-send -h'
|
||||
- Show usage string for 'git get-tar-commit-id -h'
|
||||
- Show usage string for 'git fast-import -h'
|
||||
- Show usage string for 'git check-ref-format -h'
|
||||
- Show usage string for 'git show-ref -h'
|
||||
- Show usage string for 'git merge-ours -h'
|
||||
- Show usage string for 'git commit-tree -h'
|
||||
- Show usage string for 'git cherry -h'
|
||||
- Show usage string for 'git grep -h'
|
||||
(this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)
|
||||
|
||||
There were unrelated but still worthy fixes, so I reordered some of them;
|
||||
also the "usage()" change is different from the one that was posted (see
|
||||
my comment in $gmane/132592).
|
||||
|
||||
* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.
|
||||
- http-fetch: add missing initialization of argv0_path
|
||||
(this branch is used by jn/help-everywhere.)
|
||||
|
||||
* jn/remove-fetch--tool (2009-11-09) 1 commit
|
||||
- Retire fetch--tool helper to contrib/examples
|
||||
(this branch is used by jn/help-everywhere.)
|
||||
|
||||
These two were originally part of the "help-everywhere" topic but
|
||||
they can stand on their own.
|
||||
|
||||
* jc/log-stdin (2009-11-03) 1 commit
|
||||
- Teach --stdin option to "log" family
|
||||
|
||||
This is not signed-off (see $gmane/131971 for list of things you can do to
|
||||
help advancing this topic).
|
||||
|
||||
* jn/gitweb-log-history (2009-11-13) 3 commits
|
||||
- gitweb: Make 'history' view (re)use git_log_generic()
|
||||
- gitweb: Refactor common parts of 'log' and 'shortlog' views
|
||||
- gitweb: Refactor 'log' action generation, adding git_log_body()
|
||||
|
||||
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
|
||||
- git-pull.sh --rebase: overhaul error handling when no candidates are found
|
||||
|
||||
* np/maint-sideband-favor-status (2009-11-11) 1 commit.
|
||||
- give priority to progress messages
|
||||
|
||||
This looked obviously correct but I wasn't fully up to speed after being
|
||||
ill for a few days, so it is queued in 'pu' with everything else.
|
||||
|
||||
* rg/doc-workflow (2009-11-14) 2 commits.
|
||||
- Corrections to release management section in gitworkflows.txt
|
||||
- Add branch management for releases to gitworkflows
|
||||
|
||||
* sb/ls-tree-parseopt (2009-11-13) 2 commits.
|
||||
- ls-tree: migrate to parse-options
|
||||
- t3101: test more ls-tree options
|
||||
|
||||
* tz/maint-rpm (2009-11-11) 1 commit.
|
||||
- Makefile: Ensure rpm packages can be read by older rpm versions
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* jl/submodule-add-noname (2009-09-22) 1 commit.
|
||||
- git submodule add: make the <path> parameter optional
|
||||
|
||||
Dscho started an interesting discussion regarding the larger workflow in
|
||||
which the "submodule add" is used. I think the patch itself makes sense
|
||||
but at the same time it probably makes sense to also take the <path> and
|
||||
infer the <repository> as Dscho suggested, probably in "git submodule
|
||||
add", not in "git add" proper, at least initially.
|
||||
|
||||
Any objections against merging this to 'next'?
|
||||
|
||||
* jc/fix-tree-walk (2009-10-22) 11 commits.
|
||||
(merged to 'next' on 2009-10-22 at 10c0c8f)
|
||||
+ Revert failed attempt since 353c5ee
|
||||
+ read-tree --debug-unpack
|
||||
(merged to 'next' on 2009-10-11 at 0b058e2)
|
||||
+ unpack-trees.c: look ahead in the index
|
||||
+ unpack-trees.c: prepare for looking ahead in the index
|
||||
+ Aggressive three-way merge: fix D/F case
|
||||
+ traverse_trees(): handle D/F conflict case sanely
|
||||
+ more D/F conflict tests
|
||||
+ tests: move convenience regexp to match object names to test-lib.sh
|
||||
+ unpack_callback(): use unpack_failed() consistently
|
||||
+ unpack-trees: typofix
|
||||
+ diff-lib.c: fix misleading comments on oneway_diff()
|
||||
|
||||
This has some stupid bugs and temporarily reverted from 'next' until I can
|
||||
fix it, but the "temporarily" turned out to be very loooong. Sigh...
|
||||
|
||||
* jh/notes (2009-10-09) 22 commits.
|
||||
- fast-import: Proper notes tree manipulation using the notes API
|
||||
- Refactor notes concatenation into a flexible interface for combining notes
|
||||
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
|
||||
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
|
||||
- Notes API: get_note(): Return the note annotating the given object
|
||||
- Notes API: add_note(): Add note objects to the internal notes tree structure
|
||||
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
|
||||
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
|
||||
(merged to 'next' on 2009-11-01 at 948327a)
|
||||
+ Add selftests verifying concatenation of multiple notes for the same commit
|
||||
+ Refactor notes code to concatenate multiple notes annotating the same object
|
||||
+ Add selftests verifying that we can parse notes trees with various fanouts
|
||||
+ Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
+ Teach notes code to free its internal data structures on request
|
||||
+ Add '%N'-format for pretty-printing commit notes
|
||||
+ Add flags to get_commit_notes() to control the format of the note string
|
||||
+ t3302-notes-index-expensive: Speed up create_repo()
|
||||
+ fast-import: Add support for importing commit notes
|
||||
+ Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
+ Add an expensive test for git-notes
|
||||
+ Speed up git notes lookup
|
||||
+ Add a script to edit/inspect notes
|
||||
+ Introduce commit notes
|
||||
|
||||
I somehow thought that the later API part was waiting for updates but
|
||||
nothing seems to be happening.
|
||||
|
||||
* jn/gitweb-blame (2009-09-01) 5 commits.
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
(merged to 'next' on 2009-10-11 at 73c4a83)
|
||||
+ gitweb: Colorize 'blame_incremental' view during processing
|
||||
+ gitweb: Incremental blame (using JavaScript)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame. Any progress or RFH?
|
||||
|
||||
* sr/gfi-options (2009-09-06) 6 commits.
|
||||
- fast-import: test the new option command
|
||||
- fast-import: add option command
|
||||
- fast-import: test the new feature command
|
||||
- fast-import: add feature command
|
||||
- fast-import: put marks reading in it's own function
|
||||
- fast-import: put option parsing code in separate functions
|
||||
|
||||
It seemed to be moving again soon, but nothing has happened yet...
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 1b99c56)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests cover the positive case (i.e. as long as the user says
|
||||
"yes" to the "do you really want to send this message that lacks subject",
|
||||
the message is sent) of this feature, but the feature itself needs its own
|
||||
test to verify the negative case (i.e. does it correctly stop if the user
|
||||
says "no"?)
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* sc/protocol-doc (2009-11-03) 1 commit.
|
||||
- Update packfile transfer protocol documentation
|
||||
|
||||
* tr/filter-branch (2009-11-10) 2 commits.
|
||||
- filter-branch: nearest-ancestor rewriting outside subdir filter
|
||||
- filter-branch: stop special-casing $filter_subdir argument
|
||||
|
||||
Updated again. Looked sane, except that the option might not be
|
||||
necessary. But that can be fixed while in 'next', so unless anybody
|
||||
sees further issues, I'll move this to 'next' soon.
|
||||
|
||||
* em/commit-claim (2009-11-04) 1 commit
|
||||
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
|
||||
|
||||
I just picked better bits from both versions, but this needs to be
|
||||
rethought.
|
||||
|
||||
* bg/format-patch-doc-update (2009-11-07) 4 commits
|
||||
- format-patch: Add "--no-stat" as a synonym for "-p"
|
||||
- format-patch documentation: Fix formatting
|
||||
- format-patch documentation: Remove diff options that are not useful
|
||||
- format-patch: Always generate a patch
|
||||
|
||||
Looked sensible, even though this may want to wait for 1.7.0. We'll see
|
||||
when we merge this to 'next'. I tweaked the --no-stat patch with noneg
|
||||
bit; please check for sanity.
|
||||
|
||||
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
|
||||
- Makefile: merge two Cygwin configuration sections into one
|
||||
(this branch is used by rj/cygwin-msvc.)
|
||||
|
||||
This is one of the most obviously correct bit from "Compiling on Cygwin
|
||||
using MSVC fails" topic.
|
||||
|
||||
* rj/cygwin-msvc (2009-11-09) 3 commits.
|
||||
- Add explicit Cygwin check to guard WIN32 header inclusion
|
||||
- MSVC: Add support for building with NO_MMAP
|
||||
- Makefile: keep MSVC and Cygwin configuration separate
|
||||
(this branch uses rj/maint-simplify-cygwin-makefile.)
|
||||
|
||||
I think J6t was not happy with the tip one.
|
||||
|
||||
* bg/fetch-multi (2009-11-10) 9 commits
|
||||
- Re-implement 'git remote update' using 'git fetch'
|
||||
- builtin-fetch: add --dry-run option
|
||||
- builtin-fetch: add --prune option
|
||||
- teach warn_dangling_symref to take a FILE argument
|
||||
- remote: refactor some logic into get_stale_heads()
|
||||
- Add missing test for 'git remote update --prune'
|
||||
- Add the configuration option skipFetchAll
|
||||
- Teach the --multiple option to 'git fetch'
|
||||
- Teach the --all option to 'git fetch'
|
||||
|
||||
This series from Björn Gustavsson contains 4 patches from Jay Soffian as
|
||||
well. I haven't looked at the code very closely yet.
|
||||
|
||||
* bs/maint-pre-commit-hook-sample (2009-11-05) 1 commit.
|
||||
(merged to 'next' on 2009-11-06 at d70f646)
|
||||
+ pre-commit.sample: Diff against the empty tree when HEAD is invalid
|
||||
|
||||
Looked Ok.
|
||||
|
||||
* cc/bisect-doc (2009-11-08) 1 commit
|
||||
- Documentation: add "Fighting regressions with git bisect" article
|
||||
|
||||
Any comments? Should it go to Documentation/technical instead?
|
||||
|
||||
* sb/tutorial-test (2009-11-06) 4 commits
|
||||
- t1200: prepare for merging with Fast-forward bikeshedding
|
||||
- t1200: further modernize test script style
|
||||
- t1200: Make documentation and test agree
|
||||
- t1200: cleanup and modernize test style
|
||||
|
||||
Ready for 'next', I think.
|
||||
|
||||
* jn/editor-pager (2009-10-30) 9 commits
|
||||
- Provide a build time default-pager setting
|
||||
- Provide a build time default-editor setting
|
||||
- am -i, git-svn: use "git var GIT_PAGER"
|
||||
- add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
|
||||
- Teach git var about GIT_PAGER
|
||||
- Teach git var about GIT_EDITOR
|
||||
- Suppress warnings from "git var -l"
|
||||
- Do not use VISUAL editor on dumb terminals
|
||||
- Handle more shell metacharacters in editor names
|
||||
|
||||
* bw/autoconf-more (2009-11-04) 2 commits
|
||||
- configure: add settings for gitconfig, editor and pager
|
||||
- configure: add macro to set arbitrary make variables
|
||||
|
||||
This will follow jn/editor-pager series.
|
||||
|
||||
* js/maint-diff-color-words (2009-10-30) 3 commits.
|
||||
(merged to 'next' on 2009-11-10 at 5619714)
|
||||
+ diff --color-words: bit of clean-up
|
||||
+ diff --color-words -U0: fix the location of hunk headers
|
||||
+ t4034-diff-words: add a test for word diff without context
|
||||
|
||||
Fixes a corner case of running --color-words with -U0.
|
||||
|
||||
* sc/difftool-p4merge (2009-10-28) 1 commit
|
||||
(merged to 'next' on 2009-10-31 at 194b5c5)
|
||||
+ mergetool--lib: add p4merge as a pre-configured mergetool option
|
||||
|
||||
I do not do p4 nor use difftool, so it's much easier for me to merge this
|
||||
to 'master' and wait for anybody to scream if there is breakage. I'll do
|
||||
so, unless I hear objections in a few days.
|
||||
|
||||
* sr/vcs-helper (2009-11-06) 12 commits
|
||||
- Add Python support library for remote helpers
|
||||
- Basic build infrastructure for Python scripts
|
||||
- Allow helpers to request the path to the .git directory
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Allow helper to map private ref names into normal names
|
||||
- Add support for "import" helper command
|
||||
- Allow specifying the remote helper in the url
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Fix memory leak in helper method for disconnect
|
||||
|
||||
Re-rolled series that contains Daniel's and Johan's.
|
||||
Any comments? Is everybody happy?
|
||||
|
||||
* mr/gitweb-snapshot (2009-11-07) 4 commits.
|
||||
- gitweb: Smarter snapshot names
|
||||
- gitweb: Document current snapshot rules via new tests
|
||||
- t/gitweb-lib.sh: Split gitweb output into headers and body
|
||||
(merged to 'next' on 2009-10-11 at 22ba047)
|
||||
+ gitweb: check given hash before trying to create snapshot
|
||||
|
||||
Replaced commits near the tip with recent updates.
|
||||
|
||||
* jp/fetch-cull-many-refs (2009-11-13) 3 commits
|
||||
(merged to 'next' on 2009-11-15 at db0f967)
|
||||
+ remote: fix use-after-free error detected by glibc in ref_remove_duplicates
|
||||
(merged to 'next' on 2009-11-01 at 1f09ce9)
|
||||
+ fetch: Speed up fetch of large numbers of refs
|
||||
+ remote: Make ref_remove_duplicates faster for large numbers of refs
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* jk/maint-add-p-empty (2009-10-27) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 2bd302f)
|
||||
+ add-interactive: handle deletion of empty files
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* lt/revision-bisect (2009-10-27) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 81ee52b)
|
||||
+ Add '--bisect' revision machinery argument
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* jc/pretty-lf (2009-10-04) 1 commit.
|
||||
- Pretty-format: %[+-]x to tweak inter-item newlines
|
||||
|
||||
* rs/pretty-wrap (2009-11-08) 2 commits
|
||||
(merged to 'next' on 2009-11-08 at 8973fd8)
|
||||
+ log --format: don't ignore %w() at the start of format string
|
||||
(merged to 'next' on 2009-10-30 at 403bbfe)
|
||||
+ Implement wrap format %w() as if it is a mode switch
|
||||
(this branch uses js/log-rewrap.)
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* js/log-rewrap (2009-10-18) 3 commits
|
||||
(merged to 'next' on 2009-10-30 at 403bbfe)
|
||||
+ Teach --wrap to only indent without wrapping
|
||||
+ Add strbuf_add_wrapped_text() to utf8.[ch]
|
||||
+ print_wrapped_text(): allow hard newlines
|
||||
(this branch is used by rs/pretty-wrap.)
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* fc/doc-fast-forward (2009-10-24) 1 commit.
|
||||
(merged to 'next' on 2009-11-01 at faaad90)
|
||||
+ Use 'fast-forward' all over the place
|
||||
|
||||
Soon in 'master'; carrying this in 'next' for too long is turning out to
|
||||
be quite painful.
|
||||
|
||||
* ks/precompute-completion (2009-10-26) 3 commits.
|
||||
(merged to 'next' on 2009-10-28 at cd5177f)
|
||||
+ completion: ignore custom merge strategies when pre-generating
|
||||
(merged to 'next' on 2009-10-22 at f46a28a)
|
||||
+ bug: precomputed completion includes scripts sources
|
||||
(merged to 'next' on 2009-10-14 at adf722a)
|
||||
+ Speedup bash completion loading
|
||||
|
||||
I didn't follow the discussion from the past few days closely, but I am
|
||||
getting an impression that the consensus is we shouldn't precompute, so I
|
||||
may have to revert this and replace with what's cooking on the list when
|
||||
it stabilizes.
|
||||
|
||||
* sp/smart-http (2009-11-11) 35 commits
|
||||
(merged to 'next' on 2009-11-15 at 2a326b2)
|
||||
+ http-backend: Fix bad treatment of uintmax_t in Content-Length
|
||||
+ t5551-http-fetch: Work around broken Accept header in libcurl
|
||||
+ t5551-http-fetch: Work around some libcurl versions
|
||||
+ http-backend: Protect GIT_PROJECT_ROOT from /../ requests
|
||||
+ Git-aware CGI to provide dumb HTTP transport
|
||||
(merged to 'next' on 2009-11-06 at 666837c)
|
||||
+ http-backend: Test configuration options
|
||||
+ http-backend: Use http.getanyfile to disable dumb HTTP serving
|
||||
+ test smart http fetch and push
|
||||
+ http tests: use /dumb/ URL prefix
|
||||
+ set httpd port before sourcing lib-httpd
|
||||
+ t5540-http-push: remove redundant fetches
|
||||
+ Smart HTTP fetch: gzip requests
|
||||
+ Smart fetch over HTTP: client side
|
||||
+ Smart push over HTTP: client side
|
||||
+ Discover refs via smart HTTP server when available
|
||||
+ http-backend: more explict LocationMatch
|
||||
+ http-backend: add example for gitweb on same URL
|
||||
+ http-backend: use mod_alias instead of mod_rewrite
|
||||
+ http-backend: reword some documentation
|
||||
+ http-backend: add GIT_PROJECT_ROOT environment var
|
||||
+ Smart fetch and push over HTTP: server side
|
||||
+ Add stateless RPC options to upload-pack, receive-pack
|
||||
+ Git-aware CGI to provide dumb HTTP transport
|
||||
+ remote-helpers: return successfully if everything up-to-date
|
||||
+ Move WebDAV HTTP push under remote-curl
|
||||
+ remote-helpers: Support custom transport options
|
||||
+ remote-helpers: Fetch more than one ref in a batch
|
||||
+ fetch: Allow transport -v -v -v to set verbosity to 3
|
||||
+ remote-curl: Refactor walker initialization
|
||||
+ Add multi_ack_detailed capability to fetch-pack/upload-pack
|
||||
+ Move "get_ack()" back to fetch-pack
|
||||
+ fetch-pack: Use a strbuf to compose the want list
|
||||
+ pkt-line: Make packet_read_line easier to debug
|
||||
+ pkt-line: Add strbuf based functions
|
||||
+ http-push: fix check condition on http.c::finish_http_pack_request()
|
||||
|
||||
* ef/msys-imap (2009-10-22) 9 commits.
|
||||
(merged to 'next' on 2009-10-31 at 8630603)
|
||||
+ Windows: use BLK_SHA1 again
|
||||
+ MSVC: Enable OpenSSL, and translate -lcrypto
|
||||
+ mingw: enable OpenSSL
|
||||
+ mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
|
||||
+ imap-send: build imap-send on Windows
|
||||
+ imap-send: fix compilation-error on Windows
|
||||
+ imap-send: use run-command API for tunneling
|
||||
+ imap-send: use separate read and write fds
|
||||
+ imap-send: remove useless uid code
|
||||
|
||||
Soon in 'master', unless I hear objections from msys folks or imap-send
|
||||
users.
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits.
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
- read-tree: add --no-sparse-checkout to disable sparse checkout support
|
||||
- unpack-trees(): ignore worktree check outside checkout area
|
||||
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
|
||||
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
|
||||
- unpack-trees.c: generalize verify_* functions
|
||||
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
|
||||
- Introduce "sparse checkout"
|
||||
- dir.c: export excluded_1() and add_excludes_from_file_1()
|
||||
- excluded_1(): support exclude files in index
|
||||
- unpack-trees(): carry skip-worktree bit over in merged_entry()
|
||||
- Read .gitignore from index if it is skip-worktree
|
||||
- Avoid writing to buffer in add_excludes_from_file_1()
|
||||
- Teach Git to respect skip-worktree bit (writing part)
|
||||
- Teach Git to respect skip-worktree bit (reading part)
|
||||
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
|
||||
- Add test-index-version
|
||||
- update-index: refactor mark_valid() in preparation for new options
|
||||
|
||||
The latest update I didn't look at very closely but I had an impression
|
||||
that it was touching very generic codepath that would affect non sparse
|
||||
cases, iow the patch looked very scary (the entire series already is).
|
||||
|
||||
--------------------------------------------------
|
||||
[For 1.7.0]
|
||||
|
||||
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
|
||||
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
|
||||
|
||||
This makes "git merge --no-commit" fail when it results in fast-forward or
|
||||
up-to-date. I haven't described this at the beginning of this message
|
||||
yet, as it is not clear if this change is even necessary. Opinions?
|
||||
|
||||
* jk/1.7.0-status (2009-09-05) 5 commits.
|
||||
- docs: note that status configuration affects only long format
|
||||
(merged to 'next' on 2009-10-11 at 65c8513)
|
||||
+ commit: support alternate status formats
|
||||
+ status: add --porcelain output format
|
||||
+ status: refactor format option parsing
|
||||
+ status: refactor short-mode printing to its own function
|
||||
(this branch uses jc/1.7.0-status.)
|
||||
|
||||
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
|
||||
is similar to that of post 1.7.0 "git status".
|
||||
|
||||
The tip one is not in 'next' as I have been hoping that somebody may want
|
||||
to change the code to make it unnecessary, but it does not seem to be
|
||||
happening, so probably it should also go to 'next'.
|
||||
|
||||
* jc/1.7.0-status (2009-09-05) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 9558627)
|
||||
+ status: typo fix in usage
|
||||
+ git status: not "commit --dry-run" anymore
|
||||
+ git stat -s: short status output
|
||||
+ git stat: the beginning of "status that is not a dry-run of commit"
|
||||
(this branch is used by jk/1.7.0-status.)
|
||||
|
||||
With this, "git status" is no longer "git commit --dry-run".
|
||||
|
||||
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 043acdf)
|
||||
+ send-email: make --no-chain-reply-to the default
|
||||
|
||||
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 546c74d)
|
||||
+ diff.c: fix typoes in comments
|
||||
+ Make test case number unique
|
||||
+ diff: Rename QUIET internal option to QUICK
|
||||
+ diff: change semantics of "ignore whitespace" options
|
||||
|
||||
This changes exit code from "git diff --ignore-whitespace" and friends
|
||||
when there is no actual output. It is a backward incompatible change, but
|
||||
we could argue that it is a bugfix.
|
||||
|
||||
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
|
||||
(merged to 'next' on 2009-10-11 at 81b8128)
|
||||
+ Refuse deleting the current branch via push
|
||||
+ Refuse updating the current branch in a non-bare repository via push
|
||||
|
||||
--------------------------------------------------
|
||||
[I have been too busy to purge these]
|
||||
|
||||
* ne/rev-cache (2009-10-19) 7 commits.
|
||||
. support for commit grafts, slight change to general mechanism
|
||||
. support for path name caching in rev-cache
|
||||
. full integration of rev-cache into git, completed test suite
|
||||
. administrative functions for rev-cache, start of integration into git
|
||||
. support for non-commit object caching in rev-cache
|
||||
. basic revision cache system, no integration or features
|
||||
. man page and technical discussion for rev-cache
|
||||
|
||||
The author indicated that there is another round coming. Does not seem to
|
||||
pass the tests when merged to 'pu', so it has been ejected for now.
|
||||
|
||||
* jc/log-tz (2009-03-03) 1 commit.
|
||||
- Allow --date=local --date=other-format to work as expected
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
|
||||
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
|
||||
|
||||
Maybe some people care about this. I dunno.
|
||||
|
||||
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
|
||||
. gitweb: Polish the content tags support
|
||||
. gitweb: Support for no project list on gitweb front page
|
||||
. gitweb: Refactor project list routines
|
||||
|
||||
I picked these up but didn't queue as Warthog9's comments made certain
|
||||
amount of sense to me.
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user