mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-01 23:07:55 +01:00
Code Activity

Fix splitting after using a squash merge.

Browse source
This commit is contained in:
Avery Pennarun 2009-05-30 03:33:39 -04:00
parent eb4fb91094
commit 1a8c36dc5f
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
git-subtree.sh
View file

@ -203,13 +203,17 @@ find_existing_splits()
dir="$1"
revs="$2"
git log --grep="^git-subtree-dir: $dir\$" \
--pretty=format:'%s%n%n%b%nEND%n' $revs |
--pretty=format:'START %H%n%s%n%n%b%nEND%n' $revs |
while read a b junk; do
case "$a" in
START) main="$b" ;;
START) main="$b"; sq="$b" ;;
git-subtree-mainline:) main="$b" ;;
git-subtree-split:) sub="$b" ;;
END)
if [ -z "$main" -a -n "$sub" ]; then
# squash commits refer to a subtree
cache_set "$sq" "$sub"
fi
if [ -n "$main" -a -n "$sub" ]; then
debug " Prior: $main -> $sub"
cache_set $main $sub