mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 15:45:25 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix-replay-merge' into 'master'

Browse Source 
fix replay-merge

See merge request isc-projects/bind9!509
This commit is contained in:
Evan Hunt
2018-07-11 00:02:05 -04:00
parent f781a1bd96 f8f32ac1fc
commit 9f37641d81
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
util/git-replay-merge.sh
View File

@@ -94,10 +94,6 @@ branch_exists() {
} }
go() { go() {
if [[ $# -ne 3 ]]; then
die_with_usage
fi
die_if_in_progress
# Process parameters. # Process parameters.
SOURCE_COMMIT="$1" SOURCE_COMMIT="$1"
TARGET_REMOTE="$2" TARGET_REMOTE="$2"
@@ -194,8 +190,14 @@ cleanup() {
} }
next_action="go" next_action="go"
while [[ $# -gt 3 ]]; do while [[ $# -ge 1 ]]; do
case "$1" in case "$1" in
"--no-push")
DONT_PUSH=true
;;
"--push")
DONT_PUSH=false
;;
"--abort") "--abort")
die_if_not_in_progress die_if_not_in_progress
source "${STATE_FILE}" source "${STATE_FILE}"
@@ -207,11 +209,11 @@ while [[ $# -gt 3 ]]; do
source "${STATE_FILE}" source "${STATE_FILE}"
next_action="resume" next_action="resume"
;; ;;
"--no-push") *)
DONT_PUSH=true if [[ $# -ne 3 ]]; then
;; die_with_usage
"--push") fi
DONT_PUSH=false break
;; ;;
esac esac
shift shift