Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
f8f32ac1
Commit
f8f32ac1
authored
Jul 10, 2018
by
Evan Hunt
Browse files
fixed an argument counting bug
parent
f781a1bd
Pipeline
#2955
failed with stages
in 9 minutes and 42 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
util/git-replay-merge.sh
View file @
f8f32ac1
...
...
@@ -94,10 +94,6 @@ branch_exists() {
}
go
()
{
if
[[
$#
-ne
3
]]
;
then
die_with_usage
fi
die_if_in_progress
# Process parameters.
SOURCE_COMMIT
=
"
$1
"
TARGET_REMOTE
=
"
$2
"
...
...
@@ -194,8 +190,14 @@ cleanup() {
}
next_action
=
"go"
while
[[
$#
-g
t
3
]]
;
do
while
[[
$#
-g
e
1
]]
;
do
case
"
$1
"
in
"--no-push"
)
DONT_PUSH
=
true
;;
"--push"
)
DONT_PUSH
=
false
;;
"--abort"
)
die_if_not_in_progress
source
"
${
STATE_FILE
}
"
...
...
@@ -207,11 +209,11 @@ while [[ $# -gt 3 ]]; do
source
"
${
STATE_FILE
}
"
next_action
=
"resume"
;;
"--no-push"
)
DONT_PUSH
=
true
;;
"--push"
)
DONT_PUSH
=
false
*
)
if
[[
$#
-ne
3
]]
;
then
die_with_usage
fi
break
;;
esac
shift
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment