From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-vcs/git-cola/files/README.gentoo | 3 +++ .../files/git-cola-2.10-disable-live-tests.patch | 24 ++++++++++++++++++++++ dev-vcs/git-cola/files/index.html | 15 ++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 dev-vcs/git-cola/files/README.gentoo create mode 100644 dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch create mode 100644 dev-vcs/git-cola/files/index.html (limited to 'dev-vcs/git-cola/files') diff --git a/dev-vcs/git-cola/files/README.gentoo b/dev-vcs/git-cola/files/README.gentoo new file mode 100644 index 000000000000..0f4af85d5ccc --- /dev/null +++ b/dev-vcs/git-cola/files/README.gentoo @@ -0,0 +1,3 @@ +Please make sure you have either a SSH key management installed and activated or +installed a SSH askpass app like net-misc/x11-ssh-askpass. +Otherwise git-cola may hang when pushing/pulling from remote git repositories via SSH. diff --git a/dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch b/dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch new file mode 100644 index 000000000000..1f58ea0eddb6 --- /dev/null +++ b/dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch @@ -0,0 +1,24 @@ +diff --git a/test/git_test.py b/test/git_test.py +index 9f812b2..ff7da24 100644 +--- a/test/git_test.py ++++ b/test/git_test.py +@@ -53,19 +53,6 @@ class GitCommandTest(unittest.TestCase): + version = self.git.version()[STDOUT] + self.failUnless(version.startswith('git version')) + +- def test_tag(self): +- """Test running 'git tag'""" +- tags = self.git.tag()[STDOUT].splitlines() +- if os.getenv('GIT_COLA_NO_HISTORY', False): +- return +- self.failUnless('v1.0.0' in tags) +- +- def test_show(self): +- """Test running 'git show'""" +- oid = 'HEAD' +- content = self.git.show(oid)[STDOUT] +- self.failUnless(content.startswith('commit ')) +- + def test_stdout(self): + """Test overflowing the stdout buffer""" + # Write to stdout only diff --git a/dev-vcs/git-cola/files/index.html b/dev-vcs/git-cola/files/index.html new file mode 100644 index 000000000000..7f1e814a0b51 --- /dev/null +++ b/dev-vcs/git-cola/files/index.html @@ -0,0 +1,15 @@ + + + Missing documentation + + +
+ This documentation is missing. Please reinstall dev-util/cola with the 'doc' useflag enabled. + +

+ Sincerely,
+ your package maintainer. +

+
+ + -- cgit v1.2.3