Fri Jan 28 08:11:30 2011 UTC ()
Changes 1.7.3.5:
* The xfuncname pattern used by "git diff" and "git grep" to show the
  last notable line in context were broken for python and ruby for a long
  time.
* "git merge" into an unborn branch removed an untracked file "foo" from
  the working tree when merged branch had "foo" (this fix was already in
  1.7.3.3 but was omitted from the release notes by mistake).
* "git status -s" did not quote unprintable characters in paths as
  documented.
* "git am --abort" used to always reset to the commit at the beginning of
  the last "am" invocation that has stopped, losing any unrelated commits
  that may have been made since then.  Now it refrains from doing so and
  instead issues a warning.
* "git blame" incorrectly reused bogusly cached result of textconv
  filter for files from the working tree.
* "git commit" used to abort after the user edited the log message
  when the committer information was not correctly set up.  It now
  aborts before starting the editor.
* "git commit --date=invalid" used to silently ignore the incorrectly
  specified date; it is now diagnosed as an error.
* "git rebase --skip" to skip the last commit in a series used to fail
  to run post-rewrite hook and to copy notes from old commits that have
  successfully been rebased so far.  Now it do (backmerge ef88ad2).
* "gitweb" tried to show a wrong feed logo when none was specified.


(adam)
diff -r1.15 -r1.16 pkgsrc/devel/scmgit/Makefile.common
diff -r1.17 -r1.18 pkgsrc/devel/scmgit/Makefile.version
diff -r1.27 -r1.28 pkgsrc/devel/scmgit-base/Makefile
diff -r1.30 -r1.31 pkgsrc/devel/scmgit-base/distinfo

cvs diff -r1.15 -r1.16 pkgsrc/devel/scmgit/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/scmgit/Attic/Makefile.common 2010/10/28 10:23:07 1.15
+++ pkgsrc/devel/scmgit/Attic/Makefile.common 2011/01/28 08:11:30 1.16
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile.common,v 1.15 2010/10/28 10:23:07 adam Exp $ 1# $NetBSD: Makefile.common,v 1.16 2011/01/28 08:11:30 adam 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.include "../../devel/scmgit/Makefile.version" 6.include "../../devel/scmgit/Makefile.version"
7 7
8DISTNAME= git-${GIT_VERSION} 8DISTNAME= git-${GIT_VERSION}
9CATEGORIES= devel scm 9CATEGORIES= devel scm
10MASTER_SITES?= http://www.kernel.org/pub/software/scm/git/ 10MASTER_SITES?= http://www.kernel.org/pub/software/scm/git/
11EXTRACT_SUFX= .tar.bz2 11EXTRACT_SUFX= .tar.bz2
12 12
13MAINTAINER?= bjs@NetBSD.org 13MAINTAINER?= bjs@NetBSD.org
14HOMEPAGE?= http://git.or.cz/ 14HOMEPAGE?= http://git.or.cz/
15LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18 18
19.include "../../mk/bsd.fast.prefs.mk" 19.include "../../mk/bsd.fast.prefs.mk"
20 20
21PATCHDIR= ${.CURDIR}/../../devel/scmgit-base/patches 21PATCHDIR= ${.CURDIR}/../../devel/scmgit-base/patches
22DISTINFO_FILE= ${.CURDIR}/../../devel/scmgit-base/distinfo 22DISTINFO_FILE= ${.CURDIR}/../../devel/scmgit-base/distinfo
23 23
24GNU_CONFIGURE?= yes 24GNU_CONFIGURE= yes
25USE_TOOLS+= gmake tar perl sh 25USE_TOOLS+= gmake tar perl sh
26EXTRACT_USING= gtar 26EXTRACT_USING= gtar
27 27
28PKG_SYSCONFSUBDIR= git 28PKG_SYSCONFSUBDIR= git
29 29
30CONFIGURE_ARGS+= --with-perl=${PERL5:Q} 30CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
31CONFIGURE_ARGS+= --with-shell=${SH:Q} 31CONFIGURE_ARGS+= --with-shell=${SH:Q}
32CONFIGURE_ARGS+= --with-tar=${TAR:Q} 32CONFIGURE_ARGS+= --with-tar=${TAR:Q}
33CONFIGURE_ARGS+= --mandir=${${PREFIX}/${PKGMANDIR}:L:Q} 33CONFIGURE_ARGS+= --mandir=${${PREFIX}/${PKGMANDIR}:L:Q}
34CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 34CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}

cvs diff -r1.17 -r1.18 pkgsrc/devel/scmgit/Attic/Makefile.version (expand / switch to unified diff)

--- pkgsrc/devel/scmgit/Attic/Makefile.version 2010/12/17 01:05:23 1.17
+++ pkgsrc/devel/scmgit/Attic/Makefile.version 2011/01/28 08:11:30 1.18
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1# $NetBSD: Makefile.version,v 1.17 2010/12/17 01:05:23 gdt Exp $ 1# $NetBSD: Makefile.version,v 1.18 2011/01/28 08:11:30 adam Exp $
2# 2#
3GIT_VERSION= 1.7.3.4 3GIT_VERSION= 1.7.3.5

cvs diff -r1.27 -r1.28 pkgsrc/devel/scmgit-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/scmgit-base/Attic/Makefile 2010/12/23 23:42:40 1.27
+++ pkgsrc/devel/scmgit-base/Attic/Makefile 2011/01/28 08:11:30 1.28
@@ -1,20 +1,18 @@ @@ -1,20 +1,18 @@
1# $NetBSD: Makefile,v 1.27 2010/12/23 23:42:40 abs Exp $ 1# $NetBSD: Makefile,v 1.28 2011/01/28 08:11:30 adam Exp $
2# 
3 2
4.include "../../devel/scmgit/Makefile.common" 3.include "../../devel/scmgit/Makefile.common"
5 4
6PKGNAME= scmgit-base-${GIT_VERSION} 5PKGNAME= scmgit-base-${GIT_VERSION}
7PKGREVISION= 1 
8COMMENT= GIT Tree History Storage Tool (base package) 6COMMENT= GIT Tree History Storage Tool (base package)
9 7
10PKG_DESTDIR_SUPPORT= user-destdir 8PKG_DESTDIR_SUPPORT= user-destdir
11 9
12CONFLICTS+= git<4.9.5nb1 # misc/git 10CONFLICTS+= git<4.9.5nb1 # misc/git
13 11
14DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error 12DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error
15 13
16USE_LANGUAGES= c99 14USE_LANGUAGES= c99
17USE_TOOLS+= perl:run sh:run msgfmt 15USE_TOOLS+= perl:run sh:run msgfmt
18 16
19PERL5_CONFIGURE= no 17PERL5_CONFIGURE= no
20PERL5_PACKLIST= auto/Git/.packlist 18PERL5_PACKLIST= auto/Git/.packlist
@@ -30,48 +28,46 @@ CONFIGURE_ARGS+= --with-openssl=${SSLBAS @@ -30,48 +28,46 @@ CONFIGURE_ARGS+= --with-openssl=${SSLBAS
30CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 28CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
31 29
32BUILD_TARGET= all 30BUILD_TARGET= all
33 31
34REPLACE_SH+= contrib/hooks/post-receive-email 32REPLACE_SH+= contrib/hooks/post-receive-email
35REPLACE_SH+= contrib/hooks/pre-auto-gc-battery 33REPLACE_SH+= contrib/hooks/pre-auto-gc-battery
36 34
37EGDIR= ${PREFIX}/share/examples/scmgit 35EGDIR= ${PREFIX}/share/examples/scmgit
38 36
39GIT_COREDIR= git-core 37GIT_COREDIR= git-core
40GIT_TEMPLATEDIR= templates 38GIT_TEMPLATEDIR= templates
41 39
42GIT_TEMPLATES= description info/exclude 40GIT_TEMPLATES= description info/exclude
43GIT_TEMPLATES+= hooks/applypatch-msg.sample hooks/commit-msg.sample \ 41GIT_TEMPLATES+= hooks/applypatch-msg.sample hooks/commit-msg.sample
44 hooks/post-commit.sample hooks/post-receive.sample \ 42GIT_TEMPLATES+= hooks/post-commit.sample hooks/post-receive.sample
45 hooks/post-update.sample hooks/pre-applypatch.sample \ 43GIT_TEMPLATES+= hooks/post-update.sample hooks/pre-applypatch.sample
46 hooks/pre-commit.sample hooks/pre-rebase.sample \ 44GIT_TEMPLATES+= hooks/pre-commit.sample hooks/pre-rebase.sample
47 hooks/prepare-commit-msg.sample hooks/update.sample 45GIT_TEMPLATES+= hooks/prepare-commit-msg.sample hooks/update.sample
48GIT_TEMPLATES+= 
49 46
50# XXX unused as of now 47# XXX unused as of now
51#GIT_CORE_EXECDIR= libexec/${GIT_COREDIR} 48#GIT_CORE_EXECDIR= libexec/${GIT_COREDIR}
52GIT_CORE_DATADIR= share/${GIT_COREDIR} 49GIT_CORE_DATADIR= share/${GIT_COREDIR}
53GIT_CORE_TEMPLATEDIR= ${GIT_CORE_DATADIR}/${GIT_TEMPLATEDIR} 50GIT_CORE_TEMPLATEDIR= ${GIT_CORE_DATADIR}/${GIT_TEMPLATEDIR}
54 51
55MAKE_DIRS= ${GIT_CORE_TEMPLATEDIR} 52MAKE_DIRS= ${GIT_CORE_TEMPLATEDIR}
56MAKE_DIRS+= ${GIT_CORE_TEMPLATEDIR}/hooks 53MAKE_DIRS+= ${GIT_CORE_TEMPLATEDIR}/hooks
57MAKE_DIRS+= ${GIT_CORE_TEMPLATEDIR}/info 54MAKE_DIRS+= ${GIT_CORE_TEMPLATEDIR}/info
58 55
59REQD_FILES+= ${GIT_TEMPLATES:@.t.@\ 56REQD_FILES+= ${GIT_TEMPLATES:@.t.@\
60 ${EGDIR}/${GIT_TEMPLATEDIR}/${.t.}\ 57 ${EGDIR}/${GIT_TEMPLATEDIR}/${.t.}\
61 ${PREFIX}/${GIT_CORE_TEMPLATEDIR}/${.t.}\ 58 ${PREFIX}/${GIT_CORE_TEMPLATEDIR}/${.t.}\
62 @:M*} 59 @:M*}
63 60
64 
65CONFIGURE_ENV+= HOME=${PREFIX} 61CONFIGURE_ENV+= HOME=${PREFIX}
66CONFIGURE_ENV+= gitexecdir=${GITCOREDIR} 62CONFIGURE_ENV+= gitexecdir=${GITCOREDIR}
67 63
68MAKE_FLAGS+= INSTALL=${INSTALL:Q} 64MAKE_FLAGS+= INSTALL=${INSTALL:Q}
69 65
70GIT_TEMPLATE_INSTDIR= ${EGDIR}/${GIT_TEMPLATEDIR} 66GIT_TEMPLATE_INSTDIR= ${EGDIR}/${GIT_TEMPLATEDIR}
71MAKE_ENV+= GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR} 67MAKE_ENV+= GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
72MESSAGE_SUBST+= GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR} 68MESSAGE_SUBST+= GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
73 69
74SUBST_CLASSES+= fix-paths 70SUBST_CLASSES+= fix-paths
75SUBST_FILES.fix-paths= templates/hooks--post-receive.sample 71SUBST_FILES.fix-paths= templates/hooks--post-receive.sample
76SUBST_MESSAGE.fix-paths=Fixing hard-coded pathnames 72SUBST_MESSAGE.fix-paths=Fixing hard-coded pathnames
77SUBST_STAGE.fix-paths= pre-build 73SUBST_STAGE.fix-paths= pre-build

cvs diff -r1.30 -r1.31 pkgsrc/devel/scmgit-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/scmgit-base/Attic/distinfo 2010/12/23 23:42:40 1.30
+++ pkgsrc/devel/scmgit-base/Attic/distinfo 2011/01/28 08:11:30 1.31
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.30 2010/12/23 23:42:40 abs Exp $ 1$NetBSD: distinfo,v 1.31 2011/01/28 08:11:30 adam Exp $
2 2
3SHA1 (git-1.7.3.4.tar.bz2) = 8bda6668531fc41a72a680978798deb9ee048846 3SHA1 (git-1.7.3.5.tar.bz2) = cf9587ecf7cae04463d05b9f9ce8990913bd925a
4RMD160 (git-1.7.3.4.tar.bz2) = 37cdb8b50c802655643a243ef26fe3d50145d29c 4RMD160 (git-1.7.3.5.tar.bz2) = 3ad6eb187b7a901addb3ee5a2ade70ba550007f6
5Size (git-1.7.3.4.tar.bz2) = 2635522 bytes 5Size (git-1.7.3.5.tar.bz2) = 2635455 bytes
6SHA1 (patch-aa) = f47ff9d8b9ba8592f7bbd21d4b0ab30394e8f9a0 6SHA1 (patch-aa) = f47ff9d8b9ba8592f7bbd21d4b0ab30394e8f9a0
7SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 7SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
8SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce 8SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
9SHA1 (patch-af) = 60029a215edf5218a76be41932afb5b9f8c4729a 9SHA1 (patch-af) = 60029a215edf5218a76be41932afb5b9f8c4729a
10SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 10SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
11SHA1 (patch-ah) = 132ab70b77140c88b2f24b9c696cbe306eb41ca8 11SHA1 (patch-ah) = 132ab70b77140c88b2f24b9c696cbe306eb41ca8
12SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e 12SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e