add git-wip and git-unwip #669
Conversation
|
Hm, kinda sounds like |
|
@eMPee584 it is very similar to |
acant
force-pushed
the
feature/wip_unwip
branch
3 times, most recently
from
4501c4a to
71395a3
Compare
|
Rebased onto |
bin/git-unwip
Outdated
|
|
||
| if [ 'WIP' != $LAST_COMMIT ]; then | ||
| echo 'Last commit is not a WIP commit, so it will not be unWIP-ed.' | ||
| exit |
There was a problem hiding this comment.
| exit | |
| exit 1 |
I think this should be an error if it is unable "to unwip"
There was a problem hiding this comment.
That makes sense I will update the commit. 👍
bin/git-unwip
Outdated
| # * https://github.com/ddollar/git-utils/blob/master/git-unwip | ||
|
|
||
| # Check if the last commit is a 'WIP' commit | ||
| LAST_COMMIT=`git log -1 --pretty=%B | tr --delete '[:space:]'` |
There was a problem hiding this comment.
| LAST_COMMIT=`git log -1 --pretty=%B | tr --delete '[:space:]'` | |
| LAST_COMMIT=`git log -1 --pretty=%B | tr -d '[:space:]'` |
BSD tr doesn't seem to support --delete
There was a problem hiding this comment.
Well, that is unfortunate. I have been trying to use the full flag names in scripts, but you are right that BSD does not support it.
I will update to use -d as you suggested.
acant
force-pushed
the
feature/wip_unwip
branch
from
71395a3 to
8915f7c
Compare
acant
force-pushed
the
feature/wip_unwip
branch
2 times, most recently
from
a792dac to
0165853
Compare
|
@hyperupcall thanks for approving the workflow execution. I have tried to fix the various failures in:
|
acant
force-pushed
the
feature/wip_unwip
branch
from
0165853 to
720beae
Compare
|
@hyperupcall thanks again for running the workflow. After some investigation is seems that the problem is the version of codespell, which does not include the inline ignore support. I have created a separate commit to upgrade codespell, which updates Hopefully it will work in Github Actions too. 🤞 |
|
Thanks! Inline ignoring seems to work fine, although CI still unfortunately fails on spellcheck. I haven't properly been able to look into it because of my schedule at the moment - though I will later |
|
I think probably the newer version of codespell is catching typos or "typos" that weren't caught before. Once those issues are fixed then I'll be able to merge this (to keep CI green on main). I'll be able to get around to doing it maybe in a week or two if its not already done |
It is a lastet verison, and is needed so that I can use the inline
ignore support in a future commit.
After updating tests/pyproject.toml I ran the following commands:
```
cd tests
poetry lock --no-update
poetry install
```
I also fixed a spelling error in man/git-summary.md, which was not
caught by the old version of codespell. After updating the file I also
updated the related files by running the following commands:
```
cd man
make -C .. man/git-summary.{1,html}
```
Updated/re-built the documentation with:
```
cd man
make -C .. man/git-unwip.{1,html}
make -C .. man/git-wip.{1,html}
make -C .. man/git-extras.{1,html}
```
acant
force-pushed
the
feature/wip_unwip
branch
from
720beae to
afe19c1
Compare
|
@hyperupcall I fixed one problem, can caused another. 😆 I just updated the Thanks again for your time and attention, it is much appreciated. |
|
Fantastic! It's green now. Everything LGTM, I just have to pass it off to @spacewander now |
I have been using these commands for a while, to save interim changes when switching between feature branches. This ideas in other places, but it would be nice to included it here too. I have added links to files in https://github.com/ddollar/git-utils which are similar, but the scripts are not exactly the same.
Any feedback is welcome. I went through the contributing guidelines, but if I have missed anything I am happy to updated it.
Thanks in advance.