Configure git author name and git author email in .gitconfig.

Configure git author name and git author email in .gitconfig.

If git author name is different in the chroot from outside the chroot, repo
may auto-delete your changes when you run repo sync. These changes can be
recovered, but their deletion is inconvenient.

BUG=chromium-os:5934
TEST=Check that git var GIT_COMMITTER_IDENT is now correct inside chroot.

Change-Id: I622cd37caa404a7482c55c4b3984877b32b3807c

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=0fd8af4

[kliegs1, 2010-09-08 00:54:06]

Will this cause any trouble with private repos that use different
credentials than the public ones?

-jon

On Sep 7, 2010 7:45 PM, <davidjames@chromium.org> wrote:
> Reviewers: anush,
>
> Description:
> Configure git author name and git author email in .gitconfig.
>
> If git author name is different in the chroot from outside the chroot,
repo
> may auto-delete your changes when you run repo sync. These changes can be
> recovered, but their deletion is inconvenient.
>
> BUG=chromium-os:5934
> TEST=Check that git var GIT_COMMITTER_IDENT is now correct inside chroot.
>
> Change-Id: I622cd37caa404a7482c55c4b3984877b32b3807c
>
> Please review this at http://codereview.chromium.org/3352008/show
>
> SVN Base: http://git.chromium.org/git/crosutils.git
>
> Affected files:
> M enter_chroot.sh
>
>
> Index: enter_chroot.sh
> diff --git a/enter_chroot.sh b/enter_chroot.sh
> index
>
a72e7ac287fa23735f3feb66af64eb3c0a0a7351..eeaf84a9a0a499aee4b2e1f34dbd6c6d77f89e90

> 100755
> --- a/enter_chroot.sh
> +++ b/enter_chroot.sh
> @@ -285,6 +285,12 @@ if [ -d "$HOME/.subversion" ]; then
> fi
> fi
>
> +# Configure committer username and email in chroot .gitconfig
> +git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --add user.name \
> + "$(git var GIT_COMMITTER_IDENT | sed -e 's/ *<.*//')"
> +git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --add user.email \
> + "$(git var GIT_COMMITTER_IDENT | sed -e 's/.*<\([^>]*\)>.*/\1/')"
> +
> # Run command or interactive shell. Also include the non-chrooted path to
> # the source trunk for scripts that may need to print it (e.g.
> # build_image.sh).
>
>

[anush, 2010-09-08 06:16:37]

As per discussion with sop that I forwarded to you earlier

"You may be able to push it in with environment variables.
GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, GIT_AUTHOR_NAME,
GIT_AUTHOR_EMAIL are the relevant environment variables.  It may be
enough to write a wrapper script that gets these from the real root,
exports them, and then enters the chroot."

So do we have to get two more env vars or are we always guaranteed
both committer and author will be set with user.* is set?

Thanks

On Tue, Sep 7, 2010 at 4:45 PM,  <davidjames@chromium.org> wrote:
> Reviewers: anush,
>
> Description:
> Configure git author name and git author email in .gitconfig.
>
> If git author name is different in the chroot from outside the chroot, repo
> may auto-delete your changes when you run repo sync. These changes can be
> recovered, but their deletion is inconvenient.
>
> BUG=chromium-os:5934
> TEST=Check that git var GIT_COMMITTER_IDENT is now correct inside chroot.
>
> Change-Id: I622cd37caa404a7482c55c4b3984877b32b3807c
>
> Please review this at http://codereview.chromium.org/3352008/show
>
> SVN Base: http://git.chromium.org/git/crosutils.git
>
> Affected files:
>  M enter_chroot.sh
>
>
> Index: enter_chroot.sh
> diff --git a/enter_chroot.sh b/enter_chroot.sh
> index
>
a72e7ac287fa23735f3feb66af64eb3c0a0a7351..eeaf84a9a0a499aee4b2e1f34dbd6c6d77f89e90
> 100755
> --- a/enter_chroot.sh
> +++ b/enter_chroot.sh
> @@ -285,6 +285,12 @@ if [ -d "$HOME/.subversion" ]; then
>   fi
>  fi
>
> +# Configure committer username and email in chroot .gitconfig
> +git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --add user.name \
> +  "$(git var GIT_COMMITTER_IDENT | sed -e 's/ *<.*//')"
> +git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --add user.email \
> +  "$(git var GIT_COMMITTER_IDENT | sed -e 's/.*<\([^>]*\)>.*/\1/')"
> +
>  # Run command or interactive shell.  Also include the non-chrooted path to
>  # the source trunk for scripts that may need to print it (e.g.
>  # build_image.sh).
>
>
>

[davidjames, 2010-09-11 01:06:05]

On 2010/09/08 06:16:37, anush wrote:
> As per discussion with sop that I forwarded to you earlier
> 
> "You may be able to push it in with environment variables.
> GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, GIT_AUTHOR_NAME,
> GIT_AUTHOR_EMAIL are the relevant environment variables.  It may be
> enough to write a wrapper script that gets these from the real root,
> exports them, and then enters the chroot."
> 
> So do we have to get two more env vars or are we always guaranteed
> both committer and author will be set with user.* is set?

Per our discussion, these are inherited from user.* so there is no need to set
both. Note that if the user sets these variables manually then they will
override user.*.

Cheers,

David

[anush, 2010-09-11 23:46:34]

LGTM

On 2010/09/11 01:06:05, davidjames wrote:
> On 2010/09/08 06:16:37, anush wrote:
> > As per discussion with sop that I forwarded to you earlier
> > 
> > "You may be able to push it in with environment variables.
> > GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, GIT_AUTHOR_NAME,
> > GIT_AUTHOR_EMAIL are the relevant environment variables.  It may be
> > enough to write a wrapper script that gets these from the real root,
> > exports them, and then enters the chroot."
> > 
> > So do we have to get two more env vars or are we always guaranteed
> > both committer and author will be set with user.* is set?
> 
> Per our discussion, these are inherited from user.* so there is no need to set
> both. Note that if the user sets these variables manually then they will
> override user.*.
> 
> Cheers,
> 
> David

[davidjames, 2010-09-12 23:25:59]

Switched from --add to --replace-all to ensure same settings aren't listed
multiple times. Also cd /tmp to make sure we aren't picking up local settings
configured in .git/config and making them global. This ensures that git var (1)
either picks up settings for ~/.gitconfig; or (2) uses the global defaults
picked up from the system or even LDAP.