Pierre-Alain Dupont
9 years ago
No known key found for this signature in database
GPG Key ID: B09FD9848F949CF7
1 changed files with
3 additions and
0 deletions
-
git-latexdiff
|
|
@ -528,6 +528,8 @@ fi |
|
|
|
|
|
|
|
|
# Checkout a subtree, without touching the index ("git checkout" would) |
|
|
# Checkout a subtree, without touching the index ("git checkout" would) |
|
|
(cd "$git_dir" && git archive --format=tar "$old" "$checkoutroot") | tar -xf - |
|
|
(cd "$git_dir" && git archive --format=tar "$old" "$checkoutroot") | tar -xf - |
|
|
|
|
|
# Also expand the possible submodules |
|
|
|
|
|
(cd "$git_worktree" && git submodule foreach 'git archive --format=tar "$sha1" | tar -xf - --directory '$tmpdir/old'/$path') |
|
|
verbose_progress |
|
|
verbose_progress |
|
|
cd ../new || die "Cannot cd to new/" |
|
|
cd ../new || die "Cannot cd to new/" |
|
|
if test "$new" == "--"; then |
|
|
if test "$new" == "--"; then |
|
|
@ -536,6 +538,7 @@ if test "$new" == "--"; then |
|
|
else |
|
|
else |
|
|
# checkout new revision |
|
|
# checkout new revision |
|
|
(cd "$git_dir" && git archive --format=tar "$new" "$checkoutroot") | tar -xf - |
|
|
(cd "$git_dir" && git archive --format=tar "$new" "$checkoutroot") | tar -xf - |
|
|
|
|
|
(cd "$git_worktree" && git submodule foreach 'git archive --format=tar "$sha1" | tar -xf - --directory '$tmpdir/new'/$path') |
|
|
fi |
|
|
fi |
|
|
if test "$ln_untracked" = 1; then |
|
|
if test "$ln_untracked" = 1; then |
|
|
( |
|
|
( |
|
|
|
