diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 15:40:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 15:40:00 -0700 |
| commit | ef0bfa25e99627b809c0902d21072821955db3fe (patch) | |
| tree | 5760644db3f9cb044c99aa0f9ce4fc8d4eb76da1 /git-checkout-script | |
| parent | Clean up different special *HEAD handling (diff) | |
| download | tgif-ef0bfa25e99627b809c0902d21072821955db3fe.tar.xz | |
Remove MERGE_HEAD in "git checkout/reset"
Both of these scripts will end up resetting the index to some specific
head, and any unresolved merge will be forgotten.
Diffstat (limited to 'git-checkout-script')
| -rwxr-xr-x | git-checkout-script | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/git-checkout-script b/git-checkout-script index 5b49662e62..870b1a3ef9 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 |