mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-save: improve commit authorship data

Browse source 
We used to always just commit as "subsurface@hohndel.org" because
libgit-19 doesn't have the interfaces to do user name lookup.  This does
better if you have libgit-20, using "git_signature_default()" to get the
actual user that does the saving.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2014-04-14 14:33:46 -07:00 • committed by Dirk Hohndel
parent 7e1d8724c5
commit a3aacfc6c2
5 changed files with 56 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
save-git.c
View file

@ -815,6 +815,24 @@ static int update_git_checkout(git_repository *repo, git_object *parent, git_tre
return git_checkout_tree(repo, (git_object *) tree, &opts);
}
static int get_authorship(git_repository *repo, git_signature **authorp)
{
#if LIBGIT2_VER_MAJOR || LIBGIT2_VER_MINOR >= 20
return git_signature_default(authorp, repo);
#else
/* Default name information, with potential OS overrides */
struct user_info user = {
.name = "Subsurface",
.email = "subsurace@hohndel.org"
};
subsurface_user_info(&user);
/* git_signature_default() is too recent */
return git_signature_now(authorp, user.name, user.email);
#endif
}
static int create_new_commit(git_repository *repo, const char *branch, git_oid *tree_id)
{
int ret;
@ -853,8 +871,7 @@ static int create_new_commit(git_repository *repo, const char *branch, git_oid *
if (git_tree_lookup(&tree, repo, tree_id))
return report_error("Could not look up newly created tree");
/* git_signature_default() is too recent */
if (git_signature_now(&author, "Subsurface", "subsurface@hohndel.org"))
if (get_authorship(repo, &author))
return report_error("No user name configuration in git repo");
/* If the parent commit has the same tree ID, do not create a new commit */
@ -897,6 +914,8 @@ static int create_new_commit(git_repository *repo, const char *branch, git_oid *
return report_error("Failed to update branch '%s'", branch);
set_git_id(&commit_id);
git_signature_free(author);
return 0;
}