return "${PIPESTATUS[0]}"
}
-do_rebase()
-{
- rbase=${1#*/}
- rbase="$2/${rbase%%:*}"
- rtop="$2/${1#*:}"
- rbid=$(git rev-parse "$rbase")
- rtid=$(git rev-parse "$rtop")
- [ "$rbid" = "$rtid" ] && {
- echo Empty tree
- return
- }
- [ "$(git rev-list HEAD..$rtop)" ] || {
- echo Already merged
- return
- }
- execute git clone -s -l -n -q . ../rebase-tmp || {
- echo Clone failed 1>&2
- bash -i || exit
- }
- log '$' cd ../rebase-tmp
- cd ../rebase-tmp
- execute git fetch --no-tags ../next "refs/remotes/$rtop:$rtop" || {
- echo Fetch of top failed 1>&2
- bash -i || exit
- }
- execute git fetch --no-tags ../next "refs/remotes/$rbase:$rbase" || {
- echo Fetch of base failed 1>&2
- bash -i || exit
- }
- execute git checkout "$rtop" || {
- echo Checkout of top failed 1>&2
- bash -i || exit
- }
- execute git rebase --onto master "$rbase" || {
- echo Rebase failed 1>&2
- bash -i || exit
- }
- log '$' cd ../next
- cd ../next
- execute git pull -f ../rebase-tmp "$rtop" || {
- echo Pull failed 1>&2
- echo "$h" >>../merge.debug
- git diff >>../merge.debug 2>&1
- git diff 2>&1 | egrep -q '<<<<<|^\*' && {
- bash -i || exit
- }
- }
- execute rm -rf ../rebase-tmp
-}
-
[ -n "$start_from" ] || {
cp /dev/null "$LOG_FILE"
execute date -R
}
-heads=$(grep -v '^#' "$CTRL_FILE" | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); } $2=="branch" { printf("branch/%s ", $1); }')
+heads=$(awk -F '\t' '/^#/ { next; } $2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); } $2=="branch" { printf("branch/%s ", $1); }' "$CTRL_FILE")
need_build=false
[ -f "../pre-merge/$tree" ] && {
for p in $(cat "../pre-merge/$tree"); do
"$bin_dir/do_patch" -n "$p" || {
- notify-send -u critical -t 0 "premerge patch failed"
+ linux-next-notify "premerge patch failed"
bash -i || exit
}
done
}
log Merging "$h" "($hlog)"
- case "$h" in
- *:*)
- do_rebase "$h" "$tree"
- ;;
- *)
- execute git merge "$h" || {
- echo Merge failed 1>&2
- echo "$h" >>../merge.debug
- git diff >>../merge.debug 2>&1
- um_files=$(git diff 2>&1 | sed -n 's/^\* Unmerged path //p')
- [ "$um_files" ] && [ -f "../merge-files/$tree" ] && {
- rm_files=$(grep -F "$um_files" "../merge-files/$tree")
- [ "$rm_files" ] &&
- "$bin_dir/do_rm" $rm_files
- }
- git diff 2>&1 | egrep -q '<<<<<|^\*' && {
- notify-send -t 0 -u critical "linux-next new conflict found merging $tree!"
- pushover "linux-next new conflict found merging $tree!"
- if [ -f "../merge-fixes/$tree" ]; then
- echo "Merge fixes exist for this tree:"
- cat "../merge-fixes/$tree"
- fi
+ execute git merge "$h" || {
+ echo Merge failed 1>&2
+ echo "$h" >>../merge.debug
+ git diff >>../merge.debug 2>&1
+
+ check_unmerged_files "$tree"
+
+ git diff 2>&1 | egrep -q '<<<<<|^\*' && {
+ linux-next-notify "new conflict found merging $tree"
+ if [ -f "../merge-fixes/$tree" ]; then
+ echo "Merge fixes exist for this tree:"
+ cat "../merge-fixes/$tree"
+ fi
+ bash -i || exit
+ }
+# [ "$(git status --porcelain)" ] && {
+ GIT_EDITOR=: execute git commit -v -a || {
+ linux-next-notify "next commit failed for $tree"
bash -i || exit
}
-# [ "$(git status --porcelain)" ] && {
- GIT_EDITOR=: execute git commit -v -a || {
- notify-send -t 0 -u critical "linux-next commit failed for $tree!"
- pushover "linux-next commit failed for $tree!"
- bash -i || exit
- }
- execute git diff -M --stat --summary 'HEAD^..'
-# }
- }
- ;;
- esac
+ execute git diff -M --stat --summary 'HEAD^..'
+# }
+ }
[ -f "../merge-fixes/$tree" ] && {
for p in $(cat "../merge-fixes/$tree"); do
"$bin_dir/merge_fix" -n "$p" || {
- notify-send -t 0 -u critical "linux-next merge fix failed for $tree!"
- pushover "linux-next merge fix failed for $tree!"
+ linux-next-notify "merge fix failed for $tree"
bash -i || exit
}
done
}
$need_build ||
continue
- do_build=$(grep -v '^#' $CTRL_FILE | awk -F ' ' '$3=="'$tree'" { print $6; }')
+ do_build=$(awk -F '\t' '/^[^#]/ && $3=="'$tree'" { print $6; }' "$CTRL_FILE")
[ "$do_build" = "yes" ] ||
continue
git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
echo git push failed 1>&2
- notify-send -t 0 -u critical "linux-next push failed for $tree!"
- pushover "linux-next push failed for $tree!"
+ linux-next-notify "push failed for $tree"
bash -i || exit
}
[ -x "../pre-build/$tree" ] && {
"../pre-build/$tree" || {
echo Prebuild script failed 1>&2
- notify-send -t 0 -u critical "linux-next pre-build script failed for $tree!"
- pushover "linux-next pre-build script failed for $tree!"
+ linux-next-notify "pre-build script failed for $tree"
bash -i || exit
}
}
"$bin_dir/do_build" "$tree" || {
echo Build failed 1>&2
- notify-send -t 0 -u critical "linux-next build failed for $tree!"
- pushover "linux-next build failed for $tree!"
+ linux-next-notify "build failed for $tree"
bash -i || exit
}
- notify-send -u normal "Merge and build of $tree successful"
-
need_build=false
done
projects / next-scripts / blobdiff