|
|
@ -184,9 +184,9 @@ while test $# -ne 0; do |
|
|
;; |
|
|
;; |
|
|
esac |
|
|
esac |
|
|
;; |
|
|
;; |
|
|
"--no-flatten") |
|
|
|
|
|
flatten=0 |
|
|
|
|
|
;; |
|
|
|
|
|
|
|
|
"--no-flatten") |
|
|
|
|
|
flatten=0 |
|
|
|
|
|
;; |
|
|
"--ignore-makefile") |
|
|
"--ignore-makefile") |
|
|
ignoremake=1 |
|
|
ignoremake=1 |
|
|
;; |
|
|
;; |
|
|
@ -378,13 +378,13 @@ verbose "Checking out old and new version" |
|
|
|
|
|
|
|
|
cd old || die "Cannot cd to old/" |
|
|
cd old || die "Cannot cd to old/" |
|
|
if test "$ln_untracked" = 1; then |
|
|
if test "$ln_untracked" = 1; then |
|
|
ln -s "$initial_dir"/* . |
|
|
|
|
|
|
|
|
ln -s "$initial_dir"/* . |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
if test "$subtree" = 1; then |
|
|
if test "$subtree" = 1; then |
|
|
checkoutroot=$git_prefix |
|
|
|
|
|
|
|
|
checkoutroot=$git_prefix |
|
|
else |
|
|
else |
|
|
checkoutroot="." |
|
|
|
|
|
|
|
|
checkoutroot="." |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
# Checkout a subtree, without touching the index ("git checkout" would) |
|
|
# Checkout a subtree, without touching the index ("git checkout" would) |
|
|
@ -392,7 +392,7 @@ fi |
|
|
verbose_progress |
|
|
verbose_progress |
|
|
cd ../new || die "Cannot cd to new/" |
|
|
cd ../new || die "Cannot cd to new/" |
|
|
if test "$ln_untracked" = 1; then |
|
|
if test "$ln_untracked" = 1; then |
|
|
ln -s "$initial_dir"/* . |
|
|
|
|
|
|
|
|
ln -s "$initial_dir"/* . |
|
|
fi |
|
|
fi |
|
|
if test "$new" != "--"; then |
|
|
if test "$new" != "--"; then |
|
|
# if new == "--" then diff working dir (already there thanks to ln |
|
|
# if new == "--" then diff working dir (already there thanks to ln |
|
|
@ -409,13 +409,13 @@ do |
|
|
verbose "Running preparation command $prepare_cmd in $dir/$git_prefix" |
|
|
verbose "Running preparation command $prepare_cmd in $dir/$git_prefix" |
|
|
( cd "$dir/$git_prefix/" && log_cmd prepare.log eval "$prepare_cmd" ) |
|
|
( cd "$dir/$git_prefix/" && log_cmd prepare.log eval "$prepare_cmd" ) |
|
|
if test ! -f "$dir/$main"; then |
|
|
if test ! -f "$dir/$main"; then |
|
|
die "$prepare_cmd did not produce $dir/$main." |
|
|
|
|
|
|
|
|
die "$prepare_cmd did not produce $dir/$main." |
|
|
fi |
|
|
fi |
|
|
verbose_done |
|
|
verbose_done |
|
|
done |
|
|
done |
|
|
|
|
|
|
|
|
if test "$flatten" = 1; then |
|
|
if test "$flatten" = 1; then |
|
|
latexdiffopt+=("--flatten") |
|
|
|
|
|
|
|
|
latexdiffopt+=("--flatten") |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
verbose "Running latexdiff ${latexdiffopt[@]} old/$main new/$main > ./diff.tex" |
|
|
verbose "Running latexdiff ${latexdiffopt[@]} old/$main new/$main > ./diff.tex" |
|
|
|