Log message:
Update to scmgit-1.6.0.1.

GIT v1.6.0.1 Release Notes
==========================

Fixes since v1.6.0
------------------

* "git diff --cc" did not honor content mangling specified by
  gitattributes and core.autocrlf when reading from the work tree.

* "git diff --check" incorrectly detected new trailing blank lines when
  whitespace check was in effect.

* "git for-each-ref" tried to dereference NULL when asked for \ 
'%(body)" on
  a tag with a single incomplete line as its payload.

* "git format-patch" peeked before the beginning of a string when
  "format.headers" variable is empty (a misconfiguration).

* "git help help" did not work correctly.

* "git mailinfo" (hence "git am") was unhappy when MIME \ 
multipart message
  contained garbage after the finishing boundary.

* "git mailinfo" also was unhappy when the "From: " line \ 
only had a bare
  e-mail address.

* "git merge" did not refresh the index correctly when a merge resulted in
  a fast-forward.

* "git merge" did not resolve a truly trivial merges that can be done
  without content level merges.

* "git svn dcommit" to a repository with URL that has embedded usernames
  did not work correctly.

* Contains other various documentation fixes.

Log message:
+========================+
|GIT v1.6.0 Release Notes|
+========================+

User visible changes

 - Templates now installed in ${PREFIX}/share/examples/scmgit/templates
   and registered as REQD_FILES.  Template subdirectories are
   registered in MAKE_DIRS.
 - Installing the many git-foo binaries/scripts into libexec/git-core
   is now default and better supported.  If you've written any
   scripts or use any applications which expect the git-foo commands
   to be in ${PREFIX}/bin, please do update them accordingly.

+--------------------+
|Updates since v1.5.6|
+--------------------+

(subsystems)

* git-p4 in contrib learned "allowSubmit" configuration to control on
  which branch to allow "submit" subcommand.

* git-gui learned to stage changes per-line.

(portability)

* Changes for MinGW port have been merged, thanks to Johannes Sixt and
  gangs.

* Sample hook scripts shipped in templates/ are now suffixed with
  *.sample.

(documentation)

* Updated howto/update-hook-example

* Got rid of usage of "git-foo" from the tutorial and made typography
  more consistent.

* Disambiguating "--" between revs and paths is finally documented.

(performance, robustness, sanity etc.)

* index-pack used too much memory when dealing with a deep delta chain.
  This has been optimized.

* reduced excessive inlining to shrink size of the "git" binary.

* verify-pack checks the object CRC when using version 2 idx files.

* When an object is corrupt in a pack, the object became unusable even
  when the same object is available in a loose form,  We now try harder to
  fall back to these redundant objects when able.  In particular, "git
  repack -a -f" can be used to fix such a corruption as long as necessary
  objects are available.

* Performance of "git-blame -C -C" operation is vastly improved.

* git-clone does not create refs in loose form anymore (it behaves as
  if you immediately ran git-pack-refs after cloning).  This will help
  repositories with insanely large number of refs.

* core.fsyncobjectfiles configuration can be used to ensure that the loose
  objects created will be fsync'ed (this is only useful on filesystems
  that does not order data writes properly).

* "git commit-tree" plumbing can make Octopus with more than 16 parents.
  "git commit" has been capable of this for quite some time.

(usability, bells and whistles)

* even more documentation pages are now accessible via "man" and \ 
"git help".

* A new environment variable GIT_CEILING_DIRECTORIES can be used to stop
  the discovery process of the toplevel of working tree; this may be useful
  when you are working in a slow network disk and are outside any working
  tree, as bash-completion and "git help" may still need to run in these
  places.

* By default, stash entries never expire.  Set reflogexpire in [gc
  "refs/stash"] to a reasonable value to get traditional auto-expiration
  behaviour back

* Longstanding latency issue with bash completion script has been
  addressed.  This will need to be backmerged to 'maint' later.

* pager.<cmd> configuration variable can be used to enable/disable the
  default paging behaviour per command.

* "git-add -i" has a new action 'e/dit' to allow you edit the patch hunk
  manually.

* git-am records the original tip of the branch in ORIG_HEAD before it
  starts applying patches.

* git-apply can handle a patch that touches the same path more than once
  much better than before.

* git-apply can be told not to trust the line counts recorded in the input
  patch but recount, with the new --recount option.

* git-apply can be told to apply a patch to a path deeper than what the
  patch records with --directory option.

* git-archive can be told to omit certain paths from its output using
  export-ignore attributes.

* git-archive uses the zlib default compression level when creating
  zip archive.

* git-archive's command line options --exec and --remote can take their
  parameters as separate command line arguments, similar to other commands.
  IOW, both "--exec=path" and "--exec path" are now supported.

* With -v option, git-branch describes the remote tracking statistics
  similar to the way git-checkout reports by how many commits your branch
  is ahead/behind.

* git-branch's --contains option used to always require a commit parameter
  to limit the branches with; it now defaults to list branches that
  contains HEAD if this parameter is omitted.

* git-branch's --merged and --no-merged option used to always limit the
  branches relative to the HEAD, but they can now take an optional commit
  argument that is used in place of HEAD.

* git-bundle can read the revision arguments from the standard input.

* git-cherry-pick can replay a root commit now.

* git-clone can clone from a remote whose URL would be rewritten by
  configuration stored in $HOME/.gitconfig now.

* "git-clone --mirror" is a handy way to set up a bare mirror repository.

* git-cvsserver learned to respond to "cvs co -c".

* git-diff --check now checks leftover merge conflict markers.

* "git-diff -p" learned to grab a better hunk header lines in
  BibTex, Pascal/Delphi, and Ruby files and also pays attention to
  chapter and part boundary in TeX documents.

* When remote side used to have branch 'foo' and git-fetch finds that now
  it has branch 'foo/bar', it refuses to lose the existing remote tracking
  branch and its reflog.  The error message has been improved to suggest
  pruning the remote if the user wants to proceed and get the latest set
  of branches from the remote, including such 'foo/bar'.

* fast-export learned to export and import marks file; this can be used to
  interface with fast-import incrementally.

* fast-import and fast-export learned to export and import gitlinks.

* "gitk" left background process behind after being asked to dig very deep
  history and the user killed the UI; the process is killed when the UI
  goes away now.

* git-rebase records the original tip of branch in ORIG_HEAD before it is
  rewound.

* "git rerere" can be told to update the index with auto-reused resolution
  with rerere.autoupdate configuration variable.

* git-rev-parse learned $commit^! and $commit^@ notations used in "log"
  family.  These notations are available in gitk as well, because the gitk
  command internally uses rev-parse to interpret its arguments.

* git-rev-list learned --children option to show child commits it
  encountered during the traversal, instead of showing parent commits.

* git-send-mail can talk not just over SSL but over TLS now.

* git-shortlog honors custom output format specified with
  "--pretty=format:".

* "git-stash save" learned --keep-index option.  This lets you stash away
  the local changes and bring the changes staged in the index to your
  working tree for examination and testing.

* git-stash also learned branch subcommand to create a new branch out of
  stashed changes.

* git-status gives the remote tracking statistics similar to the way
  git-checkout reports by how many commits your branch is ahead/behind.

* "git-svn dcommit" is now aware of auto-props setting the subversion user
  has.

* You can tell "git status -u" to even more aggressively omit checking
  untracked files with --untracked-files=no.

* Original SHA-1 value for "update-ref -d" is optional now.

* Error codes from gitweb are made more descriptive where possible, rather
  than "403 forbidden" as we used to issue everywhere.

(internal)

* git-merge has been reimplemented in C.

+------------------+
|Fixes since v1.5.6|
+------------------+

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

 * git-clone ignored its -u option; the fix needs to be backported to
   'maint';

 * git-mv used to lose the distinction between changes that are staged
   and that are only in the working tree, by staging both in the index
   after moving such a path.

 * "git-rebase -i -p" rewrote the parents to wrong ones when amending
   (either edit or squash) was involved, and did not work correctly
   when fast forwarding.

Log message:
Remove a patch that disables the Mac OS X GUI application; now PLIST has
entries to handle that.

Log message:
Enable the GUI application for Mac OS X when the scmgit-gui option
is given.

While here, add clean to PRIVILEGED_STATES; otherwise, an unprivileged
user cannot remove the Mac OS X GUI application with "make clean".

Log message:
scmgit-base builds an extra GUI application on Mac OS X.  Add its files
to PLIST.

Bump PKGREVISION.

Log message:
Disable the installation of Git Gui.app under Darwin

Log message:
Update to version 1.5.6.4.  The base package now depends on devel/p5-Error;
this ensures that git never has to install its own copy, thereby
avoiding future conflicts with devel/p5-Error.  Plus, the pkgsrc
version is newer.

While here, set PKG_SYSCONFSUBDIR=git and explicitly specify sysconfdir
in CONFIGURE_ARGS.  Remove trailing slash from GITCOREDIR.

Long list of changes since 1.5.6:

Fixes since v1.5.6.3
--------------------

* Various commands could overflow its internal buffer on a platform
  with small PATH_MAX value in a repository that has contents with
  long pathnames.

* There wasn't a way to make --pretty=format:%<> specifiers to honor
  .mailmap name rewriting for authors and committers.  Now you can with
  %aN and %cN.

* Bash completion wasted too many cycles; this has been optimized to be
  usable again.

* Bash completion lost ref part when completing something like "git show
  pu:Makefile".

* "git-cvsserver" did not clean up its temporary working area after
  annotate request.

* "git-daemon" called syslog() from its signal handler, which was a
  no-no.

* "git-fetch" into an empty repository used to remind that the fetch will
   be huge by saying "no common commits", but this was an unnecessary
   noise; it is already known by the user anyway.

* "git-http-fetch" would have segfaulted when pack idx file retrieved
  from the other side was corrupt.

* "git-index-pack" used too much memory when dealing with a deep delta
  chain.

* "git-mailinfo" (hence "git-am") did not correctly handle \ 
in-body [PATCH]
  line to override the commit title taken from the mail Subject header.

* "git-rebase -i -p" lost parents that are not involved in the history
  being rewritten.

* "git-rm" lost track of where the index file was when GIT_DIR was
  specified as a relative path.

* "git-rev-list --quiet" was not quiet as advertised.

Contains other various documentation fixes.

Fixes since v1.5.6.2
--------------------

* Setting core.sharerepository to traditional "true" value was supposed
  to make the repository group writable but should not affect permission
  for others.  However, since 1.5.6, it was broken to drop permission
  for others when umask is 022, making the repository unreadable by others.

* Setting GIT_TRACE will report spawning of external process via
  run_command().

* Using an object with very deep delta chain pinned memory needed for
  extracting intermediate base objects unnecessarily long,
  leading to excess memory usage.

* Bash completion script did not notice '--' marker on the command
  line and tried the relatively slow "ref completion" even when
  completing arguments after one.

* Registering a non-empty blob racily and then truncating the working
  tree file for it confused "racy-git avoidance" logic into thinking
  that the path is now unchanged.

* The section that describes attributes related to git-archive were placed
  in a wrong place in the gitattributes(5) manual page.

* "git am" was not helpful to the users when it detected that the committer
  information is not set up properly yet.

* "git clone" had a leftover debugging fprintf().

* "git clone -q" was not quiet enough as it used to and gave object count
  and progress reports.

* "git clone" marked downloaded packfile with .keep; this could be a
  good thing if the remote side is well packed but otherwise not,
  especially for a project that is not really big.

* "git daemon" used to call syslog() from a signal handler, which
  could raise signals of its own but generally is not reentrant.  This
  was fixed by restructuring the code to report syslog() after the handler
  returns.

* When "git push" tries to remove a remote ref, and corresponding
  tracking ref is missing, we used to report error (i.e. failure to
  remove something that does not exist).

* "git mailinfo" (hence "git am") did not handle commit log \ 
messages in a
  MIME multipart mail correctly.

Futureproof
-----------

 * "git-shell" accepts requests without a dash between "git" and
   subcommand name (e.g. "git upload-pack") which the newer client will
   start to make sometime in the future.

Fixes since v1.5.6.1
--------------------

* "git clone" from a remote that is named with url.insteadOf setting in
  $HOME/.gitconfig did not work well.

* "git describe --long --tags" segfaulted when the described revision was
  tagged with a lightweight tag.

* "git diff --check" did not report the result via its exit status
  reliably.

* When remote side used to have branch 'foo' and git-fetch finds that now
  it has branch 'foo/bar', it refuses to lose the existing remote tracking
  branch and its reflog.  The error message has been improved to suggest
  pruning the remote if the user wants to proceed and get the latest set
  of branches from the remote, including such 'foo/bar'.

* "git reset file" should mean the same thing as "git reset HEAD \ 
file",
  but we required disambiguating -- even when "file" is not ambiguous.

* "git show" segfaulted when an annotated tag that points at another
  annotated tag was given to it.

* Optimization for a large import via "git-svn" introduced in v1.5.6 had a
  serious memory and temporary file leak, which made it unusable for
  moderately large import.

* "git-svn" mangled remote nickname used in the configuration file
  unnecessarily.

Fixes since v1.5.6
------------------

* Last minute change broke loose object creation on AIX.

* (performance fix) We used to make $GIT_DIR absolute path early in the
  programs but keeping it relative to the current directory internally
  gives 1-3 per-cent performance boost.

* bash completion knows the new --graph option to git-log family.

* git-diff -c/--cc showed unnecessary "deletion" lines at the context
  boundary.

* git-for-each-ref ignored %(object) and %(type) requests for tag
  objects.

* git-merge usage had a typo.

* Rebuilding of git-svn metainfo database did not take rewriteRoot
  option into account.

* Running "git-rebase --continue/--skip/--abort" before starting a
  rebase gave nonsense error messages.

Log message:
Update to git-1.5.6.

GIT v1.5.6 Release Notes
========================

Updates since v1.5.5
--------------------

(subsystems)

* Comes with updated gitk and git-gui.

(portability)

* git will build on AIX better than before now.

* core.ignorecase configuration variable can be used to work better on
  filesystems that are not case sensitive.

* "git init" now autodetects the case sensitivity of the filesystem and
  sets core.ignorecase accordingly.

* cpio is no longer used; neither "curl" binary (libcurl is still used).

(documentation)

* Many freestanding documentation pages have been converted and made
  available to "git help" (aka "man git<something>") \ 
as section 7 of
  the manual pages. This means bookmarks to some HTML documentation
  files may need to be updated (eg "tutorial.html" became
  "gittutorial.html").

(performance)

* "git clone" was rewritten in C.  This will hopefully help cloning a
  repository with insane number of refs.

* "git rebase --onto $there $from $branch" used to switch to the tip of
  $branch only to immediately reset back to $from, smudging work tree
  files unnecessarily.  This has been optimized.

* Object creation codepath in "git-svn" has been optimized by enhancing
  plumbing commands git-cat-file and git-hash-object.

(usability, bells and whistles)

* "git add -p" (and the "patch" subcommand of "git add \ 
-i") can choose to
  apply (or not apply) mode changes independently from contents changes.

* "git bisect help" gives longer and more helpful usage information.

* "git bisect" does not use a special branch "bisect" \ 
anymore; instead, it
  does its work on a detached HEAD.

* "git branch" (and "git checkout -b") can be told to set up
  branch.<name>.rebase automatically, so that later you can say "git \ 
pull"
  and magically cause "git pull --rebase" to happen.

* "git branch --merged" and "git branch --no-merged" can be \ 
used to list
  branches that have already been merged (or not yet merged) to the
  current branch.

* "git cherry-pick" and "git revert" can add a sign-off.

* "git commit" mentions the author identity when you are committing
  somebody else's changes.

* "git diff/log --dirstat" output is consistent between binary and textual
  changes.

* "git filter-branch" rewrites signed tags by demoting them to annotated.

* "git format-patch --no-binary" can produce a patch that lack binary
  changes (i.e. cannot be used to propagate the whole changes) meant only
  for reviewing.

* "git init --bare" is a synonym for "git --bare init" now.

* "git gc --auto" honors a new pre-auto-gc hook to temporarily disable it.

* "git log --pretty=tformat:<custom format>" gives a LF after \ 
each entry,
  instead of giving a LF between each pair of entries which is how
  "git log --pretty=format:<custom format>" works.

* "git log" and friends learned the "--graph" option to show \ 
the ancestry
  graph at the left margin of the output.

* "git log" and friends can be told to use date format that is different
  from the default via 'log.date' configuration variable.

* "git send-email" now can send out messages outside a git repository.

* "git send-email --compose" was made aware of rfc2047 quoting.

* "git status" can optionally include output from "git submodule
  summary".

* "git svn" learned --add-author-from option to propagate the authorship
  by munging the commit log message.

* new object creation and looking up in "git svn" has been optimized.

* "gitweb" can read from a system-wide configuration file.

(internal)

* "git unpack-objects" and "git receive-pack" is now more \ 
strict about
  detecting breakage in the objects they receive over the wire.

Log message:
Update to version 1.5.5.1.  No pkgsrc changes, this time.

GIT v1.5.5.1 Release Notes
==========================

Fixes since v1.5.5
------------------

 * "git archive --prefix=$path/" mishandled gitattributes.

 * "git fetch -v" that fetches into FETCH_HEAD did not report the summary
   the same way as done for updating the tracking refs.

 * "git svn" misbehaved when the configuration file customized the \ 
"git
   log" output format using format.pretty.

 * "git submodule status" leaked an unnecessary error message.

 * "git log --date-order --topo-order" did not override the earlier
   date-order with topo-order as expected.

 * "git bisect good $this" did not check the validity of the revision
   given properly.

 * "url.<there>.insteadOf" did not work correctly.

 * "git clean" ran inside subdirectory behaved as if the directory was
   explicitly specified for removal by the end user from the top level.

 * "git bisect" from a detached head leaked an unnecessary error message.

 * "git bisect good $a $b" when $a is Ok but $b is bogus should have
   atomically failed before marking $a as good.

 * "git fmt-merge-msg" did not clean up leading empty lines from commit
   log messages like "git log" family does.

 * "git am" recorded a commit with empty Subject: line without
   complaining.

 * when given a commit log message whose first paragraph consists of
   multiple lines, "git rebase" squashed it into a single line.

 * "git remote add $bogus_name $url" did not complain properly.

 *  Also comes with various documentation updates.

Log message:
Add the 'scmgit-gui' option. If enabled, the GUI in Tcl/Tk will be
build, otherwise not. Use the PLIST_VARS stuff to handle the PLIST file.

Enabled by default to respect previous behaviour.