On Mon, May 25, 2015 at 04:49:06PM +0200, Jochen Sprickerhof wrote:
>* Ivan Tham <ivanthamjunhoe_AT_gmail.com> [2015-05-25 19:57]:
>> I cannot patch it, when ``git apply st-scrollback.diff``::
>>
>> error: patch failed: config.def.h:7
>> error: config.def.h: patch does not apply
>> error: patch failed: st.c:83
>> error: st.c: patch does not apply
>
>$ git rev-parse HEAD
>c03548750b2527a6ddb5edfd945c5799066a6224
>
>$ sha256sum st-scrollback.diff
>250681d44ba4c89cdaf358d89bab67f215826f84b04199427d174113f1484c06 st-scrollback.diff
>
>$ git apply st-scrollback.diff
Now ``git apply`` does work, but:
$ git rev-parse HEAD
c03548750b2527a6ddb5edfd945c5799066a6224
$ sha256sum st-scrollback.diff
250681d44ba4c89cdaf358d89bab67f215826f84b04199427d174113f1484c06
st-scrollback.diff
$ git apply st-scrollback.diff
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: config.def.h
modified: st.c
Untracked files:
(use "git add <file>..." to include in what will be committed)
config.h
log
st-scrollback.diff
no changes added to commit (use "git add" and/or "git commit -a")
$ sudo make clean install
>> Does it works too when compiling with musl-gcc?
>
>Should be no problem.
--
_____________________________________
< Do what you like, like what you do. >
-------------------------------------
\ ^__^
\ (oo)\_______
(__)\ )\/\
||----w |
|| ||
- text/plain attachment: log
Received on Tue May 26 2015 - 08:49:02 CEST