fixes. added appbeyor script and diagram (wip)
This commit is contained in:
@ -55,25 +55,27 @@ declare_branch() {
|
||||
fi
|
||||
}
|
||||
|
||||
# Function to recursively process merged branches
|
||||
process_merged_branches() {
|
||||
local branch=$1
|
||||
local merged_branches=$(git branch --merged "$branch" | grep -v "\* $branch" | grep -v "$main_branch")
|
||||
if [ -n "$merged_branches" ]; then
|
||||
for merged_branch in $merged_branches; do
|
||||
declare_branch "$merged_branch"
|
||||
echo " checkout $(escape_for_mermaid "$branch")"
|
||||
echo " merge $(escape_for_mermaid "$merged_branch")"
|
||||
process_merged_branches "$merged_branch"
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
# Process each branch
|
||||
for branch in $(git for-each-ref --sort=committerdate --format='%(refname:short)' refs/heads/); do
|
||||
base_branch=$(find_base_branch "$branch")
|
||||
|
||||
declare_branch "$branch"
|
||||
echo " checkout $(escape_for_mermaid "$branch")"
|
||||
echo " commit id: \"$(git log -1 --pretty=format:%s "$branch")\""
|
||||
|
||||
# Check which branches are merged into this branch
|
||||
merged_branches=$(git branch --merged "$branch" | grep -v "\* $branch" | grep -v "$main_branch")
|
||||
if [ -n "$merged_branches" ]; then
|
||||
for merged_branch in $merged_branches; do
|
||||
if [ "$merged_branch" != "$branch" ]; then
|
||||
declare_branch "$merged_branch"
|
||||
echo " checkout $(escape_for_mermaid "$branch")"
|
||||
echo " merge $(escape_for_mermaid "$merged_branch")"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
process_merged_branches "$branch"
|
||||
done
|
||||
|
||||
# Check for branches not yet merged into master
|
||||
@ -81,10 +83,10 @@ not_merged=$(git branch --no-merged "$main_branch")
|
||||
if [ -n "$not_merged" ]; then
|
||||
echo " commit id: \"Branches not yet merged into master:\""
|
||||
for branch in $not_merged; do
|
||||
echo " commit id: \"$branch\""
|
||||
echo " commit id: \"$branch\" - merged into: $(git branch --merged "$branch" | grep -v "\* $branch" | grep -v "$main_branch" | tr '\n' ' ')"
|
||||
done
|
||||
fi
|
||||
|
||||
} > $output_file
|
||||
|
||||
echo "Mermaid diagram saved to $output_file"
|
||||
echo "Mermaid diagram saved to $output_file"
|
Reference in New Issue
Block a user