What's cooking in git.git (topics)

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.

----------------------------------------------------------------
[New Topics]

* 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.

----------------------------------------------------------------
[Graduated to 'master']

* dp/clean-fix (Fri Mar 7 21:56:56 2008 -0800) 7 commits
+ git-clean: add tests for relative path
+ git-clean: correct printing relative path
+ Make private quote_path() in wt-status.c available as quote_path_relative()
+ Revert part of d089eba (setup: sanitize absolute and funny paths in get_pathspec())
+ Revert part of 1abf095 (git-add: adjust to the get_pathspec() changes)
+ Revert part of 744dacd (builtin-mv: minimum fix to avoid losing files)
+ get_pathspec(): die when an out-of-tree path is given

* sp/fetch-optim (Mon Mar 3 22:27:40 2008 -0500) 11 commits
+ Teach git-fetch to exploit server side automatic tag following
+ Teach fetch-pack/upload-pack about --include-tag
+ git-pack-objects: Automatically pack annotated tags if object was packed
+ Teach git-fetch to grab a tag at the same time as a commit
+ Make git-fetch follow tags we already have objects for sooner
+ Teach upload-pack to log the received need lines to an fd
+ Free the path_lists used to find non-local tags in git-fetch
+ Allow builtin-fetch's find_non_local_tags to append onto a list
+ Ensure tail pointer gets setup correctly when we fetch HEAD only
+ Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch
+ Remove unused variable in builtin-fetch find_non_local_tags

* ml/submodule-add-existing (Tue Mar 4 20:15:02 2008 -0500) 1 commit
+ git-submodule - Allow adding a submodule in-place

* jc/describe-always (Sun Mar 2 08:51:57 2008 -0800) 1 commit
+ describe --always: fall back to showing an abbreviated object name

* aw/maint-shortlog-blank-lines (Wed Mar 5 14:24:10 2008 +0000) 1 commit
+ shortlog: take the first populated line of the description

* jn/gitweb-pickaxe (Wed Mar 5 09:31:55 2008 +0100) 1 commit
+ gitweb: Fix and simplify pickaxe search

* cr/reset-parseopt (Tue Mar 4 23:11:34 2008 +0100) 1 commit
+ Make builtin-reset.c use parse_options.

* mr/compat-snprintf (Wed Mar 5 16:46:13 2008 +0100) 1 commit
+ Add compat/snprintf.c for systems that return bogus

* jc/am (Tue Mar 4 00:25:06 2008 -0800) 3 commits
+ am: --rebasing
+ am: remove support for -d .dotest
+ am: read from the right mailbox when started from a subdirectory

* ph/parseopt (Sun Mar 2 11:35:56 2008 +0100) 2 commits
+ parse-options: new option type to treat an option-like parameter as an argument.
+ parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse -- parseopt

----------------------------------------------------------------
[Actively Cooking]

* lt/unpack-trees (Fri Mar 7 13:48:40 2008 -0800) 10 commits
+ unpack_trees(): minor memory leak fix in unused destination index
+ Make 'unpack_trees()' have a separate source and destination index
+ Make 'unpack_trees()' take the index to work on as an argument
+ Add 'const' where appropriate to index handling functions
+ Fix tree-walking compare_entry() in the presense of --prefix
+ Move 'unpack_trees()' over to 'traverse_trees()' interface
+ Make 'traverse_trees()' traverse conflicting DF entries in parallel
+ Add return value to 'traverse_tree()' callback
+ Make 'traverse_tree()' use linked structure rather than 'const char *base'
+ Add 'df_name_compare()' helper function

* js/remote (Sat Mar 8 23:40:42 2008 +0100) 8 commits
+ builtin remote rm: remove symbolic refs, too
+ remote: fix "update [group...]"
+ remote show: Clean up connection correctly if object fetch wasn't done
+ builtin-remote: prune remotes correctly that were added with -- mirror
+ Make git-remote a builtin
+ Test "git remote show" and "git remote prune"
+ parseopt: add flag to stop on first non option
+ path-list: add functions to work with unsorted lists

Slated for 1.5.5, but probably needs more time to mature.

* jc/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits
+ t5300: add test for "index-pack --strict"
+ receive-pack: allow using --strict mode for unpacking objects
+ unpack-objects: fix --strict handling
+ t5300: add test for "unpack-objects --strict"
+ unpack-objects: prevent writing of inconsistent objects

This would re-instate the "unpack-objects --strict" but we probably should not do this before 1.5.5.

* py/submodule (Sat Mar 8 02:27:19 2008 +0800) 4 commits
- git-submodule summary: documentation
- git-submodule summary: limit summary size
- git-submodule summary: show commit summary
- git-submodule summary: code framework

Looking better. With tests it should be mergeable to 'next'.

----------------------------------------------------------------
[On Hold]

* nd/worktree (Sun Mar 2 17:35:43 2008 +0700) 10 commits
- Additional tests to capture worktree special cases
- Documentation: update api-builtin and api-setup
- Make setup_git_directory() auto-setup worktree if found
- builtin-archive: mark unused prefix "unused_prefix"
- Completely move out worktree setup from setup_git_directory_gently()
- http-push: Avoid calling setup_git_directory() twice
- Make setup_work_tree() return new prefix
- Make get_git_dir() and 'git rev-parse --git-dir' absolute path
- Make sure setup_git_directory is called before accessing repository
- "git read-tree -m" and the like require worktree

Every time we touch work-tree stuff we seem to unstabilize; this round seems more solid but I am still treading cautiously. Not sure if we want this for 1.5.5.

* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits
- tests: convert "cmp" and "cmp -s" to test_cmp
- tests: test_cmp helper function

* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 2 commits
- diffcore-rename: make file_table available outside exact rename detection
+ Optimize rename detection for a huge diff

* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit
- diff: make --dirstat binary-file safe

* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits
- Teach GIT-VERSION-GEN about the .git file
- Teach git-submodule.sh about the .git file
- Teach resolve_gitlink_ref() about the .git file
- Add platform-independent .git "symlink"

The idea and the implementation seem Ok, but this leaves distinct feeling that it is a solution still waiting for a user (e.g. "git submodule" enhancements to take advantage of this facility to preserve the subrepository while switching between a revision with a submodule and another before the submodule was bound to the superproject).

* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
- Move all dashed-form commands to libexecdir

Scheduled for 1.6.0. I am not sure if we should merge this to 'next' before 1.5.5. Most active people will be on 'next' and if we have this there, the resulting 1.5.5 release might end up having issues that come from differences this one introduces.

* 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.

* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits
- sha1-lookup: make selection of 'middle' less aggressive
- sha1-lookup: more memory efficient search in sorted list of SHA-1

Micro-optimization whose real world benefit is not proven.

* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 5 commits
- WIP: rethink replay merge
- Start using replay-tree merge in cherry-pick
- revert/cherry-pick: start refactoring call to merge_recursive
+ expose a helper function peel_to_type().
+ merge-recursive: split low-level merge functions out.

This is meant to improve cherry-pick's behaviour by not using merge-recursive, but unfortunately has stalled for some time now.

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.

----------------------------------------------------------------
[New Topics]

* cc/help (Tue Mar 11 08:51:12 2008 +0100) 3 commits
+ help: implement multi-valued "man.viewer" config option
+ Documentation: help: describe 'man.viewer' config variable
+ help: add "man.viewer" config var to use "woman" or "konqueror"

* ph/maint-quiltimport (Sat Mar 8 19:27:09 2008 +0100) 1 commit
+ git-quiltimport: better parser to grok "enhanced" series files.

* mr/autoconf-fread (Tue Mar 11 09:48:34 2008 +0100) 1 commit
+ autoconf: Test FREAD_READS_DIRECTORIES

* db/diff-to-fp (Mon Mar 10 13:58:26 2008 -0400) 2 commits
- wt-status.c: no need for dup() dance anymore
- Write diff output to a file in struct diff_options

All of these can be in 1.5.5 (they may or may not need fix-ups); let's close the 1.5.5 merge window now with these.

----------------------------------------------------------------
[Graduated to 'master']

* lt/unpack-trees (Fri Mar 7 13:48:40 2008 -0800) 10 commits
+ unpack_trees(): minor memory leak fix in unused destination index
+ Make 'unpack_trees()' have a separate source and destination index
+ Make 'unpack_trees()' take the index to work on as an argument
+ Add 'const' where appropriate to index handling functions
+ Fix tree-walking compare_entry() in the presense of --prefix
+ Move 'unpack_trees()' over to 'traverse_trees()' interface
+ Make 'traverse_trees()' traverse conflicting DF entries in parallel
+ Add return value to 'traverse_tree()' callback
+ Make 'traverse_tree()' use linked structure rather than 'const char *base'
+ Add 'df_name_compare()' helper function

* js/remote (Sat Mar 8 23:40:42 2008 +0100) 9 commits
+ "remote update": print remote name being fetched from
+ builtin remote rm: remove symbolic refs, too
+ remote: fix "update [group...]"
+ remote show: Clean up connection correctly if object fetch wasn't done
+ builtin-remote: prune remotes correctly that were added with -- mirror
+ Make git-remote a builtin
+ Test "git remote show" and "git remote prune"
+ parseopt: add flag to stop on first non option
+ path-list: add functions to work with unsorted lists

----------------------------------------------------------------
[Actively Cooking]

* py/submodule (Tue Mar 11 21:52:19 2008 +0800) 5 commits
+ git-submodule summary: test
+ git-submodule summary: documentation
+ git-submodule summary: limit summary size
+ git-submodule summary: show commit summary
+ git-submodule summary: code framework

I didn't see anybody very supportive for this series, but I do not think this regresses existing other subcommands to "git submodule", so let's merge this to 'master' before 1.5.5 and see how useful submodule users find this.

----------------------------------------------------------------
[On Hold]

* nd/worktree (Sun Mar 2 17:35:43 2008 +0700) 10 commits
- Additional tests to capture worktree special cases
- Documentation: update api-builtin and api-setup
- Make setup_git_directory() auto-setup worktree if found
- builtin-archive: mark unused prefix "unused_prefix"
- Completely move out worktree setup from setup_git_directory_gently()
- http-push: Avoid calling setup_git_directory() twice
- Make setup_work_tree() return new prefix
- Make get_git_dir() and 'git rev-parse --git-dir' absolute path
- Make sure setup_git_directory is called before accessing repository
- "git read-tree -m" and the like require worktree

Every time we touch work-tree stuff we seem to unstabilize; this round seems more solid but I am still treading cautiously. Not sure if we want this for 1.5.5.

* jc/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits
+ t5300: add test for "index-pack --strict"
+ receive-pack: allow using --strict mode for unpacking objects
+ unpack-objects: fix --strict handling
+ t5300: add test for "unpack-objects --strict"
+ unpack-objects: prevent writing of inconsistent objects

This would re-instate the "unpack-objects --strict" but we probably should not do this before 1.5.5.

* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits
- tests: convert "cmp" and "cmp -s" to test_cmp
- tests: test_cmp helper function

* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 2 commits
- diffcore-rename: make file_table available outside exact rename detection
+ Optimize rename detection for a huge diff

* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit
- diff: make --dirstat binary-file safe

* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits
- Teach GIT-VERSION-GEN about the .git file
- Teach git-submodule.sh about the .git file
- Teach resolve_gitlink_ref() about the .git file
- Add platform-independent .git "symlink"

The idea and the implementation seem Ok, but this leaves distinct feeling that it is a solution still waiting for a user (e.g. "git submodule" enhancements to take advantage of this facility to preserve the subrepository while switching between a revision with a submodule and another before the submodule was bound to the superproject).

* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
- Move all dashed-form commands to libexecdir

Scheduled for 1.6.0. I am not sure if we should merge this to 'next' before 1.5.5. Most active people will be on 'next' and if we have this there, the resulting 1.5.5 release might end up having issues that come from differences this one introduces.

* 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.

* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits
- sha1-lookup: make selection of 'middle' less aggressive
- sha1-lookup: more memory efficient search in sorted list of SHA-1

Micro-optimization whose real world benefit is not proven.

* 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 by not using merge-recursive, 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.

Hi,

I am sure we do not want this for 1.5.5.

It is too complicated a patch series to be obviously correct, and as I said earlier, a few design goals are not to my liking, such as trying to separate git_dir from work_tree logic with a sledgehammer.

Ciao,
Dscho

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 merge window for 1.5.5 is closed as of tonight, except for the promised git-gui (0.10) and gitk updates, and topics still cooking in 'next', and 1.5.5-rc0 will be tagged shortly.

After that we will have quite a lot of regression fixes ahead of us, I am afraid. Since v1.5.4, a few commands have been reimplemented or made built-ins (checkout, remote, merge-recursive), and these inevitably involve "growing pains".

While I am reasonably confident that we have long caught showstopper regressions in key features of these commands while they were cooking in 'next', I am sure there would remain regressions here and there in the periphery. It is unavoidable. POSIX-only people may say "why rewrite, if it involves this much pain", but like it or not, there are people stuck on unfortunate platforms that cannot run scripted versions well enough.

Let's see if our regular contributors are as good at fixing their own screw-ups as they are good at coming up with new code, and hope that we can keep this rc cycle manageably short. Touch wood...

----------------------------------------------------------------
[New Topics]

* jc/makefile (Wed Mar 12 01:46:26 2008 -0700) 2 commits
- Makefile: flatten enumeration of headers, objects and programs
- Makefile: DIFF_OBJS is not special at all these days

I promised to do this immediately after -rc0, so this will shortly be in 'next' and then in 'master'.

* jk/portable (Wed Mar 12 17:42:43 2008 -0400) 13 commits
+ t7505: use SHELL_PATH in hook
+ t9112: add missing #!/bin/sh header
+ filter-branch: use $SHELL_PATH instead of 'sh'
+ filter-branch: don't use xargs -0
+ add NO_EXTERNAL_GREP build option
+ t6000lib: tr portability fix
+ t4020: don't use grep -a
+ add test_cmp function for test scripts
+ remove use of "tail -n 1" and "tail -1"
+ grep portability fix: don't use "-e" or "-q"
+ more tr portability test script fixes
+ t0050: perl portability fix
+ tr portability fixes

Initially triggered by Solaris porting effort but these are harmless portability changes. Perhaps in 1.5.5, perhaps immediately after that.

----------------------------------------------------------------
[Dropped]

* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits . tests: convert "cmp" and "cmp -s" to test_cmp . tests: test_cmp helper function

This one may be more elaborate, but Jeff's patch is much simpler.

----------------------------------------------------------------
[Graduated to 'master']

* ph/maint-quiltimport (Wed Mar 12 21:07:19 2008 -0700) 2 commits
+ quiltimport: fix misquoting of parsed -p<num> parameter
+ git-quiltimport: better parser to grok "enhanced" series files.

* mr/autoconf-fread (Tue Mar 11 09:48:34 2008 +0100) 1 commit
+ autoconf: Test FREAD_READS_DIRECTORIES

----------------------------------------------------------------
[Actively Cooking]

* cc/help (Thu Mar 13 19:15:30 2008 -0700) 6 commits
+ Documentation/git-help: typofix
+ help: warn if specified 'man.viewer' is unsupported, instead of erroring out
+ Documentation: help: explain 'man.viewer' multiple values
+ help: implement multi-valued "man.viewer" config option
+ Documentation: help: describe 'man.viewer' config variable
+ help: add "man.viewer" config var to use "woman" or "konqueror"

* db/diff-to-fp (Mon Mar 10 13:58:26 2008 -0400) 2 commits
+ wt-status.c: no need for dup() dance anymore
+ Write diff output to a file in struct diff_options

* py/submodule (Wed Mar 12 09:30:01 2008 +0100) 6 commits
+ git-submodule summary: fix that some "wc" flavors produce leading spaces
+ git-submodule summary: test
+ git-submodule summary: documentation
+ git-submodule summary: limit summary size
+ git-submodule summary: show commit summary
+ git-submodule summary: code framework

I didn't see anybody very supportive for this series, but I do not think this regresses existing other subcommands to "git submodule", so let's merge this to 'master' before 1.5.5 and see how useful submodule users find this.

----------------------------------------------------------------
[On Hold]

* nd/worktree (Sun Mar 2 17:35:43 2008 +0700) 10 commits
- Additional tests to capture worktree special cases
- Documentation: update api-builtin and api-setup
- Make setup_git_directory() auto-setup worktree if found
- builtin-archive: mark unused prefix "unused_prefix"
- Completely move out worktree setup from setup_git_directory_gently()
- http-push: Avoid calling setup_git_directory() twice
- Make setup_work_tree() return new prefix
- Make get_git_dir() and 'git rev-parse --git-dir' absolute path
- Make sure setup_git_directory is called before accessing repository
- "git read-tree -m" and the like require worktree

Every time we touch work-tree stuff we seem to unstabilize; this round seems more solid but I am still treading cautiously. Not sure if we want this for 1.5.5.

* jc/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits
+ t5300: add test for "index-pack --strict"
+ receive-pack: allow using --strict mode for unpacking objects
+ unpack-objects: fix --strict handling
+ t5300: add test for "unpack-objects --strict"
+ unpack-objects: prevent writing of inconsistent objects

This would re-instate the "unpack-objects --strict" but we probably should not do this before 1.5.5.

* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 2 commits
- diffcore-rename: make file_table available outside exact rename detection
+ Optimize rename detection for a huge diff

* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit
- diff: make --dirstat binary-file safe

* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits
- Teach GIT-VERSION-GEN about the .git file
- Teach git-submodule.sh about the .git file
- Teach resolve_gitlink_ref() about the .git file
- Add platform-independent .git "symlink"

The idea and the implementation seem Ok, but this leaves distinct feeling that it is a solution still waiting for a user (e.g. "git submodule" enhancements to take advantage of this facility to preserve the subrepository while switching between a revision with a submodule and another before the submodule was bound to the superproject).

* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
- Move all dashed-form commands to libexecdir

Scheduled for 1.6.0. I am not sure if we should merge this to 'next' before 1.5.5. Most active people will be on 'next' and if we have this there, the resulting 1.5.5 release might end up having issues that come from differences this one introduces.

* 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.

* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits
- sha1-lookup: make selection of 'middle' less aggressive
- sha1-lookup: more memory efficient search in sorted list of SHA-1

Micro-optimization whose real world benefit is not proven.

* 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 by not using merge-recursive, 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.

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.

Since we tagged -rc0, we've seen regression fixes at a reasonable rate. At -rc1 tonight, I think we are fairly in good shape.

----------------------------------------------------------------
[New Topics]

* fl/send-email-outside (Fri Mar 14 18:29:30 2008 +0100) 4 commits
+ send-email: Don't require to be called in a repository
+ Git.pm: Don't require repository instance for ident
+ Git.pm: Don't require a repository instance for config
+ var: Don't require to be in a git repository.

People couldn't invoke "git send-email" from outside their repositories, but this series allows them to. I do not think it is urgent, though. This does not look risky, even though it touches Git.pm that is shared with other things. This has been cooking in 'next' for some time and we haven't heard about breakages caused by this. Will probably be the first thing to be merged in 'master' post 1.5.5.

* jc/rebase (Sat Mar 15 13:17:42 2008 -0700) 1 commit
+ rebase [--onto O] A B: omit needless checkout

We used to "git checkout B && git rebase A" internally to implement this, which meant the work tree was smudged one time too many. This is probably a safe optimization, but it case after -rc0 and is not really a must-have fix. One of the first after post 1.5.5.

* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits
- Make git-add behave more sensibly in a case-insensitive environment
- When adding files to the index, add support for case-independent matches
- Make unpack-tree update removed files before any updated files
- Make branch merging aware of underlying case-insensitive filsystems
- Add 'core.ignorecase' option
- Make hash_name_lookup able to do case-independent lookups
- Make "index_name_exists()" return the cache_entry it found
- Move name hashing functions into a file of its own
- Make unpack_trees_options bit flags actual bitfields

The beginning of ASCII-only case insensitive filesystem support. It is not complete yet, though. E.g. if you enable core.ignorecase in t0050, the merge test fails.

* gs/pretty-hexval (Fri Mar 21 10:05:06 2008 -0500) 1 commit
+ pretty.c: add %x00 format specifier.

Adds a generic "insert any byte value" to --pretty=format:<> specifier.

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
- "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this, but because I have met no real user with shared repository workflow who complained on this issue, I think this is not urgent.

----------------------------------------------------------------
[Graduated to 'master']

* cc/help (Thu Mar 13 19:15:30 2008 -0700) 6 commits
+ Documentation/git-help: typofix
+ help: warn if specified 'man.viewer' is unsupported, instead of erroring out
+ Documentation: help: explain 'man.viewer' multiple values
+ help: implement multi-valued "man.viewer" config option
+ Documentation: help: describe 'man.viewer' config variable
+ help: add "man.viewer" config var to use "woman" or "konqueror"

There are some leftover bits posted after -rc0, but I think they can wait.

* db/diff-to-fp (Mon Mar 10 13:58:26 2008 -0400) 2 commits
+ wt-status.c: no need for dup() dance anymore
+ Write diff output to a file in struct diff_options

* py/submodule (Wed Mar 12 09:30:01 2008 +0100) 6 commits
+ git-submodule summary: fix that some "wc" flavors produce leading spaces
+ git-submodule summary: test
+ git-submodule summary: documentation
+ git-submodule summary: limit summary size
+ git-submodule summary: show commit summary
+ git-submodule summary: code framework

I didn't see anybody very supportive for this series, but I do not think this regresses existing other subcommands to "git submodule", so let's see how useful submodule users find this. Maybe they have improvement ideas for its output before we decide post 1.5.5 if it is a good idea to include it in "git status" output.

* jc/makefile (Wed Mar 12 01:46:26 2008 -0700) 2 commits
- Makefile: flatten enumeration of headers, objects and programs
- Makefile: DIFF_OBJS is not special at all these days

I promised to do this immediately after -rc0, so this will shortly be in 'next' and then in 'master'.

* jk/portable (Wed Mar 12 17:42:43 2008 -0400) 13 commits
+ t7505: use SHELL_PATH in hook
+ t9112: add missing #!/bin/sh header
+ filter-branch: use $SHELL_PATH instead of 'sh'
+ filter-branch: don't use xargs -0
+ add NO_EXTERNAL_GREP build option
+ t6000lib: tr portability fix
+ t4020: don't use grep -a
+ add test_cmp function for test scripts
+ remove use of "tail -n 1" and "tail -1"
+ grep portability fix: don't use "-e" or "-q"
+ more tr portability test script fixes
+ t0050: perl portability fix
+ tr portability fixes

Initially triggered by Solaris porting effort but these are harmless portability changes. Perhaps in 1.5.5, perhaps immediately after that.

----------------------------------------------------------------
[Dropped]

* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits . tests: convert "cmp" and "cmp -s" to test_cmp . tests: test_cmp helper function

This one may be more elaborate, but Jeff's patch is much simpler.

* nd/worktree (Sun Mar 2 17:35:43 2008 +0700) 10 commits . Additional tests to capture worktree special cases
. Documentation: update api-builtin and api-setup
. Make setup_git_directory() auto-setup worktree if found . builtin-archive: mark unused prefix "unused_prefix" . Completely move out worktree setup from
setup_git_directory_gently()
. http-push: Avoid calling setup_git_directory() twice . Make setup_work_tree() return new prefix
. Make get_git_dir() and 'git rev-parse --git-dir' absolute path . Make sure setup_git_directory is called before accessing
repository
. "git read-tree -m" and the like require worktree

Every time we touch work-tree stuff we seem to have unstabilized things. This is excluded from 'pu' for now although I still have copies.

----------------------------------------------------------------
[On Hold]

* jc/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits
+ t5300: add test for "index-pack --strict"
+ receive-pack: allow using --strict mode for unpacking objects
+ unpack-objects: fix --strict handling
+ t5300: add test for "unpack-objects --strict"
+ unpack-objects: prevent writing of inconsistent objects

This would re-instate the "unpack-objects --strict" but we probably should not do this before 1.5.5.

* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 2 commits
- diffcore-rename: make file_table available outside exact rename detection
+ Optimize rename detection for a huge diff

* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit
- diff: make --dirstat binary-file safe

* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits
- Teach GIT-VERSION-GEN about the .git file
- Teach git-submodule.sh about the .git file
- Teach resolve_gitlink_ref() about the .git file
- Add platform-independent .git "symlink"

The idea and the implementation seem Ok, but this leaves distinct feeling that it is a solution still waiting for a user (e.g. "git submodule" enhancements to take advantage of this facility to preserve the subrepository while switching between a revision with a submodule and another before the submodule was bound to the superproject).

* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
- Move all dashed-form commands to libexecdir

Scheduled for 1.6.0. I am not sure if we should merge this to 'next' before 1.5.5. Most active people will be on 'next' and if we have this there, the resulting 1.5.5 release might end up having issues that come from differences this one introduces.

* 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.

* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits
- sha1-lookup: make selection of 'middle' less aggressive
- sha1-lookup: more memory efficient search in sorted list of SHA-1

Micro-optimization whose real world benefit is not proven.

* 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 by not using merge-recursive, 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.

I don't see your MIME/Content-Type fix in the list (adding the required headers even in presence of user headers). Did I overlook something?

Sam

Samuel Tardieu -- [email protected] -- http://www.rfc1149.net/

Do you mean 6bf4f1b (format-patch: generate MIME header as needed even when there is format.header, 2008-03-14)?

Junio> Do you mean 6bf4f1b (format-patch: generate MIME header as Junio> needed even when there is format.header, 2008-03-14)?

Yup. I hadn't seen it was in master and main already :)

Sam

Samuel Tardieu -- [email protected] -- http://www.rfc1149.net/

I also sent out the following patch that could be put in instead of or in addition to this one. The both solve my problem in different ways.

Thanks,
Govind.

---
From: Govind Salinas <[email protected]>
Date: Sun, 23 Mar 2008 16:02:11 -0500
Subject: [PATCH] log-tree.c: Make log_tree_diff_flush() honor line_termination.

---
 log-tree.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 608f697..5f55683 100644
@@ -338,7 +338,7 @@ int log_tree_diff_flush(struct rev_info *opt)
 			int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
 			if ((pch & opt->diffopt.output_format) == pch)
 				printf("---");
-			putchar('\n');
+			putchar(opt->diffopt.line_termination);
 		}
 	}
 	diff_flush(&opt->diffopt);

1.5.4.4.550.g77e21.dirty

I had an impression that that change would break the existing output that somebody other than you are depending on.

I personally think it is plausible that everybody wants the new behaviour your patch propose, but that kind of change is not appropriate for 1.5.5 cycle (might be Ok for 1.6.0 after we see agreements on the list), and definitely not something we would want to apply after -rc0.

The merge test passes for me (on hfs+). The "git mv" test still fails; Linus made clear that "git mv" is not yet fixed.

Steffen

I was actually talking about the case with your patch applied to t0050 on case sensitive systems.

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.

----------------------------------------------------------------
[New Topics]

* dd/cvsserver (Thu Mar 27 23:18:35 2008 +0100) 7 commits
- cvsserver: Use the user part of the email in log and annotate results
- cvsserver: Add test for update -p
- cvsserver: Implement update -p (print to stdout)
- cvsserver: Add a few tests for 'status' command
- cvsserver: Do not include status output for subdirectories if -l is passed
- cvsserver: Only print the file part of the filename in status header
- cvsserver: Respond to the 'editors' and 'watchers' commands

The changes seem clean and should affect only locking related client commands, so even though this is a new _feature_, I am inclined to merge this in 1.5.5. Testing by interested parties are encouraged.

* mb/prune (Mon Mar 24 23:20:51 2008 -0700) 4 commits
+ builtin-prune: protect objects listed on the command line
+ builtin-prune.c: use parse_options()
+ Add tests for git-prune
+ parse-options.c: introduce OPT_DATE

"git prune $this $that" lost its ability to protect $this and $that from getting pruned when it was rewritten in C; this attempts to resurrect it. This maybe is 1.5.5 material.

* jk/add-i-mode (Thu Mar 27 03:32:25 2008 -0400) 2 commits
+ add--interactive: allow user to choose mode update
+ add--interactive: ignore mode change in 'p'atch command

New feature, will probably be part of the release after 1.5.5

* gp/gitweb (Wed Mar 26 18:11:19 2008 +0000) 1 commit
+ gitweb: fallback to system-wide config file if default config does not exist

New feature, will probably be part of the release after 1.5.5

----------------------------------------------------------------
[On Hold]

* gs/pretty-hexval (Fri Mar 21 10:05:06 2008 -0500) 1 commit
+ pretty.c: add %x00 format specifier.

Adds a generic "insert any byte value" to --pretty=format:<> specifier. New feature, will probably be part of the release after 1.5.5

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
- "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this, but because I have met no real user with shared repository workflow who complained on this issue, I think this is not urgent.

* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits
- tests: convert "cmp" and "cmp -s" to test_cmp
- tests: test_cmp helper function

This one may be more elaborate, but Jeff's patch is much simpler.

* fl/send-email-outside (Fri Mar 14 18:29:30 2008 +0100) 4 commits
+ send-email: Don't require to be called in a repository
+ Git.pm: Don't require repository instance for ident
+ Git.pm: Don't require a repository instance for config
+ var: Don't require to be in a git repository.

People couldn't invoke "git send-email" from outside their repositories, but this series allows them to. I do not think it is urgent, though. This does not look risky, even though it touches Git.pm that is shared with other things. This has been cooking in 'next' for some time and we haven't heard about breakages caused by this. Will probably be the first thing to be merged in 'master' post 1.5.5.

* jc/rebase (Sat Mar 15 13:17:42 2008 -0700) 1 commit
+ rebase [--onto O] A B: omit needless checkout

We used to "git checkout B && git rebase A" internally to implement this, which meant the work tree was smudged one time too many. This is probably a safe optimization, but it case after -rc0 and is not really a must-have fix. One of the first after post 1.5.5.

* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits
- Make git-add behave more sensibly in a case-insensitive environment
- When adding files to the index, add support for case-independent matches
- Make unpack-tree update removed files before any updated files
- Make branch merging aware of underlying case-insensitive filsystems
- Add 'core.ignorecase' option
- Make hash_name_lookup able to do case-independent lookups
- Make "index_name_exists()" return the cache_entry it found
- Move name hashing functions into a file of its own
- Make unpack_trees_options bit flags actual bitfields

The beginning of ASCII-only case insensitive filesystem support.

* jc/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits
+ t5300: add test for "index-pack --strict"
+ receive-pack: allow using --strict mode for unpacking objects
+ unpack-objects: fix --strict handling
+ t5300: add test for "unpack-objects --strict"
+ unpack-objects: prevent writing of inconsistent objects

This would re-instate the "unpack-objects --strict" but we probably should not do this before 1.5.5.

* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 2 commits
- diffcore-rename: make file_table available outside exact rename detection
+ Optimize rename detection for a huge diff

* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit
- diff: make --dirstat binary-file safe

* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits
- Teach GIT-VERSION-GEN about the .git file
- Teach git-submodule.sh about the .git file
- Teach resolve_gitlink_ref() about the .git file
- Add platform-independent .git "symlink"

The idea and the implementation seem Ok, but this leaves distinct feeling that it is a solution still waiting for a user (e.g. "git submodule" enhancements to take advantage of this facility to preserve the subrepository while switching between a revision with a submodule and another before the submodule was bound to the superproject).

* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
- Move all dashed-form commands to libexecdir

Scheduled for 1.6.0. I am not sure if we should merge this to 'next' before 1.5.5. Most active people will be on 'next' and if we have this there, the resulting 1.5.5 release might end up having issues that come from differences this one introduces.

* 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.

* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits
- sha1-lookup: make selection of 'middle' less aggressive
- sha1-lookup: more memory efficient search in sorted list of SHA-1

Micro-optimization whose real world benefit is not proven.

* 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 by not using merge-recursive, 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.

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.

----------------------------------------------------------------
[New Topics]

* bc/mktag (Thu Mar 27 11:16:04 2008 -0500) 1 commit
+ mktag.c: improve verification of tagger field and tests

This is not very urgent but not complex nor risky enough to be worth holding back. Will merge before 1.5.5.

* je/cvsserver (Thu Mar 27 14:02:14 2008 -0700) 1 commit
+ Allow git-cvsserver database table name prefix to be specified.

The changes seem clean; even though this is a new _feature_, I am inclined to merge this in 1.5.5. Testing by interested parties are encouraged.

* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit
- filter-branch.sh: support nearly proper tag name filtering

New feature, will probably be part of the release after 1.5.5

* js/filter-branch (Mon Mar 31 09:14:15 2008 +0200) 2 commits
+ filter-branch: Fix renaming a directory in the tree-filter
+ filter-branch: Test renaming directories in a tree-filter

Fix for 1.5.5; I ran out of time this weekend to merge this.

----------------------------------------------------------------
[Graduated to "master"]

* mb/prune (Mon Mar 24 23:20:51 2008 -0700) 4 commits
+ builtin-prune: protect objects listed on the command line
+ builtin-prune.c: use parse_options()
+ Add tests for git-prune
+ parse-options.c: introduce OPT_DATE

"git prune $this $that" lost its ability to protect $this and $that from getting pruned when it was rewritten in C; this attempts to resurrect it. This maybe is 1.5.5 material.

----------------------------------------------------------------
[Actively cooking]

* dd/cvsserver (Thu Mar 27 23:18:35 2008 +0100) 7 commits
+ cvsserver: Use the user part of the email in log and annotate results
+ cvsserver: Add test for update -p
+ cvsserver: Implement update -p (print to stdout)
+ cvsserver: Add a few tests for 'status' command
+ cvsserver: Do not include status output for subdirectories if -l is passed
+ cvsserver: Only print the file part of the filename in status header
+ cvsserver: Respond to the 'editors' and 'watchers' commands

The changes seem clean and should affect only locking related client commands, so even though this is a new _feature_, I am inclined to merge this in 1.5.5. Testing by interested parties are encouraged.

* pb/cvsserver (Sun Mar 16 20:00:21 2008 +0100) 1 commit
+ git-cvsserver: handle change type T

This should be 1.5.5 material.

----------------------------------------------------------------
[On Hold]

* jk/add-i-mode (Thu Mar 27 03:32:25 2008 -0400) 2 commits
+ add--interactive: allow user to choose mode update
+ add--interactive: ignore mode change in 'p'atch command

New feature, will probably be part of the release after 1.5.5

* gp/gitweb (Wed Mar 26 18:11:19 2008 +0000) 1 commit
+ gitweb: fallback to system-wide config file if default config does not exist

New feature, will probably be part of the release after 1.5.5

* gs/pretty-hexval (Fri Mar 21 10:05:06 2008 -0500) 1 commit
+ pretty.c: add %x00 format specifier.

Adds a generic "insert any byte value" to --pretty=format:<> specifier. New feature, will probably be part of the release after 1.5.5

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
- "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this, but because I have met no real user with shared repository workflow who complained on this issue, I think this is not urgent.

* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits
- tests: convert "cmp" and "cmp -s" to test_cmp
- tests: test_cmp helper function

This one may be more elaborate, but Jeff's patch is much simpler.

* fl/send-email-outside (Fri Mar 14 18:29:30 2008 +0100) 4 commits
+ send-email: Don't require to be called in a repository
+ Git.pm: Don't require repository instance for ident
+ Git.pm: Don't require a repository instance for config
+ var: Don't require to be in a git repository.

People couldn't invoke "git send-email" from outside their repositories, but this series allows them to. I do not think it is urgent, though. This does not look risky, even though it touches Git.pm that is shared with other things. This has been cooking in 'next' for some time and we haven't heard about breakages caused by this. Will probably be the first thing to be merged in 'master' post 1.5.5.

* jc/rebase (Sat Mar 15 13:17:42 2008 -0700) 1 commit
+ rebase [--onto O] A B: omit needless checkout

We used to "git checkout B && git rebase A" internally to implement this, which meant the work tree was smudged one time too many. This is probably a safe optimization, but it case after -rc0 and is not really a must-have fix. One of the first after post 1.5.5.

* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits
- Make git-add behave more sensibly in a case-insensitive environment
- When adding files to the index, add support for case-independent matches
- Make unpack-tree update removed files before any updated files
- Make branch merging aware of underlying case-insensitive filsystems
- Add 'core.ignorecase' option
- Make hash_name_lookup able to do case-independent lookups
- Make "index_name_exists()" return the cache_entry it found
- Move name hashing functions into a file of its own
- Make unpack_trees_options bit flags actual bitfields

The beginning of ASCII-only case insensitive filesystem support.

* jc/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits
+ t5300: add test for "index-pack --strict"
+ receive-pack: allow using --strict mode for unpacking objects
+ unpack-objects: fix --strict handling
+ t5300: add test for "unpack-objects --strict"
+ unpack-objects: prevent writing of inconsistent objects

This would re-instate the "unpack-objects --strict" but we probably should not do this before 1.5.5.

* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 2 commits
- diffcore-rename: make file_table available outside exact rename detection
+ Optimize rename detection for a huge diff

* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit
- diff: make --dirstat binary-file safe

* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits
- Teach GIT-VERSION-GEN about the .git file
- Teach git-submodule.sh about the .git file
- Teach resolve_gitlink_ref() about the .git file
- Add platform-independent .git "symlink"

The idea and the implementation seem Ok, but this leaves distinct feeling that it is a solution still waiting for a user (e.g. "git submodule" enhancements to take advantage of this facility to preserve the subrepository while switching between a revision with a submodule and another before the submodule was bound to the superproject).

* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
- Move all dashed-form commands to libexecdir

Scheduled for 1.6.0. I am not sure if we should merge this to 'next' before 1.5.5. Most active people will be on 'next' and if we have this there, the resulting 1.5.5 release might end up having issues that come from differences this one introduces.

* 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.

* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits
- sha1-lookup: make selection of 'middle' less aggressive
- sha1-lookup: more memory efficient search in sorted list of SHA-1

Micro-optimization whose real world benefit is not proven.

* 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 by not using merge-recursive, 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.

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.

With a handful topics graduated to "master", we hopefully will have the final 1.5.5 soon.

----------------------------------------------------------------
[New Topics]

* mv/defer-gc (Wed Apr 2 21:35:11 2008 +0200) 3 commits
- contrib/hooks: add an example pre-auto-gc hook
- Documentation/hooks: add pre-auto-gc hook
- git-gc --auto: add pre-auto-gc hook

A new hook to stop "git gc --auto" from running.

* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit
- filter-branch.sh: support nearly proper tag name filtering

New feature, will probably be part of the release after 1.5.5

----------------------------------------------------------------
[Graduated to "master"]

* bc/mktag (Thu Mar 27 11:16:04 2008 -0500) 1 commit
+ mktag.c: improve verification of tagger field and tests

* je/cvsserver (Thu Mar 27 14:02:14 2008 -0700) 1 commit
+ Allow git-cvsserver database table name prefix to be specified.

* dd/cvsserver (Thu Mar 27 23:18:35 2008 +0100) 7 commits
+ cvsserver: Use the user part of the email in log and annotate results
+ cvsserver: Add test for update -p
+ cvsserver: Implement update -p (print to stdout)
+ cvsserver: Add a few tests for 'status' command
+ cvsserver: Do not include status output for subdirectories if -l is passed
+ cvsserver: Only print the file part of the filename in status header
+ cvsserver: Respond to the 'editors' and 'watchers' commands

* pb/cvsserver (Sun Mar 16 20:00:21 2008 +0100) 1 commit
+ git-cvsserver: handle change type T

* js/filter-branch (Mon Mar 31 09:14:15 2008 +0200) 2 commits
+ filter-branch: Fix renaming a directory in the tree-filter
+ filter-branch: Test renaming directories in a tree-filter

----------------------------------------------------------------
[On Hold]

* jk/add-i-mode (Thu Mar 27 03:32:25 2008 -0400) 2 commits
+ add--interactive: allow user to choose mode update
+ add--interactive: ignore mode change in 'p'atch command

New feature, will probably be part of the release after 1.5.5

* gp/gitweb (Wed Mar 26 18:11:19 2008 +0000) 1 commit
+ gitweb: fallback to system-wide config file if default config does not exist

New feature, will probably be part of the release after 1.5.5

* gs/pretty-hexval (Fri Mar 21 10:05:06 2008 -0500) 1 commit
+ pretty.c: add %x00 format specifier.

Adds a generic "insert any byte value" to --pretty=format:<> specifier. New feature, will probably be part of the release after 1.5.5

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
- "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this, but because I have met no real user with shared repository workflow who complained on this issue, I think this is not urgent.

* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits
- tests: convert "cmp" and "cmp -s" to test_cmp
- tests: test_cmp helper function

This one may be more elaborate, but Jeff's patch is much simpler.

* fl/send-email-outside (Fri Mar 14 18:29:30 2008 +0100) 4 commits
+ send-email: Don't require to be called in a repository
+ Git.pm: Don't require repository instance for ident
+ Git.pm: Don't require a repository instance for config
+ var: Don't require to be in a git repository.

People couldn't invoke "git send-email" from outside their repositories, but this series allows them to. I do not think it is urgent, though. This does not look risky, even though it touches Git.pm that is shared with other things. This has been cooking in 'next' for some time and we haven't heard about breakages caused by this. Will probably be the first thing to be merged in 'master' post 1.5.5.

* jc/rebase (Sat Mar 15 13:17:42 2008 -0700) 1 commit
+ rebase [--onto O] A B: omit needless checkout

We used to "git checkout B && git rebase A" internally to implement this, which meant the work tree was smudged one time too many. This is probably a safe optimization, but it case after -rc0 and is not really a must-have fix. One of the first after post 1.5.5.

* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits
- Make git-add behave more sensibly in a case-insensitive environment
- When adding files to the index, add support for case-independent matches
- Make unpack-tree update removed files before any updated files
- Make branch merging aware of underlying case-insensitive filsystems
- Add 'core.ignorecase' option
- Make hash_name_lookup able to do case-independent lookups
- Make "index_name_exists()" return the cache_entry it found
- Move name hashing functions into a file of its own
- Make unpack_trees_options bit flags actual bitfields

The beginning of ASCII-only case insensitive filesystem support.

* jc/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits
+ t5300: add test for "index-pack --strict"
+ receive-pack: allow using --strict mode for unpacking objects
+ unpack-objects: fix --strict handling
+ t5300: add test for "unpack-objects --strict"
+ unpack-objects: prevent writing of inconsistent objects

This would re-instate the "unpack-objects --strict" but we probably should not do this before 1.5.5.

* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 2 commits
- diffcore-rename: make file_table available outside exact rename detection
+ Optimize rename detection for a huge diff

* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit
- diff: make --dirstat binary-file safe

* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits
- Teach GIT-VERSION-GEN about the .git file
- Teach git-submodule.sh about the .git file
- Teach resolve_gitlink_ref() about the .git file
- Add platform-independent .git "symlink"

The idea and the implementation seem Ok, but this leaves distinct feeling that it is a solution still waiting for a user (e.g. "git submodule" enhancements to take advantage of this facility to preserve the subrepository while switching between a revision with a submodule and another before the submodule was bound to the superproject).

* 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.

* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits
- sha1-lookup: make selection of 'middle' less aggressive
- sha1-lookup: more memory efficient search in sorted list of SHA-1

Micro-optimization whose real world benefit is not proven.

* 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 by not using merge-recursive, 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.

What happened to builtin-clone? I know I just threw it over the fence, but Daniel picked it up and got it a lot closer to working? Did it fall through the cracks or is it just 1.5.6 material?

Kristian

Nothing.

If I recall correctly, "a lot closer to working" happened way after 1.5.5 merge window closed, so it definitely is not 1.5.5 material.

Judging from the fact that we recently had to deal with the fallouts of C rewrites that happened during the 1.5.4 timeframe, I would have to say that any C rewrite of a substantial and important program needs to be cooked at least for one (or preferably two cycles, especially we are trying to have shorter cycles) in 'next'.

So at this point, I optimistically say that it has a good chance of being deeply in 'next' and all the active git people would hopefully be using it, by the time 1.5.6 (or perhaps that is named 1.6.0, depending on what else we will do) ships, but I cannot say much more than that. It very much depends on how hard the code has been scrutinized already at this point; I haven't personally looked at it in any serious depth yet.

Hi,

That would mean that you'd have to merge it into 'next'. And rather sooner than later, since everything else would lead to a dragging out of the timeline.

As it happens, until you called out the 'please test master' phase, I was running with builtin clone, and did not find it lacking. Although I have to admit that I have some cleanups, and I haven't merged with Daniel in a long time. And I do not do anything particularly fancy, such as shallow clone or shared clone.

Ciao,
Dscho "who hopes that the please-test-master phase is over soon"

Yes, which means somebody needs to present a mergeable history rather sooner than later, and that somebody does not have to be me ;-)

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.

Caution. "next" has been rebuilt with the remaining topics on top of "master". "maint" is still for 1.5.4.X maintenance track for tonight.

A rough timeline from now on.

* Brown paper back fixes, if any, for 1.5.5.1 (2008-04-16).

* Discussion and review on new feature and enhancement patch series begins. Please resubmit things that you were cooking in your head during 1.5.5-rc period after cleaning up and retesting.

* 1.5.6 merge window closes (2008-05-14).

* Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21).

* 1.5.6 Final (2008-06-08).

----------------------------------------------------------------
[New Topics]

* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 6 commits
- merge: remove deprecated summary and diffstat options and config variables
- merge, pull: add '--(no-)log' command line option
- fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
- add 'merge.stat' config variable
- merge, pull: introduce '--(no-)stat' option
- doc: moved merge.* config variables into separate merge-config.txt

I tried to fix its too-eager deprecation. The last one needs re-review; it should remove "these are still supported but will be removed" comments that earlier ones add, and must be held back until 1.6.0 or later.

* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits
- 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 reverse blame I talked about earlier.

* jc/lstat (Sun Mar 30 12:39:25 2008 -0700) 3 commits
- diff-files: mark an index entry we know is up-to-date as such
- write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATE
- lstat: introduce a wrapper xlstat

Further reduce redundant lstat(2) calls during "git status" and other common operations.

----------------------------------------------------------------
[Graduated to "master"]

* jc/rebase (Sat Mar 15 13:17:42 2008 -0700) 1 commit
+ rebase [--onto O] A B: omit needless checkout

We used to "git checkout B && git rebase A" internally to implement this, which meant the work tree was smudged one time too many.

* gs/pretty-hexval (Fri Mar 21 10:05:06 2008 -0500) 1 commit
+ pretty.c: add %x00 format specifier.

Adds a generic "insert any byte value" to --pretty=format:<> specifier.

* jk/add-i-mode (Thu Mar 27 03:32:25 2008 -0400) 2 commits
+ add--interactive: allow user to choose mode update
+ add--interactive: ignore mode change in 'p'atch command

Allows mode change "pseudo hunk" to be staged separately.

NOTE NOTE NOTE! It might be interesting to extend the idea of this patch to treat "new file" as a pseudo hunk to record the much talked about "intent to add". That is, add a new command (or a new submode to patch subcommand) that lets you add a file that is so far untracked, but only with its mode and e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 which is the blob object name for an _empty_ blob. After such an operation is done, "git diff" will show the new contents of the file you build in your work tree that you _could_ commit with "git commit -a".

* fl/send-email-outside (Fri Mar 14 18:29:30 2008 +0100) 4 commits
+ send-email: Don't require to be called in a repository
+ Git.pm: Don't require repository instance for ident
+ Git.pm: Don't require a repository instance for config
+ var: Don't require to be in a git repository.

People couldn't invoke "git send-email" from outside their repositories, but this series allows them to.

* mk/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits
+ t5300: add test for "index-pack --strict"
+ receive-pack: allow using --strict mode for unpacking objects
+ unpack-objects: fix --strict handling
+ t5300: add test for "unpack-objects --strict"
+ unpack-objects: prevent writing of inconsistent objects

This would re-instate the "unpack-objects --strict".

* gp/gitweb (Sat Apr 5 16:37:18 2008 +0000) 2 commits
+ gitweb: fallback to system-wide config file (fixup)
+ gitweb: fallback to system-wide config file if default config does not exist

* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 1 commit
+ Optimize rename detection for a huge diff

This makes memory consumption of the rename detection operation for a huge diff (that is, a change that touches many many files). I've been running with this for quite a while in my day-job repository without adverse effects.

----------------------------------------------------------------
[Actively Cooking]

* mv/defer-gc (Wed Apr 2 21:35:11 2008 +0200) 3 commits
+ contrib/hooks: add an example pre-auto-gc hook
+ Documentation/hooks: add pre-auto-gc hook
+ git-gc --auto: add pre-auto-gc hook

A new hook to stop "git gc --auto" from running.

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this. There recently was a problem report that had a scent of this issue which turned out to be a false alarm (it was about http-push which does not do the native pack protocol optimization and the reporter was pushing into an empty repository which needs full transfer anyway).

* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit
+ diff: make --dirstat binary-file safe

The current "dirstat" does totally wrong thing when the set of files changed includes a binary one. This uses the same similarity evaluation code as rename heuristics uses to treat text and binary the same way.

* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits
+ Make git-add behave more sensibly in a case-insensitive environment
+ When adding files to the index, add support for case-independent matches
+ Make unpack-tree update removed files before any updated files
+ Make branch merging aware of underlying case-insensitive filsystems
+ Add 'core.ignorecase' option
+ Make hash_name_lookup able to do case-independent lookups
+ Make "index_name_exists()" return the cache_entry it found
+ Move name hashing functions into a file of its own
+ Make unpack_trees_options bit flags actual bitfields

The beginning of case insensitive filesystem support, currently ASCII-only.

* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits
+ Teach GIT-VERSION-GEN about the .git file
+ Teach git-submodule.sh about the .git file
+ Teach resolve_gitlink_ref() about the .git file
+ Add platform-independent .git "symlink"

The idea and the implementation seem Ok, but this leaves distinct feeling that it is a solution still waiting for a user (e.g. "git submodule" enhancements to take advantage of this facility to preserve the subrepository while switching between a revision with a submodule and another before the submodule was bound to the superproject).

* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits
+ sha1-lookup: make selection of 'middle' less aggressive
+ sha1-lookup: more memory efficient search in sorted list of SHA-1

Micro-optimization whose real world benefit is not proven, so let's prove it or revert it by giving it a bit more exposure.

----------------------------------------------------------------
[On Hold]

Some of these will start moving to "next", some I may have to ask for clean-up and resubmission for further discussion. Also the topics raised during the 1.5.5-rc freeze period should be rebased, cleaned-up and resubmit for discussion and review for inclusion in 1.5.6.

* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit
- filter-branch.sh: support nearly proper tag name filtering

Instead of discarding signed tags, this demotes them to simply annotated, which is technically not that different from signed tags.

* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits
- tests: convert "cmp" and "cmp -s" to test_cmp
- tests: test_cmp helper function

This one may be more elaborate, but Jeff's patch is much simpler.

* jc/rename-file-table (Fri Mar 7 14:03:19 2008 -0800) 1 commit
- diffcore-rename: make file_table available outside exact rename detection

* 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.

* 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 by not using merge-recursive, 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.

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.

Caution. "next" has been rebuilt with the remaining topics on top of "master".

A rough timeline from now on.

* Brown paper back fixes, if any, for 1.5.5.1 (2008-04-16).

* Discussion and review on new feature and enhancement patch series begins. Please resubmit things that you were cooking in your head during 1.5.5-rc period after cleaning up and retesting.

* 1.5.6 merge window closes (2008-05-14).

* Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21).

* 1.5.6 Final (2008-06-08).

----------------------------------------------------------------
[New Topics]

* mk/color (Wed Apr 9 21:32:06 2008 +0200) 1 commit
+ Use color.ui variable in scripts too

* jk/remote-default-show (Wed Apr 9 11:15:51 2008 -0400) 1 commit
+ git-remote: show all remotes with "git remote show"

* jc/terminator-separator (Mon Apr 7 17:11:34 2008 -0700) 1 commit
+ log: teach "terminator" vs "separator" mode to "--pretty=format"

* js/decorate (Mon Apr 7 14:41:12 2008 +0100) 2 commits
- pretty=format: Add %d to show decoration
- decorate: use "const struct object"

* jk/fetch-status (Wed Apr 9 20:11:52 2008 -0400) 1 commit
+ git-fetch: always show status of non-tracking-ref fetches

* py/submodule (Sat Apr 12 23:05:33 2008 +0800) 3 commits
+ builtin-status: Add tests for submodule summary
+ builtin-status: submodule summary support
+ git-submodule summary: --for-status option

----------------------------------------------------------------
[Graduated to "master"]

----------------------------------------------------------------
[Actively Cooking]

* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 6 commits
- merge: remove deprecated summary and diffstat options and config variables
+ merge, pull: add '--(no-)log' command line option
+ fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
+ add 'merge.stat' config variable
+ merge, pull: introduce '--(no-)stat' option
+ doc: moved merge.* config variables into separate merge-config.txt

I fixed its too-eager deprecation. The last one needs to be held back, as it actually removes the support for features that the main part of the series deprecates, until 1.6.0 or later.

* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits
+ 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.

* jc/lstat (Sun Mar 30 12:39:25 2008 -0700) 2 commits
+ diff-files: mark an index entry we know is up-to-date as such
+ write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATE

Further reduce redundant lstat(2) calls during "git status" and other common operations.

* mv/defer-gc (Wed Apr 2 21:35:11 2008 +0200) 3 commits
+ contrib/hooks: add an example pre-auto-gc hook
+ Documentation/hooks: add pre-auto-gc hook
+ git-gc --auto: add pre-auto-gc hook

A new hook to stop "git gc --auto" from running.

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this. There recently was a problem report that had a scent of this issue which turned out to be a false alarm (it was about http-push which does not do the native pack protocol optimization and the reporter was pushing into an empty repository which needs full transfer anyway).

* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit
+ diff: make --dirstat binary-file safe

The current "dirstat" does totally wrong thing when the set of files changed includes a binary one. This uses the same similarity evaluation code as rename heuristics uses to treat text and binary the same way.

* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits
+ Make git-add behave more sensibly in a case-insensitive environment
+ When adding files to the index, add support for case-independent matches
+ Make unpack-tree update removed files before any updated files
+ Make branch merging aware of underlying case-insensitive filsystems
+ Add 'core.ignorecase' option
+ Make hash_name_lookup able to do case-independent lookups
+ Make "index_name_exists()" return the cache_entry it found
+ Move name hashing functions into a file of its own
+ Make unpack_trees_options bit flags actual bitfields

The beginning of case insensitive filesystem support, currently ASCII-only.

* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits
+ Teach GIT-VERSION-GEN about the .git file
+ Teach git-submodule.sh about the .git file
+ Teach resolve_gitlink_ref() about the .git file
+ Add platform-independent .git "symlink"

The idea and the implementation seem Ok, but this leaves distinct feeling that it is a solution still waiting for a user (e.g. "git submodule" enhancements to take advantage of this facility to preserve the subrepository while switching between a revision with a submodule and another before the submodule was bound to the superproject).

* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits
+ sha1-lookup: make selection of 'middle' less aggressive
+ sha1-lookup: more memory efficient search in sorted list of SHA-1

Micro-optimization whose real world benefit is not proven, so let's prove it or revert it by giving it a bit more exposure.

----------------------------------------------------------------
[On Hold]

* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit
- filter-branch.sh: support nearly proper tag name filtering

Instead of discarding signed tags, this demotes them to simply annotated, which is technically not that different from signed tags.

* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits
- tests: convert "cmp" and "cmp -s" to test_cmp
- tests: test_cmp helper function

This one may be more elaborate, but Jeff's patch is much simpler.

* jc/rename-file-table (Fri Mar 7 14:03:19 2008 -0800) 1 commit
- diffcore-rename: make file_table available outside exact rename detection

* 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.

* 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 by not using merge-recursive, but unfortunately has stalled for some time now.

* jc/lstat-debug (Thu Mar 27 16:56:53 2008 -0700) 3 commits
- lstat: introduce a wrapper xlstat

* 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.

I have been out of touch for a few days. My plan had been to come back with a new version that suppressed the status on pull, but I haven't seen anyone screaming about the change, so maybe it should just be left.

-Peff

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.

Caution. "next" has been rebuilt with the remaining topics on top of "master".

A rough timeline from now on.

* 1.5.5.1 this Sunday, with what's in 'maint' tonight.

* Discussion and review on new feature and enhancement patch series begins. Please resubmit things that you were cooking in your head during 1.5.5-rc period after cleaning up and retesting.

* 1.5.6 merge window closes (2008-05-14).

* Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21).

* 1.5.6 Final (2008-06-08).

----------------------------------------------------------------
[New Topics]

* ho/shared (Wed Apr 16 11:34:24 2008 +0300) 1 commit
+ Make core.sharedRepository more generic

Looked Ok, and will start cooking soon.

* pb/remote-mirror-config (Thu Apr 17 13:17:20 2008 +0200) 1 commit
- Add a remote.*.mirror configuration option

I haven't gave this very careful review yet.

* ap/svn (Tue Apr 15 21:04:18 2008 -0400) 3 commits
- git-svn: add documentation for --add-author-from option.
- git-svn: Add --add-author-from option.
- git-svn: add documentation for --use-log-author option.

Eric requested a new set of tests for this series.

* lh/branch-merged (Fri Apr 18 18:30:15 2008 +0200) 3 commits
- Add tests for branch --[no-]merged
- git-branch.txt: compare --contains, --merged and --no-merged
- git-branch: add support for --merged and --no-merged

Looked Ok, and will start cooking soon.

* py/submodule-2 (Wed Apr 16 22:19:31 2008 +0800) 1 commit
- git-submodule: Extract functions module_info and module_url

I am a bit slow reviewing this series; only managed to queue the first one so far.

----------------------------------------------------------------
[Graduated to "master"]

----------------------------------------------------------------
[Actively Cooking]

* mk/color (Wed Apr 9 21:32:06 2008 +0200) 1 commit
+ Use color.ui variable in scripts too

* jk/remote-default-show (Wed Apr 9 11:15:51 2008 -0400) 1 commit
+ git-remote: show all remotes with "git remote show"

* jc/terminator-separator (Mon Apr 7 17:11:34 2008 -0700) 1 commit
+ log: teach "terminator" vs "separator" mode to "--pretty=format"

* jk/fetch-status (Wed Apr 9 20:11:52 2008 -0400) 1 commit
+ git-fetch: always show status of non-tracking-ref fetches

* py/submodule (Sat Apr 12 23:05:33 2008 +0800) 3 commits
+ builtin-status: Add tests for submodule summary
+ builtin-status: submodule summary support
+ git-submodule summary: --for-status option

* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 6 commits
- merge: remove deprecated summary and diffstat options and config variables
+ merge, pull: add '--(no-)log' command line option
+ fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
+ add 'merge.stat' config variable
+ merge, pull: introduce '--(no-)stat' option
+ doc: moved merge.* config variables into separate merge-config.txt

I fixed its too-eager deprecation. The last one needs to be held back, as it actually removes the support for features that the main part of the series deprecates, until 1.6.0 or later.

* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits
+ 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.

* jc/lstat (Sun Mar 30 12:39:25 2008 -0700) 2 commits
+ diff-files: mark an index entry we know is up-to-date as such
+ write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATE

Further reduce redundant lstat(2) calls during "git status" and other common operations.

* mv/defer-gc (Wed Apr 2 21:35:11 2008 +0200) 3 commits
+ contrib/hooks: add an example pre-auto-gc hook
+ Documentation/hooks: add pre-auto-gc hook
+ git-gc --auto: add pre-auto-gc hook

A new hook to stop "git gc --auto" from running.

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this. There recently was a problem report that had a scent of this issue which turned out to be a false alarm (it was about http-push which does not do the native pack protocol optimization and the reporter was pushing into an empty repository which needs full transfer anyway).

* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit
+ diff: make --dirstat binary-file safe

The current "dirstat" does totally wrong thing when the set of files changed includes a binary one. This uses the same similarity evaluation code as rename heuristics uses to treat text and binary the same way.

* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits
+ Make git-add behave more sensibly in a case-insensitive environment
+ When adding files to the index, add support for case-independent matches
+ Make unpack-tree update removed files before any updated files
+ Make branch merging aware of underlying case-insensitive filsystems
+ Add 'core.ignorecase' option
+ Make hash_name_lookup able to do case-independent lookups
+ Make "index_name_exists()" return the cache_entry it found
+ Move name hashing functions into a file of its own
+ Make unpack_trees_options bit flags actual bitfields

The beginning of case insensitive filesystem support, currently ASCII-only.

* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits
+ Teach GIT-VERSION-GEN about the .git file
+ Teach git-submodule.sh about the .git file
+ Teach resolve_gitlink_ref() about the .git file
+ Add platform-independent .git "symlink"

The idea and the implementation seem Ok, but this leaves distinct feeling that it is a solution still waiting for a user (e.g. "git submodule" enhancements to take advantage of this facility to preserve the subrepository while switching between a revision with a submodule and another before the submodule was bound to the superproject).

* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits
+ sha1-lookup: make selection of 'middle' less aggressive
+ sha1-lookup: more memory efficient search in sorted list of SHA-1

Micro-optimization whose real world benefit is not proven, so let's prove it or revert it by giving it a bit more exposure.

----------------------------------------------------------------
[On Hold]

* js/decorate (Mon Apr 7 14:41:12 2008 +0100) 2 commits
- pretty=format: Add %d to show decoration
- decorate: use "const struct object"

This has stalled, after a petered-out discussion.

* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit
- filter-branch.sh: support nearly proper tag name filtering

Instead of discarding signed tags, this demotes them to simply annotated, which is technically not that different from signed tags. There was an objection if what this claims to do is the right thing to do to begin with. Also I haven't verified if it does what it claims to do.

Comments?

* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits
- tests: convert "cmp" and "cmp -s" to test_cmp
- tests: test_cmp helper function

This one may be more elaborate, but Jeff's patch is much simpler.

* jc/rename-file-table (Fri Mar 7 14:03:19 2008 -0800) 1 commit
- diffcore-rename: make file_table available outside exact rename detection

* 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.

* 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 by not using merge-recursive, but unfortunately has stalled for some time now.

* jc/lstat-debug (Thu Mar 27 16:56:53 2008 -0700) 3 commits
- lstat: introduce a wrapper xlstat

* 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.

I notice that you moved the test script into t3201 while still adding t3202, which probably wasn't your intent.

Would you like me to resend the patches with your fixups to tests and docs (and maybe even squash them into a single patch)?

--
larsh

Thanks, but it's easy enough for me to amend the tip of lh/branch-merged to drop t3202 and that should be sufficient.

Hi,

I am not personally interested, but I thought that it was easy enough to do. So let's just scrap it, the mailing list has it should anybody need it in the future.

Ciao,
Dscho

I just want to point out that this patch is not exclusively about signed tags.

The patch is about retaining annotated tags rather than demoting them to light-weight tag references as is done currently for _all_ annotated tags, signed and unsigned. When rewriting signed tags, the signature is stripped so that we don't write a tag with a bogus signature.

-brandon

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'.

Note.

Some commits on 'pu' have [comment] in front of their title, primarily to remind myself not to accidentally merge them to 'next' before issues are resolved. They will be amended either by replacement patch from the author, or when the issue raised on the list gets refuted convincingly enough to justify the original patch (in which case only the comment like "[questionable???]" will be removed without changing the tree of the commit).

The topics list the commits in reverse chronological order.

A rough timeline from now on.

* Discussion and review on new feature and enhancement patch series begins. Please resubmit things that you were cooking in your head during 1.5.5-rc period after cleaning up and retesting.

* 1.5.6 merge window closes (2008-05-14).

* Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21).

* 1.5.6 Final (2008-06-08).

----------------------------------------------------------------
[New Topics]

* js/rebase-i-sequencer (Mon Apr 14 02:21:09 2008 +0200) 13 commits
+ 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

This may complement the proposed "sequencer" GSoC project.

* db/clone-in-c (Thu Apr 17 19:32:43 2008 -0400) 8 commits
- [mess] Build in clone
- [strdup() and other clean-ups needed] Provide API access to init_db()
- [waiting for response] Add a function to set a non-default work tree
- Allow for having for_each_ref() list extra refs
- Have a constant extern refspec for "--tags"
- Add a library function to add an alternate to the alternates file
- Add a lockfile function to append to a file
- Mark the list of refs to fetch as const

----------------------------------------------------------------
[Graduated to "master"]

* mk/color (Wed Apr 9 21:32:06 2008 +0200) 1 commit
+ Use color.ui variable in scripts too

* jk/remote-default-show (Wed Apr 9 11:15:51 2008 -0400) 1 commit
+ git-remote: show all remotes with "git remote show"

* jc/terminator-separator (Mon Apr 7 17:11:34 2008 -0700) 1 commit
+ log: teach "terminator" vs "separator" mode to "--pretty=format"

* py/submodule (Sat Apr 12 23:05:33 2008 +0800) 3 commits
+ builtin-status: Add tests for submodule summary
+ builtin-status: submodule summary support
+ git-submodule summary: --for-status option

* mv/defer-gc (Wed Apr 2 21:35:11 2008 +0200) 3 commits
+ contrib/hooks: add an example pre-auto-gc hook
+ Documentation/hooks: add pre-auto-gc hook
+ git-gc --auto: add pre-auto-gc hook

A new hook to stop "git gc --auto" from running.

* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit
+ diff: make --dirstat binary-file safe

The current "dirstat" does totally wrong thing when the set of files changed includes a binary one. This uses the same similarity evaluation code as rename heuristics uses to treat text and binary the same way.

* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits
+ sha1-lookup: make selection of 'middle' less aggressive
+ sha1-lookup: more memory efficient search in sorted list of SHA-1

Micro-optimization whose real world benefit is not proven, so let's prove it or revert it by giving it a bit more exposure.

----------------------------------------------------------------
[Actively Cooking]

* pb/remote-mirror-config (Thu Apr 17 13:17:20 2008 +0200) 1 commit
+ Add a remote.*.mirror configuration option

* ho/shared (Wed Apr 16 11:34:24 2008 +0300) 1 commit
+ Make core.sharedRepository more generic

* lh/branch-merged (Fri Apr 18 18:30:15 2008 +0200) 3 commits
+ Add tests for branch --[no-]merged
+ git-branch.txt: compare --contains, --merged and --no-merged
+ git-branch: add support for --merged and --no-merged

* jk/fetch-status (Wed Apr 9 20:11:52 2008 -0400) 1 commit
+ git-fetch: always show status of non-tracking-ref fetches

This changes reporting behaviour of one-shot "git pull $url $branch", which would affect long-time users in integrator role (that's you, Linus ;-). Let's see if we hear anybody screaming.

* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 6 commits
- merge: remove deprecated summary and diffstat options and config variables
+ merge, pull: add '--(no-)log' command line option
+ fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
+ add 'merge.stat' config variable
+ merge, pull: introduce '--(no-)stat' option
+ doc: moved merge.* config variables into separate merge-config.txt

The last one needs to be held back, as it actually removes the support for features that the main part of the series deprecates, until 1.6.0 or later.

* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits
+ 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.

* jc/lstat (Sun Mar 30 12:39:25 2008 -0700) 2 commits
+ diff-files: mark an index entry we know is up-to-date as such
+ write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATE

Further reduce redundant lstat(2) calls during "git status" and other common operations.

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this. There recently was a problem report that had a scent of this issue which turned out to be a false alarm (it was about http-push which does not do the native pack protocol optimization and the reporter was pushing into an empty repository which needs full transfer anyway).

* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits
+ Make git-add behave more sensibly in a case-insensitive environment
+ When adding files to the index, add support for case-independent matches
+ Make unpack-tree update removed files before any updated files
+ Make branch merging aware of underlying case-insensitive filsystems
+ Add 'core.ignorecase' option
+ Make hash_name_lookup able to do case-independent lookups
+ Make "index_name_exists()" return the cache_entry it found
+ Move name hashing functions into a file of its own
+ Make unpack_trees_options bit flags actual bitfields

The beginning of case insensitive filesystem support, currently ASCII-only.

* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits
+ Teach GIT-VERSION-GEN about the .git file
+ Teach git-submodule.sh about the .git file
+ Teach resolve_gitlink_ref() about the .git file
+ Add platform-independent .git "symlink"

There was a GSoC project idea to enhance "git submodule" to take advantage of this facility to preserve the subrepository while switching between a revision with a submodule and another before the submodule was bound to the superproject, but it appears nobody took it.

* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit
+ filter-branch.sh: support nearly proper tag name filtering

Instead of discarding annotated and/or signed tags, this keeps them and demotes the signed ones to simply annotated. It issues warning when it does this demotion. I think the behaviour is sensible.

----------------------------------------------------------------
[Dropped]

* js/decorate (Mon Apr 7 14:41:12 2008 +0100) 2 commits . pretty=format: Add %d to show decoration
. decorate: use "const struct object"

Per author's lack of interest

----------------------------------------------------------------
[On Hold]

* ap/svn (Tue Apr 15 21:04:18 2008 -0400) 3 commits
- git-svn: add documentation for --add-author-from option.
- git-svn: Add --add-author-from option.
- git-svn: add documentation for --use-log-author option.

Eric requested a new set of tests for this series.

* py/submodule-2 (Wed Apr 16 22:19:31 2008 +0800) 1 commit
- git-submodule: Extract functions module_info and module_url

I only managed to queue the first one so far.

It does not help motivating me reviewing the series that the overall tone of it is to ignore .git/config more and make .gitmodules take more active role, either. I have already said number of times why that is not a good idea and why it is against the overall submodule design.

* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits
- tests: convert "cmp" and "cmp -s" to test_cmp
- tests: test_cmp helper function

This one may be more elaborate, but Jeff's patch is much simpler.

* 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.

* 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 by not using merge-recursive, but unfortunately has stalled for some time now.

* jc/lstat-debug (Thu Mar 27 16:56:53 2008 -0700) 1 commit
- lstat: introduce a wrapper xlstat

* 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.

About "git gc --auto", there was a patch sometime ago:

[PATCH] commit: resurrect "gc --auto" at the end

http://marc.info/?l=git&m=120716427130606&w=2

Was it dropped?

In the thread, addition of an extra hook to "gc --auto" wasdiscussed. It was judged conditionally Ok as long as nobody assumes "gc --auto" is ultra-cheap. We used to have a "gc --auto" at the end of git-commit which violated that condition, but we do not have that anymore.

The patch resurrects the behaviour that makes the extra hook possibly unacceptable again, dosn't it?

Yes. I thought there was an unwanted change in behavior in git-commit. Sorry for the noise.

I summarize junio's points that says $GIT_DIR/config is authoritative.

1. .gitmodules shouldn't be authoritative and should be just a hint to fill $GIT_DIR/config because

a) url may be rewritten with different protocol, such as from

     "http://" to "git://"

b) url may be total different between .gitmodules and $GIT_DIR/config

2. When going back to an old HEAD of super project and do "git submodule update", the url recorded in .gitmodules may be stale or not existent anymore, so we should refer to $GIT_DIR/config for the right url.

3. We can record what contents we've seen in the .gitmodules, so that we can give users a chance to adjust what is in $GIT_DIR/config when we notice the entry in .gitmodules has changed.

Any others?

However, i argue the fall back strategy (say fall back to .gitmodules when we can't find an entries in $GIT_DIR/config) doesn't break the authority and isn't in contrast with the cases above. It just attachs more importance to .gitmodules and can make the world better in most cases.

For 1.a, i think we can keep these entries in .gitmodules, and use "url.<thisurl>.insteadof = <otherurl>" to override the urls.

For 1.b, i think this is a rare case. And we can override these urls in $GIT_DIR/config. However, in many cases, we havn't to do that.

For 2, i think it is also a rare case. And before going back, we can override the urls in $GIT_DIR/config.

For 3, i havn't found a good way to do that. And it doesn't conflict with the fall back strategy (say, wh

So, my conclusion

* 1.b, 2 and 3 are all rare cases, and these cases don't conflict with the fall back strategy

* 1.a is a usual case, and fallback + 'url insteadOf" will make things better

* The most common case is that most (even all) entries in .gitmodules are the same as entires in $GIT_DIR/config. So with fallback, we don't have to copy entries from .gitmodules to $GIT_DIR/config.

* And, in a central environment, i think it's common that the super project and sub project use the same protocol. So if we use relative urls in .gitmodules, when changing the url protocol the super project, the urls in .gitmodules needn't change and can be dynamically expanded with the url of the super project (Of course, after applying the 2nd patch of this series)

Ping Yin

A reason you did not mention is security:
You never want your .git/config to be changed behind your back, which effectivly is the case when using the versioned .gitmodules information (similar problem as with a .gitconfig in-tree).

Another one:
From a design point of view, submodule URLs are project meta information unrelated to source history. So, actually, I think it was wrong to put submodule URLs (even hints only) into the versioned .gitmodules files (*).

The main reason for .gitmodules is to store submodule information which has to be in sync with commits, such as a submodule name related to some path where the submodule happens to be checked out in a given commit, and also related to some config entry holding the URL to allow for fetch/pull. The idea is that submodules have an identity in the supermodule (in contrast to files in git), such that related configuration keeps valid when moving submodules around. This needs simultanous adjusting the path attribute in .gitmodules when a submodule is moved.

Josef

(*) IMHO, it would be far better if such project meta/policy information could be in its own history (e.g. branch "gitconfig" to allow for easy propagation at clone/fetch time). However, any such configuration should need explicit interaction by the user to take over project config into the local git config (e.g. via a "git config merge gitconfig:config" after inspecting via "git show gitconfig:config").

As discussed in another thread about in-tree .gitconfig, security issues only arise on limited configuration entries. However, there are no entries in .gitmodules falling into any of these entries.

But now it actually acts as hints and we don't find a better way. I just propose that the hints become the good default.

If we go back to a old HEAD or switch to another branch with changed path for a submodule, what should 'git submodule update' do? I think entries in .gitmodules should take precedence.

So url in $GIT_DIR/config is authoritative, and path in .gitmodules is authoritative.

Ping Yin

Hmm... At least, it can be very annoying when git fetches data from repositories you did not expect, only because submodule URLs change via this fallback mechanism. Perhaps it is a little far reached, but suppose a project changes its URL, and the old one becomes occupied by a malicious person. The problem is that the URL with the now malicious repository is bound in the history of the project. For sure, you do not want to fetch from that old repository by accident, after you did a checkout of an old commit. And there would be no way to protect other people from this malicious repository other than rewriting the whole history.

For me this sounds like: Now that we have made this bad decision, it does not matter to make it even worse.

What was the motivation for this fallback mechanism?

In any way, it is preferable to always use the correct URL for submodules. Thus, when the URL ever changes in the projects livetime (covered by git history), you want to have the correct URL in your .git/config (not to accidently use the wrong URL when checking out an old commit). But then, the fallback mechanism does not trigger anyway.

Of course. It makes no sense to have submodule path configuration in .git/config, as it has to be in sync with the current commit. That has nothing to do with precedence. The same is true for .gitattributes, for example.

No.
These are totally different types of configurations.

Josef

It is always bound now without the fallback patch :)

I wonder how the *malicious* repository can hurt us since only the commit recorded in commit of the super project will be checked out.

I should be like: Now that we have made a bad decision (if it is), we have to improve it to make life better before we can find a better solution.

I havn't found yet how an incorrect URL can hurt us. The worst case i can imagine is the failure of "git submodule update".

Two of the most common cases which can result in an incorrect/stale url is

* the repository has been moved to another machine
* the directory structure of upstream repositories has changed

However, there are also cases that the old version of url in .gitmodules is correct.

Think about the case that the reposotory maintainer has decided to replace current submodule with a totoally different one. In this case, when back to the old HEAD, the url in .gitmodules is correct while url in $GIT_DIR/config is incorrect.

So, when error happens, we can't judge which url is correct. So just let the user make the decision by refering the change history of .gitmodules or asking the repository maintainer.

Ping Yin

If one manages to hack on repository one can modify it enormous amount of ways, including spoofing on SHA (providing wrong contents for it - does git verify that when getting a pack?), utilizing bugs in git etc...

I doubt somebody would spend that much of an effort but you know, you can not be paranoid *enough* :)

regards,
Fedor.

onsdagen den 23 april 2008 09.47.57 skrev Fedor Sergeev:

The pack transfer protocol does not transfer the SHA of objects, only the contents is transferred. The SHA-1 is (has to be since it is not sent) reconstructed on the receiving end.

-- robin

Thats nice. Then I agree its difficult to spoil superproject out of submodule other than it just does not checkout.

regards,
Fedor.

Doable? I dunno.

Ping Yin

Hi,

Literally the most common reason for a _different_ .gitmodules in an older revision is that the repository was moved to another machine.

In this case, your suggestion is actively wrong.

Ciao,
Dscho

Another common reason is the adjustment of repository directory in the central environment
so i said *path*, not *url*. I agree what Josef said in the the following reply: "It makes no sense to have submodule path configuration in .git/config, as it has to be in sync with the current commit". So it should be bettter to store path info only in .gitmodules instead of $GIT_DIR/config

Ping Yin

I'm wrong, this is the case that *url* changes.

The case that *path* changes is the submodule is moved to a new path in some commit. But it is a very rare case.

Ping Yin

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.

A rough timeline from now on.

* Discussion and review on new feature and enhancement patch series begins. Please resubmit things that you were cooking in your head during 1.5.5-rc period after cleaning up and retesting.

* 1.5.6 merge window closes (2008-05-14).

* Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21).

* 1.5.6 Final (2008-06-08).

----------------------------------------------------------------
[New Topics]

* db/learn-HEAD (Sat Apr 26 15:53:12 2008 -0400) 2 commits
- Make ls-remote http://... list HEAD, like for git://...
- Make walker.fetch_ref() take a struct ref.

* cc/help (Fri Apr 25 08:25:41 2008 +0200) 5 commits
- documentation: web--browse: add a note about konqueror
- documentation: help: add info about "man.<tool>.cmd" config var
- help: use "man.<tool>.cmd" as custom man viewer command
- documentation: help: add "man.<tool>.path" config variable
- help: use man viewer path from "man.<tool>.path" config var

* jn/webfeed (Sun Apr 20 22:09:48 2008 +0200) 1 commit
+ gitweb: Use feed link according to current view

* ar/batch-cat (Wed Apr 23 15:17:53 2008 -0400) 11 commits
- git-svn: Speed up fetch
- Git.pm: Add hash_and_insert_object and cat_blob
- Git.pm: Add command_bidi_pipe and command_close_bidi_pipe
- git-hash-object: Add --stdin-paths option
- Add more tests for git hash-object
- Move git-hash-object tests from t5303 to t1007
- git-cat-file: Add --batch option
- git-cat-file: Add --batch-check option
- git-cat-file: Make option parsing a little more flexible
- git-cat-file: Small refactor of cmd_cat_file
- <<REJECT>> Add tests for git cat-file

* lt/dirmatch-optim (Sat Apr 19 14:22:38 2008 -0700) 1 commit
+ Optimize match_pathspec() to avoid fnmatch()

* dm/cherry-pick-s (Sat Apr 26 15:14:28 2008 -0500) 1 commit
+ Allow cherry-pick (and revert) to add signoff line

----------------------------------------------------------------
[Graduated to "master"]

* ho/shared (Wed Apr 16 11:34:24 2008 +0300) 1 commit
+ Make core.sharedRepository more generic

----------------------------------------------------------------
[Will merge to "master" soonish]

* pb/remote-mirror-config (Thu Apr 17 13:17:20 2008 +0200) 1 commit
+ Add a remote.*.mirror configuration option

* lh/branch-merged (Fri Apr 18 18:30:15 2008 +0200) 3 commits
+ Add tests for branch --[no-]merged
+ git-branch.txt: compare --contains, --merged and --no-merged
+ git-branch: add support for --merged and --no-merged

* jk/fetch-status (Wed Apr 9 20:11:52 2008 -0400) 1 commit
+ git-fetch: always show status of non-tracking-ref fetches

This changes reporting behaviour of one-shot "git pull $url $branch", which would affect long-time users in integrator role (that's you, Linus ;-). Let's see if we hear anybody screaming.

* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits
+ Teach GIT-VERSION-GEN about the .git file
+ Teach git-submodule.sh about the .git file
+ Teach resolve_gitlink_ref() about the .git file
+ Add platform-independent .git "symlink"

There was a GSoC project idea to enhance "git submodule" to take advantage of this facility to preserve the subrepository while switching between a revision with a submodule and another before the submodule was bound to the superproject, but it appears nobody took it.

* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit
+ filter-branch.sh: support nearly proper tag name filtering

Instead of discarding annotated and/or signed tags, this keeps them and demotes the signed ones to simply annotated. It issues warning when it does this demotion. I think the behaviour is sensible.

* jc/lstat (Sun Mar 30 12:39:25 2008 -0700) 2 commits
+ diff-files: mark an index entry we know is up-to-date as such
+ write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATE

Further reduce redundant lstat(2) calls during "git status" and other common operations.

----------------------------------------------------------------
[Actively Cooking]

* js/rebase-i-sequencer (Fri Apr 25 22:50:53 2008 -0700) 14 commits
+ 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

This may complement the proposed "sequencer" GSoC project.

* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 6 commits
- merge: remove deprecated summary and diffstat options and config variables
+ merge, pull: add '--(no-)log' command line option
+ fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
+ add 'merge.stat' config variable
+ merge, pull: introduce '--(no-)stat' option
+ doc: moved merge.* config variables into separate merge-config.txt

The last one needs to be held back, as it actually removes the support for features that the main part of the series deprecates, until 1.6.0 or later.

* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits
+ 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.

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this. There recently was a problem report that had a scent of this issue which turned out to be a false alarm (it was about http-push which does not do the native pack protocol optimization and the reporter was pushing into an empty repository which needs full transfer anyway).

* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits
+ Make git-add behave more sensibly in a case-insensitive environment
+ When adding files to the index, add support for case-independent matches
+ Make unpack-tree update removed files before any updated files
+ Make branch merging aware of underlying case-insensitive filsystems
+ Add 'core.ignorecase' option
+ Make hash_name_lookup able to do case-independent lookups
+ Make "index_name_exists()" return the cache_entry it found
+ Move name hashing functions into a file of its own
+ Make unpack_trees_options bit flags actual bitfields

The beginning of case insensitive filesystem support, currently ASCII-only.

----------------------------------------------------------------
[Dropped]

----------------------------------------------------------------
[On Hold]

* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
- Move all dashed-form commands to libexecdir

Scheduled for 1.6.0.

* db/clone-in-c (Thu Apr 17 19:32:43 2008 -0400) 8 commits
- [mess] Build in clone
- [strdup() and other clean-ups needed] Provide API access to init_db()
- [waiting for response] Add a function to set a non-default work tree
- Allow for having for_each_ref() list extra refs
- Have a constant extern refspec for "--tags"
- Add a library function to add an alternate to the alternates file
- Add a lockfile function to append to a file
- Mark the list of refs to fetch as const

There were a few comments and suggestions to the ones near the tip that need to be addressed. Earlier ones look Ok.

* ap/svn (Tue Apr 15 21:04:18 2008 -0400) 3 commits
- git-svn: add documentation for --add-author-from option.
- git-svn: Add --add-author-from option.
- git-svn: add documentation for --use-log-author option.

Eric requested a new set of tests for this series.

* py/submodule-2 (Wed Apr 16 22:19:31 2008 +0800) 1 commit
- git-submodule: Extract functions module_info and module_url

Not going well.

* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits
- tests: convert "cmp" and "cmp -s" to test_cmp
- tests: test_cmp helper function

This one may be more elaborate, but Jeff's patch is much simpler.

* 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.

* 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 by not using merge-recursive, but unfortunately has stalled for some time now.

* jc/lstat-debug (Thu Mar 27 16:56:53 2008 -0700) 1 commit
- lstat: introduce a wrapper xlstat

* 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.

Hmm, i wonder how this series can go well. Or this series is totoally bad and should be discarded.

Ping Yin

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's been a while since the last issue of this series. I've been swamped, and haven't had a chance to spend enough time on reviewing and accepting patches.

A good news is that the tip of 'pu' tonight passes all the test --- it has been broken for some time.

A rough timeline from now on.

* Discussion and review on new feature and enhancement patch series begins. Please resubmit things that you were cooking in your head during 1.5.5-rc period after cleaning up and retesting.

* 1.5.6 merge window closes (2008-05-14).

* Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21).

* 1.5.6 Final (2008-06-08).

----------------------------------------------------------------
[New Topics]

* bd/tests (Sun May 4 01:38:00 2008 -0400) 10 commits
+ Rename the test trash directory to contain spaces.
+ Fix tests breaking when checkout path contains shell metacharacters
+ Don't use the 'export NAME=value' in the test scripts.
+ lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters
+ test-lib.sh: Fix some missing path quoting
+ Use test_set_editor in t9001-send-email.sh
+ test-lib.sh: Add a test_set_editor function to safely set $VISUAL
+ git-send-email.perl: Handle shell metacharacters in $EDITOR properly
+ config.c: Escape backslashes in section names properly
+ git-rebase.sh: Fix --merge --abort failures when path contains whitespace

Making sure the tools quote paths correctly and work inside a directory whose pathname contains whitespace. Thanks Bryan, and thanks J6t for reviewing and testing.

* np/pack (Fri May 2 15:11:51 2008 -0400) 7 commits
+ pack-objects: fix early eviction for max depth delta objects
+ pack-objects: allow for early delta deflating
+ pack-objects: move compression code in a separate function
+ pack-objects: clean up write_object() a bit
+ pack-objects: simplify the condition associated with --all- progress
+ pack-objects: remove some double negative logic
+ pack-objects: small cleanup

Every time Nico tweaks pack generation, something good comes out ;-).

* py/diff-submodule (Sat May 3 17:24:28 2008 -0700) 5 commits
+ is_racy_timestamp(): do not check timestamp for gitlinks
+ diff-lib.c: rename check_work_tree_entity()
+ diff: a submodule not checked out is not modified
+ Add t7506 to test submodule related functions for git-status
+ t4027: test diff for submodule with empty directory

A submodule that is not checked out is not modified, but was mistaken as being removed. Thanks Ping for tests and fixes.

* cc/hooks-doc (Fri May 2 05:30:47 2008 +0200) 1 commit
- Documentation: rename "hooks.txt" to "githooks.txt" and make it a man page

I've looked at but not applied most of the patches in the series that built on top of this. I think it probably is a good goal to make everything _accessible_ as manual pages, but at the same time I do not exactly like the HTML rendered results of material that are not really manual pages. E.g. "Everyday" looks much worse to me.

At least, the categorization of sections 1/5/7 should be straightened out. diffcore is not about "file format" at all and do not belong to section 5, for example.

* pb/push (Mon Apr 28 11:32:12 2008 -0400) 1 commit
- add special "matching refs" refspec

This first patch is a good enhancement without hurting any existing users. We need a staged introduction of the second and later patches, and many people including me did not agree the later ones in the series are desirable.

* mv/format-cc (Tue Apr 29 12:56:47 2008 +0200) 3 commits
+ Add tests for sendemail.cc configuration variable
+ git-send-email: add a new sendemail.cc configuration variable
+ git-format-patch: add a new format.cc configuration variable

* as/graph (Mon May 5 00:57:03 2008 -0700) 4 commits
- graph API: eliminate unnecessary indentation
- log and rev-list: add --graph option
- Add history graph API
- revision API: split parent rewriting and parent printing options

Draw "tig 'g'" graph without tig ;-)

* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 4 commits
- diff: enable "too large a rename" warning when -M/-C is explicitly asked for
+ diff: make "too many files" rename warning optional
+ bump rename limit defaults
+ add merge.renamelimit config option

The documentation part of this series partly depends on another series, but I am expecting both to graduate smoothly to 'master' reasonably soon.

* sv/first-parent (Sun Apr 27 19:32:46 2008 +0200) 1 commit
+ Simplify and fix --first-parent implementation

* gp/bisect-fix (Mon May 5 07:43:00 2008 +0000) 1 commit
+ git-bisect.sh: don't accidentally override existing branch "bisect"

----------------------------------------------------------------
[Graduated to "master"]

* pb/remote-mirror-config (Thu Apr 17 13:17:20 2008 +0200) 1 commit
+ Add a remote.*.mirror configuration option

* lh/branch-merged (Fri Apr 18 18:30:15 2008 +0200) 3 commits
+ Add tests for branch --[no-]merged
+ git-branch.txt: compare --contains, --merged and --no-merged
+ git-branch: add support for --merged and --no-merged

* jk/fetch-status (Wed Apr 9 20:11:52 2008 -0400) 1 commit
+ git-fetch: always show status of non-tracking-ref fetches

This changes reporting behaviour of one-shot "git pull $url $branch", which would affect long-time users in integrator role (that's you, Linus ;-). Let's see if we hear anybody screaming.

* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits
+ Teach GIT-VERSION-GEN about the .git file
+ Teach git-submodule.sh about the .git file
+ Teach resolve_gitlink_ref() about the .git file
+ Add platform-independent .git "symlink"

There was a GSoC project idea to enhance "git submodule" to take advantage of this facility to preserve the subrepository while switching between a revision with a submodule and another before the submodule was bound to the superproject, but it appears nobody took it.

* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit
+ filter-branch.sh: support nearly proper tag name filtering

Instead of discarding annotated and/or signed tags, this keeps them and demotes the signed ones to simply annotated. It issues warning when it does this demotion. I think the behaviour is sensible.

* jc/lstat (Sun Mar 30 12:39:25 2008 -0700) 2 commits
+ diff-files: mark an index entry we know is up-to-date as such
+ write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATE

Further reduce redundant lstat(2) calls during "git status" and other common operations.

----------------------------------------------------------------
[Will merge to "master" soonish]

* lt/dirmatch-optim (Sat Apr 19 14:22:38 2008 -0700) 1 commit
+ Optimize match_pathspec() to avoid fnmatch()

* dm/cherry-pick-s (Sat Apr 26 15:14:28 2008 -0500) 1 commit
+ Allow cherry-pick (and revert) to add signoff line

* cc/help (Fri Apr 25 08:25:41 2008 +0200) 5 commits
+ documentation: web--browse: add a note about konqueror
+ documentation: help: add info about "man.<tool>.cmd" config var
+ help: use "man.<tool>.cmd" as custom man viewer command
+ documentation: help: add "man.<tool>.path" config variable
+ help: use man viewer path from "man.<tool>.path" config var

* jn/webfeed (Sun Apr 20 22:09:48 2008 +0200) 1 commit
+ gitweb: Use feed link according to current view

----------------------------------------------------------------
[Actively Cooking]

* 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

This may complement the proposed "sequencer" GSoC project. Dscho seems to have quite a strong objection to the 'mark' syntax and mechanism being unnecessarily complex. Let's wait and see if a less complex but equally expressive alternative materializes...

* db/learn-HEAD (Sat Apr 26 15:53:12 2008 -0400) 2 commits
+ Make ls-remote http://... list HEAD, like for git://...
+ Make walker.fetch_ref() take a struct ref.

* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 6 commits
- merge: remove deprecated summary and diffstat options and config variables
+ merge, pull: add '--(no-)log' command line option
+ fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
+ add 'merge.stat' config variable
+ merge, pull: introduce '--(no-)stat' option
+ doc: moved merge.* config variables into separate merge-config.txt

The last one needs to be held back, as it actually removes the support for features that the main part of the series deprecates, until 1.6.0 or later.

* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits
+ 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.

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this. There recently was a problem report that had a scent of this issue which turned out to be a false alarm (it was about http-push which does not do the native pack protocol optimization and the reporter was pushing into an empty repository which needs full transfer anyway).

* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits
+ Make git-add behave more sensibly in a case-insensitive environment
+ When adding files to the index, add support for case-independent matches
+ Make unpack-tree update removed files before any updated files
+ Make branch merging aware of underlying case-insensitive filsystems
+ Add 'core.ignorecase' option
+ Make hash_name_lookup able to do case-independent lookups
+ Make "index_name_exists()" return the cache_entry it found
+ Move name hashing functions into a file of its own
+ Make unpack_trees_options bit flags actual bitfields

The beginning of case insensitive filesystem support, currently ASCII-only.

----------------------------------------------------------------
[Dropped]

* ap/svn (Tue Apr 15 21:04:18 2008 -0400) 3 commits . git-svn: add documentation for --add-author-from option. . git-svn: Add --add-author-from option.
. git-svn: add documentation for --use-log-author option.

Eric requested a new set of tests for this series which never came. I am still holding onto the tip of the topic in case we can resurrect it, but it is not merged to 'pu'.

----------------------------------------------------------------
[On Hold]

* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
- Move all dashed-form commands to libexecdir

Scheduled for 1.6.0.

* db/clone-in-c (Sun Apr 27 13:39:30 2008 -0400) 8 commits
- Build in clone
- Provide API access to init_db()
- Add a function to set a non-default work tree
- Allow for having for_each_ref() list extra refs
- Have a constant extern refspec for "--tags"
- Add a library function to add an alternate to the alternates file
- Add a lockfile function to append to a file
- Mark the list of refs to fetch as const

I'd really want this in 1.5.6; will merge to 'next' after giving a final pass sometime this week.

* ar/batch-cat (Wed Apr 23 15:17:47 2008 -0400) 5 commits
- git-cat-file: Add --batch option
- git-cat-file: Add --batch-check option
- git-cat-file: Make option parsing a little more flexible
- git-cat-file: Small refactor of cmd_cat_file
- Add tests for git cat-file

I fixed up the problematic shell script in the first patch in the series but later one introduced the same problematic constructs in another file, at which point I gave up and discarded the rest. At least it now passes its own testsuite without breaking others.

* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits
- tests: convert "cmp" and "cmp -s" to test_cmp
- tests: test_cmp helper function

This one may be more elaborate, but Jeff's patch is much simpler.

* 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.

* 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 by not using merge-recursive, but unfortunately has stalled for some time now.

* jc/lstat-debug (Thu Mar 27 16:56:53 2008 -0700) 1 commit
- lstat: introduce a wrapper xlstat

* 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.

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's been a while since the last issue of this series. I've been swamped, and haven't had a chance to spend enough time on reviewing and accepting patches.

A rough timeline from now on.

* Will merge the remaining topics already on 'next', and perhaps accept a handful minor topics that are not yet in.

* Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21).

* 1.5.6 Final (2008-06-08).

----------------------------------------------------------------
[New Topics]

* bc/tag (Fri May 9 00:03:35 2008 -0500) 3 commits
- ident.c: New function valid_ident for checking ident string formatting
- Make mktag a builtin
- mktag.c: adjust verify_tag parameters

I stopped looking at this after hitting an unappliable patch --- will need to take a look at it again.

* js/config-cb (Wed May 14 18:46:53 2008 +0100) 1 commit
- Provide git_config with a callback-data parameter

This needs to wait until most of the other things graduate for 1.5.6; luckily, unlike the other "path-list" changes, misconversions is much easier to catch for this change and I am not worried about it.

* ds/branch-auto-rebase (Sat May 10 15:36:29 2008 -0700) 1 commit
+ Allow tracking branches to set up rebase by default.

For 1.5.6.

* bc/repack (Wed May 14 01:33:53 2008 -0400) 5 commits
+ let pack-objects do the writing of unreachable objects as loose objects
+ add a force_object_loose() function
+ builtin-gc.c: deprecate --prune, it now really has no effect
+ git-gc: always use -A when manually repacking
+ repack: modify behavior of -A option to leave unreferenced objects unpacked

For 1.5.6.

* sp/ignorecase (Sun May 11 18:16:42 2008 +0200) 4 commits
- t0050: Add test for case insensitive add
- t0050: Set core.ignorecase case to activate case insensitivity
- t0050: Test autodetect core.ignorecase
- git-init: autodetect core.ignorecase

This unfortunately seems to break on natively case sensitive filesystems.

* ar/add-unreadable (Mon May 12 19:59:23 2008 +0200) 5 commits
+ Add a config option to ignore errors for git-add
+ Add a test for git-add --ignore-errors
+ Add --ignore-errors to git-add to allow it to skip files with read errors
+ Extend interface of add_files_to_cache to allow ignore indexing errors
+ Make the exit code of add_file_to_index actually useful

* jc/diff-words (Sun May 11 12:33:48 2008 -0700) 2 commits
- diff --color-words: a bit of tweak
- diff --color-words reimplementation

----------------------------------------------------------------
[Graduated to "master"]

* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits
+ Make git-add behave more sensibly in a case-insensitive environment
+ When adding files to the index, add support for case-independent matches
+ Make unpack-tree update removed files before any updated files
+ Make branch merging aware of underlying case-insensitive filsystems
+ Add 'core.ignorecase' option
+ Make hash_name_lookup able to do case-independent lookups
+ Make "index_name_exists()" return the cache_entry it found
+ Move name hashing functions into a file of its own
+ Make unpack_trees_options bit flags actual bitfields

The beginning of case insensitive filesystem support, currently ASCII-only.

* db/learn-HEAD (Sat Apr 26 15:53:12 2008 -0400) 2 commits
+ Make ls-remote http://... list HEAD, like for git://...
+ Make walker.fetch_ref() take a struct ref.

* cc/help (Fri Apr 25 08:25:41 2008 +0200) 5 commits
+ documentation: web--browse: add a note about konqueror
+ documentation: help: add info about "man.<tool>.cmd" config var
+ help: use "man.<tool>.cmd" as custom man viewer command
+ documentation: help: add "man.<tool>.path" config variable
+ help: use man viewer path from "man.<tool>.path" config var

* dm/cherry-pick-s (Sat Apr 26 15:14:28 2008 -0500) 1 commit
+ Allow cherry-pick (and revert) to add signoff line

* lt/dirmatch-optim (Sat Apr 19 14:22:38 2008 -0700) 1 commit
+ Optimize match_pathspec() to avoid fnmatch()

* jn/webfeed (Sun Apr 20 22:09:48 2008 +0200) 1 commit
+ gitweb: Use feed link according to current view

* gp/bisect-fix (Mon May 5 07:43:00 2008 +0000) 1 commit
+ git-bisect.sh: don't accidentally override existing branch "bisect"

* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 3 commits
+ diff: make "too many files" rename warning optional
+ bump rename limit defaults
+ add merge.renamelimit config option

* py/diff-submodule (Sat May 3 17:24:28 2008 -0700) 5 commits
+ is_racy_timestamp(): do not check timestamp for gitlinks
+ diff-lib.c: rename check_work_tree_entity()
+ diff: a submodule not checked out is not modified
+ Add t7506 to test submodule related functions for git-status
+ t4027: test diff for submodule with empty directory

A submodule that is not checked out is not modified, but was mistaken as being removed. Thanks Ping for tests and fixes.

* cc/hooks-doc (Fri May 2 05:30:47 2008 +0200) 1 commit
+ Documentation: rename "hooks.txt" to "githooks.txt" and make it a man page

* mv/format-cc (Tue Apr 29 12:56:47 2008 +0200) 3 commits
+ Add tests for sendemail.cc configuration variable
+ git-send-email: add a new sendemail.cc configuration variable
+ git-format-patch: add a new format.cc configuration variable

* bd/tests (Sun May 4 01:38:00 2008 -0400) 10 commits
+ Rename the test trash directory to contain spaces.
+ Fix tests breaking when checkout path contains shell metacharacters
+ Don't use the 'export NAME=value' in the test scripts.
+ lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters
+ test-lib.sh: Fix some missing path quoting
+ Use test_set_editor in t9001-send-email.sh
+ test-lib.sh: Add a test_set_editor function to safely set $VISUAL
+ git-send-email.perl: Handle shell metacharacters in $EDITOR properly
+ config.c: Escape backslashes in section names properly
+ git-rebase.sh: Fix --merge --abort failures when path contains whitespace

Making sure the tools quote paths correctly and work inside a directory whose pathname contains whitespace. Thanks Bryan, and thanks J6t for reviewing and testing.

* sb/committer (Sun May 4 18:04:51 2008 +0200) 3 commits
+ commit: Show committer if automatic
+ commit: Show author if different from committer
+ Preparation to call determine_author_info from prepare_to_commit

----------------------------------------------------------------
[Will merge to "master" soonish]

* as/graph (Mon May 5 00:57:03 2008 -0700) 4 commits
+ graph API: eliminate unnecessary indentation
+ log and rev-list: add --graph option
+ Add history graph API
+ revision API: split parent rewriting and parent printing options

Draw "tig 'g'" graph without tig ;-)

* np/pack (Fri May 2 15:11:51 2008 -0400) 7 commits
+ pack-objects: fix early eviction for max depth delta objects
+ pack-objects: allow for early delta deflating
+ pack-objects: move compression code in a separate function
+ pack-objects: clean up write_object() a bit
+ pack-objects: simplify the condition associated with --all- progress
+ pack-objects: remove some double negative logic
+ pack-objects: small cleanup

Every time Nico tweaks pack generation, something good comes out ;-).

* db/clone-in-c (Sun Apr 27 13:39:30 2008 -0400) 8 commits
+ Build in clone
+ Provide API access to init_db()
+ Add a function to set a non-default work tree
+ Allow for having for_each_ref() list extra refs
+ Have a constant extern refspec for "--tags"
+ Add a library function to add an alternate to the alternates file
+ Add a lockfile function to append to a file
+ Mark the list of refs to fetch as const

For 1.5.6; please give it a good beating.

----------------------------------------------------------------
[Actively Cooking]

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this.

This needs debugging.

* ap/svn (Mon May 12 17:09:49 2008 -0700) 4 commits
+ git-svn: add test for --add-author-from and --use-log-author
+ git-svn: add documentation for --add-author-from option.
+ git-svn: Add --add-author-from option.
+ git-svn: add documentation for --use-log-author option.

Some tweak for output might be needed, I dunno.

* sv/first-parent (Mon May 12 17:12:36 2008 +0200) 2 commits
+ revision.c: really honor --first-parent
+ Simplify and fix --first-parent implementation

----------------------------------------------------------------
[Stalled]

* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits
+ 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 tip commit on the series).

* 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

This may complement the proposed "sequencer" GSoC project. Dscho seems to have quite a strong objection to the 'mark' syntax and mechanism being unnecessarily complex. Let's wait and see if a less complex but equally expressive alternative materializes...

* ar/batch-cat (Wed Apr 23 15:17:47 2008 -0400) 5 commits
- git-cat-file: Add --batch option
- git-cat-file: Add --batch-check option
- git-cat-file: Make option parsing a little more flexible
- git-cat-file: Small refactor of cmd_cat_file
- Add tests for git cat-file

I fixed up the problematic shell script in the first patch in the series but later one introduced the same problematic constructs in another file, at which point I gave up and discarded the rest. At least it now passes its own testsuite without breaking others.

----------------------------------------------------------------
[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.

* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
- merge: remove deprecated summary and diffstat options and config variables

This needs to be held back, as it actually removes the support for features that the main part of the series deprecates, until 1.6.0 or later.

* pb/push (Mon Apr 28 11:32:12 2008 -0400) 1 commit
+ add special "matching refs" refspec

This first patch is a good enhancement without hurting any existing users. We need a staged introduction of the second and later patches, and many people including me did not agree the later ones in the series are desirable.

* 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.

* 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.

Last time, you said you were going to review this again; did you review it and find nothing to comment on, decide to just make sure it gets a beating, or are you still planning to review it more? (Just wondering so I can try to arrange to have time to respond to comments if there's going to be a bunch)

I did not have any further nitpicks on either design nor code in particular.

But keep in mind that I won't be the single source of review comments ;-). .

From: Steffen Prohaska <[email protected]>
Date: Thu, 15 May 2008 07:19:54 +0200
Subject: [PATCH] t0050: Fix merge test on case sensitive file systems

On a case sensitive filesystem, "git reset --hard" might refuse to overwrite a file whose name differs only by case, even if core.ignorecase is set. It is not clear which circumstances cause this behavior. This commit simply works around the problem by removing the case changing file before running "git reset --hard".

---
 t/t0050-filesystem.sh |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

index 0e33c4b..c5360e2 100755
@@ -72,6 +72,8 @@ $test_case 'rename (case change)' '
 
 $test_case 'merge (case change)' '
 
+	rm -f CamelCase &&
+	rm -f camelcase &&
 	git reset --hard initial &&
 	git merge topic
 

1.5.5.1.349.g99d0

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's been a while since the last issue of this series. I've been swamped, and haven't had a chance to spend enough time on reviewing and accepting patches.

A rough timeline from now on.

* Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21 -- need to slip til the weekend).

* 1.5.6 Final (2008-06-08).

There are a few known breakages I want to see addressed that are not in here before 1.5.6 (no not any new features but pure bugfixes).

----------------------------------------------------------------
[New Topics]

* js/config-cb (Wed May 14 18:46:53 2008 +0100) 1 commit
- Provide git_config with a callback-data parameter

This needs to wait until most of the other things graduate for 1.5.6; luckily, unlike the other "path-list" changes, misconversions is much easier to catch for this change and I am not worried about it.

* jc/apply-whitespace (Sat May 17 02:02:44 2008 -0700) 3 commits
+ builtin-apply: do not declare patch is creation when we do not know it
+ builtin-apply: accept patch to an empty file
+ builtin-apply: typofix

We were loose when parsing a patch that adds contents to an empty file. This fix would be nice to have in 1.5.6.

* js/mailinfo (Fri May 16 14:03:30 2008 +0100) 1 commit
- <<PARK - BASE64 and QP still broken>> mailsplit and mailinfo:
gracefully handle NUL characters

When "am" processes a patch that modifies a line with NUL, we used to chomp the patch line there, resulting in rejects. This patch fixes the issue partially, only when the message is not encoded in BASE64 nor Quoted-Printable.

* mo/cvsserver (Wed May 14 22:35:48 2008 -0600) 3 commits
+ git-cvsserver: add ability to guess -kb from contents
+ implement gitcvs.usecrlfattr
+ git-cvsserver: add mechanism for managing working tree and current directory

CVS interoperability improvements, for 1.5.6

* js/cvsexportcommit (Wed May 14 15:29:49 2008 +0100) 2 commits
+ cvsexportcommit: introduce -W for shared working trees (between Git and CVS)
+ cvsexportcommit: chomp only removes trailing whitespace

CVS interoperability improvements, for 1.5.6

* ar/t6031 (Sun May 18 16:57:27 2008 +0200) 1 commit
+ Fix t6031 on filesystems without working exec bit

* jc/unpack-trees-reword (Sat May 17 12:03:49 2008 -0700) 1 commit
+ unpack-trees: allow Porcelain to give different error messages

* jc/add-n-u (Wed May 21 12:04:34 2008 -0700) 1 commit
+ "git-add -n -u" should not add but just report

* js/ignore-submodule (Wed May 14 18:03:59 2008 +0100) 3 commits
+ Ignore dirty submodule states during rebase and stash
+ Teach update-index about --ignore-submodules
+ diff options: Introduce --ignore-submodules

The above are all fixes, meant for 1.5.6.

* dr/ceiling (Fri May 16 00:27:28 2008 +0100) 1 commit
- Add support for GIT_CEILING_DIRECTORIES

I haven't had a chance to take a look at the updated series myself.

* jc/diff-words (Sun May 11 12:33:48 2008 -0700) 2 commits
- diff --color-words: a bit of tweak
- diff --color-words reimplementation

This series did not pan out well. I briefly thought that perhaps I should discard them and replace with the "not just whitespace" one from Ping Yin first, hoping that we can clean the overall logic up later, but perhaps the whole thing can get a fresh restart after 1.5.6.

----------------------------------------------------------------
[Graduated to "master"]

* ar/add-unreadable (Mon May 12 19:59:23 2008 +0200) 5 commits
+ Add a config option to ignore errors for git-add
+ Add a test for git-add --ignore-errors
+ Add --ignore-errors to git-add to allow it to skip files with read errors
+ Extend interface of add_files_to_cache to allow ignore indexing errors
+ Make the exit code of add_file_to_index actually useful

When you sometimes have unreadable path in your own work tree, this allows you to ignore failures to index such path with "git add". Philosophically that whole notion is wrong ("why should you be adding such a file to begin with"), but this has practical value of working around insane systems that locks out the access by the user to a file when the file is in use by somebody else.

I am somewhat skeptical about the last one that enables such a workaround on a permanent basis, though.

* ds/branch-auto-rebase (Sat May 10 15:36:29 2008 -0700) 1 commit
+ Allow tracking branches to set up rebase by default.

For 1.5.6.

* as/graph (Mon May 5 00:57:03 2008 -0700) 4 commits
+ graph API: eliminate unnecessary indentation
+ log and rev-list: add --graph option
+ Add history graph API
+ revision API: split parent rewriting and parent printing options

Draw "tig 'g'" graph without tig ;-)

* np/pack (Fri May 2 15:11:51 2008 -0400) 7 commits
+ pack-objects: fix early eviction for max depth delta objects
+ pack-objects: allow for early delta deflating
+ pack-objects: move compression code in a separate function
+ pack-objects: clean up write_object() a bit
+ pack-objects: simplify the condition associated with --all- progress
+ pack-objects: remove some double negative logic
+ pack-objects: small cleanup

Every time Nico tweaks pack generation, something good comes out ;-).

* sv/first-parent (Mon May 12 17:12:36 2008 +0200) 2 commits
+ revision.c: really honor --first-parent
+ Simplify and fix --first-parent implementation

----------------------------------------------------------------
[Will merge to "master" soonish]

* sp/ignorecase (Thu May 15 07:19:54 2008 +0200) 5 commits
+ t0050: Fix merge test on case sensitive file systems
+ t0050: Add test for case insensitive add
+ t0050: Set core.ignorecase case to activate case insensitivity
+ t0050: Test autodetect core.ignorecase
+ git-init: autodetect core.ignorecase

For 1.5.6.

* bc/repack (Thu May 15 22:37:31 2008 -0400) 6 commits
+ Documentation/git-repack.txt: document new -A behaviour
+ let pack-objects do the writing of unreachable objects as loose objects
+ add a force_object_loose() function
+ builtin-gc.c: deprecate --prune, it now really has no effect
+ git-gc: always use -A when manually repacking
+ repack: modify behavior of -A option to leave unreferenced objects unpacked

For 1.5.6.

* db/clone-in-c (Tue May 20 14:15:14 2008 -0400) 11 commits
+ clone: fall back to copying if hardlinking fails
+ builtin-clone.c: Need to closedir() in copy_or_link_directory()
+ builtin-clone: fix initial checkout
+ Build in clone
+ Provide API access to init_db()
+ Add a function to set a non-default work tree
+ Allow for having for_each_ref() list extra refs
+ Have a constant extern refspec for "--tags"
+ Add a library function to add an alternate to the alternates file
+ Add a lockfile function to append to a file
+ Mark the list of refs to fetch as const

For 1.5.6.

* pb/push (Mon Apr 28 11:32:12 2008 -0400) 1 commit
+ add special "matching refs" refspec

This first patch is a good enhancement without hurting any existing users. We need a staged introduction of the second and later patches, and many people including me did not agree the later ones in the series are desirable.

----------------------------------------------------------------
[Stalled]

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this.

This needs debugging.

* ap/svn (Mon May 12 17:09:49 2008 -0700) 4 commits
+ git-svn: add test for --add-author-from and --use-log-author
+ git-svn: add documentation for --add-author-from option.
+ git-svn: Add --add-author-from option.
+ git-svn: add documentation for --use-log-author option.

Some tweak for output might be needed, I dunno.

* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits
+ 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 tip commit on the series).

* 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

This may complement the proposed "sequencer" GSoC project. Dscho seems to have quite a strong objection to the 'mark' syntax and mechanism being unnecessarily complex. Let's wait and see if a less complex but equally expressive alternative materializes...

* ar/batch-cat (Wed Apr 23 15:17:47 2008 -0400) 5 commits
- git-cat-file: Add --batch option
- git-cat-file: Add --batch-check option
- git-cat-file: Make option parsing a little more flexible
- git-cat-file: Small refactor of cmd_cat_file
- Add tests for git cat-file

The series was meant to speed up git-svn by avoiding many individual invocations of git-cat-file.

I fixed up the problematic shell script in the first patch in the series but later one introduced the same problematic constructs in another file, at which point I gave up and discarded the rest. At least it now passes its own testsuite without breaking others. The remainder needs to be resubmit for the entire series to be usable for git-svn.

----------------------------------------------------------------
[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.

* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
- merge: remove deprecated summary and diffstat options and config variables

This needs to be held back, as it actually removes the support for features that the main part of the series deprecates, until 1.6.0 or later.

* 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.

* 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.

----------------------------------------------------------------
[Dropped]

* bc/tag (Fri May 9 00:03:35 2008 -0500) 3 commits
- ident.c: New function valid_ident for checking ident string formatting
- Make mktag a builtin
- mktag.c: adjust verify_tag parameters

The goal of the series was to unify the internal implementation of git-mktag and git-tag but the patches did not quite apply. Needs rebase/resubmit.

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's been a while since the last issue of this series. I've been swamped, and haven't had a chance to spend enough time on reviewing and accepting patches.

A rough timeline from now on.

* 1.5.6-rc0 has been tagged. Expect a few minor breakages ;-)

* Fixes of 'master' continues, with newer -rcX tagged every once in a while.

* 1.5.6 Final (2008-06-08).

There are a few known breakages I want to see addressed that are not in here before 1.5.6 (no not any new features but pure bugfixes).

----------------------------------------------------------------
[New Topics]

* 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 but it appears neither will happen by 1.5.6 anyway.

* jc/diff-no-no-index (Fri May 23 22:28:56 2008 -0700) 3 commits
+ "git diff": do not ignore index without --no-index
+ diff-files: do not play --no-index games
+ tests: do not use implicit "git diff --no-index"

This was done in response to recently discovered interaction with stgit; we were too eater to invoke --no-index behaviour without being asked. Currently it even drops the behaviour when you ask to compare two paths that are outside of git work tree if your current directory is inside it, which I think could safely resurrect, and then the whole thing will be ready for 1.5.6.

----------------------------------------------------------------
[Graduated to "master"]

* js/config-cb (Wed May 14 18:46:53 2008 +0100) 1 commit
+ Provide git_config with a callback-data parameter

* jc/apply-whitespace (Sat May 17 02:02:44 2008 -0700) 3 commits
+ builtin-apply: do not declare patch is creation when we do not know it
+ builtin-apply: accept patch to an empty file
+ builtin-apply: typofix

We were loose when parsing a patch that adds contents to an empty file. This fix would be nice to have in 1.5.6.

* js/mailinfo (Fri May 16 14:03:30 2008 +0100) 3 commits
+ mailsplit: minor clean-up in read_line_with_nul()
+ mailinfo: apply the same fix not to lose NULs in BASE64 and QP codepaths
+ mailsplit and mailinfo: gracefully handle NUL characters

When "am" processes a patch that modifies a line with NUL, we used to chomp the patch line there, resulting in rejects. This patch fixes the issue partially, only when the message is not encoded in BASE64 nor Quoted-Printable. I suspect its handling of a MIME attachment may still wrong, but otherwise this should fix the breakage reported earlier.

* mo/cvsserver (Wed May 14 22:35:48 2008 -0600) 3 commits
+ git-cvsserver: add ability to guess -kb from contents
+ implement gitcvs.usecrlfattr
+ git-cvsserver: add mechanism for managing working tree and current directory

* js/cvsexportcommit (Wed May 14 15:29:49 2008 +0100) 2 commits
+ cvsexportcommit: introduce -W for shared working trees (between Git and CVS)
+ cvsexportcommit: chomp only removes trailing whitespace

CVS interoperability improvements.

* ar/t6031 (Sun May 18 16:57:27 2008 +0200) 1 commit
+ Fix t6031 on filesystems without working exec bit

* jc/unpack-trees-reword (Sat May 17 12:03:49 2008 -0700) 1 commit
+ unpack-trees: allow Porcelain to give different error messages

Makes safety message from "git checkout switch-to-this-branch" a bit easier to read, and opens up the possibility to reword messages from other commands that use unpack-trees machinery.

* jc/add-n-u (Wed May 21 12:04:34 2008 -0700) 1 commit
+ "git-add -n -u" should not add but just report

* js/ignore-submodule (Wed May 14 18:03:59 2008 +0100) 3 commits
+ Ignore dirty submodule states during rebase and stash
+ Teach update-index about --ignore-submodules
+ diff options: Introduce --ignore-submodules

* sp/ignorecase (Thu May 15 07:19:54 2008 +0200) 5 commits
+ t0050: Fix merge test on case sensitive file systems
+ t0050: Add test for case insensitive add
+ t0050: Set core.ignorecase case to activate case insensitivity
+ t0050: Test autodetect core.ignorecase
+ git-init: autodetect core.ignorecase

* bc/repack (Thu May 15 22:37:31 2008 -0400) 6 commits
+ Documentation/git-repack.txt: document new -A behaviour
+ let pack-objects do the writing of unreachable objects as loose objects
+ add a force_object_loose() function
+ builtin-gc.c: deprecate --prune, it now really has no effect
+ git-gc: always use -A when manually repacking
+ repack: modify behavior of -A option to leave unreferenced objects unpacked

* db/clone-in-c (Tue May 20 14:15:14 2008 -0400) 11 commits
+ clone: fall back to copying if hardlinking fails
+ builtin-clone.c: Need to closedir() in copy_or_link_directory()
+ builtin-clone: fix initial checkout
+ Build in clone
+ Provide API access to init_db()
+ Add a function to set a non-default work tree
+ Allow for having for_each_ref() list extra refs
+ Have a constant extern refspec for "--tags"
+ Add a library function to add an alternate to the alternates file
+ Add a lockfile function to append to a file
+ Mark the list of refs to fetch as const

* pb/push (Mon Apr 28 11:32:12 2008 -0400) 1 commit
+ add special "matching refs" refspec

This first patch is a good enhancement without hurting any existing users. We need a staged introduction of the second and later patches, and many people including me did not agree the later ones in the series are desirable.

* ap/svn (Mon May 12 17:09:49 2008 -0700) 4 commits
+ git-svn: add test for --add-author-from and --use-log-author
+ git-svn: add documentation for --add-author-from option.
+ git-svn: Add --add-author-from option.
+ git-svn: add documentation for --use-log-author option.

Some tweak for output might be needed, but I'll leave that to actual git-svn users.

* ar/batch-cat (Wed Apr 23 15:17:47 2008 -0400) 13 commits
+ change quoting in test t1006-cat-file.sh
+ builtin-cat-file.c: use parse_options()
+ git-svn: Speed up fetch
+ Git.pm: Add hash_and_insert_object and cat_blob
+ Git.pm: Add command_bidi_pipe and command_close_bidi_pipe
+ git-hash-object: Add --stdin-paths option
+ Add more tests for git hash-object
+ Move git-hash-object tests from t5303 to t1007
+ git-cat-file: Add --batch option
+ git-cat-file: Add --batch-check option
+ git-cat-file: Make option parsing a little more flexible
+ git-cat-file: Small refactor of cmd_cat_file
+ Add tests for git cat-file

The series is meant to speed up git-svn by avoiding many individual invocations of git-cat-file, started by Adam Roben and finished by Michele Ballabio.

----------------------------------------------------------------
[Stalled]

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this.

This needs debugging.

* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits
+ 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 tip commit on the series).

* 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

This may complement the proposed "sequencer" GSoC project. Dscho seems to have quite a strong objection to the 'mark' syntax and mechanism being unnecessarily complex. Let's wait and see if a less complex but equally expressive alternative materializes...

----------------------------------------------------------------
[On Hold]

* 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

* 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.

* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
- merge: remove deprecated summary and diffstat options and config variables

This needs to be held back, as it actually removes the support for features that the main part of the series deprecates, until 1.6.0 or later.

* 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.

* 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/diff-words (Sun May 11 12:33:48 2008 -0700) 2 commits
- diff --color-words: a bit of tweak
- diff --color-words reimplementation

This series did not pan out well. I briefly thought that perhaps I should discard them and replace with the "not just whitespace" one from Ping Yin first, hoping that we can clean the overall logic up later, but perhaps the whole thing can get a fresh restart after 1.5.6. I'll drop this altogether the next round.

Even when inside a git work tree, if two paths are given and at least one is clearly outside the work tree, it cannot be a request to diff a tracked path anyway; allow such an invocation to use --no-index semantics.

---

And this should hopefully be enough.

 diff-no-index.c |   39 ++++++++++++++++++++++++++++++++-------
 1 files changed, 32 insertions(+), 7 deletions(-)

index 1b57fee..b1ae791 100644
@@ -144,6 +144,25 @@ static int queue_diff(struct diff_options *o,
 	}
 }
 
+static int path_outside_repo(const char *path)
+{
+	/*
+	 * We have already done setup_git_directory_gently() so we
+	 * know we are inside a git work tree already.
+	 */
+	const char *work_tree;
+	size_t len;
+
+	if (!is_absolute_path(path))
+		return 0;
+	work_tree = get_git_work_tree();
+	len = strlen(work_tree);
+	if (strncmp(path, work_tree, len) ||
+	    (path[len] != '\0' && path[len] != '/'))
+		return 1;
+	return 0;
+}
+
 void diff_no_index(struct rev_info *revs,
 		   int argc, const char **argv,
 		   int nongit, const char *prefix)

@@ -162,13 +181,19 @@ void diff_no_index(struct rev_info *revs,
 			break;
 	}
 
-	/*
-	 * No explicit --no-index, but "git diff --opts A B" outside
-	 * a git repository is a cute hack to support.
-	 */
-	if (!no_index && !nongit)
-		return;
-
+	if (!no_index && !nongit) {
+		/*
+		 * Inside a git repository, without --no-index.  Only
+		 * when a path outside the repository is given,
+		 * e.g. "git diff /var/tmp/[12]", or "git diff
+		 * Makefile /var/tmp/Makefile", allow it to be used as
+		 * a colourful "diff" replacement.
+		 */
+		if ((argc != i + 2) ||
+		    (!path_outside_repo(argv[i]) &&
+		     !path_outside_repo(argv[i+1])))
+			return;
+	}
 	if (argc != i + 2)
 		die("git diff %s takes two paths",
 		    no_index ? "--no-index" : "[--no-index]");

1.5.6.rc0.13.g2d392

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's been a while since the last issue of this series. I've been swamped, and haven't had a chance to spend enough time on reviewing and accepting patches.

A rough timeline from now on.

* Fixes of 'master' continues, with newer -rcX tagged every once in a while.

* 1.5.6 Final (2008-06-08 -- likely to slip by a week or so, though).

There are a few known breakages I want to see addressed that are not in here before 1.5.6 (no not any new features but pure bugfixes).

----------------------------------------------------------------
[New Topics]

* jc/checkout (Wed May 28 16:11:16 2008 -0700) 5 commits
- PARK: NUL hack to entry
- checkout: "best effort" checkout
- unpack_trees(): allow callers to differentiate worktree errors from merge errors
- checkout: consolidate reset_{to_new,clean_to_new|()
- checkout: make reset_clean_to_new() not die by itself

* lr/init-bare (Wed May 28 19:53:57 2008 +0100) 1 commit
- git-init: accept --bare option

This makes both "git --bare init" and "git init --bare" work, which would reduce confusion. I am tempted to include it in 1.5.6. Comments?

----------------------------------------------------------------
[Graduated to "master"]

* jc/diff-no-no-index (Mon May 26 22:35:07 2008 -0700) 5 commits
+ git diff --no-index: default to page like other diff frontends
+ git-diff: allow --no-index semantics a bit more
+ "git diff": do not ignore index without --no-index
+ diff-files: do not play --no-index games
+ tests: do not use implicit "git diff --no-index"

This was done in response to recently discovered interaction with stgit; we were too eater to invoke --no-index behaviour without being asked.

----------------------------------------------------------------
[Stalled]

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this.

This needs debugging.

* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits
+ 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 tip commit on the series).

* 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

This may complement the proposed "sequencer" GSoC project. Dscho seems to have quite a strong objection to the 'mark' syntax and mechanism being unnecessarily complex. Let's wait and see if a less complex but equally expressive alternative materializes...

* 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 but it appears neither will happen by 1.5.6 anyway.

* 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

----------------------------------------------------------------
[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.

* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
- merge: remove deprecated summary and diffstat options and config variables

This needs to be held back, as it actually removes the support for features that the main part of the series deprecates, until 1.6.0 or later.

* 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.

* 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.

Well, there are the two not-quite facetious suggestions I made off list to Junio. Granted, he though they would be overkill (too), but I guess I could make them here for the general record in any case.

One suggestion was to make a procedural model out of the commit graph and allow something like this:

b :- pick(B)
x :- merge(pick(A), b)
y :- merge(pick(C), b)
z :- merge(x, y)

My second and semi-equivallent suggestion was to allow a lisp-like notation:

(merge (merge (pick A)
(pick B)
(merge (pick B)
(pick C)

As Junio observed, even that could be beyond what most casual git rebase -i users are willing to do to a sequencer edit stream before getting down to business.

Ah well. :-)

jdl

Hi,

Nice idea. But imho too hard for casual users. Someone who has to learn a new language won't use the tool.

You forgot some right parenthesis here ;-) ...which shows, that it is also not easy enough for users.

Or is it intentional?

:)
Stephan

Stephan Beyer <[email protected]>, PGP 0x6EDDD207FCC5040F

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's been a while since the last issue of this series. I've been swamped, and haven't had a chance to spend enough time on reviewing and accepting patches.

A rough timeline from now on.

* Fixes of 'master' continues, with newer -rcX tagged every once in a while. I'd like to tag -rc1 in a few days.

* 1.5.6 Final (2008-06-08 -- likely to slip by a week or so, though).

----------------------------------------------------------------
[New Topics]

* lw/gitweb (Sat May 31 16:19:24 2008 +0200) 2 commits
- gitweb: use Git.pm, and use its parse_rev method for git_get_head_hash
- perl/Git.pm: add parse_rev method

I do not necessarily think it is an improvement to name the operation called as "rev-parse" at the plumbing layer with a different name "get_hash" as the later round of this series does.

As I mentioned on the list, I think the "PERL5LIB fix" I squashed in was a misguided workaround to a wrong problem; if we are making gitweb.perl to use Git.pm, I think we should do the same GITPERLLIB trick we do to other perl scripts for consistency.

I've looked at the Git.pm testsuite that uses Test::More briefly but hadn't really reviewed it. Is Test::More commonly used, considered solid and widely available?

----------------------------------------------------------------
[Graduated to "master"]

* lw/test-fix (Sat May 31 23:11:21 2008 +0200) 1 commit
+ t/test-lib.sh: resolve symlinks in working directory, for pathname comparisons

* sb/am-tests (Sun Jun 1 00:11:43 2008 +0200) 2 commits
+ Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh
+ Add test cases for git-am

* lt/pack-sync (Fri May 30 08:54:46 2008 -0700) 2 commits
+ Remove now unnecessary 'sync()' calls
+ Make pack creation always fsync() the result

* sp/remote (Sun Jun 1 00:28:04 2008 -0400) 3 commits
+ Make "git-remote rm" delete refs acccording to fetch specs
+ Make "git-remote prune" delete refs according to fetch specs
+ Remove unused remote_prefix member in builtin-remote

"git-remote" had an unwarranted assumption that everybody uses refs/remotes/$it namespace to track remote repository called $it. This series is a reasonable fix to it.

* np/pack-check (Thu May 29 17:34:50 2008 -0400) 1 commit
+ make verify-pack a bit more useful with bad packs

* lr/init-bare (Wed May 28 19:53:57 2008 +0100) 1 commit
+ git-init: accept --bare option

This makes both "git --bare init" and "git init --bare" work, which would reduce confusion.

* jc/checkout (Wed May 28 16:11:16 2008 -0700) 4 commits
+ checkout: "best effort" checkout
+ unpack_trees(): allow callers to differentiate worktree errors from merge errors
+ checkout: consolidate reset_{to_new,clean_to_new|()
+ checkout: make reset_clean_to_new() not die by itself

This "fix" seems to help real-world users.

* jb/reset-q (Sat May 31 18:10:58 2008 -0700) 1 commit
+ git-reset: honor -q and do not show progress message

----------------------------------------------------------------
[Stalled]

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this.

This needs debugging.

* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits
+ 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 tip commit on the series).

* 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

This may complement the proposed "sequencer" GSoC project. Dscho seems to have quite a strong objection to the 'mark' syntax and mechanism being unnecessarily complex. Let's wait and see if a less complex but equally expressive alternative materializes...

* 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 but it appears neither will happen by 1.5.6 anyway.

* 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

----------------------------------------------------------------
[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.

* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
- merge: remove deprecated summary and diffstat options and config variables

This needs to be held back, as it actually removes the support for features that the main part of the series deprecates, until 1.6.0 or later.

* 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.

* 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.

yes it is on all three points. It is the most commonly used test module for Perl, used by thousands of CPAN distributions. Test::More is delivered as core module since 5.8.0 or 5.6.2, so is widely deployed. It is actively maintained and is integrated in a test framework that allows the use and development of further "plug-in" test modules. With that it's conceivable to write a test module specifically for git and its usage scenarios.

Regards,
Sebastian

Hi,

AFAIR this limitation was already in the scripted version, and I tried to wrap my head around lifting it. However, I did not end up with the brillian analysis of Shawn, and was almost sending a reply contradicting his logic. However, I agree with Shawn that it is the same issue as contradicting fetches, so if it leads to problems, it is a pilot error.

_However_, I still try to come up with some attic for deleted refs. It is not just a matter of moving the logs to a different namespace because of D/F conflicts.

Ciao,
Dscho

Record the delete at the end of the reflog so we have a date/time record and the last SHA-1 value, just in case it doesn't match up with the most recent reflog entry (e.g. user ran some legacy tool that just redirect git-commit-tree output to the branch itself).

Take the SHA-1 hash of the reflog now that the final entry is written. Rename the file to .git/attic/$sha1 and call it a day. I thought about compressing the file too, but its not worth saving the disk space here and it would make tools that inspect the attic expensive to run.

The attic can be easily cleaned out by looking at the timestamp of the last record of each file. Attic log files older than X days can be removed. This is better than reading the modification time of the file as we don't have to worry about some copy tool not saving the modification time if the user moves/copies the repository.

That's all the easy stuff.

The hard stuff is:

- Should the commits listed in attic reflogs be considered reachable when we pack, prune or fsck? Commits in a reflog are, even if they aren't reachable from a transport perspective.

- What command gets the extra options to see what branches are in the attic and when they got there?

- What command gets the extra option to recover a branch from the attic?

- When we recover a branch from the attic is it sufficient to recover it to the name it had at time of deletion? Should we allow you to recover it to a different name?

- Is it sufficient to make you recover the branch from the attic before you can access the rest of its reflog with porcelain?

- What do we do if we recover a branch with stale reflog entries and the attic is deemed to not be reachable (see above).

Shawn.

Hi,

That's obvious.

I actually would prefer to have the logs in the .git/logs/ directory, so that I can easily reuse all existing reflog handling.

After sending the mail, I actually got an idea:

.git/logs/attic/<timestamp>/<refname>

I think this should work without problems. In that case, git-gc also handles the garbage collection.

Yes, they should. That is the whole purpose of keeping the reflogs: I want to be able to resurrect the branch, if I deleted it by accident.

I'd like to have them listed with the other reflogs.

None. It is the user's responsibility to use the information wisely.

git branch resurrected attic/<bla>/refs/heads/accidentally-deleted@{1}

See above. I think resurrecting under the same name would not necessarily be the most frequent operation on deleted refs.

I'll just go with my idea, implement it, and post it here for discussion.

Ciao,
Dscho

I do not like that particular color of the bikeshed, but I'd agree that it certainly is the easiest route from both the implementation and the design point of view. All of the "hard stuff" Shawn mentions goes away, and you are left with only one new "hard stuff", which is much easier to solve:

- Should there be a way to really remove the archived reflog?

And my answer is "yes, a new subcommand to 'git-reflog' to list and another subcommand to remove one".

As to default behaviour, probably we would by default archive any local branches, and _not_ archive other things like remote trackers and tags. A new configuration variable reflog.archive = {none,heads,all} would be honored and absense of it defaults to reflog.archive = heads.

Hi,

Okay, how about "deleted-%d.%m.%Y-%H:%M:%S" instead of "attic/%s"?

You mean a subcommand to list just the refs that exist in the deleted-* namespace?

As to remove one, how about:

	 git reflog --expire=now --expire-unreachable=now \
		deleted-<date>/<refname>

Hmm?

Unfortunately, this is exactly what I need: remote trackers and tags. Since I have to delete branches from repo.or.cz as long as the pruning of forked projects' objects does not work correctly.

Sure, that makes sense. I'd just "git config --global reflog.archive all".

Ciao,
Dscho

Hi,

Just tried that, and for obvious reasons it fails the testsuite: Git is just too darned fast.

Ciao,
Dscho

It is part of perl-5.8.6-24 RPM package in Fedora Core 4.
It is mentioned in http://www.perlfoundation.org/perl5/index.cgi?testing

Nice.

Jakub Narebski
Poland
ShadeHawk on #git

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's been a while since the last issue of this series. I've been swamped, and haven't had a chance to spend enough time on reviewing and accepting patches.

A rough timeline from now on.

* 1.5.6-rc3 this weekend.

* 1.5.6 Final (2008-06-20).

----------------------------------------------------------------
[New Topics]

* 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

* rs/attr (Sun Jun 8 17:16:11 2008 +0200) 1 commit
+ Ignore .gitattributes in bare repositories

* 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/*

None of the above are 1.5.6 material, except for the "ignore .gitattributes file in bare repositories" from René, which I think we should have.

----------------------------------------------------------------
[Graduated to "master"]

Nothing this week.

----------------------------------------------------------------
[Stalled]

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this.

This needs debugging.

* 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).

* 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

This may complement the proposed "sequencer" GSoC project. Dscho seems to have quite a strong objection to the 'mark' syntax and mechanism being unnecessarily complex. Let's wait and see if a less complex but equally expressive alternative materializes...

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 but it appears neither will happen by 1.5.6 anyway.

* 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

----------------------------------------------------------------
[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.

* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
- merge: remove deprecated summary and diffstat options and config variables

This needs to be held back, as it actually removes the support for features that the main part of the series deprecates, until 1.6.0 or later.

* 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.

* 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.

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's been a while since the last issue of this series. I've been swamped, and haven't had a chance to spend enough time on reviewing and accepting patches.

A rough timeline from now on.

* 1.5.6 Final (late this week).

----------------------------------------------------------------
[New Topics]

* 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

Would be helpful 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.

* lw/perlish (Tue Jun 17 08:59:51 2008 +0200) 2 commits
- Git.pm: add test suite
- t/test-lib.sh: add test_external and test_external_without_stderr

IO::String dependency is a bit worrysome, and the error diagnostic could hopefully be made more obvious, but I do not have a fundamental objection to this series.

* 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"]

* rs/attr (Sun Jun 8 17:16:11 2008 +0200) 1 commit
+ Ignore .gitattributes in bare repositories

----------------------------------------------------------------
[On Hold]

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ "git push": tellme-more protocol extension

Allows common ancestor negotiation for git-push to help people with shared repository workflow in certain minority situations. The lack of protocol support has been bugging me for quite some time, and that was the reason I did this.

This needs debugging.

* 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).

* 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. There is no fundamental reason to favor one over the other, so I'll be torn after 1.5.6 happens, but not before.

* 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/*

* 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.

* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
- merge: remove deprecated summary and diffstat options and config variables

This needs to be held back, as it actually removes the support for features that the main part of the series deprecates, until 1.6.0 or later.

* 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.

* 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.

The first 3 patches (i.e. the bottom 3 in the above list) might be considered general cleanup patches, and are independent of each other (i.e. you might want to include them on their own merit, independently of patch #4).

The final patch doesn't make any difference for "regular" repos (e.g. git.git with ~200 refs) on Linux (see below). But once the number of refs increase, the difference becomes obvious.

Here are some numbers to give some more context:

All tests done on 64-bit quad-core Linux, cloning locally (hard-linked):

~200 refs (git.git):

current next:    0.2s
w/above patches: 0.2s

~1000 refs (test repo):

current next:    0.16s
w/above patches: 0.05s

~11000 refs (test repo):

current next:    1.3s
w/above patches: 0.3s

~26000 refs (actual repo at $dayjob):

current next:    3.2s
w/above patches: 0.8s

Regards,

...Johan

Johan Herland, <[email protected]>
www.herland.net

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.

I may be wrong, but given that git-upload-pack/receive-pack is now not in PATH, I think it will be problematic to do a pull/push in case the server runs next, the client is 1.5.6 and the user has git-shell as shell, for example.

Or have I missed something?

Thanks

The idea of the "shell: accept 'git foo' form" patch is that as long as the server end consistently use the same version (i.e. git-shell is from 'next' and it knows where the rest of git is installed), things should work fine. I've merged them to 'next' and pushed it out so that you can try it.

I do not use git-shell in production setting (I do have one user account whose login shell is git-shell from 'next' I use purely for testing), and I do not know how much use it has seen in the real world. My cursory sanity-check ("cvs -d :ext:thatuser@myhost:/path/ co --help", and "git ls-remote ssh://thatuser@myhost/path/") seems to be Ok with $(bindir) that has only git, gitk and nothing else.

Any clone / push operation fails if you use current next:

Vienna:bin pieter$ git --version
git version 1.5.6.129.g274ea
Vienna:bin pieter$ git clone localhost:project/bonnenteller Initialize bonnenteller/.git
Initialized empty Git repository in /opt/git/bin/bonnenteller/.git/ Password:
bash: git-upload-pack: command not found
fatal: The remote end hung up unexpectedly

I think that is what Miklos meant. Also, I think the client sends the command to execute on the remote side. At least for v1.5.5 clients and before, that is "git-upload-pack". As this is not in PATH, that command will fail on any server that runs v1.5.6 and has the libexec dir.

- Pieter

That is supposed to be "v1.5.6" and "v1.6.0" respectively.

Exactly. Thanks for the good description.

Hi,

AFAICT these are fixed with ed99a225(Merge branch 'jc/dashless' into next).

Ciao,
Dscho

Using fc48199 ("Merge branch 'master' into next", which includes ed99a225) on the server, v1.5.6 on the client, I get:

$ git clone server:/home/vmiklos/git/test next
Initialize next/.git
Initialized empty Git repository in /home/vmiklos/scm/git/next/.git/
vmiklos@server's password:
bash: git-upload-pack: command not found
fatal: The remote end hung up unexpectedly

Hi,

Hmm. Probably the client needs to be newer, too. This is going to be painful. Junio?

Sorry for the noise,
Dscho

Even with maint client accessing an account with next git-shell as its login shell, I do not get the above failure.

Is git-shell installed and configured correctly at all in Miklos's setup? Why does the other side say "bash: git-upload-pack" when login shell is git-shell and not bash?

Sorry for the confusion, this is not about git-shell at all. I have bash as the shell on the server, obviously.

So, in case the server runs next, the client runs master, and I try to clone via ssh, I get the above error.

Ah, there is not much we can do in that case then. git-upload-pack is what the client asks you to run, and if you do not have it in the path, you can (1) either make sure it is on the path, (2) have the client be more explicit when asking for git-upload-pack (--upload-pack=$where), or
(3) leave the minimum git-* binaries that can remotely be launched directly in the usual $PATH.

It most likely makes sense to do (3) anyway. upload-pack, receive-pack, anything else?

I think that's all.

Then that would be this patch on top of nd/dashless topic.

 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 929136b..babf16b 100644
@@ -1268,7 +1268,7 @@ install: all
 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
-	$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
+	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X '$(DESTDIR_SQ)$(bindir_SQ)'
 	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
 	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
 ifndef NO_TCLTK

Quoting Junio C Hamano <[email protected]>:

Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/

Yes, it runs git-upload-archive on the remote side. The three primary services for the remote side are documented in daemon.c:

    403 static struct daemon_service daemon_service[] = {
    404     { "upload-archive", "uploadarch", upload_archive, 0, 1 },
    405     { "upload-pack", "uploadpack", upload_pack, 1, 1 },
    406     { "receive-pack", "receivepack", receive_pack, 0, 1 },
    407 };

(with git- prefixes).

IMHO all three need to be in $PATH, along with git and gitk, through at least a major revision release cycle to give clients a chance to upgrade to something that uses "git foo" rather than "git-foo" when talking to the remote.

Shawn.

Otherwise remote executions directly over ssh won't find them as they used to. --upload-pack and --receive-pack options _could_ be used on the client side, but things should keep working out-of-box for older clients.

Later versions of clients (fetch-pack and send-pack) probably could start asking for these programs with dashless form, but that is a different topic.

---

Ok, how about this?

 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 929136b..742e7d3 100644
@@ -1268,7 +1268,7 @@ install: all
 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
-	$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
+	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-archive$X '$(DESTDIR_SQ)$(bindir_SQ)'
 	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
 	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
 ifndef NO_TCLTK

1.5.6.56.g29b0d

The daemon expects to see the dashed form and we cannot change older servers. But when invoking programs on the remote end over SSH, the command line the client side build is under client's control.

---
* This I haven't even compile tested at all, but it feels right. We probably should do this before bindir=>libexecdir move; as long as this is in place on the client side the version running on the server end should not matter.

 connect.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

index e92af29..fd1da26 100644
@@ -589,6 +589,10 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
 	conn = xcalloc(1, sizeof(*conn));
 
 	strbuf_init(&cmd, MAX_CMD_LEN);
+	if (protocol != PROTO_GIT && !strncmp(prog, "git-", 4)) {
+		strbuf_addstr(&cmd, "git ");
+		prog += 4;
+	}
 	strbuf_addstr(&cmd, prog);
 	strbuf_addch(&cmd, ' ');
 	sq_quote_buf(&cmd, path);

1.5.6.56.g29b0d

...

Shawn.

Well, the thing is, "higher up" would not have enough clue to see if it needs to give dashed form (for git-daemon) or space form (for ssh), so that suggestion won't help much.

I do not care too much about closed source service, but gitosis should be able to update the pattern to allow "git[ -]upload-pack" reasonably easily.

Any other suggestions that is workable?

Actually I'd go the other direction. Allow the higher up level to supply "git upload-pack" and convert it to git- for the git://
protocol. Possible patch below.

Pasky also has to update:

$ git ls-remote --upload-pack='git upload-pack' repo.or.cz:/srv/git/egit.git
fatal: unrecognized command 'git upload-pack '/srv/git/egit.git''
fatal: The remote end hung up unexpectedly

;-)

index 5c5acb4..98d0f0f 100644
@@ -37,7 +37,7 @@ static int option_quiet, option_no_checkout, option_bare;
 static int option_local, option_no_hardlinks, option_shared;
 static char *option_template, *option_reference, *option_depth;
 static char *option_origin = NULL;
-static char *option_upload_pack = "git-upload-pack";
+static char *option_upload_pack = "git upload-pack";
 
 static struct option builtin_clone_options[] = {
 	OPT__QUIET(&option_quiet),

@@ -58,7 +58,7 @@ static struct option builtin_clone_options[] = {
 	OPT_STRING('o', "origin", &option_origin, "branch",
 		   "use <branch> instead or 'origin' to track upstream"),
 	OPT_STRING('u', "upload-pack", &option_upload_pack, "path",
-		   "path to git-upload-pack on the remote"),
+		   "path to git upload-pack on the remote"),
 	OPT_STRING(0, "depth", &option_depth, "depth",
 		    "create a shallow clone of that depth"),
 

index f4dbcf0..b0efd01 100644
@@ -14,7 +14,7 @@ static int transfer_unpack_limit = -1;
 static int fetch_unpack_limit = -1;
 static int unpack_limit = 100;
 static struct fetch_pack_args args = {
-	/* .uploadpack = */ "git-upload-pack",
+	/* .uploadpack = */ "git upload-pack",
 };
 
 static const char fetch_pack_usage[] =

index e92af29..dbabd93 100644
@@ -576,8 +576,8 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
 		 * from extended components with a NUL byte.
 		 */
 		packet_write(fd[1],
-			     "%s %s%chost=%s%c",
-			     prog, path, 0,
+			     "git-%s %s%chost=%s%c",
+			     prog + 4, path, 0,
 			     target_host, 0);
 		free(target_host);
 		free(url);

index 695a409..0f82a93 100755
@@ -255,10 +255,10 @@ get_uploadpack () {
 	case "$data_source" in
 	config)
 		uplp=$(git config --get "remote.$1.uploadpack")
-		echo ${uplp:-git-upload-pack}
+		echo ${uplp:-git upload-pack}
 		;;
 	*)
-		echo "git-upload-pack"
+		echo "git upload-pack"
 		;;
 	esac
 }

index 3ff8519..351b7f5 100644
@@ -762,10 +762,10 @@ struct transport *transport_get(struct remote *remote, const char *url)
 
 		data->thin = 1;
 		data->conn = NULL;
-		data->uploadpack = "git-upload-pack";
+		data->uploadpack = "git upload-pack";
 		if (remote && remote->uploadpack)
 			data->uploadpack = remote->uploadpack;
-		data->receivepack = "git-receive-pack";
+		data->receivepack = "git receive-pack";
 		if (remote && remote->receivepack)
 			data->receivepack = remote->receivepack;
 	}

Shawn.

Typofix: s/cond/uncond/;

If we force --upload-pack workaround to _everybody_ we are already lost.

Also I think the previous one still lets you work it around by giving a full path, like "/usr/local/bin/git-upload-pack", because "/usr" does not match "git-" ;-)

Shouldn't "git upload-pack" work on the server side as far back as 0.99.9k? That's back really old. And my patch fixed "git " to be "git-" when talking to git-daemon, thus keeping clients compatible with all current git:// servers.

For SSH servers that can't handle "git upload-pack" the user can change it to --upload-pack=git-upload-pack and get back to the old behavior, until the server operator can upgrade.

Your patch doesn't offer that work around on the client side.

Check my change in git_connect again:

index e92af29..dbabd93 100644
@@ -576,8 +576,8 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
 		 * from extended components with a NUL byte.
 		 */
 		packet_write(fd[1],
-			     "%s %s%chost=%s%c",
-			     prog, path, 0,
+			     "git-%s %s%chost=%s%c",
+			     prog + 4, path, 0,
 			     target_host, 0);
 		free(target_host);
 		free(url);

Its buggy if the user tried to do "git ls-remote --upload-pack=crp git://"
but if this is the direction we want to go we can obviously work out a better method of forcing "git " to be "git-" when talking to git-daemon.

Please tell me, where is git-upload-pack on repo.or.cz?

$ ssh repo.or.cz which git-upload-pack
fatal: unrecognized command 'which git-upload-pack'

I doubt I can pass it '/usr/local/bin/git-upload-pack' and get it to work too. So I don't think this is a good work around.

Obviously pasky will fix repo.or.cz to accept both at some point in the near future, likely before 1.6.0 releases, because he's cool like that. Not everyone is.

Please don't make 1.6.0 unavailable to end-users because their server operator can't currently accept "git upload-pack" without giving them a workaround to force "git-upload-pack" over SSH.

Shawn.

Yeah, I missed the patch to connect.c that was buried among other changes. Sorry.

Ok, let's map this out seriously.

* 1.6.0 will install the server-side programs in $(bindir) so that people coming over ssh will find them on the $PATH

* In 1.6.0 (and 1.5.6.1), we will change "git daemon" to accept both "git-program" and "git program" forms. When the spaced form is used, it will behave as if the dashed form is requested. This is a prerequisite for client side change to start asking for "git program".

* In the near future, there will no client-side change. "git-program" will be asked for.

* 6 months after 1.6.0 ships, hopefully all the deployed server side will be running that version or newer. Client side will start asking for "git program" by default, but we can still override with --upload-pack and friends.

* 12 months after client side changes, everybody will be running that version or newer. We stop installing the server side programs in $(bindir) but people coming over ssh will be asking for "git program" and "git" will be on the $PATH so there is no issue.

The above 6 and 12 are yanked out of thin air and I am of course open to tweaking them, but I think the above order of events would be workable.

This plan makes a lot of sense to me. I'm behind it. For whatever that means. At least I'll shutup and stop making noise about this issue if you take this approach. :-)

Yea, 6 and 12 seem like a good idea. Its a couple of releases and gives people time to migrate their server installations.

Shawn.

This is a step to futureproof git-daemon to accept clients that ask for "git upload-pack" and friends, instead of using the more traditional dash-form "git-upload-pack". By allowing both, it makes the client side easier to handle, as it makes "git" the only thing necessary to be on $PATH when invoking the remote command directly via ssh.

---

So this obviously needs to be queued to 'maint' to be included in 1.5.6.1 and 1.6.0.

 daemon.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 63cd12c..621c567 100644
@@ -586,7 +586,7 @@ static int execute(struct sockaddr *addr)
 	for (i = 0; i < ARRAY_SIZE(daemon_service); i++) {
 		struct daemon_service *s = &(daemon_service[i]);
 		int namelen = strlen(s->name);
-		if (!prefixcmp(line, "git-") &&
+		if ((!prefixcmp(line, "git-") || !prefixcmp(line, "git ")) &&
 		    !strncmp(s->name, line + 4, namelen) &&
 		    line[namelen + 4] == ' ') {
 			/*

Obviously correct. Ack. Thanks Junio.

Shawn.

By the way I looked at gitosis (Tommi CC'ed).

    http://repo.or.cz/w/gitosis.git?a=blob;f=gitosis/serve.py;h=c0b7135bf45305ee1079b0dcab3b4ed1ce988aab;hb=38561aa6a51a2ef6cc04aa119481df62d213ffa4

In gitosis/serve.py, there are COMMANDS_READONLY and COMMANDS_WRITE array that holds 'git-upload-pack' and 'git-receive-pack' commands, and they are compared with user commands after doing:

verb, args = command.split(None, 1)

(and "verb" is looked up in the set of valid commands). It should not be too involved to notice verb is 'git' and then re-split the args part to see if they are upload-pack/receive-pack, which would be the equivalent change to this patch. It needs to be done before the clients are updated.

Yeah, that's pretty much a trivial change, doing it now to future-proof gitosis.

:(){ :|:&};:

Hi,

This just happened to me with a dashless client, so I tried your patch but it does not work. The problem comes from git-shell that do not support dashless argument, yet (IOW: git shell -c 'git upload-pack ...' give an error).

The following patch on top of yours fix the problem. The s/git-shell/git shell/ part is not really necessary, but why not?

index 9a91fcb..5aac355 100644
@@ -21,12 +21,10 @@ ALLOW_RE = re.compile("^'/*(?P<path>[a-zA-Z0-9][a-zA-Z0-9@._-]*(/[a-zA-Z0-9][a-z
 
 COMMANDS_READONLY = [
     'git-upload-pack',
-    'git upload-pack',
     ]
 
 COMMANDS_WRITE = [
     'git-receive-pack',
-    'git receive-pack',
     ]
 
 class ServingError(Exception):

@@ -75,7 +73,7 @@ def serve(
             # all known "git foo" commands take one argument; improve
             # if/when needed
             raise UnknownCommandError()
-        verb = '%s %s' % (verb, subverb)
+        verb = '%s-%s' % (verb, subverb)
 
     if (verb not in COMMANDS_WRITE
         and verb not in COMMANDS_READONLY):

@@ -201,6 +199,6 @@ class Main(app.App):
             sys.exit(1)
 
         main_log.debug('Serving %s', newcmd)
-        os.execvp('git-shell', ['git-shell', '-c', newcmd])
-        main_log.error('Cannot execute git-shell.')
+        os.execvp('git', ['git', 'shell', '-c', newcmd])
+        main_log.error('Cannot execute git.')
         sys.exit(1)

Olivier.

This will allow server side programs such as upload-pack to be installed outside $PATH. Connections to git-daemon still ask for "git-program" to retain backward compatibility for daemons before 1.5.6.1 and 1.6.0.

---
* This is essentially your patch. This can be in 1.6.0 clients and it should also be in 1.5.6.1 as people might keep ancient clients to talk to new servers that won't have anything but "git" on $PATH.

 builtin-clone.c      |    2 +-
 builtin-fetch-pack.c |    2 +-
 connect.c            |   10 ++++++++--
 git-parse-remote.sh  |    4 ++--
 transport.c          |    4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)

index 7190952..2f3e9c9 100644
@@ -36,7 +36,7 @@ static int option_quiet, option_no_checkout, option_bare;
 static int option_local, option_no_hardlinks, option_shared;
 static char *option_template, *option_reference, *option_depth;
 static char *option_origin = NULL;
-static char *option_upload_pack = "git-upload-pack";
+static char *option_upload_pack = "git upload-pack";
 
 static struct option builtin_clone_options[] = {
 	OPT__QUIET(&option_quiet),

index de1e8d1..a5f21f9 100644
@@ -14,7 +14,7 @@ static int transfer_unpack_limit = -1;
 static int fetch_unpack_limit = -1;
 static int unpack_limit = 100;
 static struct fetch_pack_args args = {
-	/* .uploadpack = */ "git-upload-pack",
+	/* .uploadpack = */ "git upload-pack",
 };
 
 static const char fetch_pack_usage[] =

index e92af29..4a32ba4 100644
@@ -567,6 +567,8 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
 		 * cannot connect.
 		 */
 		char *target_host = xstrdup(host);
+		const char *program_prefix = "";
+
 		if (git_use_proxy(host))
 			git_proxy_connect(fd, host);
 		else

@@ -575,9 +577,13 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
 		 * Separate original protocol components prog and path
 		 * from extended components with a NUL byte.
 		 */
+		if (!prefixcmp(prog, "git ")) {
+			program_prefix = "git-";
+			prog += 4;
+		}
 		packet_write(fd[1],
-			     "%s %s%chost=%s%c",
-			     prog, path, 0,
+			     "%s%s %s%chost=%s%c",
+			     program_prefix, prog, path, 0,
 			     target_host, 0);
 		free(target_host);
 		free(url);

index 695a409..0f82a93 100755
@@ -255,10 +255,10 @@ get_uploadpack () {
 	case "$data_source" in
 	config)
 		uplp=$(git config --get "remote.$1.uploadpack")
-		echo ${uplp:-git-upload-pack}
+		echo ${uplp:-git upload-pack}
 		;;
 	*)
-		echo "git-upload-pack"
+		echo "git upload-pack"
 		;;
 	esac
 }

index 3ff8519..351b7f5 100644
@@ -762,10 +762,10 @@ struct transport *transport_get(struct remote *remote, const char *url)
 
 		data->thin = 1;
 		data->conn = NULL;
-		data->uploadpack = "git-upload-pack";
+		data->uploadpack = "git upload-pack";
 		if (remote && remote->uploadpack)
 			data->uploadpack = remote->uploadpack;
-		data->receivepack = "git-receive-pack";
+		data->receivepack = "git receive-pack";
 		if (remote && remote->receivepack)
 			data->receivepack = remote->receivepack;
 	}

1.5.6.86.ge2da6

Ack. Thanks for cleaning up the code in connect.c to not segfault or send garbage.

I think you want to squash this in as well:

index d76260c..f693a6d 100644
@@ -12,7 +12,7 @@ static const char send_pack_usage[] =
 "  --all and explicit <ref> specification are mutually exclusive.";
 
 static struct send_pack_args args = {
-	/* .receivepack = */ "git-receive-pack",
+	/* .receivepack = */ "git receive-pack",
 };
 
 /*

Shawn.

This drops backward compatibility support to ask for "git-program" form when talking to git-daemon. Now all git native requests use "git program" form over ssh, local and git transports.

This needs to be held back until everybody runs git-daemon from 1.5.6.1 or 1.6.0 or newer.

---
* According to the roadmap we exchanged earlier, this should happen in a major release (that increments the second dewey-decimal digit from the left) that ships at least 6 months after 1.5.6.1 and 1.6.0 (which will have the "git daemon preparation" patch included) are released.

 connect.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

index 4a32ba4..f2e72c2 100644
@@ -567,7 +567,6 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
 		 * cannot connect.
 		 */
 		char *target_host = xstrdup(host);
-		const char *program_prefix = "";
 
 		if (git_use_proxy(host))
 			git_proxy_connect(fd, host);

@@ -577,13 +576,9 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
 		 * Separate original protocol components prog and path
 		 * from extended components with a NUL byte.
 		 */
-		if (!prefixcmp(prog, "git ")) {
-			program_prefix = "git-";
-			prog += 4;
-		}
 		packet_write(fd[1],
-			     "%s%s %s%chost=%s%c",
-			     program_prefix, prog, path, 0,
+			     "%s %s%chost=%s%c",
+			     prog, path, 0,
 			     target_host, 0);
 		free(target_host);
 		free(url);