[PATCH 1/3] dim: rename $today to $dim_today
Jani Nikula
jani.nikula at intel.com
Wed Oct 11 16:49:53 UTC 2017
Seems like a batter name for a global.
Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
dim | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/dim b/dim
index ac6533d63067..f074021dfe34 100755
--- a/dim
+++ b/dim
@@ -76,7 +76,7 @@ DIM_GPG_KEYID=${DIM_GPG_KEYID:+-u $DIM_GPG_KEYID}
dim=$(basename $0)
-today=$(date +%Y-%m-%d)
+dim_today=$(date +%Y-%m-%d)
# Recipients for all dim based pull requests.
# Add To: lines to the end, Cc: lines in the beginning with -c.
@@ -1608,12 +1608,12 @@ function dim_update_next_continue
remote=$(repo_to_remote drm-tip)
git push $DRY_RUN -f $intel_remote drm-intel-next-queued:drm-intel-next
- tag=drm-intel-next-$today
- tag_testing=drm-intel-testing-$today
+ tag=drm-intel-next-$dim_today
+ tag_testing=drm-intel-testing-$dim_today
while git tag -l $tag | grep -q $tag ; do
- tag="drm-intel-next-$today-$((++suffix))"
- tag_testing="drm-intel-testing-$today-$((++suffix))"
+ tag="drm-intel-next-$dim_today-$((++suffix))"
+ tag_testing="drm-intel-testing-$dim_today-$((++suffix))"
done
$DRY git tag -a $DIM_GPG_KEYID $tag $intel_remote/drm-intel-next
@@ -1651,9 +1651,9 @@ function dim_tag_next
if [ $(git rev-parse drm-intel-next) == $(git rev-parse "drm-intel-next@{u}") ] ; then
echo "Tagging current drm-intel-next"
- tag=drm-intel-next-$today
+ tag=drm-intel-next-$dim_today
while git tag -l $tag | grep -q $tag ; do
- tag="drm-intel-next-$today-$((++suffix))"
+ tag="drm-intel-next-$dim_today-$((++suffix))"
done
$DRY git tag -a $DIM_GPG_KEYID $tag $intel_remote/drm-intel-next
@@ -1710,10 +1710,10 @@ function dim_pull_request
repo="drm-intel"
else
- tag=$branch-$today
+ tag=$branch-$dim_today
while git tag -l $tag | grep -q $tag ; do
- tag="$branch-$today-$((++suffix))"
+ tag="$branch-$dim_today-$((++suffix))"
done
gitk "$branch@{upstream}" ^$upstream &
prep_pull_tag_summary | $DRY git tag -F- $tag "$branch@{upstream}"
--
2.11.0
More information about the dim-tools
mailing list