Skip to content

[pull] master from aurutils:master #35

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
pull merged 1 commit into from
Oct 23, 2025
Merged

[pull] master from aurutils:master #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions lib/aurweb/aur-fetch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ git_empty_object=$(git hash-object -t tree /dev/null)
# Default options
existing=0 recurse=0 discard=0 sync=fetch

# Default to only allowing fast-forward merges (as git-pull)
merge_args=(--ff-only)

unset -v rebase_args merge_args results_file

# option handling
Expand Down Expand Up @@ -103,6 +100,11 @@ while true; do
shift
done

# Default to only allowing fast-forward merges (as git-pull)
if (( ! ${#merge_args[@]} )); then
merge_args=(--ff-only)
fi

# Option validation
if [[ $sync != @(auto|merge|rebase|reset|fetch) ]]; then
warn '%s: invalid --sync mode\n' "$sync"
Expand Down Expand Up @@ -227,7 +229,7 @@ for pkg in "${!packages[@]}"; do

# Retrieve per-package configuration (aurutils.rebase, #1007)
if [[ $sync = auto ]]; then
case $(git config --get --type bool aurutils.rebase) in
case $(git config --default=false --get --type bool aurutils.rebase) in
true) sync=rebase ;;
false) sync=merge
esac
Expand Down
2 changes: 1 addition & 1 deletion lib/pacman/aur-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ while IFS= read "${read_args[@]}" -ru "$fd" path; do

if (( create_package )); then
# pkglist/siglist contain basename
if [[ $db_root != "$db_pool" ]]; then
if [[ -v db_pool ]] && [[ $db_root != "$db_pool" ]]; then
mv -f "${siglist[@]}" "${pkglist[@]}" "$db_pool"

# Absolute links for packages in pool (repose --pool)
Expand Down