diff options
| author | Erich Eckner <git@eckner.net> | 2021-03-25 22:04:07 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2021-03-25 22:04:07 +0100 |
| commit | 3905ce2c3a08d5934737f7081b66c2b8fb62067f (patch) | |
| tree | b73794f2dbe2a8348adac66b3c771b27f50617bc /commit-package | |
| parent | 3af1244553a39ac3d8f0de94655ab39d131b2260 (diff) | |
| download | archlinuxewe-3905ce2c3a08d5934737f7081b66c2b8fb62067f.tar.xz | |
commit-package: pull master, too before patching
Diffstat (limited to 'commit-package')
| -rwxr-xr-x | commit-package | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/commit-package b/commit-package index c1aca8399..648af22f4 100755 --- a/commit-package +++ b/commit-package @@ -73,6 +73,7 @@ if [ -d '.git' ] || [ -f '.git' ]; then makepkg --printsrcinfo > .SRCINFO git commit 'PKGBUILD' '.SRCINFO' -m "${commit_message:-rebuild}" git checkout master + git pull --ff-only diff=$( git diff archlinuxewe{^,} --name-status \ | cut -f2 \ |