diff options
| author |  Jesse Greenwald <jesse.greenwald@gmail.com> | 2010-11-09 08:34:49 -0600 |
|---|---|---|
| committer |  Avery Pennarun <apenwarr@gmail.com> | 2010-11-09 21:20:32 -0800 |
| commit | 6f4f84fa2a03f441826f323c291ca6566acd0d3a (patch) | |
| tree | 1918dbf26f16d7c2a303e64c08e1c4de776604b7 | |
| parent | Fix a few typos/grammar-o's in the preceding commit. (diff) | |
| download | tgif-6f4f84fa2a03f441826f323c291ca6566acd0d3a.tar.xz | |
Split cmd now processes commits in topo order.
Added the "--topo-order" option to git rev-list. Without this, it seems that
the revision list is coming back in reverse order but it is sorted
chronologically. This does not gurantee that parent commits are handled
before child commits.
| -rwxr-xr-x | git-subtree.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-subtree.sh b/git-subtree.sh index ce94d363dc..390c0fc574 100755 --- a/git-subtree.sh +++ b/git-subtree.sh @@ -547,7 +547,7 @@ cmd_split() # 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) - grl='git rev-list --reverse --parents $revs $unrevs' + grl='git rev-list --topo-order --reverse --parents $revs $unrevs' revmax=$(eval "$grl" | wc -l) revcount=0 createcount=0 |