summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2014-10-09 16:29:30 +0200
committerCarlos Martín Nieto <cmn@dwim.me>2014-10-09 16:29:30 +0200
commitc327d5db8b62e42f62a0b9e54b61b5f857036ca5 (patch)
tree45678798f63121d1d2ccd73314517f8ade30a0b5 /src
parent274c3fa62e1e78e0927e43e620546fd4d024a1d2 (diff)
downloadlibgit2-cmn/reference-transaction.tar.gz
transaction: rename lock() to lock_ref()cmn/reference-transaction
This leaves space for future expansion to locking other resources without having to change the API for references.
Diffstat (limited to 'src')
-rw-r--r--src/stash.c2
-rw-r--r--src/transaction.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/stash.c b/src/stash.c
index ea4ba1af4..cad87d120 100644
--- a/src/stash.c
+++ b/src/stash.c
@@ -611,7 +611,7 @@ int git_stash_drop(
if ((error = git_transaction_new(&tx, repo)) < 0)
return error;
- if ((error = git_transaction_lock(tx, GIT_REFS_STASH_FILE)) < 0)
+ if ((error = git_transaction_lock_ref(tx, GIT_REFS_STASH_FILE)) < 0)
goto cleanup;
if ((error = git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE)) < 0)
diff --git a/src/transaction.c b/src/transaction.c
index b515deacf..ebb943cea 100644
--- a/src/transaction.c
+++ b/src/transaction.c
@@ -80,7 +80,7 @@ on_error:
return error;
}
-int git_transaction_lock(git_transaction *tx, const char *refname)
+int git_transaction_lock_ref(git_transaction *tx, const char *refname)
{
int error;
transaction_node *node;