forked from Ponysearch/Ponysearch
[mod] utils/manage_static.sh: remove git_log_current_branch
Marginal simplification of the procedure to get only the last local commit which is not in remotes. Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
parent
80710c666f
commit
03d5d14d98
1 changed files with 7 additions and 8 deletions
|
@ -13,13 +13,6 @@ BUILT_PATHS=(
|
||||||
searx/static/themes/simple/src/generated/pygments.less
|
searx/static/themes/simple/src/generated/pygments.less
|
||||||
)
|
)
|
||||||
|
|
||||||
git_log_current_branch() {
|
|
||||||
local branch
|
|
||||||
branch="$(git branch --show-current)"
|
|
||||||
git log "${branch}" --pretty=format:'%h' \
|
|
||||||
--not --exclude="${branch}" --branches --remotes
|
|
||||||
}
|
|
||||||
|
|
||||||
is.build.commit() {
|
is.build.commit() {
|
||||||
local commit_sha="$1"
|
local commit_sha="$1"
|
||||||
local commit_message
|
local commit_message
|
||||||
|
@ -46,9 +39,15 @@ is.build.commit() {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static.build.commit.drop() {
|
static.build.commit.drop() {
|
||||||
local last_commit_id
|
local last_commit_id
|
||||||
last_commit_id=$(git_log_current_branch | head -1)
|
local branch
|
||||||
|
|
||||||
|
# get only last (option -n1) local commit not in remotes
|
||||||
|
branch="$(git branch --show-current)"
|
||||||
|
last_commit_id="$(git log -n1 "${branch}" --pretty=format:'%h'\
|
||||||
|
--not --exclude="${branch}" --branches --remotes)"
|
||||||
|
|
||||||
if [ -z "${last_commit_id}" ]; then
|
if [ -z "${last_commit_id}" ]; then
|
||||||
echo "Empty branch"
|
echo "Empty branch"
|
||||||
|
|
Loading…
Reference in a new issue