Compare commits

..

2 Commits

Author SHA1 Message Date
clrbuilder c76272e46a Update packages file for version 36130
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-04-05 04:10:03 -07:00
Patrick McCarty 1559d4e0b5 log: improve query results
Comparing whether commit hashes for `HEAD` and `origin/master` are not
equal captures three typical scenarios:

1. HEAD is behind origin/master
2. HEAD is ahead of origin/master
3. HEAD is ahead of an older commit in origin/master

The intent of `make log` is to capture cases #2 and #3, and not #1, so
use `git rev-list ...` with the appropriate commit range instead.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2022-03-31 22:28:23 -07:00
2 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -170,7 +170,7 @@ diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
#help displaying any committed but unpushed changes.
log: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
( cd $$p; if [ "$$(git rev-parse --verify HEAD)" != "$$(git rev-parse --verify origin/master)" ] ; then \
( cd $$p; if [ -n "$$(git rev-list origin/master..HEAD)" ] ; then \
echo $$p ; git --no-pager log --pretty="format:%s" origin/master..HEAD ; echo ; echo;\
fi ; ) \
done
+3
View File
@@ -408,6 +408,7 @@ R-fixest
R-flashClust
R-flexmix
R-flexsurv
R-flextable
R-float
R-fontBitstreamVera
R-fontLiberation
@@ -640,6 +641,7 @@ R-npsurv
R-numDeriv
R-nws
R-nycflights13
R-officer
R-openssl
R-openxlsx
R-optextras
@@ -4670,6 +4672,7 @@ thermal_daemon
thermal_monitor
thin-provisioning-tools
threadweaver
thrift
thunar-volman
thunderbird
thunderbolt-software-user-space