summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjs <bjs>2008-04-07 15:05:31 +0000
committerbjs <bjs>2008-04-07 15:05:31 +0000
commit9d888002f161c35cba49a11680692fe9442297c1 (patch)
tree795dcda8685109c693e4d13b917af945924e154d
parent512384dc64f677f23757004cc344838139306d00 (diff)
downloadpkgsrc-9d888002f161c35cba49a11680692fe9442297c1.tar.gz
Update to v1.5.4.5.
GIT v1.5.4.5 Release Notes ========================== Fixes since v1.5.4.4 -------------------- * "git fetch there" when the URL information came from the Cogito style branches/there file did not update refs/heads/there (regression in 1.5.4). * Bogus refspec configuration such as "remote.there.fetch = =" were not detected as errors (regressionin 1.5.4). * You couldn't specify a custom editor whose path contains a whitespace via GIT_EDITOR (and core.editor). * The subdirectory filter to "git filter-branch" mishandled a history where the subdirectory becomes empty and then later becomes non-empty. * "git shortlog" gave an empty line if the original commit message was malformed (e.g. a botched import from foreign SCM). Now it finds the first non-empty line and uses it for better information. * When the user fails to give a revision parameter to "git svn", an error from the Perl interpreter was issued because the script lacked proper error checking. * After "git rebase" stopped due to conflicts, if the user played with "git reset" and friends, "git rebase --abort" failed to go back to the correct commit. * Additional work trees prepared with git-new-workdir (in contrib/) did not share git-svn metadata directory .git/svn with the original. * "git-merge-recursive" did not mark addition of the same path with different filemodes correctly as a conflict. * "gitweb" gave malformed URL when pathinfo stype paths are in use. * "-n" stands for "--no-tags" again for "git fetch". * "git format-patch" did not detect the need to add 8-bit MIME header when the user used format.header configuration. * "rev~" revision specifier used to mean "rev", which was inconsistent with how "rev^" worked. Now "rev~" is the same as "rev~1" (hence it also is the same as "rev^1"), and "rev~0" is the same as "rev^0" (i.e. it has to be a commit). * "git quiltimport" did not grok empty lines, lines in "file -pNNN" format to specify the prefix levels and lines with trailing comments. * "git rebase -m" triggered pre-commit verification, which made "rebase --continue" impossible. As usual, it also comes with many documentation fixes and clarifications.
-rw-r--r--devel/scmgit-base/distinfo8
-rw-r--r--devel/scmgit/Makefile.common4
2 files changed, 6 insertions, 6 deletions
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index e1fe0b03608..315a77b7890 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2008/03/15 05:09:07 bjs Exp $
+$NetBSD: distinfo,v 1.6 2008/04/07 15:05:31 bjs Exp $
-SHA1 (git-1.5.4.4.tar.gz) = 62595d686ab5f3c197b2ff1e2c2c9948a9273dcf
-RMD160 (git-1.5.4.4.tar.gz) = 5e93c452c279a71138ce062276adcfd064d18793
-Size (git-1.5.4.4.tar.gz) = 1903687 bytes
+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 (patch-aa) = 5af7779f0ac99aa6694d2a4d87ed999ef21c9375
SHA1 (patch-ab) = 746bcea15853cd78b14dc2916f5f02bf67e59751
SHA1 (patch-ac) = b8b70fabbd2857d5b4962b94d2c852f8d092ef27
diff --git a/devel/scmgit/Makefile.common b/devel/scmgit/Makefile.common
index c87d64725c8..2f6dee535d3 100644
--- a/devel/scmgit/Makefile.common
+++ b/devel/scmgit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2008/03/15 05:09:07 bjs Exp $
+# $NetBSD: Makefile.common,v 1.8 2008/04/07 15:05:31 bjs Exp $
#
# used by devel/scmgit-base/Makefile
# used by devel/scmgit-docs/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE?= http://git.or.cz/
PKG_DESTDIR_SUPPORT= user-destdir
-GIT_VERSION= 1.5.4.4
+GIT_VERSION= 1.5.4.5
.include "../../mk/bsd.fast.prefs.mk"