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.

7 files changed, 38 insertions, 24 deletions

diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index ec0fa0560bf..ab00e8acd7d 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/04/21 16:34:45 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/24 08:21:04 bjs Exp $
 #
 
 .include "${.CURDIR}/../scmgit/Makefile.common"
@@ -28,6 +28,10 @@ PERL5_CONFIGURE= 	no
 PERL5_PACKLIST=		auto/Git/.packlist
 REPLACE_PERL+=		*.perl */*.perl */*/*.perl
 
+GITCOREDIR=		${PREFIX}/libexec/git-core/
+
+CONFIGURE_ENV+=		gitexecdir=${GITCOREDIR:Q}
+
 #.include "../../mk/emacs.mk" # XXX TODO (see patch-ad)
 
 .include "options.mk"
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index 611fd207a33..4898d4c1b5b 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/04/21 16:34:45 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/06/24 08:21:04 bjs Exp $
 bin/git
 ${PLIST.gui}bin/gitk
 libexec/git-core/git
@@ -195,7 +195,9 @@ ${PLIST.gui}share/git-gui/lib/transport.tcl
 ${PLIST.gui}share/git-gui/lib/win32.tcl
 ${PLIST.gui}share/git-gui/lib/win32_shortcut.js
 ${PLIST.gui}share/gitk/lib/msgs/de.msg
+${PLIST.gui}share/gitk/lib/msgs/es.msg
 ${PLIST.gui}share/gitk/lib/msgs/it.msg
+${PLIST.gui}share/gitk/lib/msgs/sv.msg
 ${PLIST.gui}@dirrm share/gitk/lib/msgs
 ${PLIST.gui}@dirrm share/gitk/lib
 ${PLIST.gui}@dirrm share/gitk
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index bbb22dc64b4..75d813f1262 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.8 2008/04/25 16:40:47 bjs Exp $
+$NetBSD: distinfo,v 1.9 2008/06/24 08:21:04 bjs Exp $
 
-SHA1 (git-1.5.5.1.tar.gz) = bb254a23a212fd55642c2049181d37a6ecf57117
-RMD160 (git-1.5.5.1.tar.gz) = d4d3cf6e7257c590ba9dcaccc2cb5fa041afef01
-Size (git-1.5.5.1.tar.gz) = 2002900 bytes
+SHA1 (git-1.5.6.tar.gz) = 2b0ea373e78c8bc3f4476dbd5738594abe9abf46
+RMD160 (git-1.5.6.tar.gz) = 50adf026374d834f4d82f862987598a64e6e0b6e
+Size (git-1.5.6.tar.gz) = 2087708 bytes
 SHA1 (patch-aa) = 5af7779f0ac99aa6694d2a4d87ed999ef21c9375
-SHA1 (patch-ab) = 746bcea15853cd78b14dc2916f5f02bf67e59751
-SHA1 (patch-ac) = b8b70fabbd2857d5b4962b94d2c852f8d092ef27
+SHA1 (patch-ab) = 519c6b2892d9483c08b08f7874790ab05bc3f2d6
+SHA1 (patch-ac) = 1f358de94d7476212c02374de888fbc372b60f32
 SHA1 (patch-ad) = 1b5ea997ea60206857b385a670509897637d5078
 SHA1 (patch-ae) = 502cf80e047155a1302cbdafdd2a82e6077077e1
 SHA1 (patch-af) = 93b83ac35f3f48cbf9a8ee39db0709547bf9d6c3
 SHA1 (patch-ag) = 8918a23e50f4e1f9aa0bb5dda4404140cda3c5b5
 SHA1 (patch-ah) = 94947b3d79c43246388da9c434f9e71e6716c790
 SHA1 (patch-ai) = 95b2b0a41b8b6f0ee804b48a3f3686d2fdf164f5
-SHA1 (patch-aj) = efd57b17ed88c8892cee757c3159e32efcb07560
+SHA1 (patch-aj) = 54c2200363b4d2cc5eb6266c4b62d4a7fc43dd07
diff --git a/devel/scmgit-base/patches/patch-ab b/devel/scmgit-base/patches/patch-ab
index a6d41d86aac..863aae58099 100644
--- a/devel/scmgit-base/patches/patch-ab
+++ b/devel/scmgit-base/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2008/02/06 07:53:32 bjs Exp $
+$NetBSD: patch-ab,v 1.3 2008/06/24 08:21:04 bjs Exp $
 
---- git-compat-util.h.orig	2008-02-01 23:09:01.000000000 -0500
+--- git-compat-util.h.orig	2008-06-18 18:49:49.000000000 -0400
 +++ git-compat-util.h
 @@ -39,7 +39,7 @@
  /* Approximation of the length of the decimal representation of this type. */
  #define decimal_length(x)	((int)(sizeof(x) * 2.56 + 0.5) + 1)
  
--#if !defined(__APPLE__) && !defined(__FreeBSD__)
-+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__sun)
+-#if !defined(__APPLE__) && !defined(__FreeBSD__)  && !defined(__USLC__) && !defined(_M_UNIX)
++#if !defined(__APPLE__) && !defined(__FreeBSD__)  && !defined(__USLC__) && !defined(_M_UNIX) && !defined(__sun)
  #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
  #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
  #endif
diff --git a/devel/scmgit-base/patches/patch-ac b/devel/scmgit-base/patches/patch-ac
index c042023910a..abb0b121b30 100644
--- a/devel/scmgit-base/patches/patch-ac
+++ b/devel/scmgit-base/patches/patch-ac
@@ -1,14 +1,14 @@
-$NetBSD: patch-ac,v 1.1 2008/02/06 07:53:32 bjs Exp $
+$NetBSD: patch-ac,v 1.2 2008/06/24 08:21:04 bjs Exp $
 
---- gitk-git/Makefile.orig	2008-02-01 23:09:01.000000000 -0500
+--- gitk-git/Makefile.orig	2008-06-18 18:49:49.000000000 -0400
 +++ gitk-git/Makefile
-@@ -36,9 +36,9 @@ endif
+@@ -40,9 +40,9 @@ endif
  all:: gitk-wish $(ALL_MSGFILES)
  
  install:: all
--	$(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
--	$(INSTALL) -d '$(DESTDIR_SQ)$(msgsdir_SQ)'
--	$(foreach p,$(ALL_MSGFILES), $(INSTALL) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
+-	$(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
+-	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)'
+-	$(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
 +	$(BSD_INSTALL_SCRIPT) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
 +	$(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(msgsdir_SQ)'
 +	$(foreach p,$(ALL_MSGFILES), $(BSD_INSTALL_DATA) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
diff --git a/devel/scmgit-base/patches/patch-aj b/devel/scmgit-base/patches/patch-aj
index d33f37a5873..028852b6c09 100644
--- a/devel/scmgit-base/patches/patch-aj
+++ b/devel/scmgit-base/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.1 2008/04/21 01:09:51 bjs Exp $
+$NetBSD: patch-aj,v 1.2 2008/06/24 08:21:04 bjs Exp $
 
---- config.mak.in.orig	2008-04-08 03:10:01.000000000 -0400
+--- config.mak.in.orig	2008-06-18 18:49:49.000000000 -0400
 +++ config.mak.in
 @@ -11,7 +11,7 @@ TCLTK_PATH = @TCLTK_PATH@
  prefix = @prefix@
diff --git a/devel/scmgit-docs/PLIST b/devel/scmgit-docs/PLIST
index 2dd6f763129..8122ddbb0df 100644
--- a/devel/scmgit-docs/PLIST
+++ b/devel/scmgit-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2008/04/21 01:09:51 bjs Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/06/24 08:21:04 bjs Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -129,9 +129,17 @@ man/man1/git-verify-tag.1
 man/man1/git-web--browse.1
 man/man1/git-whatchanged.1
 man/man1/git-write-tree.1
+man/man1/git.1
 man/man1/gitk.1
 man/man5/gitattributes.5
-man/man5/gitcli.5
+man/man5/githooks.5
 man/man5/gitignore.5
 man/man5/gitmodules.5
-man/man7/git.7
+man/man5/gitrepository-layout.5
+man/man7/gitcli.7
+man/man7/gitcore-tutorial.7
+man/man7/gitcvs-migration.7
+man/man7/gitdiffcore.7
+man/man7/gitglossary.7
+man/man7/gittutorial-2.7
+man/man7/gittutorial.7