bundle: run setup_git_directory_gently() sooner

Without this change, “git -p bundle” does not always
respect the repository-local “[core] pager” setting.

It is hard to notice because subcommands other than
“git bundle unbundle” do not produce much output.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/bundle.c b/builtin/bundle.c
index 2006cc5cd5cc4d381189f5cf7bdd09fcdd66b9ca..80649ba0b28846d09b49a791dd25af9a2907f75f 100644 (file)
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -18,7 +18,6 @@ static const char builtin_bundle_usage[] =
 int cmd_bundle(int argc, const char **argv, const char *prefix)
 {
        struct bundle_header header;
 int cmd_bundle(int argc, const char **argv, const char *prefix)
 {
        struct bundle_header header;

-       int nongit;

        const char *cmd, *bundle_file;
        int bundle_fd = -1;
        char buffer[PATH_MAX];
        const char *cmd, *bundle_file;
        int bundle_fd = -1;
        char buffer[PATH_MAX];


@@ -31,7 +30,6 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
        argc -= 2;
        argv += 2;
 
        argc -= 2;
        argv += 2;
 

-       prefix = setup_git_directory_gently(&nongit);

        if (prefix && bundle_file[0] != '/') {
                snprintf(buffer, sizeof(buffer), "%s/%s", prefix, bundle_file);
                bundle_file = buffer;
        if (prefix && bundle_file[0] != '/') {
                snprintf(buffer, sizeof(buffer), "%s/%s", prefix, bundle_file);
                bundle_file = buffer;


@@ -54,11 +52,11 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
                return !!list_bundle_refs(&header, argc, argv);
        }
        if (!strcmp(cmd, "create")) {
                return !!list_bundle_refs(&header, argc, argv);
        }
        if (!strcmp(cmd, "create")) {

-               if (nongit)
+               if (!startup_info->have_repository)

                        die("Need a repository to create a bundle.");
                return !!create_bundle(&header, bundle_file, argc, argv);
        } else if (!strcmp(cmd, "unbundle")) {
                        die("Need a repository to create a bundle.");
                return !!create_bundle(&header, bundle_file, argc, argv);
        } else if (!strcmp(cmd, "unbundle")) {

-               if (nongit)
+               if (!startup_info->have_repository)

                        die("Need a repository to unbundle.");
                return !!unbundle(&header, bundle_fd) ||
                        list_bundle_refs(&header, argc, argv);
                        die("Need a repository to unbundle.");
                return !!unbundle(&header, bundle_fd) ||
                        list_bundle_refs(&header, argc, argv);

diff --git a/git.c b/git.c
index 38dbe7022e99599a051af84f73685b23248b752f..e76b647b61e8dcb9c4f341ce14e2230969ce457c 100644 (file)
--- a/git.c
+++ b/git.c
@@ -306,7 +306,7 @@ static void handle_internal_command(int argc, const char **argv)
                { "bisect--helper", cmd_bisect__helper, RUN_SETUP | NEED_WORK_TREE },
                { "blame", cmd_blame, RUN_SETUP },
                { "branch", cmd_branch, RUN_SETUP },
                { "bisect--helper", cmd_bisect__helper, RUN_SETUP | NEED_WORK_TREE },
                { "blame", cmd_blame, RUN_SETUP },
                { "branch", cmd_branch, RUN_SETUP },

-               { "bundle", cmd_bundle },
+               { "bundle", cmd_bundle, RUN_SETUP_GENTLY },

                { "cat-file", cmd_cat_file, RUN_SETUP },
                { "checkout", cmd_checkout, RUN_SETUP | NEED_WORK_TREE },
                { "checkout-index", cmd_checkout_index,
                { "cat-file", cmd_cat_file, RUN_SETUP },
                { "checkout", cmd_checkout, RUN_SETUP | NEED_WORK_TREE },
                { "checkout-index", cmd_checkout_index,

diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 6c86d7035ffa32d75bfd7e93f61299eafb2b3603..1890c65fa123e40f956d2c12d6bbe2ecfbcc59d8 100755 (executable)
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -58,6 +58,21 @@ test_expect_success TTY 'some commands use a pager' '
        test -e paginated.out
 '
 
        test -e paginated.out
 '
 

+test_expect_failure TTY 'pager runs from subdir' '
+       echo subdir/paginated.out >expected &&
+       mkdir -p subdir &&
+       rm -f paginated.out subdir/paginated.out &&
+       (
+               cd subdir &&
+               test_terminal git log
+       ) &&
+       {
+               ls paginated.out subdir/paginated.out ||
+               :
+       } >actual &&
+       test_cmp expected actual
+'
+

 test_expect_success TTY 'some commands do not use a pager' '
        rm -f paginated.out ||
        cleanup_fail &&
 test_expect_success TTY 'some commands do not use a pager' '
        rm -f paginated.out ||
        cleanup_fail &&


@@ -119,6 +134,24 @@ test_expect_success TTY 'configuration can disable pager' '
        ! test -e paginated.out
 '
 
        ! test -e paginated.out
 '
 

+test_expect_success 'configuration can enable pager (from subdir)' '
+       rm -f paginated.out &&
+       mkdir -p subdir &&
+       git config pager.bundle true &&
+       test_when_finished "git config --unset pager.bundle" &&
+
+       git bundle create test.bundle --all &&
+       rm -f paginated.out subdir/paginated.out &&
+       (
+               cd subdir &&
+               test_terminal git bundle unbundle ../test.bundle
+       ) &&
+       {
+               test -e paginated.out ||
+               test -e subdir/paginated.out
+       }
+'
+

 # A colored commit log will begin with an appropriate ANSI escape
 # for the first color; the text "commit" comes later.
 colorful() {
 # A colored commit log will begin with an appropriate ANSI escape
 # for the first color; the text "commit" comes later.
 colorful() {