diff options
| -rwxr-xr-x | git-checkout-script | 13 | ||||
| -rwxr-xr-x | git-reset-script | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/git-checkout-script b/git-checkout-script index 5b49662e6..870b1a3ef 100755 --- a/git-checkout-script +++ b/git-checkout-script @@ -37,4 +37,15 @@ then git-checkout-cache -q -f -u -a else git-read-tree -m -u $old $new -fi && [ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD" +fi + +# +# Switch the HEAD pointer to the new branch if it we +# checked out a branch head, and remove any potential +# old MERGE_HEAD's (subsequent commits will clearly not +# be based on them, since we re-set the index) +# +if [ "$?" -eq 0 ]; then + [ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD" + rm -f "$GIT_DIR/MERGE_HEAD" +fi diff --git a/git-reset-script b/git-reset-script index eaefd00d9..fe773388c 100755 --- a/git-reset-script +++ b/git-reset-script @@ -1,3 +1,5 @@ #!/bin/sh +: ${GIT_DIR=.git} git-read-tree --reset HEAD git-update-cache --refresh +rm -f "$GIT_DIR/MERGE_HEAD" |