mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prune out some extra merge commits by comparing their parents correctly.

Browse Source
This commit is contained in:
Avery Pennarun
2009-04-24 21:49:19 -04:00
parent 847e868167
commit 210d083904
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
git-subtree.sh
View File

@ -168,9 +168,17 @@ merge_msg()
EOF EOF
} }
tree_for_commit() toptree_for_commit()
{ {
git ls-tree "$1" -- "$dir" | commit="$1"
git log -1 --pretty=format:'%T' "$commit" -- || exit $?
}
subtree_for_commit()
{
commit="$1"
dir="$2"
git ls-tree "$commit" -- "$dir" |
while read mode type tree name; do while read mode type tree name; do
assert [ "$name" = "$dir" ] assert [ "$name" = "$dir" ]
echo $tree echo $tree
@ -185,7 +193,7 @@ tree_changed()
if [ $# -ne 1 ]; then if [ $# -ne 1 ]; then
return 0 # weird parents, consider it changed return 0 # weird parents, consider it changed
else else
ptree=$(tree_for_commit $1) ptree=$(toptree_for_commit $1)
if [ "$ptree" != "$tree" ]; then if [ "$ptree" != "$tree" ]; then
return 0 # changed return 0 # changed
else else
@ -226,7 +234,7 @@ cmd_split()
newparents=$(cache_get $parents) newparents=$(cache_get $parents)
debug " newparents: $newparents" debug " newparents: $newparents"
tree=$(tree_for_commit $rev) tree=$(subtree_for_commit $rev "$dir")
debug " tree is: $tree" debug " tree is: $tree"
[ -z $tree ] && continue [ -z $tree ] && continue
@ -235,7 +243,7 @@ cmd_split()
p="$p -p $parent" p="$p -p $parent"
done done
if tree_changed $tree $parents; then if tree_changed $tree $newparents; then
newrev=$(copy_commit $rev $tree "$p") || exit $? newrev=$(copy_commit $rev $tree "$p") || exit $?
else else
newrev="$newparents" newrev="$newparents"