search

cms-sw / cms-git-tools

CMS Git Helpers
34 stars 26 forks source link

use no-renames with git diff to get package names with renamed files #108

Closed smuzaffar closed 4 years ago

smuzaffar commented 4 years ago

We have noticed ( https://github.com/cms-sw/cmssw/pull/28881 https://github.com/cms-sw/cmssw/pull/28847 ) that git-cms-sparse-checkout does not checkout packages where we only have renamed files. Problem is that git diff --name-only does not show files which were renamed, passing --no-renames option should fix this issue

FYI, @silviodonato , @kpedro88 , @makortel , @fabiocos

[a]

diff -u <(git diff CMSSW_11_1_X_2020-02-04-2300..CMSSW_11_1_X_2020-02-05-2300 --name-only) <(git diff CMSSW_11_1_X_2020-02-04-2300..CMSSW_11_1_X_2020-02-05-2300 --name-only --no-renames)
--- /dev/fd/63  2020-02-08 14:12:52.960402077 +0100
+++ /dev/fd/62  2020-02-08 14:12:52.960402077 +0100
@@ -1,3 +1,5 @@
+Configuration/Eras/python/Modifier_dd4hep_cff.py
+Configuration/Geometry/python/DD4hep_GeometrySim_cff.py
 Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py
 Configuration/Geometry/python/GeometryDD4hepExtended2021_cff.py
 Configuration/ProcessModifiers/python/dd4hep_cff.py
cmsbuild commented 4 years ago

A new Pull Request was created by @smuzaffar (Malik Shahzad Muzaffar) for branch master.

@cmsbuild, @smuzaffar, @mrodozov, @tulamor can you please review it and eventually sign? Thanks. cms-bot commands are listed here

smuzaffar commented 4 years ago

note that --no-renames option is available in all git versions we use so it should work for all releases.

smuzaffar commented 4 years ago

please test

cmsbuild commented 4 years ago

The tests are being triggered in jenkins. https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/4559/console Started: 2020/02/08 14:38

cmsbuild commented 4 years ago

+1 Tested at: 9ff695241258b2a8ee7acef0872b23110f83508f https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-7dcddf/4559/summary.html CMSSW: CMSSW_11_1_X_2020-02-08-1100 SCRAM_ARCH: slc7_amd64_gcc820

cmsbuild commented 4 years ago

Comparison job queued.

cmsbuild commented 4 years ago

Comparison is ready https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-7dcddf/4559/summary.html

Comparison Summary:

smuzaffar commented 4 years ago

+externals

cmsbuild commented 4 years ago

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @davidlange6, @silviodonato, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)