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

We now copy the other stuff about a commit (changelog, author, etc).

Browse Source
This commit is contained in:
Avery Pennarun 2009-04-24 14:45:02 -04:00
parent 2573354e9b
commit fd9500eef2
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
git-subtree.sh
View File

@ -77,7 +77,6 @@ cache_setup()
rm -rf "$cachedir" || die "Can't delete old cachedir: $cachedir" rm -rf "$cachedir" || die "Can't delete old cachedir: $cachedir"
mkdir -p "$cachedir" || die "Can't create new cachedir: $cachedir" mkdir -p "$cachedir" || die "Can't create new cachedir: $cachedir"
debug "Using cachedir: $cachedir" >&2 debug "Using cachedir: $cachedir" >&2
echo "$cachedir"
} }
cache_get() cache_get()
@ -100,6 +99,24 @@ cache_set()
echo "$newrev" >"$cachedir/$oldrev" echo "$newrev" >"$cachedir/$oldrev"
} }
copy_commit()
{
# We're doing to set some environment vars here, so
# do it in a subshell to get rid of them safely later
git log -1 --pretty=format:'%an%n%ae%n%ad%n%cn%n%ce%n%cd%n%s%n%n%b' "$1" |
(
read GIT_AUTHOR_NAME
read GIT_AUTHOR_EMAIL
read GIT_AUTHOR_DATE
read GIT_COMMITTER_NAME
read GIT_COMMITTER_EMAIL
read GIT_COMMITTER_DATE
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
export GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE
git commit-tree "$2" $3 # reads the rest of stdin
) || die "Can't copy commit $1"
}
cmd_split() cmd_split()
{ {
debug "Splitting $dir..." debug "Splitting $dir..."
@ -119,9 +136,9 @@ cmd_split()
for parent in $newparents; do for parent in $newparents; do
p="$p -p $parent" p="$p -p $parent"
done done
newrev=$(echo synthetic | git commit-tree $tree $p) \
|| die "Can't create new commit for $rev / $tree" newrev=$(copy_commit $rev $tree "$p") || exit $?
echo " newrev is: $newrev" debug " newrev is: $newrev"
cache_set $rev $newrev cache_set $rev $newrev
done || exit $? done || exit $?
done || exit $? done || exit $?