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

Directly Fix #2839 #3135

Merged
merged 3 commits into from
Sep 1, 2016
Merged

Directly Fix #2839 #3135

merged 3 commits into from
Sep 1, 2016

Conversation

kevina
Copy link
Contributor

@kevina kevina commented Aug 27, 2016

Revert the original fix for #2839 and instead fix the original issue so that adding the current directory works as expected without changing the semantics of how symbolic links are handled.

This reverts commit fe7b01f.

Conflicts:
	commands/cli/parse.go

Revert "Merge pull request #3023 from ipfs/feature/eval-symlink-windows"

This reverts commit 16c5a89, reversing
changes made to 8c77ff8.

Conflicts:
	commands/cli/parse.go

License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>
@Kubuxu Kubuxu added the status/in-progress In progress label Aug 27, 2016
License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>
@kevina kevina changed the title [WIP] Directly Fix #2839 Directly Fix #2839 Aug 27, 2016
@kevina kevina added need/review Needs a review and removed status/in-progress In progress labels Aug 27, 2016
@Kubuxu Kubuxu added this to the ipfs-0.4.3-rc4 milestone Aug 28, 2016
@Kubuxu Kubuxu mentioned this pull request Aug 29, 2016
58 tasks
'

test_expect_success "output looks good" '
echo "QmWYN8SEXCgNT2PSjB6BnxAx6NJQtazWoBkTRH9GRfPFFQ" > badlink_exp &&
test_cmp badlink_exp badlink_out
'

test_expect_success "adding with symlink in middle of path is same as\
adding with no symlink" '
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test should still be valid.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Add back still useful test from reverted commit:
  fe7b01f
  Resolve symlink if it is directly referenced in cli (#2897)

License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>
@whyrusleeping
Copy link
Member

Alright, This LGTM. @jbenet since this is in response to your review, want to give it a quick look over?

@jbenet
Copy link
Member

jbenet commented Aug 30, 2016

LGTM

@whyrusleeping whyrusleeping merged commit ade598e into version/0.4.3-rc4 Sep 1, 2016
@whyrusleeping whyrusleeping deleted the kevina/2839directfix branch September 1, 2016 02:34
@whyrusleeping
Copy link
Member

Thanks @kevina!

@NeoTheFox
Copy link

So, just to be clear, would we be able to make ipfs add -r to resolve symlinks if needed now?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
need/review Needs a review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants