diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-11-30 15:24:32 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-12-01 11:00:12 -0800 |
| commit | c697b577a28ba8360314e09bc3d66c6c80043b3c (patch) | |
| tree | f1f2e44c8783048c82530a848dc142541f41d917 /git-pull.sh | |
| parent | git_path(): be aware of file relocation in $GIT_DIR (diff) | |
| download | tgif-c697b577a28ba8360314e09bc3d66c6c80043b3c.tar.xz | |
*.sh: respect $GIT_INDEX_FILE
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index 4d4fc77b05..ad442264cb 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -240,7 +240,7 @@ test true = "$rebase" && { if ! git rev-parse -q --verify HEAD >/dev/null then # On an unborn branch - if test -f "$GIT_DIR/index" + if test -f "$(git rev-parse --git-path index)" then die "$(gettext "updating an unborn branch with changes added to the index")" fi |