diff options
| -rwxr-xr-x | git-fetch.sh | 9 | ||||
| -rwxr-xr-x | git-sh-setup.sh | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/git-fetch.sh b/git-fetch.sh index 466fe59e3..c58704d79 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -231,11 +231,12 @@ update_local_ref () { esac } -case "$update_head_ok" in -'') +# updating the current HEAD with git-fetch in a bare +# repository is always fine. +if test -z "$update_head_ok" && test $(is_bare_repository) = false +then orig_head=$(git-rev-parse --verify HEAD 2>/dev/null) - ;; -esac +fi # If --tags (and later --heads or --all) is specified, then we are # not talking about defaults stored in Pull: line of remotes or diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 87b939c0e..7fdc91216 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -28,6 +28,14 @@ set_reflog_action() { fi } +is_bare_repository () { + git-repo-config --bool --get core.bare || + case "$GIT_DIR" in + .git | */.git) echo false ;; + *) echo true ;; + esac +} + if [ -z "$LONG_USAGE" ] then LONG_USAGE="Usage: $0 $USAGE" |