diff options
| -rwxr-xr-x | git-checkout-script | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/git-checkout-script b/git-checkout-script index 48e1da9399..7e70338c47 100755 --- a/git-checkout-script +++ b/git-checkout-script @@ -5,10 +5,19 @@ old=$(git-rev-parse HEAD) new= force= branch= +newbranch= while [ "$#" != "0" ]; do arg="$1" shift case "$arg" in + "-b") + newbranch="$1" + shift + [ -z "$newbranch" ] && + die "git checkout: -b needs a branch name" + [ -e "$GIT_DIR/refs/heads/$newbranch" ] && + die "git checkout: branch $newbranch already exists" + ;; "-f") force=1 ;; @@ -32,6 +41,16 @@ while [ "$#" != "0" ]; do done [ -z "$new" ] && new=$old +# +# If we don't have an old branch that we're switching to, +# and we don't have a new branch name for the target we +# are switching to, then we'd better just be checking out +# what we already had +# +[ -z "$branch$newbranch" ] && + [ "$new" != "$old" ] && + die "git checkout: you need to specify a new branch name" + if [ "$force" ] then git-read-tree --reset $new && @@ -47,6 +66,10 @@ fi # be based on them, since we re-set the index) # if [ "$?" -eq 0 ]; then + if [ "$newbranch" ]; then + echo $new > "$GIT_DIR/refs/heads/$newbranch" + branch="$newbranch" + fi [ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD" rm -f "$GIT_DIR/MERGE_HEAD" fi |