Merge branch 'js/export-with-assignment'

diff --git a/t/t4100/t-apply-6.patch b/t/t4100/t-apply-6.patch
index d9753637fc23822795bca72c26b71d0ba71e6552..a72729a712038dc64f55d154eb9a94713e3269c9 100644 (file)
--- a/t/t4100/t-apply-6.patch
+++ b/t/t4100/t-apply-6.patch
@@ -8,7 +8,7 @@ diff a/Makefile b/Makefile
 -      git-deltafy-script
 +      git-deltafy-script git-fetch-script
  
- PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
+ PROG=   git-update-index git-diff-files git-init-db git-write-tree \
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \
 diff a/git-fetch-script b/git-fetch-script
 --- /dev/null