Skip to content

Commit

Permalink
Fix unprotected arguments
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Widgren <stefan.widgren@gmail.com>
  • Loading branch information
stewid committed Jul 10, 2017
1 parent 89a7e85 commit e6a4ebd
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/git2r_merge.c
@@ -1,6 +1,6 @@
/*
* git2r, R bindings to the libgit2 library.
* Copyright (C) 2013-2015 The git2r contributors
* Copyright (C) 2013-2017 The git2r contributors
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 2,
Expand Down Expand Up @@ -249,6 +249,7 @@ static int git2r_normal_merge(
if (commit_on_success) {
char sha[GIT_OID_HEXSZ + 1];
git_oid oid;
SEXP s_sha = Rf_install("sha");

err = git2r_commit_create(
&oid,
Expand All @@ -262,7 +263,7 @@ static int git2r_normal_merge(

git_oid_fmt(sha, &oid);
sha[GIT_OID_HEXSZ] = '\0';
SET_SLOT(merge_result, Rf_install("sha"), mkString(sha));
SET_SLOT(merge_result, s_sha, mkString(sha));
}
}

Expand Down

0 comments on commit e6a4ebd

Please sign in to comment.