How to safely perform `git rev-parse origin/master > .git/refs/heads/master`

Question

I would like to reset the local master branch to the commit that origin/master points at. This operation should make a reflog entry so that it can be reverted if need be. It is a requirement that this operation doesn't change the index, working tree, and that it can be performed regardless of the current HEAD, without moving HEAD or checking out any specific commit.

In other words, what is a safe git CLI equivalent of git rev-parse origin/master > .git/refs/heads/master?

Considered options:

git branch -f master origin/master
- Not acceptable because it doesn't leave a record in the reflog

How did you determine that `git branch` does not leave a reflog entry? I'm asking because it does. — j6t, Sep 01 '22 at 11:25
@j6t I just also noticed this. The mistake was that I used `git reflog` instead of the alternatives that I posted as an answer to the question. — Grant Zvolsky, Sep 01 '22 at 11:29

score 2 · Accepted Answer · answered Sep 01 '22 at 11:19

2

Use git update-ref:

git update-ref -m 'reset' refs/heads/master origin/master

answered Sep 01 '22 at 11:19

FelipeC

9,123
4
44
38

score 1 · Answer 2 · answered Sep 01 '22 at 11:22

1

The command

git branch -f master origin/master

resets branch master to origin/master, and it does create a reflog entry. The entry can be viewed using one of the following commands:

git reflog show --all
git reflog show master --

answered Sep 01 '22 at 11:22

Grant Zvolsky

483
5
6

How to safely perform `git rev-parse origin/master > .git/refs/heads/master`

2 Answers2