Browse Source

Compatibility with recursive submodules.

master^2
Élie Gouzien 5 years ago
parent
commit
686a8c269e
  1. 4
      git-latexdiff

4
git-latexdiff

@ -628,7 +628,7 @@ fi
# Checkout a subtree, without touching the index ("git checkout" would)
(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')
(cd "$git_worktree" && git submodule foreach --recursive 'git archive --format=tar "$sha1" | tar -xf - --directory '$tmpdir/old'/$displaypath')
verbose_progress
cd ../new || die "Cannot cd to new/"
if test "$new" == "--"; then
@ -637,7 +637,7 @@ if test "$new" == "--"; then
else
# checkout new revision
(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')
(cd "$git_worktree" && git submodule foreach --recursive 'git archive --format=tar "$sha1" | tar -xf - --directory '$tmpdir/new'/$displaypath')
fi
if test "$ln_untracked" = 1; then
(

Loading…
Cancel
Save