Skip to content
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 1 commit into from
Mar 20, 2020

Conversation

Stebalien
Copy link
Member

  • add the gitignore or `ignore options to the add command

rebase of #6901

@corntoole
Copy link
Contributor

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
Copy link
Member Author

Bug fix in ipfs/go-ipfs-cmds#186.

- add the `gitignore` or `ignore options to the add command
@Stebalien Stebalien merged commit 7a4752a into master Mar 20, 2020
@Stebalien
Copy link
Member Author

@corntoole all merged! This will be in the next go-ipfs release.

Thanks!

@Stebalien Stebalien deleted the feat/cmd-add-ignore-2 branch March 20, 2020 16:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants