Merge branch 'js/unmap-before-ext-diff'

diff --git a/t/t6001-rev-list-graft.sh b/t/t6001-rev-list-graft.sh
index 05ddc69cf2ad9470a125fda47fc450401f94902b..7504ba47511bf5df27dd54d7090fdd920285db07 100755 (executable)
--- a/t/t6001-rev-list-graft.sh
+++ b/t/t6001-rev-list-graft.sh
@@ -110,4 +110,13 @@ do
        "
 
 done
+
+test_expect_success 'show advice that grafts are deprecated' '
+       git show HEAD 2>err &&
+       test_i18ngrep "git replace" err &&
+       test_config advice.graftFileDeprecated false &&
+       git show HEAD 2>err &&
+       test_i18ngrep ! "git replace" err
+'
+
 test_done