Skip to content

Buildmaster subtree merge

Emanuele Roberto Nocera requested to merge buildmaster-subtree-merge into master

Created by: voisey

Closes https://github.com/NNPDF/nnpdf/issues/861

I followed the instructions at https://docs.github.com/en/github/using-git/about-git-subtree-merges to copy buildmaster/master into a folder in nnpdf, but I'm not sure if it's done exactly what we want.

If I do git log filters/ATLAS_SINGLETOP_TCH_DIFF_7TEV.cc I just get the following, which doesn't seem desirable:

commit 5f6e14d3d37c090b8a484500e6f7f45ec98d1ba4 (HEAD -> buildmaster-subtree-merge, origin/buildmaster-subtree-merge)
Merge: 9041cd81 b543f17f
Author: Cameron Voisey <voisey@hep.phy.cam.ac.uk>
Date:   Wed Aug 26 17:36:52 2020 +0200

    Subtree merge of buildmaster into nnpdf

Things like git blame filters/ATLAS_SINGLETOP_TCH_DIFF_7TEV.cc work fine though:

b5da0411c filters/ATLAS_SINGLETOP_TCH_DIFF_7TEV.cc (voisey          2019-03-07 15:27:30 +0000    1) /*
b5da0411c filters/ATLAS_SINGLETOP_TCH_DIFF_7TEV.cc (voisey          2019-03-07 15:27:30 +0000    2) Differential cross section measurements of the single top and single antitop quark in the t-channel @LHC ATLAS 7 TeV
b5da0411c filters/ATLAS_SINGLETOP_TCH_DIFF_7TEV.cc (voisey          2019-03-07 15:27:30 +0000    3)
b5da0411c filters/ATLAS_SINGLETOP_TCH_DIFF_7TEV.cc (voisey          2019-03-07 15:27:30 +0000    4) LHC-ATLAS 7 TeV
b5da0411c filters/ATLAS_SINGLETOP_TCH_DIFF_7TEV.cc (voisey          2019-03-07 15:27:30 +0000    5) ---------------
b5da0411c filters/ATLAS_SINGLETOP_TCH_DIFF_7TEV.cc (voisey          2019-03-07 15:27:30 +0000    6)
c71406d1d filters/ATLAS_SINGLETOP_TCH_DIFF_7TEV.cc (Emanuele Nocera 2020-01-22 15:53:13 +0100    7) Selected events contain one charged lepton, large missing transverse momentum,
c71406d1d filters/ATLAS_SINGLETOP_TCH_DIFF_7TEV.cc (Emanuele Nocera 2020-01-22 15:53:13 +0100    8) and two or three jets (L = 4.59 1/fb)
...

There are some things online about this, e.g. https://stackoverflow.com/questions/10918244/git-subtree-without-squash-view-log, but I'm not sure whether (i) it's fine as it is, (ii) we can get it to work with subtree merges but we need to do it slightly differently, or (iii) we need to use something else entirely.

Let me know what you think @Zaharid @scarrazza

Merge request reports