Jeff King [off-list ref] writes:
..., but an
"ok, but btw I changed your commit" status from receive-pack seems like
it would be useful, for two reasons:
- it can be displayed differently, so the user is reminded to do a
fetch afterwards
- we can avoid updating the tracking ref, which makes it less likely
to result in a non-fast forward fetch next time. For example,
consider:
1. The remote master and my origin/master are at A.
2. I make a commit B on top of A.
3. I push B to remote, who rewrites it to B' on top of A. At the
same time, I move my origin/master to B.
4. I fetch, and get non-ff going from B to B'.
If I had never written anything to my origin/master, it would be a
fast forward. And obviously git handles it just fine, but it is more
useful to the user during the next fetch to see A..B rather than
B'...B.
Sensible argument. I stand corrected.