Created
August 2, 2019 13:22
-
-
Save zph/7d3953208d60c267ce4f96cfda0e7efb to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
class GitlessWithUntracked < Formula | |
include Language::Python::Virtualenv | |
desc "Simplified version control system on top of git" | |
homepage "https://gitless.com/" | |
url "https://github.com/sdg-mit/gitless/archive/v0.8.8.tar.gz" | |
sha256 "470aab13d51baec2ab54d7ceb6d12b9a2937f72d840516affa0cb34a6360523c" | |
depends_on "libgit2" | |
depends_on "python" | |
resource "args" do | |
url "https://files.pythonhosted.org/packages/e5/1c/b701b3f4bd8d3667df8342f311b3efaeab86078a840fb826bd204118cc6b/args-0.1.0.tar.gz" | |
sha256 "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814" | |
end | |
resource "cffi" do | |
url "https://files.pythonhosted.org/packages/10/f7/3b302ff34045f25065091d40e074479d6893882faef135c96f181a57ed06/cffi-1.11.4.tar.gz" | |
sha256 "df9083a992b17a28cd4251a3f5c879e0198bb26c9e808c4647e0a18739f1d11d" | |
end | |
resource "clint" do | |
url "https://files.pythonhosted.org/packages/3d/b4/41ecb1516f1ba728f39ee7062b9dac1352d39823f513bb6f9e8aeb86e26d/clint-0.5.1.tar.gz" | |
sha256 "05224c32b1075563d0b16d0015faaf9da43aa214e4a2140e51f08789e7a4c5aa" | |
end | |
resource "pycparser" do | |
url "https://files.pythonhosted.org/packages/8c/2d/aad7f16146f4197a11f8e91fb81df177adcc2073d36a17b1491fd09df6ed/pycparser-2.18.tar.gz" | |
sha256 "99a8ca03e29851d96616ad0404b4aad7d9ee16f25c9f9708a11faf2810f7b226" | |
end | |
resource "pygit2" do | |
url "https://files.pythonhosted.org/packages/4c/64/88c2a4eb2d22ca1982b364f41ff5da42d61de791d7eb68140e7f8f7eb721/pygit2-0.28.2.tar.gz" | |
sha256 "4d8c3fbbf2e5793a9984681a94e6ac2f1bc91a92cbac762dbdfbea296b917f86" | |
end | |
resource "sh" do | |
url "https://files.pythonhosted.org/packages/7c/71/199d27d3e7e78bf448bcecae0105a1d5b29173ffd2bbadaa95a74c156770/sh-1.12.14.tar.gz" | |
sha256 "b52bf5833ed01c7b5c5fb73a7f71b3d98d48e9b9b8764236237bdc7ecae850fc" | |
end | |
resource "six" do | |
url "https://files.pythonhosted.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz" | |
sha256 "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9" | |
end | |
patch :DATA | |
def install | |
virtualenv_install_with_resources | |
end | |
test do | |
system bin/"gl", "init" | |
system "git", "config", "user.name", "Gitless Install" | |
system "git", "config", "user.email", "Gitless@Install" | |
%w[haunted house].each { |f| touch testpath/f } | |
system bin/"gl", "track", "haunted", "house" | |
system bin/"gl", "commit", "-m", "Initial Commit" | |
assert_equal "haunted\nhouse", shell_output("git ls-files").strip | |
end | |
end | |
__END__ | |
diff --git a/gitless/core.py b/gitless/core.py | |
index a6a1780..0251f1e 100644 | |
--- a/gitless/core.py | |
+++ b/gitless/core.py | |
@@ -335,7 +335,7 @@ class Repository(object): | |
if not move_over: | |
# Stash | |
- git.stash.save('--all', '--', msg) | |
+ git.stash.save('--include-untracked', '--', msg) | |
def restore(b): | |
s_id, msg = _stash(_stash_msg(b.branch_name)) | |
diff --git a/gitless/tests/test_e2e.py b/gitless/tests/test_e2e.py | |
index c478143..043a184 100755 | |
--- a/gitless/tests/test_e2e.py | |
+++ b/gitless/tests/test_e2e.py | |
@@ -736,7 +736,7 @@ class TestPerformance(TestEndToEnd): | |
# do the same for git | |
t = time.time() | |
git.branch('gitdev') | |
- git.stash.save('--all') | |
+ git.stash.save('--include-untracked') | |
git.checkout('gitdev') | |
git_t = time.time() - t |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment