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

[zend-progressbar] fix "stty: 'standard input': Inappropriate ioctl for device" spam #303

Merged
merged 1 commit into from
Jan 11, 2023

Conversation

hungtrinh
Copy link

Carries zf1s/zf1#155 which was created by @falkenhawk

fix Inappropriate ioctl for device spam

@hungtrinh
Copy link
Author

Mr @glensc could you please review this PR

@glensc
Copy link
Collaborator

glensc commented Jan 10, 2023

@hungtrinh LGTM

but you could preserve the original author and commit date with git commit --amend --author "Name Email" --date "Date Header Value from git show"

I personally try first with export the commit with git format-patch -1 SHA from original repo and in the other repo git am 0001-the-commit.patch, manually apply .patch with patch program or manually resolve conflicts, and git add -p or git add followed by git am --continue

I'll leave you to try this, or do it myself some days later.

@hungtrinh hungtrinh force-pushed the zend-progresbar-fix-tty branch from a910495 to 943e71d Compare January 11, 2023 02:48
@hungtrinh
Copy link
Author

i tried apply patch but not success so i used git commit --amend --author "Name Email" --date "Date Header Value from git show"

Mr @glensc do have experiences about Unknown or bad timezone on linux?

i'm investigating about randomly issue:

@hungtrinh
Copy link
Author

Oops, About Unknown or bad timezone is internal bug of php/php-src/issues/10218

@glensc
Copy link
Collaborator

glensc commented Jan 11, 2023

well, i hope you didn't use the git command literally but actually replaced the placeholders with intended values. do show actual command and actual error you had

@glensc
Copy link
Collaborator

glensc commented Jan 11, 2023

The author and date seem ok:

@glensc
Copy link
Collaborator

glensc commented Jan 11, 2023

CI errors seem unrelated to this, so merging

@glensc glensc merged commit 504e75d into Shardj:master Jan 11, 2023
@glensc
Copy link
Collaborator

glensc commented Jan 11, 2023

the date problem has already issue in this repo:

@hungtrinh
Copy link
Author

hungtrinh commented Jan 12, 2023

well, i hope you didn't use the git command literally but actually replaced the placeholders with intended values. do show actual command and actual error you had

That's my fail
After download https://patch-diff.githubusercontent.com/raw/zf1s/zf1/pull/155.patch i run cmd:

$~/Projects/zf1-future
git apply -p 3 ~/Downloads/155.patch 

error: patch failed: library/Zend/ProgressBar/Adapter/Console.php:243
error: library/Zend/ProgressBar/Adapter/Console.php: patch does not apply

Next time i will do that and resolve conflict:

$~/Projects/zf1-future
git am -p3 -3  ~/Downloads/155.patch

Applying: fix "stty: 'standard input': Inappropriate ioctl for device" spam
Using index info to reconstruct a base tree...
M       library/Zend/ProgressBar/Adapter/Console.php
Falling back to patching base and 3-way merge...
Auto-merging library/Zend/ProgressBar/Adapter/Console.php
CONFLICT (content): Merge conflict in library/Zend/ProgressBar/Adapter/Console.php
error: Failed to merge in the changes.
Patch failed at 0001 fix "stty: 'standard input': Inappropriate ioctl for device" spam
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

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.

3 participants