diff options
| author | bjs <bjs@pkgsrc.org> | 2008-07-25 04:00:59 +0000 |
|---|---|---|
| committer | bjs <bjs@pkgsrc.org> | 2008-07-25 04:00:59 +0000 |
| commit | b4fa5f3620c3984317ab08645ba05bef499cf293 (patch) | |
| tree | ee388523ae46beee799a92215b5f74f888e014f4 /devel | |
| parent | 523911ad97ce174f67b2741d27cd9dbc95073f15 (diff) | |
| download | pkgsrc-b4fa5f3620c3984317ab08645ba05bef499cf293.tar.gz | |
Update to version 0.14.3.
Changes:
commit 8fe07fa4cef52c194e27b1ae764e2647c3f674f2
Handle refresh of changed files with non-ASCII names
Without -z, git diff-files was quoting them for us.
commit adb61608fb1611570bbb53ddd0b7551e90e3fbdd
Test for another filename quoting issue in tree_status()
stgit.git.tree_status() had another filename quoting issue,
similar to the one just fixed. Test for that one too.
commit fb9b3c0243657a2cf520e5bd5ccfe4aab94799c8
Handle changed files with non-ASCII names
Git was quoting them for us, which was not what we wanted. So call
diff-index with the -z flag, so that it doesn't.
commit 82863c3c5b26c743d1c0c288d354dd78557a914c
Add rebase test for when upstream has deleted a non-ASCII file
Test that stg rebase can handle upstream deleting a file with a
non-ASCII name. It currently can't.
Bug spotted by Jakub Narebski <jnareb@gmail.com>.
commit 466bfe50d7930bca950ca2b3436f1278a6b15af5
Fix "refresh" failure with moved files (bug 11661)
This patch fixes the git.tree_status() function to not pass
missing files to the git-diff-files command which crashes in weird
ways (see the bug report on gna.org).
commit 340793d1f7dc889720ceef3271ca58187474d110
Allow export to write unapplied files as well
This was an artificial limit which upset many people (including me).
commit 61fb81b963c1adb0abb08239c24fa4ee39c5929a
Fix the sync'ing of unapplied patches only
When only unapplied patches are to be sync'ed, the command failed
because the first patch was trying to be pushed twice.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/stgit/Makefile | 6 | ||||
| -rw-r--r-- | devel/stgit/distinfo | 10 | ||||
| -rw-r--r-- | devel/stgit/patches/patch-ac | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/devel/stgit/Makefile b/devel/stgit/Makefile index d6dd011af8b..dcdc46d2319 100644 --- a/devel/stgit/Makefile +++ b/devel/stgit/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2008/04/25 20:39:09 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2008/07/25 04:00:59 bjs Exp $ -DISTNAME= stgit-0.14.2 +DISTNAME= stgit-0.14.3 CATEGORIES= devel MASTER_SITES= http://homepage.ntlworld.com/cmarinas/stgit/ @@ -24,7 +24,7 @@ PYTHON_PATCH_SCRIPTS= *.py stgit/*.py stg PYDISTUTILSPKG= yes PYSETUPINSTALLARGS= --prefix=${PREFIX} -MAKE_ENV+= ASCIIDOC=${LOCALBASE}/bin/asciidoc +MAKE_ENV+= ASCIIDOC=${PREFIX}/bin/asciidoc MAKE_ENV+= ASCIIDOC_EXTRA=${ASCIIDOC_EXTRA:M*:Q} .include "../../mk/bsd.prefs.mk" diff --git a/devel/stgit/distinfo b/devel/stgit/distinfo index 49ee5e84741..c4b1b5f5657 100644 --- a/devel/stgit/distinfo +++ b/devel/stgit/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2008/04/10 12:11:34 bjs Exp $ +$NetBSD: distinfo,v 1.8 2008/07/25 04:00:59 bjs Exp $ -SHA1 (stgit-0.14.2.tar.gz) = 9cd3e4368fd36ea77c48eff4fd305d05469e8010 -RMD160 (stgit-0.14.2.tar.gz) = 566bbcccc93c3c011c866620992ff9e479ea902f -Size (stgit-0.14.2.tar.gz) = 225695 bytes +SHA1 (stgit-0.14.3.tar.gz) = 9ea2e859281f8fe3cbb7f2bd9fd83b9846923cbe +RMD160 (stgit-0.14.3.tar.gz) = 5ed7ab18a3f98269c3fc29e4d1dd353171add7d9 +Size (stgit-0.14.3.tar.gz) = 227645 bytes SHA1 (patch-aa) = 364103963f8e74eee12dbd548b4ed48b349b662f SHA1 (patch-ab) = 4808d98409c39cd6af33aad1b318a8df41c9cfec -SHA1 (patch-ac) = ae316f684e33cca913be25a3f697ee8052218eaf +SHA1 (patch-ac) = ce1df6ab709c4c4e27b96491a8fc37669c593cb0 diff --git a/devel/stgit/patches/patch-ac b/devel/stgit/patches/patch-ac index e3948353181..c8fcf605be6 100644 --- a/devel/stgit/patches/patch-ac +++ b/devel/stgit/patches/patch-ac @@ -1,3 +1,5 @@ +$NetBSD: patch-ac,v 1.2 2008/07/25 04:00:59 bjs Exp $ + --- Documentation/Makefile.orig 2007-07-25 19:49:46.000000000 -0400 +++ Documentation/Makefile 2008-02-11 14:55:30.000000000 -0500 @@ -20,7 +20,7 @@ |