diff options
| author | Johan Herland <johan@herland.net> | 2012-10-21 12:40:32 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-21 12:08:42 -0700 |
| commit | b274a7146c44624bc30bbd54124312d4d3e6a28d (patch) | |
| tree | 379f1bd1c443d760bd723647f5b9b6da9ed3f08d | |
| parent | 75c96e05cec5654912122cb2435e8c3f928a441d (diff) | |
| download | git-b274a7146c44624bc30bbd54124312d4d3e6a28d.tar.gz git-b274a7146c44624bc30bbd54124312d4d3e6a28d.tar.xz | |
Fix failure to delete a packed ref through a symref
When deleting a ref through a symref (e.g. using 'git update-ref -d HEAD'
to delete refs/heads/master), we would remove the loose ref, but a packed
version of the same ref would remain, the end result being that instead of
deleting refs/heads/master we would appear to reset it to its state as of
the last repack.
This patch fixes the issue, by making sure we pass the correct ref name
when invoking repack_without_ref() from within delete_ref().
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | refs.c | 2 | ||||
| -rwxr-xr-x | t/t1400-update-ref.sh | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1778,7 +1778,7 @@ int delete_ref(const char *refname, const unsigned char *sha1, int delopt) * packed one. Also, if it was not loose we need to repack * without it. */ - ret |= repack_without_ref(refname); + ret |= repack_without_ref(lock->ref_name); unlink_or_warn(git_path("logs/%s", lock->ref_name)); invalidate_ref_cache(NULL); diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index f7ec203cf..e415ee0bb 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -85,7 +85,7 @@ test_expect_success \ "move $m (by HEAD)" \ "git update-ref HEAD $B $A && test $B"' = $(cat .git/'"$m"')' -test_expect_failure "delete $m (by HEAD) should remove both packed and loose $m" ' +test_expect_success "delete $m (by HEAD) should remove both packed and loose $m" ' git update-ref -d HEAD $B && ! grep "$m" .git/packed-refs && ! test -f .git/$m |