Update devel/scmgit [1.5.4.5 -> 1.5.5]

   The scmgit-base package now installs most of its binaries, e.g. git-*,
   to ${PREFIX}/libexec/git-core/ instead of ${PREFIX}/bin.  There are
   only two programs under ${LOCALBASE}/bin: the "master" git(7) wrapper
   program and the gitk tcl/tk repository browser.  Given that there are
   many different GIT interfaces (GUI applications, devel/tig, shell
   completion scripts, etc.), it seemed needless to me to have 120+
   binaries--a vast majority of which most users would seldom invoke
   directly--polluting ${LOCALBASE}/bin.


GIT v1.5.5 Release Notes
========================

Updates since v1.5.4
--------------------

(subsystems)

 * Comes with git-gui 0.10.1

(portability)

 * We shouldn't ask for BSD group ownership semantics by setting g+s bit
   on directories on older BSD systems that refuses chmod() by non root
   users.  BSD semantics is the default there anyway.

 * Bunch of portability improvement patches coming from an effort to port
   to Solaris has been applied.

(performance)

 * On platforms with suboptimal qsort(3) implementation, there
   is an option to use more reasonable substitute we ship with
   our software.

 * New configuration variable "pack.packsizelimit" can be used
   in place of command line option --max-pack-size.

 * "git fetch" over the native git protocol used to make a
   connection to find out the set of current remote refs and
   another to actually download the pack data.  We now use only
   one connection for these tasks.

 * "git commit" does not run lstat(2) more than necessary
   anymore.

(usability, bells and whistles)

 * Bash completion script (in contrib) are aware of more commands and
   options.

 * You can be warned when core.autocrlf conversion is applied in
   such a way that results in an irreversible conversion.

 * A catch-all "color.ui" configuration variable can be used to
   enable coloring of all color-capable commands, instead of
   individual ones such as "color.status" and "color.branch".

 * The commands refused to take absolute pathnames where they
   require pathnames relative to the work tree or the current
   subdirectory.  They now can take absolute pathnames in such a
   case as long as the pathnames do not refer outside of the
   work tree.  E.g. "git add $(pwd)/foo" now works.

 * Error messages used to be sent to stderr, only to get hidden,
   when $PAGER was in use.  They now are sent to stdout along
   with the command output to be shown in the $PAGER.

 * A pattern "foo/" in .gitignore file now matches a directory
   "foo".  Pattern "foo" also matches as before.

 * bash completion's prompt helper function can talk about
   operation in-progress (e.g. merge, rebase, etc.).

 * Configuration variables "url.<usethis>.insteadof = <otherurl>" can be
   used to tell "git-fetch" and "git-push" to use different URL than what
   is given from the command line.

 * "git add -i" behaves better even before you make an initial commit.

 * "git am" refused to run from a subdirectory without a good reason.

 * After "git apply --whitespace=fix" fixes whitespace errors in a patch,
   a line before the fix can appear as a context or preimage line in a
   later patch, causing the patch not to apply.  The command now knows to
   see through whitespace fixes done to context lines to successfully
   apply such a patch series.

 * "git branch" (and "git checkout -b") to branch from a local branch can
   optionally set "branch.<name>.merge" to mark the new branch to build on
   the other local branch, when "branch.autosetupmerge" is set to
   "always", or when passing the command line option "--track" (this option
   was ignored when branching from local branches).  By default, this does
   not happen when branching from a local branch.

 * "git checkout" to switch to a branch that has "branch.<name>.merge" set
   (i.e. marked to build on another branch) reports how much the branch
   and the other branch diverged.

 * When "git checkout" has to update a lot of paths, it used to be silent
   for 4 seconds before it showed any progress report.  It is now a bit
   more impatient and starts showing progress report early.

 * "git commit" learned a new hook "prepare-commit-msg" that can
   inspect what is going to be committed and prepare the commit
   log message template to be edited.

 * "git cvsimport" can now take more than one -M options.

 * "git describe" learned to limit the tags to be used for
   naming with --match option.

 * "git describe --contains" now barfs when the named commit
   cannot be described.

 * "git describe --exact-match" describes only commits that are tagged.

 * "git describe --long" describes a tagged commit as $tag-0-$sha1,
   instead of just showing the exact tagname.

 * "git describe" warns when using a tag whose name and path contradict
   with each other.

 * "git diff" learned "--relative" option to limit and output paths
   relative to the current directory when working in a subdirectory.

 * "git diff" learned "--dirstat" option to show birds-eye-summary of
   changes more concisely than "--diffstat".

 * "git format-patch" learned --cover-letter option to generate a cover
   letter template.

 * "git gc" learned --quiet option.

 * "git gc" now automatically prunes unreachable objects that are two
   weeks old or older.

 * "git gc --auto" can be disabled more easily by just setting gc.auto
   to zero.  It also tolerates more packfiles by default.

 * "git grep" now knows "--name-only" is a synonym for the "-l" option.

 * "git help <alias>" now reports "'git <alias>' is alias to <what>",
   instead of saying "No manual entry for git-<alias>".

 * "git help" can use different backends to show manual pages and this can
   be configured using "man.viewer" configuration.

 * "gitk" does not restore window position from $HOME/.gitk anymore (it
   still restores the size).

 * "git log --grep=<what>" learned "--fixed-strings" option to look for
   <what> without treating it as a regular expression.

 * "git gui" learned an auto-spell checking.

 * "git push <somewhere> HEAD" and "git push <somewhere> +HEAD" works as
   expected; they push the current branch (and only the current branch).
   In addition, HEAD can be written as the value of "remote.<there>.push"
   configuration variable.

 * When the configuration variable "pack.threads" is set to 0, "git
   repack" auto detects the number of CPUs and uses that many threads.

 * "git send-email" learned to prompt for passwords
   interactively.

 * "git send-email" learned an easier way to suppress CC
   recipients.

 * "git stash" learned "pop" command, that applies the latest stash and
   removes it from the stash, and "drop" command to discard the named
   stash entry.

 * "git submodule" learned a new subcommand "summary" to show the
   symmetric difference between the HEAD version and the work tree version
   of the submodule commits.

 * Various "git cvsimport", "git cvsexportcommit", "git cvsserver",
   "git svn" and "git p4" improvements.

(internal)

 * Duplicated code between git-help and git-instaweb that
   launches user's preferred browser has been refactored.

 * It is now easier to write test scripts that records known
   breakages.

 * "git checkout" is rewritten in C.

 * "git remote" is rewritten in C.

 * Two conflict hunks that are separated by a very short span of common
   lines are now coalesced into one larger hunk, to make the result easier
   to read.

 * Run-command API's use of file descriptors is documented clearer and
   is more consistent now.

 * diff output can be sent to FILE * that is different from stdout.  This
   will help reimplementing more things in C.

Fixes since v1.5.4
------------------

All of the fixes in v1.5.4 maintenance series are included in
this release, unless otherwise noted.

 * "git-http-push" did not allow deletion of remote ref with the usual
   "push <remote> :<branch>" syntax.

 * "git-rebase --abort" did not go back to the right location if
   "git-reset" was run during the "git-rebase" session.

 * "git imap-send" without setting imap.host did not error out but
   segfaulted.

3 files changed, 162 insertions, 143 deletions

diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index 5a517db0c16..07c5f407abe 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,144 +1,145 @@
-@comment $NetBSD: PLIST,v 1.2 2008/02/06 07:53:31 bjs Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/04/21 01:09:51 bjs Exp $
 bin/git
-bin/git-add
-bin/git-add--interactive
-bin/git-am
-bin/git-annotate
-bin/git-apply
-bin/git-archimport
-bin/git-archive
-bin/git-bisect
-bin/git-blame
-bin/git-branch
-bin/git-bundle
-bin/git-cat-file
-bin/git-check-attr
-bin/git-check-ref-format
-bin/git-checkout
-bin/git-checkout-index
-bin/git-cherry
-bin/git-cherry-pick
-bin/git-citool
-bin/git-clean
-bin/git-clone
-bin/git-commit
-bin/git-commit-tree
-bin/git-config
-bin/git-count-objects
-bin/git-cvsexportcommit
-bin/git-cvsimport
-bin/git-cvsserver
-bin/git-daemon
-bin/git-describe
-bin/git-diff
-bin/git-diff-files
-bin/git-diff-index
-bin/git-diff-tree
-bin/git-fast-export
-bin/git-fast-import
-bin/git-fetch
-bin/git-fetch--tool
-bin/git-fetch-pack
-bin/git-filter-branch
-bin/git-fmt-merge-msg
-bin/git-for-each-ref
-bin/git-format-patch
-bin/git-fsck
-bin/git-fsck-objects
-bin/git-gc
-bin/git-get-tar-commit-id
-bin/git-grep
-bin/git-gui
-bin/git-hash-object
-bin/git-help--browse
-bin/git-http-fetch
-bin/git-http-push
-bin/git-imap-send
-bin/git-index-pack
-bin/git-init
-bin/git-init-db
-bin/git-instaweb
-bin/git-log
-bin/git-lost-found
-bin/git-ls-files
-bin/git-ls-remote
-bin/git-ls-tree
-bin/git-mailinfo
-bin/git-mailsplit
-bin/git-merge
-bin/git-merge-base
-bin/git-merge-file
-bin/git-merge-index
-bin/git-merge-octopus
-bin/git-merge-one-file
-bin/git-merge-ours
-bin/git-merge-recursive
-bin/git-merge-resolve
-bin/git-merge-stupid
-bin/git-merge-subtree
-bin/git-merge-tree
-bin/git-mergetool
-bin/git-mktag
-bin/git-mktree
-bin/git-mv
-bin/git-name-rev
-bin/git-pack-objects
-bin/git-pack-redundant
-bin/git-pack-refs
-bin/git-parse-remote
-bin/git-patch-id
-bin/git-peek-remote
-bin/git-prune
-bin/git-prune-packed
-bin/git-pull
-bin/git-push
-bin/git-quiltimport
-bin/git-read-tree
-bin/git-rebase
-bin/git-rebase--interactive
-bin/git-receive-pack
-bin/git-reflog
-bin/git-relink
-bin/git-remote
-bin/git-repack
-bin/git-repo-config
-bin/git-request-pull
-bin/git-rerere
-bin/git-reset
-bin/git-rev-list
-bin/git-rev-parse
-bin/git-revert
-bin/git-rm
-bin/git-send-email
-bin/git-send-pack
-bin/git-sh-setup
-bin/git-shell
-bin/git-shortlog
-bin/git-show
-bin/git-show-branch
-bin/git-show-index
-bin/git-show-ref
-bin/git-stash
-bin/git-status
-bin/git-stripspace
-bin/git-submodule
-bin/git-svn
-bin/git-symbolic-ref
-bin/git-tag
-bin/git-tar-tree
-bin/git-unpack-file
-bin/git-unpack-objects
-bin/git-update-index
-bin/git-update-ref
-bin/git-update-server-info
-bin/git-upload-archive
-bin/git-upload-pack
-bin/git-var
-bin/git-verify-pack
-bin/git-verify-tag
-bin/git-whatchanged
-bin/git-write-tree
 bin/gitk
+libexec/git-core/git
+libexec/git-core/git-add
+libexec/git-core/git-add--interactive
+libexec/git-core/git-am
+libexec/git-core/git-annotate
+libexec/git-core/git-apply
+libexec/git-core/git-archimport
+libexec/git-core/git-archive
+libexec/git-core/git-bisect
+libexec/git-core/git-blame
+libexec/git-core/git-branch
+libexec/git-core/git-bundle
+libexec/git-core/git-cat-file
+libexec/git-core/git-check-attr
+libexec/git-core/git-check-ref-format
+libexec/git-core/git-checkout
+libexec/git-core/git-checkout-index
+libexec/git-core/git-cherry
+libexec/git-core/git-cherry-pick
+libexec/git-core/git-citool
+libexec/git-core/git-clean
+libexec/git-core/git-clone
+libexec/git-core/git-commit
+libexec/git-core/git-commit-tree
+libexec/git-core/git-config
+libexec/git-core/git-count-objects
+libexec/git-core/git-cvsexportcommit
+libexec/git-core/git-cvsimport
+libexec/git-core/git-cvsserver
+libexec/git-core/git-daemon
+libexec/git-core/git-describe
+libexec/git-core/git-diff
+libexec/git-core/git-diff-files
+libexec/git-core/git-diff-index
+libexec/git-core/git-diff-tree
+libexec/git-core/git-fast-export
+libexec/git-core/git-fast-import
+libexec/git-core/git-fetch
+libexec/git-core/git-fetch--tool
+libexec/git-core/git-fetch-pack
+libexec/git-core/git-filter-branch
+libexec/git-core/git-fmt-merge-msg
+libexec/git-core/git-for-each-ref
+libexec/git-core/git-format-patch
+libexec/git-core/git-fsck
+libexec/git-core/git-fsck-objects
+libexec/git-core/git-gc
+libexec/git-core/git-get-tar-commit-id
+libexec/git-core/git-grep
+libexec/git-core/git-gui
+libexec/git-core/git-hash-object
+libexec/git-core/git-http-fetch
+libexec/git-core/git-http-push
+libexec/git-core/git-imap-send
+libexec/git-core/git-index-pack
+libexec/git-core/git-init
+libexec/git-core/git-init-db
+libexec/git-core/git-instaweb
+libexec/git-core/git-log
+libexec/git-core/git-lost-found
+libexec/git-core/git-ls-files
+libexec/git-core/git-ls-remote
+libexec/git-core/git-ls-tree
+libexec/git-core/git-mailinfo
+libexec/git-core/git-mailsplit
+libexec/git-core/git-merge
+libexec/git-core/git-merge-base
+libexec/git-core/git-merge-file
+libexec/git-core/git-merge-index
+libexec/git-core/git-merge-octopus
+libexec/git-core/git-merge-one-file
+libexec/git-core/git-merge-ours
+libexec/git-core/git-merge-recursive
+libexec/git-core/git-merge-resolve
+libexec/git-core/git-merge-stupid
+libexec/git-core/git-merge-subtree
+libexec/git-core/git-merge-tree
+libexec/git-core/git-mergetool
+libexec/git-core/git-mktag
+libexec/git-core/git-mktree
+libexec/git-core/git-mv
+libexec/git-core/git-name-rev
+libexec/git-core/git-pack-objects
+libexec/git-core/git-pack-redundant
+libexec/git-core/git-pack-refs
+libexec/git-core/git-parse-remote
+libexec/git-core/git-patch-id
+libexec/git-core/git-peek-remote
+libexec/git-core/git-prune
+libexec/git-core/git-prune-packed
+libexec/git-core/git-pull
+libexec/git-core/git-push
+libexec/git-core/git-quiltimport
+libexec/git-core/git-read-tree
+libexec/git-core/git-rebase
+libexec/git-core/git-rebase--interactive
+libexec/git-core/git-receive-pack
+libexec/git-core/git-reflog
+libexec/git-core/git-relink
+libexec/git-core/git-remote
+libexec/git-core/git-repack
+libexec/git-core/git-repo-config
+libexec/git-core/git-request-pull
+libexec/git-core/git-rerere
+libexec/git-core/git-reset
+libexec/git-core/git-rev-list
+libexec/git-core/git-rev-parse
+libexec/git-core/git-revert
+libexec/git-core/git-rm
+libexec/git-core/git-send-email
+libexec/git-core/git-send-pack
+libexec/git-core/git-sh-setup
+libexec/git-core/git-shell
+libexec/git-core/git-shortlog
+libexec/git-core/git-show
+libexec/git-core/git-show-branch
+libexec/git-core/git-show-index
+libexec/git-core/git-show-ref
+libexec/git-core/git-stash
+libexec/git-core/git-status
+libexec/git-core/git-stripspace
+libexec/git-core/git-submodule
+libexec/git-core/git-svn
+libexec/git-core/git-symbolic-ref
+libexec/git-core/git-tag
+libexec/git-core/git-tar-tree
+libexec/git-core/git-unpack-file
+libexec/git-core/git-unpack-objects
+libexec/git-core/git-update-index
+libexec/git-core/git-update-ref
+libexec/git-core/git-update-server-info
+libexec/git-core/git-upload-archive
+libexec/git-core/git-upload-pack
+libexec/git-core/git-var
+libexec/git-core/git-verify-pack
+libexec/git-core/git-verify-tag
+libexec/git-core/git-web--browse
+libexec/git-core/git-whatchanged
+libexec/git-core/git-write-tree
 share/git-core/templates/description
 share/git-core/templates/hooks/applypatch-msg
 share/git-core/templates/hooks/commit-msg
@@ -148,6 +149,7 @@ share/git-core/templates/hooks/post-update
 share/git-core/templates/hooks/pre-applypatch
 share/git-core/templates/hooks/pre-commit
 share/git-core/templates/hooks/pre-rebase
+share/git-core/templates/hooks/prepare-commit-msg
 share/git-core/templates/hooks/update
 share/git-core/templates/info/exclude
 share/git-gui/lib/about.tcl
@@ -186,12 +188,14 @@ share/git-gui/lib/option.tcl
 share/git-gui/lib/remote.tcl
 share/git-gui/lib/remote_branch_delete.tcl
 share/git-gui/lib/shortcut.tcl
+share/git-gui/lib/spellcheck.tcl
 share/git-gui/lib/status_bar.tcl
 share/git-gui/lib/tclIndex
 share/git-gui/lib/transport.tcl
 share/git-gui/lib/win32.tcl
 share/git-gui/lib/win32_shortcut.js
 share/gitk/lib/msgs/de.msg
+share/gitk/lib/msgs/it.msg
 @dirrm share/gitk/lib/msgs
 @dirrm share/gitk/lib
 @dirrm share/gitk
@@ -204,3 +208,4 @@ share/gitk/lib/msgs/de.msg
 @dirrm share/git-core/templates/branches
 @dirrm share/git-core/templates
 @dirrm share/git-core
+@dirrm libexec/git-core
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 315a77b7890..81aacb66617 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2008/04/07 15:05:31 bjs Exp $
+$NetBSD: distinfo,v 1.7 2008/04/21 01:09:51 bjs Exp $
 
-SHA1 (git-1.5.4.5.tar.gz) = a0e2373cca840ef2ac311c4e364aefa137ad4f92
-RMD160 (git-1.5.4.5.tar.gz) = 19a0b9f03ba7ddd1446ab79792dc3ca0cb76b8d9
-Size (git-1.5.4.5.tar.gz) = 1908589 bytes
+SHA1 (git-1.5.5.tar.gz) = 3a778211f5523832e8a712ad7cfe7b9ceb902b2e
+RMD160 (git-1.5.5.tar.gz) = 4a901c224572929f0c45970b89d90f2e988403c9
+Size (git-1.5.5.tar.gz) = 2000376 bytes
 SHA1 (patch-aa) = 5af7779f0ac99aa6694d2a4d87ed999ef21c9375
 SHA1 (patch-ab) = 746bcea15853cd78b14dc2916f5f02bf67e59751
 SHA1 (patch-ac) = b8b70fabbd2857d5b4962b94d2c852f8d092ef27
@@ -12,3 +12,4 @@ SHA1 (patch-af) = 93b83ac35f3f48cbf9a8ee39db0709547bf9d6c3
 SHA1 (patch-ag) = 8918a23e50f4e1f9aa0bb5dda4404140cda3c5b5
 SHA1 (patch-ah) = 94947b3d79c43246388da9c434f9e71e6716c790
 SHA1 (patch-ai) = 95b2b0a41b8b6f0ee804b48a3f3686d2fdf164f5
+SHA1 (patch-aj) = efd57b17ed88c8892cee757c3159e32efcb07560
diff --git a/devel/scmgit-base/patches/patch-aj b/devel/scmgit-base/patches/patch-aj
new file mode 100644
index 00000000000..d33f37a5873
--- /dev/null
+++ b/devel/scmgit-base/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2008/04/21 01:09:51 bjs Exp $
+
+--- config.mak.in.orig	2008-04-08 03:10:01.000000000 -0400
++++ config.mak.in
+@@ -11,7 +11,7 @@ TCLTK_PATH = @TCLTK_PATH@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+-#gitexecdir = @libexecdir@/git-core/
++gitexecdir = @libexecdir@/git-core/
+ datarootdir = @datarootdir@
+ template_dir = @datadir@/git-core/templates/
+