xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

git: separate author and committer

Browse source 
Git has the ability to track the person who
creates a commit separately from the person
who wrote the commit. For git9, we ignored
this feature.

However, as we start using git/import more,
it will be useful to figure out who imported
a commit, as well as who wrote it.

This change adds support for seeing this
information in git, as well as setting the
author and committer separately in git/import.
This commit is contained in:
Ori Bernstein 2021-09-03 02:47:18 +00:00
parent 485b334608
commit d9564c0642
7 changed files with 118 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

17
sys/lib/git/common.rc
View file

@ -38,7 +38,22 @@ fn present {
status=()
}
# merge1 out theirs base ours
fn whoami{
name=`$nl{git/conf user.name}
email=`$nl{git/conf user.email}
if(test -f /adm/keys.who){
if(~ $name '')
name=`$nl{awk -F'|' '$1=="'$user'" {x=$3} END{print x}' </adm/keys.who}
if(~ $email '')
email=`$nl{awk -F'|' '$1=="'$user'" {x=$5} END{print x}' </adm/keys.who}
}
if(~ $name '')
name=glenda
if(~ $email '')
email=glenda@9front.local
}
# merge1 out ours base theirs
fn merge1 {@{
rfork e
n=$pid