On Fri, Jul 11, 2014 at 09:44:33PM -0700, David Turner wrote:
> When git checkout checks out a branch, create or update the
> cache-tree so that subsequent operations are faster.
>
> update_main_cache_tree learned a new flag, WRITE_TREE_REPAIR. When
> WRITE_TREE_REPAIR is set, portions of the cache-tree which do not
> correspond to existing tree objects are invalidated (and portions which
> do are marked as valid). No new tree objects are created.
>
> Signed-off-by: David Turner <[email protected]>
> ---
This causes an incorrect error message to be printed when switching
branches with staged changes in a subdirectory. The test case is pretty
simple:
git init test &&
cd test &&
mkdir sub &&
echo one >sub/one &&
git add sub/one &&
git commit -m one &&
echo two >sub/two &&
git add sub/two &&
git checkout -b test
After this commit the output is:
error: invalid object 040000 0000000000000000000000000000000000000000
for 'bar'
A bar/quux
Switched to branch 'test'
but the "error:" line should not be there.
Everything still works, but I think the error message is a bit scary
considering that this isn't actually an error.
> builtin/checkout.c | 8 ++++++++
> cache-tree.c | 12 +++++++++++-
> cache-tree.h | 1 +
> t/t0090-cache-tree.sh | 19 ++++++++++++++++---
> 4 files changed, 36 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/checkout.c b/builtin/checkout.c
> index 07cf555..054214f 100644
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -553,6 +553,14 @@ static int merge_working_tree(const struct checkout_opts
> *opts,
> }
> }
>
> + if (!active_cache_tree)
> + active_cache_tree = cache_tree();
> +
> + if (!cache_tree_fully_valid(active_cache_tree))
> + cache_tree_update(active_cache_tree,
> + (const struct cache_entry * const
> *)active_cache,
> + active_nr, WRITE_TREE_SILENT |
> WRITE_TREE_REPAIR);
> +
> if (write_cache(newfd, active_cache, active_nr) ||
> commit_locked_index(lock_file))
> die(_("unable to write new index file"));
> diff --git a/cache-tree.c b/cache-tree.c
> index 7fa524a..f951d7d 100644
> --- a/cache-tree.c
> +++ b/cache-tree.c
> @@ -239,9 +239,12 @@ static int update_one(struct cache_tree *it,
> struct strbuf buffer;
> int missing_ok = flags & WRITE_TREE_MISSING_OK;
> int dryrun = flags & WRITE_TREE_DRY_RUN;
> + int repair = flags & WRITE_TREE_REPAIR;
> int to_invalidate = 0;
> int i;
>
> + assert(!(dryrun && repair));
> +
> *skip_count = 0;
>
> if (0 <= it->entry_count && has_sha1_file(it->sha1))
> @@ -374,7 +377,14 @@ static int update_one(struct cache_tree *it,
> #endif
> }
>
> - if (dryrun)
> + if (repair) {
> + unsigned char sha1[20];
> + hash_sha1_file(buffer.buf, buffer.len, tree_type, sha1);
> + if (has_sha1_file(sha1))
> + hashcpy(it->sha1, sha1);
> + else
> + to_invalidate = 1;
> + } else if (dryrun)
> hash_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1);
> else if (write_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1)) {
> strbuf_release(&buffer);
> diff --git a/cache-tree.h b/cache-tree.h
> index f1923ad..666d18f 100644
> --- a/cache-tree.h
> +++ b/cache-tree.h
> @@ -39,6 +39,7 @@ int update_main_cache_tree(int);
> #define WRITE_TREE_IGNORE_CACHE_TREE 2
> #define WRITE_TREE_DRY_RUN 4
> #define WRITE_TREE_SILENT 8
> +#define WRITE_TREE_REPAIR 16
>
> /* error return codes */
> #define WRITE_TREE_UNREADABLE_INDEX (-1)
> diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
> index 6c33e28..98fb1ab 100755
> --- a/t/t0090-cache-tree.sh
> +++ b/t/t0090-cache-tree.sh
> @@ -44,14 +44,14 @@ test_expect_success 'read-tree HEAD establishes
> cache-tree' '
>
> test_expect_success 'git-add invalidates cache-tree' '
> test_when_finished "git reset --hard; git read-tree HEAD" &&
> - echo "I changed this file" > foo &&
> + echo "I changed this file" >foo &&
> git add foo &&
> test_invalid_cache_tree
> '
>
> test_expect_success 'update-index invalidates cache-tree' '
> test_when_finished "git reset --hard; git read-tree HEAD" &&
> - echo "I changed this file" > foo &&
> + echo "I changed this file" >foo &&
> git update-index --add foo &&
> test_invalid_cache_tree
> '
> @@ -85,9 +85,22 @@ test_expect_success 'reset --hard without index gives
> cache-tree' '
> test_shallow_cache_tree
> '
>
> -test_expect_failure 'checkout gives cache-tree' '
> +test_expect_success 'checkout gives cache-tree' '
> + git tag current &&
> git checkout HEAD^ &&
> test_shallow_cache_tree
> '
>
> +test_expect_success 'checkout -b gives cache-tree' '
> + git checkout current &&
> + git checkout -b prev HEAD^ &&
> + test_shallow_cache_tree
> +'
> +
> +test_expect_success 'checkout -B gives cache-tree' '
> + git checkout current &&
> + git checkout -B prev HEAD^ &&
> + test_shallow_cache_tree
> +'
> +
> test_done
> --
> 2.0.0.390.gcb682f8
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
