Han Young <hanyang.tony@xxxxxxxxxxxxx> writes:
> The --contents option can be used with git blame to blame the file as if
> it had the contents from the specified file. Since 1a3119ed06c8fbb1c00a6aa3615299252575abab ("blame: allow --contents to work with non-HEAD commit"), the --contents option can work with non-HEAD commit. However, if you try to use --contents in a bare repository, you get the following error:
When using the "show -s --pretty=reference --oneline", abbreviate
the commit object name to a reasonable length (like 8 to 12
hexadecimal digits). Please wrap overlong lines.
I'll fix them up at the receiving end, if there is no other issues
in the patch. Let's read on.
> blame.c | 4 +++-
> t/annotate-tests.sh | 9 +++++++++
> 2 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/blame.c b/blame.c
> index d12bd9f97..141756975 100644
> --- a/blame.c
> +++ b/blame.c
> @@ -2806,7 +2806,9 @@ void setup_scoreboard(struct blame_scoreboard *sb,
> parent_oid = &head_oid;
> }
>
> - setup_work_tree();
> + if (!sb->contents_from)
> + setup_work_tree();
> +
> sb->final = fake_working_tree_commit(sb->repo,
> &sb->revs->diffopt,
> sb->path, sb->contents_from,
Thanks.
> diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
> index 2ef70235b..5e21e84f3 100644
> --- a/t/annotate-tests.sh
> +++ b/t/annotate-tests.sh
> @@ -83,6 +83,15 @@ test_expect_success 'blame with --contents' '
> check_count --contents=file A 2
> '
>
> +test_expect_success 'blame with --contents in a bare repo' '
> + git clone --bare . bare-contents.git &&
> + (
> + cd bare-contents.git &&
> + echo "1A quick brown fox jumps over the" >contents &&
> + check_count --contents=contents A 1
> + )
> +'
> +
> test_expect_success 'blame with --contents changed' '
> echo "1A quick brown fox jumps over the" >contents &&
> echo "another lazy dog" >>contents &&
