X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-remote.c;h=71abf68404f5b260ba96208717d89e50e778dd36;hb=77ce907786d2c4a7789e81c83a28e829c36fab30;hp=ca7c639ad30fd5682014eb984ab18d3fb0546c67;hpb=ef5542ca93ea6751c97104ca13f79b3d4d2d2ca8;p=git.git

diff --git a/builtin-remote.c b/builtin-remote.c
index ca7c639ad..71abf6840 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -525,8 +525,8 @@ static int migrate_file(struct remote *remote)
 		path = git_path("remotes/%s", remote->name);
 	else if (remote->origin == REMOTE_BRANCHES)
 		path = git_path("branches/%s", remote->name);
-	if (path && unlink(path))
-		warning("failed to remove '%s'", path);
+	if (path)
+		unlink_or_warn(path);
 	return 0;
 }
 
@@ -1216,7 +1216,7 @@ static int update(int argc, const char **argv)
 	struct option options[] = {
 		OPT_GROUP("update specific options"),
 		OPT_BOOLEAN('p', "prune", &prune,
-			    "prune remotes after fecthing"),
+			    "prune remotes after fetching"),
 		OPT_END()
 	};