6 while getopts 'ns:' opt; do
21 # shellcheck source=common.sh
22 source "$(dirname "$0")/common.sh"
26 echo "$@" | tee -a "$LOG_FILE"
32 "$@" 2>&1 | tee -a "$LOG_FILE"
33 return "${PIPESTATUS[0]}"
39 linux-next-notify "$1"
42 printf '%s\n' "$2" 1>&2
49 if [ -z "$start_from" ]; then
50 cp /dev/null "$LOG_FILE"
52 execute git checkout master
53 execute git reset --hard stable
54 printf 'Name\t\tSHA1\n----\t\t----\n' > "$SHA1_FILE"
59 $2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }
60 $2=="branch" { printf("branch/%s ", $1); }' "$CTRL_FILE")
67 if [ -n "$start_from" ]; then
68 if [ "$tree" = "$start_from" ]; then
75 if [ "$tree" = "branch" ]; then
76 git branch -f "${h#branch/}"
80 hlog=$(git log -1 --oneline "$h") 2>/dev/null
81 old_head=$(git rev-parse HEAD)
82 if [ -f "../pre-merge/$tree" ]; then
83 while read -r p <&7; do
84 if ! "$bin_dir/do_patch" -n "$p"; then
85 fix_up "premerge patch failed"
87 done 7<"../pre-merge/$tree"
89 log Merging "$h" "($hlog)"
90 if ! execute git merge "$h"; then
91 echo Merge failed 1>&2
92 echo "$h" >>../merge.debug
93 git diff >>../merge.debug 2>&1
95 check_unmerged_files "$tree"
97 if git diff 2>&1 | grep -E -q '<<<<<|^\*'; then
98 if [ -f "../merge-fixes/$tree" ]; then
99 echo "Merge fixes exist for this tree:"
100 cat "../merge-fixes/$tree"
102 fix_up "new conflict found merging $tree"
104 # if [ "$(git status --porcelain)" ]; then
105 if ! execute git commit --no-edit -v -a; then
106 fix_up "next commit failed for $tree"
108 execute git diff -M --stat --summary 'HEAD^..'
111 if [ -f "../merge-fixes/$tree" ]; then
112 while read -r p <&7; do
113 if ! "$bin_dir/merge_fix" -n "$p"; then
114 fix_up "merge fix failed for $tree"
116 done 7<"../merge-fixes/$tree"
120 if [ "${#tree}" -le 8 ]; then
123 printf '%s%s%s\n' "$tree" "$tab" "$(git rev-parse "$h^{}")" >> "$SHA1_FILE"
129 if ! $need_build; then
130 # See if we need to build after merging this tree
131 if [ -n "$(git diff "$old_head"..)" ]; then
135 if ! $need_build; then
139 do_build=$(awk -F '\t' '/^[^#]/ && $3=="'"$tree"'" { print $6; }' "$CTRL_FILE")
140 if [ "$do_build" != "yes" ]; then
144 repo="${build_host:+$build_host:}${build_dir}"
145 if ! git push -f "$repo" master:refs/heads/next; then
146 fix_up "push failed for $tree" "git push failed"
149 if [ -x "../pre-build/$tree" ] &&
150 ! "../pre-build/$tree"; then
151 fix_up "pre-build script failed for $tree" "Prebuild script failed"
153 if ! "$bin_dir/do_build" "$tree"; then
154 fix_up "build failed for $tree" "Build failed"