summaryrefslogtreecommitdiff
path: root/builtin/replace.c
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2012-11-13 10:34:11 (GMT)
committerJeff King <peff@peff.net>2012-11-13 13:34:14 (GMT)
commit9dfc36841b3f1a2669f0513676cc4d72ef1220a1 (patch)
tree45007aa220439f0e3c5cb9e7d62109ac12683676 /builtin/replace.c
parentb0b00a3ee43b4813eb85728a482500f6422499fd (diff)
downloadgit-9dfc36841b3f1a2669f0513676cc4d72ef1220a1.zip
git-9dfc36841b3f1a2669f0513676cc4d72ef1220a1.tar.gz
git-9dfc36841b3f1a2669f0513676cc4d72ef1220a1.tar.bz2
replace: parse revision argument for -d
'git replace' parses the revision arguments when it creates replacements (so that a sha1 can be abbreviated, e.g.) but not when deleting replacements. Make it parse the argument to 'replace -d' in the same way. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'builtin/replace.c')
-rw-r--r--builtin/replace.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/builtin/replace.c b/builtin/replace.c
index e3aaf70..398ccd5 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -46,24 +46,27 @@ typedef int (*each_replace_name_fn)(const char *name, const char *ref,
static int for_each_replace_name(const char **argv, each_replace_name_fn fn)
{
- const char **p;
+ const char **p, *full_hex;
char ref[PATH_MAX];
int had_error = 0;
unsigned char sha1[20];
for (p = argv; *p; p++) {
- if (snprintf(ref, sizeof(ref), "refs/replace/%s", *p)
- >= sizeof(ref)) {
- error("replace ref name too long: %.*s...", 50, *p);
+ if (get_sha1(*p, sha1)) {
+ error("Failed to resolve '%s' as a valid ref.", *p);
had_error = 1;
continue;
}
+ full_hex = sha1_to_hex(sha1);
+ snprintf(ref, sizeof(ref), "refs/replace/%s", full_hex);
+ /* read_ref() may reuse the buffer */
+ full_hex = ref + strlen("refs/replace/");
if (read_ref(ref, sha1)) {
- error("replace ref '%s' not found.", *p);
+ error("replace ref '%s' not found.", full_hex);
had_error = 1;
continue;
}
- if (fn(*p, ref, sha1))
+ if (fn(full_hex, ref, sha1))
had_error = 1;
}
return had_error;