Merge branch 'maint'

* maint:
  http.c: Fix problem with repeated calls of http_init
  Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
  Fix import-tars fix.
  Update .mailmap with "Michael"
  Do not barf on too long action description
  Catch empty pathnames in trees during fsck
  Don't allow empty pathnames in fast-import
  import-tars: be nice to wrong directory modes
  git-svn: Added 'find-rev' command
  git shortlog documentation: add long options and fix a typo

1 files changed, 1 insertions, 4 deletions

diff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c
index 3145c01f7e..2065466f27 100644
--- a/builtin-fetch--tool.c
+++ b/builtin-fetch--tool.c
@@ -35,16 +35,13 @@ static int update_ref(const char *action,
 		      unsigned char *sha1,
 		      unsigned char *oldval)
 {
-	int len;
 	char msg[1024];
 	char *rla = getenv("GIT_REFLOG_ACTION");
 	static struct ref_lock *lock;
 
 	if (!rla)
 		rla = "(reflog update)";
-	len = snprintf(msg, sizeof(msg), "%s: %s", rla, action);
-	if (sizeof(msg) <= len)
-		die("insanely long action");
+	snprintf(msg, sizeof(msg), "%s: %s", rla, action);
 	lock = lock_any_ref_for_update(refname, oldval);
 	if (!lock)
 		return 1;