Skip to content

Add support for -x/--exec= to run commands after each commit #2

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add support for -x/--exec= to run commands after each commit #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efdd7d3
Drop --no-<foo> for command lines ars where it does not make sense
arichardson Jan 3, 2025
73d94be
Add support for -x/--exec= to run commands after each commit
arichardson Jan 3, 2025
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
14 changes: 11 additions & 3 deletions git-rebase-first-parent
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ die() {
OPTS_SPEC="\
git rebase-first-parent [-i | --interactive] [--onto <newbase>] [<upstream> [<branch>]]
--
h,help show the help
h,help! show the help

i,interactive let the user edit the list of commits to rebase
onto=newbase rebase onto given branch instead of upstream"
i,interactive! let the user edit the list of commits to rebase
x,exec!=cmd run command after each commit (e.g. to check compilation)
onto!=newbase rebase onto given branch instead of upstream"

usage() {
if [ $# -gt 0 ]; then
Expand All @@ -60,6 +61,7 @@ eval "$(echo "$OPTS_SPEC" | git rev-parse --parseopt --stuck-long -- "$@" || ech

unset INTERACTIVE
unset ONTO
GIT_REBASE_FIRST_PARENT_EXEC_CMDS=
while [ $# -gt 0 ]; do
case "$1" in
--interactive)
Expand All @@ -68,6 +70,9 @@ while [ $# -gt 0 ]; do
--onto=*)
ONTO="${1#--onto=}"
;;
--exec=*)
GIT_REBASE_FIRST_PARENT_EXEC_CMDS="${GIT_REBASE_FIRST_PARENT_EXEC_CMDS}exec ${1#--exec=}\n"
;;
--)
shift
break
Expand Down Expand Up @@ -115,5 +120,8 @@ if [ -n "${INTERACTIVE+set}" ]; then
fi
export GIT_REBASE_FIRST_PARENT_SEQUENCE_EDITOR
fi
# The variable GIT_REBASE_FIRST_PARENT_EXEC_CMDS is interpreted by
# make-rebase-first-parent to add extra "exec" lines to each rebase step.
export GIT_REBASE_FIRST_PARENT_EXEC_CMDS

env GIT_SEQUENCE_EDITOR=git-rebase-first-parent-sequence-editor GIT_REBASE_FIRST_PARENT_UPSTREAM="$UPSTREAM" GIT_REBASE_FIRST_PARENT_BRANCH="$BRANCH" git rebase "$@"
5 changes: 4 additions & 1 deletion make-rebase-first-parent
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,16 @@ git log --first-parent --reverse --format='tformat:%H %P#%s' "$1".."$2" | while
l="${l%%#*}"
c="${l%% *}"
p="${l#* }"
p="`echo "$p" | sed 's/^[[:space:]]*[^[:space:]]\{1,\}//;s/[[:space:]]*\([^[:space:]]\{1,\}\)/ -p \1/g'`"
p="$(echo "$p" | sed 's/^[[:space:]]*[^[:space:]]\{1,\}//;s/[[:space:]]*\([^[:space:]]\{1,\}\)/ -p \1/g')"
if [ -z "$p" ]; then
printf 'pick %s %s\n' "$c" "$s"
else
printf '# %s\n' "$s"
echo "exec git update-ref HEAD \`git commit-tree -p HEAD$p -m 'dummy merge for $c' 'HEAD^{tree}'\` && git cherry-pick -n -m 1 $c && git commit --amend -q -n -C $c"
fi
if [ -n "${GIT_REBASE_FIRST_PARENT_EXEC_CMDS}" ]; then
printf "%b" "${GIT_REBASE_FIRST_PARENT_EXEC_CMDS}"
fi
done

sed '/^noop$/d'