diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-03 10:41:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 10:41:31 -0700 |
| commit | 0533a9b70cc768438a817103f02c51bc4f52bf45 (patch) | |
| tree | 1d69e2fd8a639c2ec1c45957c8f4c0b5e02f35a1 /mergetools/tortoisemerge | |
| parent | Merge branch 'sg/commit-cleanup-scissors' into maint (diff) | |
| parent | read_loose_refs(): treat NULL_SHA1 loose references as broken (diff) | |
| download | tgif-0533a9b70cc768438a817103f02c51bc4f52bf45.tar.xz | |
Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint
"git for-each-ref" reported "missing object" for 0{40} when it
encounters a broken ref. The lack of object whose name is 0{40} is
not the problem; the ref being broken is.
* mh/reporting-broken-refs-from-for-each-ref:
read_loose_refs(): treat NULL_SHA1 loose references as broken
read_loose_refs(): simplify function logic
for-each-ref: report broken references correctly
t6301: new tests of for-each-ref error handling
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions