mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
Fix a minor problem in identifying squashes vs. normal splits.
This didn't seem to have any noticeable side effects other than suspicious-looking log messages when you used -d.
This commit is contained in:
parent
6f2012cdc0
commit
2275f7077d
1 changed files with 3 additions and 1 deletions
|
@ -214,12 +214,14 @@ find_existing_splits()
|
|||
--pretty=format:'START %H%n%s%n%n%b%nEND%n' $revs |
|
||||
while read a b junk; do
|
||||
case "$a" in
|
||||
START) main="$b"; sq="$b" ;;
|
||||
START) sq="$b" ;;
|
||||
git-subtree-mainline:) main="$b" ;;
|
||||
git-subtree-split:) sub="$b" ;;
|
||||
END)
|
||||
debug " Main is: '$main'"
|
||||
if [ -z "$main" -a -n "$sub" ]; then
|
||||
# squash commits refer to a subtree
|
||||
debug " Squash: $sq from $sub"
|
||||
cache_set "$sq" "$sub"
|
||||
fi
|
||||
if [ -n "$main" -a -n "$sub" ]; then
|
||||
|
|
Loading…
Reference in a new issue