undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a minor problem in identifying squashes vs. normal splits.

Browse Source 
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:
Avery Pennarun 2009-10-02 16:09:09 -04:00
parent 6f2012cdc0
commit 2275f7077d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-subtree.sh
View File

@ -214,12 +214,14 @@ find_existing_splits()
--pretty=format:'START %H%n%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 while read a b junk; do
case "$a" in case "$a" in
START) main="$b"; sq="$b" ;; START) sq="$b" ;;
git-subtree-mainline:) main="$b" ;; git-subtree-mainline:) main="$b" ;;
git-subtree-split:) sub="$b" ;; git-subtree-split:) sub="$b" ;;
END) END)
debug " Main is: '$main'"
if [ -z "$main" -a -n "$sub" ]; then if [ -z "$main" -a -n "$sub" ]; then
# squash commits refer to a subtree # squash commits refer to a subtree
debug " Squash: $sq from $sub"
cache_set "$sq" "$sub" cache_set "$sq" "$sub"
fi fi
if [ -n "$main" -a -n "$sub" ]; then if [ -n "$main" -a -n "$sub" ]; then