Skip to content

Also add untracked files in stash to prevent issues with deleted files #974

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.

Sign up for GitHub

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

Merged
christianlupus merged 2 commits into from
May 2, 2022
Merged

Also add untracked files in stash to prevent issues with deleted files #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ee54f3
Also add untracked files in stash to prevent issues with deleted files
christianlupus May 2, 2022
6db3da3
Update Chnagelog
christianlupus May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .hooks/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# set -x

lines_before=`git stash list | wc -l`
git stash push --keep-index -q
git stash push --keep-index --include-untracked -q --message "You should never see this commit message. If you do, please repair your git setup manully!"
lines_after=`git stash list | wc -l`

cleanup() {
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
[#952](https://github.com/nextcloud/cookbook/pull/952) @christianlupus
- Redirect to login in case of logged out user
[#956](https://github.com/nextcloud/cookbook/pull/956) @christianlupus
- Fix problem with git pre-commit hook dropping files unintentionally
[#974](https://github.com/nextcloud/cookbook/pull/974) @christianlupus

### Documentation
- Corrected some spelling issues
Expand Down