Did anything weird happen to the git monorepo?

Project Infrastructure LLVM Dev List Archives
1

Hi,

I got a forced update when pulling today. If I merge master to a local branch, I get a bunch of add/add conflicts.

This same commit exists under several hashes:
https://github.com/llvm-project/llvm-project-20170507/commit/687841777ef505

https://github.com/llvm-project/llvm-project-20170507/commit/74725885552

Did someone push -f to the monorepo after doing branch surgery?

Maybe there was a PSA somewhere that I missed?

Thanks,
Nico

2

Here’s official master:
https://github.com/llvm-project/llvm-project-20170507/commits/master?after=b66bfed5ba898b5e901a216bf229bfee48ebfc46+209

Here’s master on my fork:
https://github.com/nico/llvm-project-20170507/commits/master?after=612985fa09e93c06c8816270740ab81a2cdfb1de+34

Things are identical until “[Sparc] allow tls_add/tls_call syntax in assembler parser”. On official master, it’s followed by “[OpenCL] Traverse vector types for ocl extensions support” and then “[AArch64] Simplify code in LowerGlobalAddress. NFCI.”, while on my fork it’s followed by “[AArch64] Simplify code in LowerGlobalAddress. NFCI.” immediately.

Normally I’d say I just held git wrong, but the commit hashes of my copy also exist on the official llvm-project master.

If nobody else sees weirdness it’s probably all good.

3

I also got a forced update just now, but I use split repos.

I think someone force pushed in order to remove a commit "[libFuzzer] Port to Windows" and it's reversion?

Thanks,

Stephen.

4

I still see those revisions in my local clone, FWIW…

5

Here’s official master:
https://github.com/llvm-project/llvm-project-20170507/commits/master?after=b66bfed5ba898b5e901a216bf229bfee48ebfc46+209

Here’s master on my fork:
https://github.com/nico/llvm-project-20170507/commits/master?after=612985fa09e93c06c8816270740ab81a2cdfb1de+34

Doesn’t even need my fork, here’s the official repo at that rev:

https://github.com/llvm-project/llvm-project-20170507/commits/master?after=612985fa09e93c06c8816270740ab81a2cdfb1de+34

My local master pointed to that change history somehow. I’ve since force pushed the new master from the llvm repo, but something is definitely weird here.