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.diff -r1.7 -r1.8 pkgsrc/devel/scmgit/Makefile.common
(bjs)
@@ -1,28 +1,28 @@ | @@ -1,28 +1,28 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.7 2008/03/15 05:09:07 bjs Exp $ | 1 | # $NetBSD: Makefile.common,v 1.8 2008/04/07 15:05:31 bjs Exp $ | |
2 | # | 2 | # | |
3 | # used by devel/scmgit-base/Makefile | 3 | # used by devel/scmgit-base/Makefile | |
4 | # used by devel/scmgit-docs/Makefile | 4 | # used by devel/scmgit-docs/Makefile | |
5 | 5 | |||
6 | DISTNAME= git-${GIT_VERSION} | 6 | DISTNAME= git-${GIT_VERSION} | |
7 | CATEGORIES= devel scm | 7 | CATEGORIES= devel scm | |
8 | MASTER_SITES?= http://www.kernel.org/pub/software/scm/git/ | 8 | MASTER_SITES?= http://www.kernel.org/pub/software/scm/git/ | |
9 | 9 | |||
10 | MAINTAINER?= pancake@phreaker.net | 10 | MAINTAINER?= pancake@phreaker.net | |
11 | HOMEPAGE?= http://git.or.cz/ | 11 | HOMEPAGE?= http://git.or.cz/ | |
12 | 12 | |||
13 | PKG_DESTDIR_SUPPORT= user-destdir | 13 | PKG_DESTDIR_SUPPORT= user-destdir | |
14 | 14 | |||
15 | GIT_VERSION= 1.5.4.4 | 15 | GIT_VERSION= 1.5.4.5 | |
16 | 16 | |||
17 | .include "../../mk/bsd.fast.prefs.mk" | 17 | .include "../../mk/bsd.fast.prefs.mk" | |
18 | 18 | |||
19 | .if "${PKGPATH}" != "devel/scmgit" | 19 | .if "${PKGPATH}" != "devel/scmgit" | |
20 | PATCHDIR= ${.CURDIR}/../scmgit-base/patches | 20 | PATCHDIR= ${.CURDIR}/../scmgit-base/patches | |
21 | DISTINFO_FILE= ${.CURDIR}/../scmgit-base/distinfo | 21 | DISTINFO_FILE= ${.CURDIR}/../scmgit-base/distinfo | |
22 | 22 | |||
23 | GNU_CONFIGURE?= yes | 23 | GNU_CONFIGURE?= yes | |
24 | USE_TOOLS+= gmake tar perl sh | 24 | USE_TOOLS+= gmake tar perl sh | |
25 | EXTRACT_USING= gtar | 25 | EXTRACT_USING= gtar | |
26 | 26 | |||
27 | CONFIGURE_ARGS+= --with-perl=${PERL5:Q} | 27 | CONFIGURE_ARGS+= --with-perl=${PERL5:Q} | |
28 | CONFIGURE_ARGS+= --with-shell=${SH:Q} | 28 | CONFIGURE_ARGS+= --with-shell=${SH:Q} |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: distinfo,v 1.5 2008/03/15 05:09:07 bjs Exp $ | 1 | $NetBSD: distinfo,v 1.6 2008/04/07 15:05:31 bjs Exp $ | |
2 | 2 | |||
3 | SHA1 (git-1.5.4.4.tar.gz) = 62595d686ab5f3c197b2ff1e2c2c9948a9273dcf | 3 | SHA1 (git-1.5.4.5.tar.gz) = a0e2373cca840ef2ac311c4e364aefa137ad4f92 | |
4 | RMD160 (git-1.5.4.4.tar.gz) = 5e93c452c279a71138ce062276adcfd064d18793 | 4 | RMD160 (git-1.5.4.5.tar.gz) = 19a0b9f03ba7ddd1446ab79792dc3ca0cb76b8d9 | |
5 | Size (git-1.5.4.4.tar.gz) = 1903687 bytes | 5 | Size (git-1.5.4.5.tar.gz) = 1908589 bytes | |
6 | SHA1 (patch-aa) = 5af7779f0ac99aa6694d2a4d87ed999ef21c9375 | 6 | SHA1 (patch-aa) = 5af7779f0ac99aa6694d2a4d87ed999ef21c9375 | |
7 | SHA1 (patch-ab) = 746bcea15853cd78b14dc2916f5f02bf67e59751 | 7 | SHA1 (patch-ab) = 746bcea15853cd78b14dc2916f5f02bf67e59751 | |
8 | SHA1 (patch-ac) = b8b70fabbd2857d5b4962b94d2c852f8d092ef27 | 8 | SHA1 (patch-ac) = b8b70fabbd2857d5b4962b94d2c852f8d092ef27 | |
9 | SHA1 (patch-ad) = 1b5ea997ea60206857b385a670509897637d5078 | 9 | SHA1 (patch-ad) = 1b5ea997ea60206857b385a670509897637d5078 | |
10 | SHA1 (patch-ae) = 502cf80e047155a1302cbdafdd2a82e6077077e1 | 10 | SHA1 (patch-ae) = 502cf80e047155a1302cbdafdd2a82e6077077e1 | |
11 | SHA1 (patch-af) = 93b83ac35f3f48cbf9a8ee39db0709547bf9d6c3 | 11 | SHA1 (patch-af) = 93b83ac35f3f48cbf9a8ee39db0709547bf9d6c3 | |
12 | SHA1 (patch-ag) = 8918a23e50f4e1f9aa0bb5dda4404140cda3c5b5 | 12 | SHA1 (patch-ag) = 8918a23e50f4e1f9aa0bb5dda4404140cda3c5b5 | |
13 | SHA1 (patch-ah) = 94947b3d79c43246388da9c434f9e71e6716c790 | 13 | SHA1 (patch-ah) = 94947b3d79c43246388da9c434f9e71e6716c790 | |
14 | SHA1 (patch-ai) = 95b2b0a41b8b6f0ee804b48a3f3686d2fdf164f5 | 14 | SHA1 (patch-ai) = 95b2b0a41b8b6f0ee804b48a3f3686d2fdf164f5 |