Put the git URL and branch name of the tree in there.
awk -F '\t' '/^[^#]/ && $3=="'"$1"'" { print $1; }' $CTRL_FILE
}
awk -F '\t' '/^[^#]/ && $3=="'"$1"'" { print $1; }' $CTRL_FILE
}
+get_url()
+{
+ awk -F '\t' '/^[^#]/ && $3=="'"$1"'" { print $4; }' $CTRL_FILE
+}
+
check_unmerged_files()
{
local tree="$1"
check_unmerged_files()
{
local tree="$1"
done 7<"../pre-merge/$tree"
fi
log Merging "$h" "($hlog)"
done 7<"../pre-merge/$tree"
fi
log Merging "$h" "($hlog)"
- if ! execute git merge "$h"; then
+ printf -v msg "Merge branch '%s' of %s" "${h#*/}" "$(get_url "$tree")"
+ if ! execute git merge -m "$msg" "$h"; then
echo Merge failed 1>&2
echo "$h" >>../merge.debug
git diff >>../merge.debug 2>&1
echo Merge failed 1>&2
echo "$h" >>../merge.debug
git diff >>../merge.debug 2>&1