Page MenuHomeFreeBSD
Files F144567010

D55195.id171525.diff
No OneTemporary
Actions

D55195.id171525.diff
View Options

diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh
--- a/tools/tools/git/git-arc.sh
+++ b/tools/tools/git/git-arc.sh
@@ -452,26 +452,27 @@
# The Phabricator interface doesn't have a simple way to get author name and
# address, so we have to try a number of heuristics to get the right result.
- # Choice 1: It's a FreeBSD committer. These folks have no '.' in their phab
+ # Choice 1: author_addr and author_name were set in the bundle, so use
+ # that. We may need to filter some known bogus ones, should they crop up.
+ if [ -n "$author_name" -a -n "$author_addr" ]; then
+ echo "${author_name} <${author_addr}>"
+ return
+ fi
+
+ # Choice 2: It's a FreeBSD committer. These folks have no '.' in their phab
# username/addr. Sampled data in phab suggests that there's a high rate of
# these people having their local config pointing at something other than
# freebsd.org (which isn't surprising for ports committers getting src
# commits reviewed).
case "${addr}" in
*.*) ;; # external user
+ guest-*) ;; # Fake email address, not a FreeBSD user
*)
echo "${name} <${addr}@FreeBSD.org>"
return
;;
esac
- # Choice 2: author_addr and author_name were set in the bundle, so use
- # that. We may need to filter some known bogus ones, should they crop up.
- if [ -n "$author_name" -a -n "$author_addr" ]; then
- echo "${author_name} <${author_addr}>"
- return
- fi
-
# Choice 3: We can find this user in the FreeBSD repo. They've submited
# something before, and they happened to use an email that's somewhat
# similar to their phab username.

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 10, 4:22 PM (9 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28627986
Default Alt Text
D55195.id171525.diff (1 KB)

Event Timeline