git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3 04/11] update-index: add untracked cache notifications

From
Duy Nguyen <pclouds@gmail.com>
Date
Dec 24, 2015, 10:01 UTC
Message-ID
<CACsJy8BQi8LQSHsZ7UMduCdE2_AeNwxn3kppc1xTfaNsMN=OXA@mail.gmail.com>
In-Reply-To
<1450904639-25592-5-git-send-email-chriscool@tuxfamily.org>

On Thu, Dec 24, 2015 at 4:03 AM, Christian Couder <christian.couder@gmail.com> wrote:

Show 47 quoted lines
> Attempting to flip the untracked-cache feature on for a random index
> file with
>
>     cd /random/unrelated/place
>     git --git-dir=/somewhere/else/.git update-index --untracked-cache
>
> would not work as you might expect. Because flipping the feature on
> in the index also records the location of the corresponding working
> tree (/random/unrelated/place in the above example), when the index
> is subsequently used to keep track of files in the working tree in
> /somewhere/else, the feature is disabled.
>
> With this patch "git update-index --[test-]untracked-cache" tells the
> user in which directory tests are performed. This makes it easy to
> spot any problem.
>
> Also in verbose mode, let's tell the user when the cache is enabled
> or disabled.
>
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
>  builtin/update-index.c | 16 +++++++++++-----
>  1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/builtin/update-index.c b/builtin/update-index.c
> index 62222dd..c91e695 100644
> --- a/builtin/update-index.c
> +++ b/builtin/update-index.c
> @@ -130,7 +130,7 @@ static int test_if_untracked_cache_is_supported(void)
>         if (!mkdtemp(mtime_dir.buf))
>                 die_errno("Could not make temporary directory");
>
> -       fprintf(stderr, _("Testing "));
> +       fprintf(stderr, _("Testing mtime in '%s' "), xgetcwd());
>         atexit(remove_test_directory);
>         xstat_mtime_dir(&st);
>         fill_stat_data(&base, &st);
> @@ -1135,10 +1135,16 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
>                 }
>                 add_untracked_ident(the_index.untracked);
>                 the_index.cache_changed |= UNTRACKED_CHANGED;
> -       } else if (untracked_cache == UC_DISABLE && the_index.untracked) {
> -               free_untracked_cache(the_index.untracked);
> -               the_index.untracked = NULL;
> -               the_index.cache_changed |= UNTRACKED_CHANGED;
> +               if (verbose)
> +                       printf(_("Untracked cache enabled for '%s'\n"), get_git_work_tree());

Nit. If you use report(), then you can skip "if (verbose)" because it's done inside report().

Show 14 quoted lines
> +       } else if (untracked_cache == UC_DISABLE) {
> +               if (the_index.untracked) {
> +                       free_untracked_cache(the_index.untracked);
> +                       the_index.untracked = NULL;
> +                       the_index.cache_changed |= UNTRACKED_CHANGED;
> +               }
> +               if (verbose)
> +                       printf(_("Untracked cache disabled\n"));
>         }
>
>         if (active_cache_changed) {
> --
> 2.7.0.rc2.11.g68ccdd4
>
-- 
Duy
Previous: Christian CouderNext: Christian Couder
Message 6 of 18 in “Untracked cache improvements”
  1. 00/11 Untracked cache improvementsChristian Couder, Dec 23, 2015
  2. 01/11 dir: free untracked cache when removing itChristian Couder, Dec 23, 2015
  3. 02/11 update-index: use enum for untracked cache optionsChristian Couder, Dec 23, 2015
  4. 03/11 update-index: add --test-untracked-cacheChristian Couder, Dec 23, 2015
  5. 04/11 update-index: add untracked cache notificationsChristian Couder, Dec 23, 2015
  6. Duy NguyenDec 24, 2015
  7. Christian CouderDec 24, 2015
  8. 05/11 update-index: move 'uc' var declarationChristian Couder, Dec 23, 2015
  9. 06/11 dir: add add_untracked_cache()Christian Couder, Dec 23, 2015
  10. 07/11 dir: add new_untracked_cache()Christian Couder, Dec 23, 2015
  11. Eric SunshineDec 23, 2015
  12. Christian CouderDec 24, 2015
  13. 08/11 dir: add remove_untracked_cache()Christian Couder, Dec 23, 2015
  14. 09/11 dir: simplify untracked cache "ident" fieldChristian Couder, Dec 23, 2015
  15. 10/11 config: add core.untrackedCacheChristian Couder, Dec 23, 2015
  16. Duy NguyenDec 24, 2015
  17. Christian CouderDec 24, 2015
  18. 11/11 t7063: add tests for core.untrackedCacheChristian Couder, Dec 23, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.