|
|
@ -290,12 +290,12 @@ verbose "Checking out old and new version" |
|
|
|
|
|
|
|
cd old || die "Cannot cd to old/" |
|
|
|
# in case the work directory contained uncommited important files |
|
|
|
ln -s -t . "$initial_dir"/* |
|
|
|
ln -s "$initial_dir"/* . |
|
|
|
|
|
|
|
git --git-dir="$git_dir" --work-tree=. checkout "$old" -- . || die "checkout failed for old/" |
|
|
|
verbose_progress |
|
|
|
cd ../new || die "Cannot cd to new/" |
|
|
|
ln -s -t . "$initial_dir"/* |
|
|
|
ln -s "$initial_dir"/* . |
|
|
|
if test "$new" != "--"; then |
|
|
|
# if new == "--" then diff working dir (already there thanks to ln |
|
|
|
# -s above). |
|
|
|