summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 86de04c)
raw | patch | inline | side by side (parent: 86de04c)
author | Avery Pennarun <apenwarr@gmail.com> | |
Sun, 26 Apr 2009 19:54:42 +0000 (15:54 -0400) | ||
committer | Avery Pennarun <apenwarr@gmail.com> | |
Sun, 26 Apr 2009 19:54:42 +0000 (15:54 -0400) |
git-subtree.sh | patch | blob | history |
diff --git a/git-subtree.sh b/git-subtree.sh
index 8b797dfc23c8cfe7c5f7f4dea877be0dda45c87e..19ac2ef1c14aec87c9e91eb175e0319aab60122c 100755 (executable)
--- a/git-subtree.sh
+++ b/git-subtree.sh
unrevs="$(find_existing_splits "$dir" "$revs")"
fi
- # We can't restrict rev-list to only "$dir" here, because that leaves out
- # critical information about commit parents.
- debug "git rev-list --reverse --parents $revs $unrevs"
+ # We can't restrict rev-list to only $dir here, because some of our
+ # parents have the $dir contents the root, and those won't match.
+ # (and rev-list --follow doesn't seem to solve this)
git rev-list --reverse --parents $revs $unrevs |
while read rev parents; do
debug