proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-21 08:22:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: make reflog include "(merge)" for merge commits

Browse Source 
This fixes issue #4094
This commit is contained in:
Richard Ipsum 2017-02-26 13:34:13 +00:00
parent 7143145f2f
commit 1255a9ac0c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/refs.c
View File

@ -1130,6 +1130,18 @@ int git_reference__update_terminal(
return error; return error;
} }
static const char *commit_type(const git_commit *commit)
{
unsigned int count = git_commit_parentcount(commit);
if (count >= 2)
return " (merge)";
else if (count == 0)
return " (initial)";
else
return "";
}
int git_reference__update_for_commit( int git_reference__update_for_commit(
git_repository *repo, git_repository *repo,
git_reference *ref, git_reference *ref,
@ -1146,7 +1158,7 @@ int git_reference__update_for_commit(
if ((error = git_commit_lookup(&commit, repo, id)) < 0 || if ((error = git_commit_lookup(&commit, repo, id)) < 0 ||
(error = git_buf_printf(&reflog_msg, "%s%s: %s", (error = git_buf_printf(&reflog_msg, "%s%s: %s",
operation ? operation : "commit", operation ? operation : "commit",
git_commit_parentcount(commit) == 0 ? " (initial)" : "", commit_type(commit),
git_commit_summary(commit))) < 0) git_commit_summary(commit))) < 0)
goto done; goto done;