diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2017-12-21 14:25:58 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-12-21 14:25:58 +0100 |
| commit | 309783fee4f46f88f5cddcd5f69c691a329b82b5 (patch) | |
| tree | a3a1cbb6acf24bf256e62c396184a5ffcf036bce /patch-kernel.sh | |
| parent | Drastically simplify (diff) | |
| download | android_kernel_wireguard-309783fee4f46f88f5cddcd5f69c691a329b82b5.tar.xz android_kernel_wireguard-309783fee4f46f88f5cddcd5f69c691a329b82b5.zip | |
patch-kernel: do not do freaky things to index
Diffstat (limited to 'patch-kernel.sh')
| -rwxr-xr-x | patch-kernel.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/patch-kernel.sh b/patch-kernel.sh index fc57de8..793e92c 100755 --- a/patch-kernel.sh +++ b/patch-kernel.sh @@ -29,12 +29,8 @@ chmod +x scripts/fetch-latest-wireguard.sh [[ $(< scripts/Kbuild.include) == *fetch-latest-wireguard.sh* ]] || echo '$(shell cd "$(srctree)" && ./scripts/fetch-latest-wireguard.sh)' >> scripts/Kbuild.include -if [[ -d .git ]]; then - if [[ $WG_PATCHER_GIT_IGNORE -eq 1 ]]; then - echo -e 'scripts/fetch-latest-wireguard.sh\nnet/.gitignore' >> .gitignore - git update-index --assume-unchanged .gitignore scripts/Kbuild.include net/Kconfig net/Makefile - else - git add scripts/Kbuild.include scripts/fetch-latest-wireguard.sh net/.gitignore net/Kconfig net/Makefile - git commit -s -m "net/wireguard: add wireguard importer" scripts/Kbuild.include scripts/fetch-latest-wireguard.sh net/.gitignore net/Kconfig net/Makefile - fi +MODIFIED_FILES=( scripts/Kbuild.include scripts/fetch-latest-wireguard.sh net/.gitignore net/Kconfig net/Makefile ) +if [[ -d .git && -n $(git status --porcelain "${MODIFIED_FILES[@]}") ]]; then + git add "${MODIFIED_FILES[@]}" + git commit -s -m "net/wireguard: add wireguard importer" "${MODIFIED_FILES[@]}" fi |