diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 20:01:10 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 20:01:10 +0200 |
| commit | 31a0ad545681159be2ccc633a1a16a891cafbae3 (patch) | |
| tree | 26ab4d6997f50fdab7ecebfa950d926683a5c492 /builtin/replace.c | |
| parent | Git 2.5 (diff) | |
| parent | Allow to control where the replace refs are looked for (diff) | |
| download | git-31a0ad545681159be2ccc633a1a16a891cafbae3.tar.xz git-31a0ad545681159be2ccc633a1a16a891cafbae3.zip | |
Merge branch 'mh/replace-refs'
Add an environment variable to tell Git to look into refs hierarchy
other than refs/replace/ for the object replacement data.
* mh/replace-refs:
Allow to control where the replace refs are looked for
Diffstat (limited to 'builtin/replace.c')
| -rw-r--r-- | builtin/replace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/replace.c b/builtin/replace.c index 0d52e7fa1d..6b3c469a33 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -104,9 +104,9 @@ static int for_each_replace_name(const char **argv, each_replace_name_fn fn) continue; } full_hex = sha1_to_hex(sha1); - snprintf(ref, sizeof(ref), "refs/replace/%s", full_hex); + snprintf(ref, sizeof(ref), "%s%s", git_replace_ref_base, full_hex); /* read_ref() may reuse the buffer */ - full_hex = ref + strlen("refs/replace/"); + full_hex = ref + strlen(git_replace_ref_base); if (read_ref(ref, sha1)) { error("replace ref '%s' not found.", full_hex); had_error = 1; @@ -134,7 +134,7 @@ static void check_ref_valid(unsigned char object[20], int force) { if (snprintf(ref, ref_size, - "refs/replace/%s", + "%s%s", git_replace_ref_base, sha1_to_hex(object)) > ref_size - 1) die("replace ref name too long: %.*s...", 50, ref); if (check_refname_format(ref, 0)) |