From 686a8c269e4de195df9fdcae9eebf0dd97482ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Gouzien?= Date: Fri, 7 Feb 2020 12:16:55 +0100 Subject: [PATCH] Compatibility with recursive submodules. --- git-latexdiff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-latexdiff b/git-latexdiff index 980399c..4971b67 100755 --- a/git-latexdiff +++ b/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 (