diff options
| author |  Avery Pennarun <apenwarr@gmail.com> | 2009-10-02 16:09:09 -0400 |
|---|---|---|
| committer | Avery Pennarun <apenwarr@gmail.com> | 2009-10-02 16:09:48 -0400 |
| commit | 2275f7077d5ea2bb9201599dec0dd8f2a5de2e40 (patch) | |
| tree | bd361ddbb36b7334c6a95d520937e0986ee05203 | |
| parent | If someone provides a --prefix that ends with slash, strip the slash. (diff) | |
| download | tgif-2275f7077d5ea2bb9201599dec0dd8f2a5de2e40.tar.xz | |
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.
| -rwxr-xr-x | git-subtree.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-subtree.sh b/git-subtree.sh index 0949fefe20..cccc3400fd 100755 --- a/git-subtree.sh +++ b/git-subtree.sh @@ -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 |