From 4d9dc9a4e25cfe372b6d853b31bf1afffa33dc2b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 19 Mar 2018 01:20:38 +0100 Subject: [PATCH 1/1] Continued: - generalized .gitignore - added jcore-utils project (derived from jcoreee) - added "git prune" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .gitignore | 11 ++++++----- .jprojects.sh | 2 +- cherry-jprojects.sh | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1653e82..22aa21b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,14 @@ -/nbproject/private/ -/nbproject/faces-config.NavData -/nbproject/genfiles.properties -/nbproject/*~ +nbproject/private/ +nbproject/faces-config.NavData +nbproject/genfiles.properties +nbproject/*~ /manifest.mf /build/ /dist/ /data/* /*.properties .~lock* -*.tmp .gitcommits +# Local i18n strings +local_*.properties diff --git a/.jprojects.sh b/.jprojects.sh index 07fd2cc..4f2740b 100644 --- a/.jprojects.sh +++ b/.jprojects.sh @@ -4,7 +4,7 @@ THIS="jprojects-scripts" # Libraries and EJBs -LIBRARIES="jcore jcoreee \ +LIBRARIES="jcore-utils jcore jcoreee \ jcore-logger-lib jcore-logger-ejb \ jcountry-core jcountry-lib \ jphone-core jphone-lib \ diff --git a/cherry-jprojects.sh b/cherry-jprojects.sh index 627d59d..c04438e 100755 --- a/cherry-jprojects.sh +++ b/cherry-jprojects.sh @@ -25,6 +25,7 @@ for project in ${LIST}; do then cd "${JPROJECTS_HOME}/${project}" echo "$0: Fetching all for project '${project}' ..." + git prune git fetch --all else echo "$0: Nothing to cherry-pick for '${project}'." -- 2.30.2