diff options
| author | minskim <minskim@pkgsrc.org> | 2009-05-05 06:21:16 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2009-05-05 06:21:16 +0000 |
| commit | e5e30159cdeadd7a4731c3448c5b2abe72ecb060 (patch) | |
| tree | 11feb501c0c8091e3f75140183922559fb3411b9 /devel/scmgit | |
| parent | b51e5867ccdda1a041ebb6ec447e79215ed7393f (diff) | |
| download | pkgsrc-e5e30159cdeadd7a4731c3448c5b2abe72ecb060.tar.gz | |
Update scmgit{,-base,-docs} to 1.6.2.5.
Major changes in 1.6.1:
When some commands (e.g. "git log", "git diff") spawn pager
internally, we used to make the pager the parent process of the git
command that produces output. This meant that the exit status of the
whole thing comes from the pager, not the underlying git command. We
swapped the order of the processes around and you will see the exit
code from the command from now on.
Major changes in 1.6.2:
With the next major release, "git push" into a branch that is
currently checked out will be refused by default. You can choose what
should happen upon such a push by setting the configuration variable
receive.denyCurrentBranch in the receiving repository.
To ease the transition plan, the receiving repository of such a push
running this release will issue a big warning when the configuration
variable is missing.
For a similar reason, "git push $there :$killed" to delete the branch
$killed in a remote repository $there, if $killed branch is the
current branch pointed at by its HEAD, gets a large warning. You can
choose what should happen upon such a push by setting the
configuration variable receive.denyDeleteCurrent in the receiving
repository.
Diffstat (limited to 'devel/scmgit')
| -rw-r--r-- | devel/scmgit/Makefile | 6 | ||||
| -rw-r--r-- | devel/scmgit/Makefile.version | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/devel/scmgit/Makefile b/devel/scmgit/Makefile index b7355a36b01..0dc79d99bb7 100644 --- a/devel/scmgit/Makefile +++ b/devel/scmgit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2008/06/15 09:52:00 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2009/05/05 06:21:16 minskim Exp $ .include "../../devel/scmgit/Makefile.version" @@ -13,7 +13,7 @@ COMMENT= GIT version control suite meta-package META_PACKAGE= yes -DEPENDS+= scmgit-base-[0-9]*:../../devel/scmgit-base -DEPENDS+= scmgit-docs-[0-9]*:../../devel/scmgit-docs +DEPENDS+= scmgit-base>=${GIT_VERSION}:../../devel/scmgit-base +DEPENDS+= scmgit-docs>=${GIT_VERSION}:../../devel/scmgit-docs .include "../../mk/bsd.pkg.mk" diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version index a21b4cdb15e..563f8151a0e 100644 --- a/devel/scmgit/Makefile.version +++ b/devel/scmgit/Makefile.version @@ -1,3 +1,3 @@ -# $NetBSD: Makefile.version,v 1.7 2009/01/09 13:42:15 tonnerre Exp $ +# $NetBSD: Makefile.version,v 1.8 2009/05/05 06:21:16 minskim Exp $ # -GIT_VERSION= 1.6.0.6 +GIT_VERSION= 1.6.2.5 |