rename_ref(): remove unneeded local variable
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Michael Haggerty committed
Apr 21, 2016 at 23:42 UTC
e711b1af2ead2ffad5c510aadbbc387c7d8aa4c7
1 file changed
+3
-6
refs/files-backend.c
+3
-6
@@ -2360,20 +2360,17 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
2360
struct ref_lock *lock;
2361
struct stat loginfo;
2362
int log = !lstat(git_path("logs/%s", oldrefname), &loginfo);
2363
- const char *symref = NULL;
2363
struct strbuf err = STRBUF_INIT;
2364
2365
if (log && S_ISLNK(loginfo.st_mode))
2366
return error("reflog for %s is a symlink", oldrefname);
2367
2369
- symref = resolve_ref_unsafe(oldrefname, RESOLVE_REF_READING,
2370
- orig_sha1, &flag);
2368
+ if (!resolve_ref_unsafe(oldrefname, RESOLVE_REF_READING, orig_sha1, &flag))
2369
+ return error("refname %s not found", oldrefname);
2370
+
2371
if (flag & REF_ISSYMREF)
2372
return error("refname %s is a symbolic ref, renaming it is not supported",
2373
oldrefname);
2374
- if (!symref)
2375
- return error("refname %s not found", oldrefname);
2376
-
2374
if (!rename_ref_available(oldrefname, newrefname))
2375
return 1;
2376