diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:15 -0700 |
| commit | 42a9c6c0e2060327def808d9c4c2aa167d6d8934 (patch) | |
| tree | aeaf7616738519ed6e8e930b0e57060713156836 /git-merge-one-file.sh | |
| parent | Merge branch 'nd/commit-p-doc' into maint (diff) | |
| parent | files_read_raw_ref: prevent infinite retry loops in general (diff) | |
| download | tgif-42a9c6c0e2060327def808d9c4c2aa167d6d8934.tar.xz | |
Merge branch 'jk/ref-symlink-loop' into maint
A stray symbolic link in $GIT_DIR/refs/ directory could make name
resolution loop forever, which has been corrected.
* jk/ref-symlink-loop:
files_read_raw_ref: prevent infinite retry loops in general
files_read_raw_ref: avoid infinite loop on broken symlinks
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions