diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-02-12 04:31:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-13 00:01:47 (GMT) |
| commit | 17f1365dbce9aa00cab3f196e7fa7138d9081eef (patch) | |
| tree | 8d66e92d668049ec01b4d970d8fcc0506e0b1b99 /git-merge-resolve.sh | |
| parent | 754884255bb580df159e58defa81cdd30b5c430c (diff) | |
| download | git-17f1365dbce9aa00cab3f196e7fa7138d9081eef.zip git-17f1365dbce9aa00cab3f196e7fa7138d9081eef.tar.gz git-17f1365dbce9aa00cab3f196e7fa7138d9081eef.tar.bz2 | |
rev-parse: take prefix into account in --git-common-dir
Most of the time, get_git_common_dir() returns an absolute path so
prefix is irrelevant. If it returns a relative path (e.g. from the
main worktree) then prefixing is required.
Noticed-by: Mike Hommey <mh@glandium.org>
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-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions