diff options
author | Eric Sunshine <sunshine@sunshineco.com> | 2015-07-17 19:00:15 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-07-20 11:29:52 -0700 |
commit | ed197a6ab983783550bd0b0c71cb97d734f4cfaa (patch) | |
tree | 2c3b007274e0b02f4f95c56e8cff02247f9e5bd7 /mergetools/kdiff3 | |
parent | worktree: make setup of new HEAD distinct from worktree population (diff) | |
download | tgif-ed197a6ab983783550bd0b0c71cb97d734f4cfaa.tar.xz |
worktree: avoid resolving HEAD unnecessarily
Now that git-worktree sets HEAD explicitly to its final value via either
git-symbolic-ref or git-update-ref, rather than relying upon
git-checkout to do so, the "hack" for pacifying is_git_directory() with
a temporary HEAD, though still necessary, can be simplified.
Since the real HEAD is now populated with its proper final value, the
value of the temporary HEAD truly no longer matters, and any value which
looks like an object ID is good enough to satisfy is_git_directory().
Therefore, just set the temporary HEAD to a literal value rather than
going through the effort of resolving the current branch's HEAD.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/kdiff3')
0 files changed, 0 insertions, 0 deletions