Skip to content

Conversation

@bcattaneo
Copy link
Contributor

Solves issue #15 plus transitioning to JSON in order to use the v1 API (thanks to @mjeveritt suggestion).

@mjeveritt
Copy link

This looks good @bcattaneo ! 👍
I think you could probably rebase, and squash those commits into one, as you're only amending your first 'cut' at the API ! 😉

I'll test it locally to verify all is good here, and then I have good cause to poke our maintainer(s) in Gentoo to push to the new release + patches! 😀

@Cogitri
Copy link
Collaborator

Cogitri commented Oct 19, 2020

Ping @bcattaneo

@bcattaneo
Copy link
Contributor Author

Ping @bcattaneo

Hi!. Was waiting for that other PR to get merged, because there were some notable changes. I'll get my hands back at this asap :)

@mjeveritt
Copy link

Ping @bcattaneo

Hi!. Was waiting for that other PR to get merged, because there were some notable changes. I'll get my hands back at this asap :)

Alas I fear that could be a very long wait .. not sure where the lead dev has gone .. 😞

# Conflicts:
#	wgetpaste
@bcattaneo
Copy link
Contributor Author

Ping @bcattaneo

Hi!. Was waiting for that other PR to get merged, because there were some notable changes. I'll get my hands back at this asap :)

Alas I fear that could be a very long wait .. not sure where the lead dev has gone .. 😞

Not so fast! 😃
Mind testing locally one more time?

@mjeveritt
Copy link

Not so fast!
Mind testing locally one more time?

Fine by me here!

@Cogitri
Copy link
Collaborator

Cogitri commented Oct 24, 2020

This branch cannot be rebased due to conflicts

@nvinson
Copy link
Contributor

nvinson commented Dec 12, 2020

This branch cannot be rebased due to conflicts

I assume the issue is that feature/bpaste_v1_api contains a merge commit?
If so, please take a look at https://github.com/nvinson/wgetpaste/tree/bpaste_v1. With the exception of 1 typographical error fix, this branch should have the same state as feature/bpaste_v1_api and has a merge-commit-less history.

@Cogitri
Copy link
Collaborator

Cogitri commented Dec 27, 2020

Well, doing the following should fix it:

git fetch https://github.com/zlin/wgetpaste.git
git rebase FETCH_HEAD
git push -f

@mjeveritt
Copy link

Where are we at with this @nvinson @bcattaneo @Cogitri ?! 😃

@Cogitri
Copy link
Collaborator

Cogitri commented Feb 23, 2021

Still conflicts so can't merge this.

This was referenced Feb 23, 2021
@Cogitri Cogitri closed this in #24 Mar 31, 2021
@mjeveritt
Copy link

@bcattaneo are you OK to revisit the 'jq' stuff now this is merged?! 😃

Thanks for the merge!
@Zlogene for ebuild bump 😛

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.

4 participants