[PATCH v2 3/5] pick: rename "pick()" to "pick_commit()"
From: Christian Couder <hidden>
Date: 2016-06-15 22:47:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Christian Couder <redacted> --- builtin-revert.c | 2 +- pick.c | 8 ++++---- pick.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/builtin-revert.c b/builtin-revert.c
index 6dd29a3..4797ac5 100644
--- a/builtin-revert.c
+++ b/builtin-revert.c@@ -206,7 +206,7 @@ static int revert_or_cherry_pick(int argc, const char **argv) git_commit_encoding, encoding))) commit->buffer = reencoded_message; - failed = pick(commit, mainline, flags, &msgbuf); + failed = pick_commit(commit, mainline, flags, &msgbuf); if (failed < 0) { exit(1); } else if (failed > 0) {
diff --git a/pick.c b/pick.c
index 6fea39c..13bf793 100644
--- a/pick.c
+++ b/pick.c@@ -60,16 +60,16 @@ static struct tree *empty_tree(void) } /* - * Pick changes introduced by pick_commit into current working tree - * and index. + * Pick changes introduced by "commit" argument into current working + * tree and index. * * Return 0 on success. * Return negative value on error before picking, * and a positive value after picking, * and return 1 if and only if a conflict occurs but no other error. */ -int pick(struct commit *pick_commit, int mainline, int flags, - struct strbuf *msg) +int pick_commit(struct commit *pick_commit, int mainline, int flags, + struct strbuf *msg) { unsigned char head[20]; struct commit *base, *next, *parent;
diff --git a/pick.h b/pick.h
index 7eb0d3a..7a74ad8 100644
--- a/pick.h
+++ b/pick.h@@ -8,6 +8,6 @@ #define PICK_ADD_NOTE 2 /* add note about original commit (unless conflict) */ /* We don't need a PICK_QUIET. This is done by * setenv("GIT_MERGE_VERBOSITY", "0", 1); */ -extern int pick(struct commit *pick_commit, int mainline, int flags, struct strbuf *msg); +extern int pick_commit(struct commit *commit, int mainline, int flags, struct strbuf *msg); #endif
--
1.6.4.133.g8a5c8