-
-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(file-ignore): add ignore opts to add cmd #7017
Merged
Merged
Conversation
This file contains 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
Stebalien
force-pushed
the
feat/cmd-add-ignore-2
branch
from
March 19, 2020 17:51
2c5c9cd
to
10efedf
Compare
The following changes should fix the test failures in t0042-add-skip.sh diff --git a/test/sharness/t0042-add-skip.sh b/test/sharness/t0042-add-skip.sh
index 27af0c9ff..9da78163c 100755
--- a/test/sharness/t0042-add-skip.sh
+++ b/test/sharness/t0042-add-skip.sh
@@ -45,16 +45,16 @@ added QmU4zFD5eJtRBsWC63AvpozM9Atiadg9kPVTuTrnCYJiNF planets/.pluto.txt
added QmZy3khu7qf696i5HtkgL2NotsCZ8wzvNZJ1eUdA5n8KaV planets/mars.txt
added QmQnv4m3Q5512zgVtpbJ9z85osQrzZzGRn934AGh6iVEXz planets/venus.txt
added Qmf6rbs5GF85anDuoxpSAdtuZPM9D2Yt3HngzjUVSQ7kDV planets/.asteroids
-added QmR8nD1Vzk5twWVC6oShTHvv7mMYkVh6dApCByBJyV2oj3 planets
+added QmczhHaXyb3bc9APMxe4MXbr87V5YDLKLaw3DZX3fK7HrK planets
EOF
test_cmp expected actual
'
- test_expect_success "'ipfs add -r --ignore-rules=.gitignore --hidden' succeeds" '
- (cd mountdir/planets && ipfs add -r --ignore-rules=.gitignore --hidden .) > actual
+ test_expect_success "'ipfs add -r --ignore-rules-path=.gitignore --hidden' succeeds" '
+ (cd mountdir/planets && ipfs add -r --ignore-rules-path=.gitignore --hidden .) > actual
'
- test_expect_success "'ipfs add -r --ignore-rules=.gitignore --hidden' did not include mars.txt file" '
+ test_expect_success "'ipfs add -r --ignore-rules-path=.gitignore --hidden' did not include mars.txt file" '
cat >expected <<-\EOF &&
added QmcAREBcjgnUpKfyFmUGnfajA1NQS5ydqRp7WfqZ6JF8Dx planets/.asteroids/ceres.txt
added QmZ5eaLybJ5GUZBNwy24AA9EEDTDpA4B8qXnuN3cGxu2uF planets/.asteroids/pallas.txt
@@ -63,21 +63,21 @@ added QmPHrRjTH8FskN3C2iv6BLekDT94o23KSL2u5qLqQqGhVH planets/.gitignore
added QmU4zFD5eJtRBsWC63AvpozM9Atiadg9kPVTuTrnCYJiNF planets/.pluto.txt
added QmQnv4m3Q5512zgVtpbJ9z85osQrzZzGRn934AGh6iVEXz planets/venus.txt
added Qmf6rbs5GF85anDuoxpSAdtuZPM9D2Yt3HngzjUVSQ7kDV planets/.asteroids
-added QmZSa7JWZPVVu6q3nNZLhWBn9iPrvMWwSzNS6ycvwdeC5T planets
+added QmaRsiaCYvc65RqHVAcv2tqyjZgQYgvaNqW1tQGsjfy4N5 planets
EOF
test_cmp expected actual
'
- test_expect_success "'ipfs add -r --ignore-rules=.gitignore --ignore .asteroids --ignore venus.txt --hidden' succeeds" '
- (cd mountdir/planets && ipfs add -r --ignore-rules=.gitignore --ignore .asteroids --ignore venus.txt --hidden .) > actual
+ test_expect_success "'ipfs add -r --ignore-rules-path=.gitignore --ignore .asteroids --ignore venus.txt --hidden' succeeds" '
+ (cd mountdir/planets && ipfs add -r --ignore-rules-path=.gitignore --ignore .asteroids --ignore venus.txt --hidden .) > actual
'
- test_expect_success "'ipfs add -r --ignore-rules=.gitignore --ignore .asteroids --ignore venus.txt --hidden' did not include ignored files" '
+ test_expect_success "'ipfs add -r --ignore-rules-path=.gitignore --ignore .asteroids --ignore venus.txt --hidden' did not include ignored files" '
cat >expected <<-\EOF &&
added QmaowqjedBkUrMUXgzt9c2ZnAJncM9jpJtkFfgdFstGr5a planets/.charon.txt
added QmPHrRjTH8FskN3C2iv6BLekDT94o23KSL2u5qLqQqGhVH planets/.gitignore
added QmU4zFD5eJtRBsWC63AvpozM9Atiadg9kPVTuTrnCYJiNF planets/.pluto.txt
-added QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn planets
+added QmemuMahjSh7eYLY3hbz2q8sqMPnbQzBQeUdosqNiWChE6 planets
EOF
test_cmp expected actual
' |
Stebalien
force-pushed
the
feat/cmd-add-ignore-2
branch
from
March 20, 2020 00:41
10efedf
to
82a44b0
Compare
Bug fix in ipfs/go-ipfs-cmds#186. |
- add the `gitignore` or `ignore options to the add command
Stebalien
force-pushed
the
feat/cmd-add-ignore-2
branch
from
March 20, 2020 16:23
82a44b0
to
62de9ba
Compare
@corntoole all merged! This will be in the next go-ipfs release. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
gitignore
or `ignore options to the add commandrebase of #6901