[Toybox] [PATCH 2/2] Replaced sizeof by strlen in wget POST

Rob Landley rob at landley.net
Wed Mar 30 08:53:51 PDT 2022


On 3/29/22 04:35, Moritz C. Weber wrote:
> ---
>  toys/pending/wget.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Sorry for the delay applying these, git is really stupid sometimes:

$ git am one.eml
fatal: Dirty index: cannot apply patches (dirty: toys/other/chvt.c)

I did a git rm toys/other/chvt.c because I'm merging it into toys/other/openvt.c
(putting all three text mode vt commands in the same file), and I haven't
finished that yet so it won't let me "git am" to a COMPLETELY DIFFERENT FILE.
(For no obvious reason.)

It's queued, sorry 'bout that. Gotta finish something else first...

Rob

P.S. I'm sure there's a way to back out a "git rm" you haven't commited yet, but
it's sort of non-obvious. There's the repository state, and the working tree
state, and a sort of limnal state of pending changes between the two that "git
mv" and such affect. And this doesn't even get into "stash". I don't really use
"stash" because I don't understand it well enough...

P.P.S. Did you know that git's patch format can rename files?
https://unix.stackexchange.com/questions/671081/how-to-create-a-patch-for-renaming-a-file
I've meant to add support for that to toybox/busybox patch forever, but the real
question is how "diff" should figure out a file's been renamed. Especially if it
has small changes to it, such as "default n" becoming "default y" like I do when
promoting commands out of pending. It's on the todo list...


More information about the Toybox mailing list