Skip to content

Add base commit option to start splitting from #4

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
basile-henry wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add base commit option to start splitting from #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions git-split-branch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ get_reparents() {
printf '%s\n' "$parentstr"
}

USAGE="[-d <workdir>] [-r <remainder>] <source>
USAGE="[-d <workdir>] [-r <remainder>] [-b <base>] <source>
<dest1> <files>... [-- <dest2> <files>...]..."
OPTIONS_SPEC=
. git-sh-setup
Expand All @@ -79,6 +79,7 @@ fi
tempdir=.git-rewrite
rembr=
srcbr=
basecommit=
while arg=$1; shift
do
case "$arg" in
Expand All @@ -99,6 +100,13 @@ do
shift || usage
fi
;;
-b*)
basecommit=${arg:2}
if [ -z "$basecommit" ]; then
basecommit=$1
shift || usage
fi
;;
-?*)
usage
;;
Expand All @@ -114,6 +122,9 @@ done
# By default, rewrite source branch to remainder in place
: ${rembr:=$srcbr}

# By default, set base commit to empty tree
: ${basecommit:=4b825dc642cb6eb9a060e54bf8d69288fbee4904}

# Set up and change to temporary directory
orig_dir=$(pwd)
mkdir -p "$tempdir/t" &&
Expand Down Expand Up @@ -160,7 +171,7 @@ done

srcrev=$(git rev-parse "$srcbr")
git rev-list --reverse --topo-order --default HEAD \
--parents --simplify-merges "$srcrev" >../revs ||
--parents --simplify-merges "$basecommit".."$srcrev" >../revs ||
die "Could not get the commits"
commits=$(wc -l <../revs | tr -d " ")

Expand Down Expand Up @@ -227,7 +238,7 @@ while read commit parents; do
# Get just the specified files into the index
eval set -- "${dstfiles[$branch]}"
GIT_INDEX_FILE=$GIT_INDEX_FILE-rem git rm -qr --cached --ignore-unmatch -- "$@"
git read-tree --empty
git read-tree $basecommit
git reset -q $commit -- "$@"

parentstr=$(get_reparents "$branch" $parents)
Expand Down