diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-17 13:25:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-17 13:25:20 -0700 |
| commit | dec040192fde87fb3249a3d53f802decd84fa7b7 (patch) | |
| tree | 7c73c3807033b62c98368ff2d3ca8ecbf20177b9 /transport.c | |
| parent | af9a70c8de7b1d45ecd0bbb1379c5c3e911a9dcd (diff) | |
| parent | ea0fc3b4176a424a2b20eb76a6a503dc4d59cebb (diff) | |
| download | git-dec040192fde87fb3249a3d53f802decd84fa7b7.tar.gz | |
Merge branch 'jk/alt-odb-cleanup'
Codepaths involved in interacting alternate object store have
been cleaned up.
* jk/alt-odb-cleanup:
alternates: use fspathcmp to detect duplicates
sha1_file: always allow relative paths to alternates
count-objects: report alternates via verbose mode
fill_sha1_file: write into a strbuf
alternates: store scratch buffer as strbuf
fill_sha1_file: write "boring" characters
alternates: use a separate scratch space
alternates: encapsulate alt->base munging
alternates: provide helper for allocating alternate
alternates: provide helper for adding to alternates list
link_alt_odb_entry: refactor string handling
link_alt_odb_entry: handle normalize_path errors
t5613: clarify "too deep" recursion tests
t5613: do not chdir in main process
t5613: whitespace/style cleanups
t5613: use test_must_fail
t5613: drop test_valid_repo function
t5613: drop reachable_via function
Diffstat (limited to 'transport.c')
| -rw-r--r-- | transport.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/transport.c b/transport.c index a85801042b..079499dbaf 100644 --- a/transport.c +++ b/transport.c @@ -1096,9 +1096,7 @@ static int refs_from_alternate_cb(struct alternate_object_database *e, const struct ref *extra; struct alternate_refs_data *cb = data; - e->name[-1] = '\0'; - other = xstrdup(real_path(e->base)); - e->name[-1] = '/'; + other = xstrdup(real_path(e->path)); len = strlen(other); while (other[len-1] == '/') |