Commit Diff

Commit:
711bb1324928686dc0d198cfa76680ecefce91ac
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
show author's email handle instead of full name in tog log view
Actions:
Patch | Tree
commit - 72640c6b9523d614bd76c74d22b0df01d2a42598
commit + 711bb1324928686dc0d198cfa76680ecefce91ac
blob - e3e4b93890abb45c3e78da0f6a650a08921c7cbb
blob + c1a08e99dca1b6a96beb2b2b90ba4dd9f3a80006
--- tog/tog.c
+++ tog/tog.c
@@ -930,11 +930,11 @@ draw_commit(struct tog_view *view, struct got_commit_o
 	char *author0 = NULL, *author = NULL;
 	wchar_t *wlogmsg = NULL, *wauthor = NULL;
 	int author_width, logmsg_width;
-	char *newline, *smallerthan;
+	char *newline, *smallerthan, *at;
 	char *line = NULL;
 	int col, limit;
 	static const size_t date_display_cols = 9;
-	static const size_t author_display_cols = 16;
+	static const size_t author_display_cols = 10;
 	const int avail = view->ncols;
 	struct tm tm;
 	time_t committer_time;
@@ -962,13 +962,11 @@ draw_commit(struct tog_view *view, struct got_commit_o
 	}
 	author = author0;
 	smallerthan = strchr(author, '<');
-	if (smallerthan)
-		*smallerthan = '\0';
-	else {
-		char *at = strchr(author, '@');
-		if (at)
-			*at = '\0';
-	}
+	if (smallerthan && smallerthan[1] != '\0')
+		author = smallerthan + 1;
+	at = strchr(author, '@');
+	if (at)
+		*at = '\0';
 	limit = avail - col;
 	err = format_line(&wauthor, &author_width, author, limit);
 	if (err)