Update 2.5.0 to 2.5.3: `fatal: bad object refs/remotes/origin/HEAD` #423

koppor · 2015-09-21T19:22:13Z

After updating from 2.5.0 to 2.5.3, I get the error message fatal: bad object refs/remotes/origin/HEAD when doing git gc. git fsck outputs

error: refs/remotes/origin/HEAD: invalid sha1 pointer 0000000000000000000000000000000000000000

Content of .git/refs/remotes/origin/HEAD is ref: refs/remotes/origin/master. The file .git/refs/remotes/origin/master doesn't exist. The branch master at origin also doesn't exist. It is the branch template.

Solution Edit .git/refs/remotes/origin/HEAD manually and let it contain ref: refs/remotes/origin/template.

That solution is only a quick hack and it should be investigated, why git 2.5.3 deletes refs/remotes/origin/template and replaces it by refs/remotes/origin/HEAD pointing to an invalid branch.

~~I'm currently investigating possible solutions such as http://stackoverflow.com/q/25797315/873282.~~

The text was updated successfully, but these errors were encountered:

Radrik5 · 2015-09-22T17:22:50Z

What does git reflog origin/HEAD return?

koppor · 2015-09-22T17:38:28Z

warning: ignoring dangling symref refs/remotes/origin/HEAD.
warning: ignoring dangling symref refs/remotes/origin/HEAD.
fatal: ambiguous argument 'origin/HEAD': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

I am not sure how to reproduce the issue as it only happens if the upstream repository does not contain a master branch and if it was cloned with git 1.9.x, then used with git 2.5.0, then with git 2.5.2. Feel free to close this issue. Google will surely find it if someone else discovers the same issue.

dscho · 2015-09-22T17:51:10Z

I guess the real solution is to let git gc remove a bogus left-over refs/remotes/origin/HEAD. But that would probably be a discussion for the Git mailing list, as it is not limited to Windows.

Radrik5 · 2015-09-22T19:59:11Z

I guess the real solution is not to create a bogus refs/remotes/origin/HEAD. It should point at template if remote HEAD points at template or it shouldn't exist if remote HEAD doesn't exist.

dscho · 2015-09-23T11:24:13Z

@Radrik5 maybe you point into the direction of a possible MCVE: if you clone from a repository whose active branch is template, then the active branch in the remote repository is switched to master and template is removed, then fetch (with --prune), we should be able to replicate the error, generating the MCVE that every good bug report has. Don't you think?

koppor · 2015-09-23T11:40:32Z

In my case, I used https://github.com/latextemplates/uni-stuttgart-dissertation-template, but there, the remote repository did not switch to master at all. On Thursday, I'll have access to a machine with git 2.5.0 and with the repository checked out (using git 1.x). Then, I'll update to git 2.5.3 and report back, what happened.

dscho · 2015-09-23T12:38:14Z

And indeed, I could produce an MCVE: dscho@ec2bd78

koppor · 2015-09-24T21:37:08Z

I checked with the other machine, everything worked fine there. @dscho Yes, your MCVE indeed resembles the steps I did.

I wonder, why this came up when switchting from 1.9.x to 2.5.x. I could normally push and pull with old versions of git without any issues. I think, I never called git gc though...

Following is the directory listing of .git/refs/remotes/origin:

11.03.2014  16:04                32 HEAD
03.06.2015  10:44                41 lncs_as
29.05.2015  20:45                41 template

Is HEAD not used in the 1.9.x branch, but in the 2.5.x branch?

linquize · 2015-09-25T01:20:27Z

.git/refs/remotes/origin/HEAD sometimes causes problem. Removing this ref solves the problem

When encountering broken symrefs, such as a stale remote HEAD (which can happen if the active branch was renamed in the remote), it is more helpful to remove those symrefs than to exit with an error. This fixes git-for-windows#423 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

When encountering broken symrefs, such as a stale remote HEAD (which can happen if the active branch was renamed in the remote), it is more helpful to remove those symrefs than to exit with an error. This fixes git-for-windows#423 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

…index Sparse index: integrate with `git update-index`

…mance tests One thing I forgot when talking about the sparse index is that we have a performance test: `t/perf/p2000-sparse-operations.sh`. This test wasn't helpful for commands like `git merge` that need a particular set of input, but work for more read-only operations. Here is a quick demonstration of how this performance test works so we could have a definitive measure of how your previous updates improved performance. To get these results, I ran the following command in `t/perf`: ``` ./run 4bcd533 f9255a5 f28fc01 b713582 -- p2000-sparse-operations.sh ``` The short-shas correspond to the merge commits for these PRs: * git-for-windows#410 * git-for-windows#421 * git-for-windows#417 * git-for-windows#419 The test takes a copy of the Git repository and creates several copies within a nested directory heirarchy. ``` Test 4bcd533 f9255a5 f28fc01 b713582 ------------------------------------------------------------------------------------------------------------------------------------------------- 2000.2: git status (full-v3) 0.19(0.15+0.05) 0.19(0.16+0.05) +0.0% 0.20(0.18+0.03) +5.3% 0.19(0.17+0.04) +0.0% 2000.3: git status (full-v4) 0.20(0.18+0.04) 0.19(0.15+0.06) -5.0% 0.21(0.18+0.05) +5.0% 0.18(0.18+0.02) -10.0% 2000.4: git status (sparse-v3) 0.04(0.04+0.04) 0.05(0.07+0.04) +25.0% 0.04(0.04+0.05) +0.0% 0.04(0.06+0.04) +0.0% 2000.5: git status (sparse-v4) 0.04(0.03+0.06) 0.04(0.05+0.05) +0.0% 0.05(0.05+0.04) +25.0% 0.05(0.06+0.04) +25.0% 2000.6: git add -A (full-v3) 0.36(0.29+0.05) 0.38(0.28+0.07) +5.6% 0.36(0.31+0.05) +0.0% 0.37(0.31+0.05) +2.8% 2000.7: git add -A (full-v4) 0.34(0.27+0.06) 0.34(0.29+0.05) +0.0% 0.34(0.29+0.04) +0.0% 0.35(0.28+0.06) +2.9% 2000.8: git add -A (sparse-v3) 0.06(0.07+0.04) 0.06(0.05+0.06) +0.0% 0.06(0.09+0.01) +0.0% 0.06(0.08+0.03) +0.0% 2000.9: git add -A (sparse-v4) 0.05(0.05+0.04) 0.05(0.05+0.07) +0.0% 0.05(0.04+0.06) +0.0% 0.06(0.06+0.05) +20.0% 2000.10: git add . (full-v3) 0.38(0.31+0.05) 0.37(0.29+0.06) -2.6% 0.37(0.30+0.07) -2.6% 0.37(0.29+0.06) -2.6% 2000.11: git add . (full-v4) 0.35(0.31+0.04) 0.35(0.29+0.07) +0.0% 0.35(0.29+0.05) +0.0% 0.34(0.29+0.06) -2.9% 2000.12: git add . (sparse-v3) 0.06(0.06+0.05) 0.06(0.05+0.06) +0.0% 0.06(0.07+0.05) +0.0% 0.06(0.09+0.03) +0.0% 2000.13: git add . (sparse-v4) 0.06(0.06+0.06) 0.06(0.07+0.04) +0.0% 0.05(0.06+0.05) -16.7% 0.05(0.05+0.07) -16.7% 2000.14: git commit -a -m A (full-v3) 0.48(0.37+0.08) 0.45(0.36+0.08) -6.2% 0.45(0.35+0.09) -6.2% 0.44(0.36+0.07) -8.3% 2000.15: git commit -a -m A (full-v4) 0.45(0.40+0.06) 0.43(0.34+0.07) -4.4% 0.45(0.37+0.06) +0.0% 0.42(0.36+0.05) -6.7% 2000.16: git commit -a -m A (sparse-v3) 0.05(0.05+0.06) 0.05(0.05+0.03) +0.0% 0.05(0.06+0.06) +0.0% 0.05(0.04+0.06) +0.0% 2000.17: git commit -a -m A (sparse-v4) 0.05(0.06+0.03) 0.05(0.06+0.04) +0.0% 0.06(0.07+0.05) +20.0% 0.05(0.04+0.06) +0.0% 2000.18: git checkout -f - (full-v3) 0.55(0.43+0.08) 0.54(0.46+0.05) -1.8% 0.55(0.46+0.07) +0.0% 0.54(0.40+0.10) -1.8% 2000.19: git checkout -f - (full-v4) 0.55(0.41+0.09) 0.50(0.40+0.09) -9.1% 0.51(0.46+0.05) -7.3% 0.51(0.44+0.06) -7.3% 2000.20: git checkout -f - (sparse-v3) 0.06(0.09+0.03) 0.06(0.08+0.03) +0.0% 0.06(0.06+0.05) +0.0% 0.07(0.09+0.03) +16.7% 2000.21: git checkout -f - (sparse-v4) 0.06(0.08+0.04) 0.05(0.07+0.05) -16.7% 0.05(0.07+0.04) -16.7% 0.06(0.09+0.03) +0.0% ``` All of the above were already integrated. ``` 2000.22: git reset (full-v3) 0.41(0.32+0.06) 0.40(0.31+0.06) -2.4% 0.41(0.33+0.05) +0.0% 0.42(0.34+0.04) +2.4% 2000.23: git reset (full-v4) 0.37(0.32+0.05) 0.35(0.30+0.05) -5.4% 0.37(0.30+0.05) +0.0% 0.35(0.31+0.03) -5.4% 2000.24: git reset (sparse-v3) 0.68(0.65+0.05) 0.55(0.52+0.04) -19.1% 0.04(0.05+0.04) -94.1% 0.04(0.05+0.04) -94.1% 2000.25: git reset (sparse-v4) 0.70(0.65+0.05) 0.54(0.50+0.06) -22.9% 0.04(0.07+0.01) -94.3% 0.03(0.05+0.05) -95.7% 2000.26: git reset --hard (full-v3) 0.54(0.43+0.07) 0.53(0.43+0.06) -1.9% 0.55(0.46+0.05) +1.9% 0.55(0.44+0.06) +1.9% 2000.27: git reset --hard (full-v4) 0.50(0.45+0.03) 0.50(0.43+0.05) +0.0% 0.49(0.41+0.06) -2.0% 0.50(0.42+0.05) +0.0% 2000.28: git reset --hard (sparse-v3) 0.83(0.76+0.06) 0.68(0.62+0.05) -18.1% 0.07(0.05+0.02) -91.6% 0.07(0.05+0.02) -91.6% 2000.29: git reset --hard (sparse-v4) 0.80(0.75+0.05) 0.69(0.62+0.06) -13.8% 0.07(0.04+0.02) -91.2% 0.07(0.04+0.03) -91.2% ``` As expected, `git reset [--hard]` improves with the sparse index integration, but remains constant across the full index case. ``` 2000.30: git update-index --add --remove (full-v3) 0.03(0.01+0.01) 0.03(0.02+0.01) +0.0% 0.03(0.02+0.01) +0.0% 0.03(0.01+0.01) +0.0% 2000.31: git update-index --add --remove (full-v4) 0.03(0.02+0.01) 0.03(0.02+0.01) +0.0% 0.03(0.03+0.00) +0.0% 0.03(0.02+0.01) +0.0% 2000.32: git update-index --add --remove (sparse-v3) 0.57(0.54+0.02) 0.43(0.42+0.00) -24.6% 0.44(0.41+0.03) -22.8% 0.44(0.42+0.01) -22.8% 2000.33: git update-index --add --remove (sparse-v4) 0.56(0.52+0.04) 0.43(0.42+0.01) -23.2% 0.44(0.42+0.02) -21.4% 0.42(0.41+0.01) -25.0% ``` These do not change significantly because git-for-windows#423 is not merged. ``` 2000.34: git diff (full-v3) 0.07(0.05+0.03) 0.06(0.05+0.03) -14.3% 0.07(0.05+0.03) +0.0% 0.06(0.05+0.03) -14.3% 2000.35: git diff (full-v4) 0.06(0.05+0.03) 0.06(0.05+0.02) +0.0% 0.06(0.05+0.02) +0.0% 0.06(0.06+0.02) +0.0% 2000.36: git diff (sparse-v3) 0.25(0.23+0.03) 0.17(0.17+0.02) -32.0% 0.18(0.18+0.02) -28.0% 0.01(0.03+0.03) -96.0% 2000.37: git diff (sparse-v4) 0.25(0.22+0.05) 0.16(0.16+0.01) -36.0% 0.18(0.15+0.04) -28.0% 0.01(0.04+0.02) -96.0% 2000.38: git diff --staged (full-v3) 0.03(0.01+0.01) 0.03(0.02+0.01) +0.0% 0.03(0.02+0.01) +0.0% 0.03(0.02+0.00) +0.0% 2000.39: git diff --staged (full-v4) 0.04(0.03+0.01) 0.03(0.02+0.01) -25.0% 0.03(0.03+0.00) -25.0% 0.03(0.03+0.00) -25.0% 2000.40: git diff --staged (sparse-v3) 0.21(0.19+0.01) 0.15(0.13+0.01) -28.6% 0.15(0.14+0.01) -28.6% 0.01(0.01+0.00) -95.2% 2000.41: git diff --staged (sparse-v4) 0.22(0.21+0.01) 0.14(0.11+0.03) -36.4% 0.15(0.13+0.02) -31.8% 0.01(0.01+0.00) -95.5% ``` The `git diff` improvements are measurable. ``` 2000.42: git sparse-checkout reapply (full-v3) 0.63(0.54+0.05) 0.56(0.48+0.04) -11.1% 0.57(0.48+0.03) -9.5% 0.59(0.48+0.05) -6.3% 2000.43: git sparse-checkout reapply (full-v4) 0.60(0.54+0.02) 0.51(0.46+0.03) -15.0% 0.54(0.48+0.02) -10.0% 0.50(0.44+0.04) -16.7% 2000.44: git sparse-checkout reapply (sparse-v3) 0.91(0.86+0.05) 0.05(0.05+0.00) -94.5% 0.06(0.05+0.01) -93.4% 0.06(0.06+0.00) -93.4% 2000.45: git sparse-checkout reapply (sparse-v4) 0.92(0.88+0.04) 0.05(0.05+0.00) -94.6% 0.05(0.05+0.01) -94.6% 0.05(0.04+0.01) -94.6% ``` Finally, the `git sparse-checkout` measurements are also present. This test script is particularly valuable when contributing changes upstream. It can be good to start by adding the lines to the performance test in an early commit, then demonstrating the performance change by copying the necessary lines from the output table into your commit message.

dscho added enhancement git-upstream labels Sep 22, 2015

dscho added bug and removed enhancement labels Sep 23, 2015

dscho closed this as completed in 14886b4 Nov 9, 2015

jeffhostetler pushed a commit to jeffhostetler/git that referenced this issue Sep 30, 2021

Merge pull request git-for-windows#423 from vdye/sparse-index/update-…

de87f1d

…index Sparse index: integrate with `git update-index`

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update 2.5.0 to 2.5.3: `fatal: bad object refs/remotes/origin/HEAD` #423

Update 2.5.0 to 2.5.3: `fatal: bad object refs/remotes/origin/HEAD` #423

koppor commented Sep 21, 2015

Radrik5 commented Sep 22, 2015

koppor commented Sep 22, 2015

dscho commented Sep 22, 2015

Radrik5 commented Sep 22, 2015

dscho commented Sep 23, 2015

koppor commented Sep 23, 2015

dscho commented Sep 23, 2015

koppor commented Sep 24, 2015

linquize commented Sep 25, 2015

Update 2.5.0 to 2.5.3: fatal: bad object refs/remotes/origin/HEAD #423

Update 2.5.0 to 2.5.3: fatal: bad object refs/remotes/origin/HEAD #423

Comments

koppor commented Sep 21, 2015

Radrik5 commented Sep 22, 2015

koppor commented Sep 22, 2015

dscho commented Sep 22, 2015

Radrik5 commented Sep 22, 2015

dscho commented Sep 23, 2015

koppor commented Sep 23, 2015

dscho commented Sep 23, 2015

koppor commented Sep 24, 2015

linquize commented Sep 25, 2015

Update 2.5.0 to 2.5.3: `fatal: bad object refs/remotes/origin/HEAD` #423

Update 2.5.0 to 2.5.3: `fatal: bad object refs/remotes/origin/HEAD` #423