Closed Fniz closed 5 years ago
@Fniz thanks for the PR, it is fine as soon as you rebase on the current master, if you don't mind! :) Also, while at it, would you mind reformatting the changes to be in line with the rest of the code? Unless you don't mind me reformatting after merging :) Thanks again!
Hi @grendello thanks for your feedbacks and sorry for newbie skill in github. I close this PR and reopen one from master (without this mix of white space / tabs)
@Fniz no problem :) FYI, you don't need to close the PR to fix it up. All you need to do is rebase your branch on master using these commands in your fork:
git checkout master
git pull origin
git checkout OpenZipArchiveWithPwd
git rebase master
git push -f fork OpenZipArchiveWithPwd
The git rebase master
will show you conflicts, at this point you edit each file that's marked (see git status
) as modified by both
and resolve the conflicts. After that you git add
that file. Then you make other changes you have to, add the modified files as well and follow up with git rebase --continue
which will finish the process and let you issue the last command from the above set. This will automatically update the PR.
@grendello, Thank you very much for the information ! Really precious :)
Yours sincerely,
Florian
On Wed, Dec 5, 2018 at 5:29 PM Marek Habersack notifications@github.com wrote:
@Fniz https://github.com/Fniz no problem :) FYI, you don't need to close the PR to fix it up. All you need to do is rebase your branch on master using these commands in your fork:
git checkout master git pull origin git checkout OpenZipArchiveWithPwd git rebase master git push -f fork OpenZipArchiveWithPwd
The git rebase master will show you conflicts, at this point you edit each file that's marked (see git status) as modified by both and resolve the conflicts. After that you git add that file. Then you make other changes you have to, add the modified files as well and follow up with git rebase --continue which will finish the process and let you issue the last command from the above set. This will automatically update the PR.
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/grendello/LibZipSharp/pull/28#issuecomment-444549411, or mute the thread https://github.com/notifications/unsubscribe-auth/ABcyRbI_eIsDaYW2HbrLjv0QZtiLvaWaks5u1_RcgaJpZM4ZCL2D .
@grendello, Thank you very much for the information ! Really precious :)
Yours sincerely,
Florian
On Thu, Dec 6, 2018 at 9:36 AM Florian Nouri florian.nouri@gmail.com wrote:
@grendello, Thank you very much for the information ! Really precious :)
Yours sincerely,
Florian
On Wed, Dec 5, 2018 at 5:29 PM Marek Habersack notifications@github.com wrote:
@Fniz https://github.com/Fniz no problem :) FYI, you don't need to close the PR to fix it up. All you need to do is rebase your branch on master using these commands in your fork:
git checkout master git pull origin git checkout OpenZipArchiveWithPwd git rebase master git push -f fork OpenZipArchiveWithPwd
The git rebase master will show you conflicts, at this point you edit each file that's marked (see git status) as modified by both and resolve the conflicts. After that you git add that file. Then you make other changes you have to, add the modified files as well and follow up with git rebase --continue which will finish the process and let you issue the last command from the above set. This will automatically update the PR.
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/grendello/LibZipSharp/pull/28#issuecomment-444549411, or mute the thread https://github.com/notifications/unsubscribe-auth/ABcyRbI_eIsDaYW2HbrLjv0QZtiLvaWaks5u1_RcgaJpZM4ZCL2D .
Add the password string parameter in the method ExtractAll
Add the private method OpenArchive which calls the native method zip_fopen_index_encrypted if the password parameter is filled. Otherwise, use the zip_fopen_index