Commit 8a86c48a authored by Mark Derricutt's avatar Mark Derricutt

Finishing features now only update / and / if they exists, this allows you to...

Finishing features now only update / and / if they exists, this allows you to work on a unpushed repo, or a git svn repo
parent 1911101c
...@@ -282,14 +282,18 @@ cmd_finish() { ...@@ -282,14 +282,18 @@ cmd_finish() {
require_clean_working_tree require_clean_working_tree
# update local repo with remote changes first, if asked # update local repo with remote changes first, if asked
if has "$ORIGIN/$BRANCH" "$(git_remote_branches)"; then
if flag fetch; then if flag fetch; then
git fetch -q "$ORIGIN" "$BRANCH" git fetch -q "$ORIGIN" "$BRANCH"
fi fi
fi
if has "$ORIGIN/$BRANCH" "$(git_remote_branches)"; then if has "$ORIGIN/$BRANCH" "$(git_remote_branches)"; then
require_branches_equal "$BRANCH" "$ORIGIN/$BRANCH" require_branches_equal "$BRANCH" "$ORIGIN/$BRANCH"
fi fi
if has "$ORIGIN/$DEVELOP_BRANCH" "$(git_remote_branches)"; then
require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH" require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
fi
# if the user wants to rebase, do that first # if the user wants to rebase, do that first
if flag rebase; then if flag rebase; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment