Page MenuHomeFreeBSD
Files F96830267

D46789.diff
No OneTemporary
Actions

D46789.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
@@ -493,16 +493,16 @@
case "${addr}" in
*.*) ;; # external user
*)
- echo "${name} <${addr}@FreeBSD.org>"
- return
- ;;
+ 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
+ echo "${author_name} <${author_addr}>"
+ return
fi
# Choice 3: We can find this user in the FreeBSD repo. They've submited
@@ -510,8 +510,8 @@
# similar to their phab username.
email=$(git log -1 --author "$(echo ${addr} | tr _ .)" --pretty="%aN <%aE>")
if [ -n "${email}" ]; then
- echo "${email}"
- return
+ echo "${email}"
+ return
fi
# Choice 4: We know this user. They've committed before, and they happened
@@ -519,11 +519,11 @@
# might not be a good idea, since names can be somewhat common (there
# are two Andrew Turners that have contributed to FreeBSD, for example).
if ! (echo "${name}" | grep -w "[Uu]ser" -q); then
- email=$(git log -1 --author "${name}" --pretty="%aN <%aE>")
- if [ -n "$email" ]; then
- echo "$email"
- return
- fi
+ email=$(git log -1 --author "${name}" --pretty="%aN <%aE>")
+ if [ -n "$email" ]; then
+ echo "$email"
+ return
+ fi
fi
# Choice 5: Wing it as best we can. In this scenario, we replace the last _
@@ -534,8 +534,8 @@
a=$(printf "%s <%s>\n" "${name}" $(echo "$addr" | sed -e 's/\(.*\)_/\1@/'))
echo "Making best guess: Truning ${addr} to ${a}"
if ! prompt; then
- echo "ABORT"
- return
+ echo "ABORT"
+ return
fi
echo "${a}"
}
@@ -573,6 +573,16 @@
jq -r '.response | flatten | .[]')
author_addr=$(echo "$diff_data" | jq -r ".authorEmail?" | sort -u)
author_name=$(echo "$diff_data" | jq -r ".authorName?" | sort -u)
+
+ # JSON will return "null" when a field is not populated.
+ # Turn this string into an empty one.
+ if [ "$author_addr" = "null" ]; then
+ author_addr=""
+ fi
+ if [ "$author_name" = "null" ]; then
+ author_name=""
+ fi
+
author=$(find_author "$user_addr" "$user_name" "$author_addr" "$author_name")
# If we had to guess, and the user didn't want to guess, abort

File Metadata

Mime Type
text/plain
Expires
Fri, Sep 27, 7:55 PM (10 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
12850941
Default Alt Text
D46789.diff (2 KB)

Event Timeline