Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'merge.c')
-rw-r--r--merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge.c b/merge.c
index fcff632bd6..5db7d56b90 100644
--- a/merge.c
+++ b/merge.c
@@ -10,7 +10,7 @@
static const char *merge_argument(struct commit *commit)
{
if (commit)
- return sha1_to_hex(commit->object.sha1);
+ return oid_to_hex(&commit->object.oid);
else
return EMPTY_TREE_SHA1_HEX;
}