summaryrefslogtreecommitdiff
path: root/logerrit
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-04-26 17:22:47 +0200
committerMichael Stahl <mstahl@redhat.com>2016-04-27 15:52:40 +0200
commit7895f7e1a8d12a89b69fe55326fde7b7f5a34b8f (patch)
treeba248ddfdfb5bcd482aa1162e64bd4c54ee7a9b7 /logerrit
parent3585cfe5f55f3ac8131a19abc5cbbf857364de9a (diff)
logerrit: disarm the "resubmit" foot-gun
Recently some new developers accidentally used "resubmit", intending to upload a new revision of their change, but it actually always creates a new gerrit change. 4e15809a78ea3c6062e20e439cf8df3d06cd8569 claims that "resubmit creates a new Change-Id for the current change and thus allow to submit changes for review on release branches that were already reviewed on master", but that is not actually required with gerrit versions that were in use in the recent years, gerrit is capable of tracking Change-Id per branch. Change-Id: I66eda4dbc6f4ff1e235105b3f55041cda88a6b60
Diffstat (limited to 'logerrit')
-rwxr-xr-xlogerrit13
1 files changed, 0 insertions, 13 deletions
diff --git a/logerrit b/logerrit
index a88c56f383d7..6e7338aad0aa 100755
--- a/logerrit
+++ b/logerrit
@@ -45,12 +45,7 @@ case "$1" in
echo
echo " --- for submitters:"
echo " submit [BRANCH] submit your change for review"
- echo " resubmit [BRANCH] create a new Change-Id and submit your change for review"
- echo " (yes, this modifies your last commit)"
echo " submit-draft [BRANCH] submit your change as draft"
- echo " resubmit-draft [BRANCH] create a new Change-Id and submit your change as draft"
- echo " (yes, this modifies your last commit)"
- echo " (yes, this modifies your last commit)"
echo " nextchange [BRANCH] reset branch to the remote to start with the next change"
echo " testfeature [BRANCH] trigger a test of a feature branch on gerrit"
echo "Note: drafts are only visibly to yourself and those that you explicitly add as reviewers."
@@ -136,17 +131,9 @@ case "$1" in
submit)
submit 'for' $2
;;
- resubmit)
- git log -1 --pretty=%B | grep -v ^Change-Id: | git commit --amend -F -
- submit 'for' $2
- ;;
submit-draft)
submit drafts $2
;;
- resubmit-draft)
- git log -1 --pretty=%B | grep -v ^Change-Id: | git commit --amend -F -
- submit drafts $2
- ;;
nextchange)
if test -n "`git status -s -uno`"
then