You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ec...@apache.org on 2016/05/17 22:04:51 UTC
[09/50] hbase git commit: HBASE-15725 make_patch.sh should add the
branch name when -b is passed. -- addendum
HBASE-15725 make_patch.sh should add the branch name when -b is passed. -- addendum
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c12eaa5c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c12eaa5c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c12eaa5c
Branch: refs/heads/HBASE-14850
Commit: c12eaa5cc48a616518a11278586083f32aa3f60c
Parents: 00e61d2
Author: Elliott Clark <ec...@apache.org>
Authored: Fri May 13 16:38:02 2016 -0700
Committer: Elliott Clark <ec...@apache.org>
Committed: Tue May 17 09:05:53 2016 -0700
----------------------------------------------------------------------
dev-support/make_patch.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/c12eaa5c/dev-support/make_patch.sh
----------------------------------------------------------------------
diff --git a/dev-support/make_patch.sh b/dev-support/make_patch.sh
index 0aedf88..8179098 100755
--- a/dev-support/make_patch.sh
+++ b/dev-support/make_patch.sh
@@ -97,7 +97,7 @@ elif [ "$status" -ge 1 ]; then
# At least one patch already exists -- add a version prefix
for i in {1..99}; do
# Check to see the maximum version of patch that exists
- if [ ! -f "$patch_dir/$branch-v$i.patch" ]; then
+ if [ ! -f "$patch_dir/$branch.v$i.patch" ]; then
version=$i
if [ -n "$addendum" ]; then
# Don't increment the patch # if it is an addendum
@@ -108,10 +108,10 @@ elif [ "$status" -ge 1 ]; then
else
# We are making an addendum to a different version of the patch
let version=$version-1
- prefix="-v$version"
+ prefix=".v$version"
fi
else
- prefix="-v$version"
+ prefix=".v$version"
fi
break
fi
@@ -122,7 +122,7 @@ fi
tracking_suffix=""
if [[ $tracking_branch != "origin/master" \
&& $tracking_branch != "master" ]]; then
- tracking_suffix="-${tracking_branch#origin/}"
+ tracking_suffix=".${tracking_branch#origin/}"
fi
patch_name="$branch$prefix$addendum$tracking_suffix.patch"