{"thread":{"id":"20331","subject":"[PATCH v2 3/5] pick: rename \"pick()\" to \"pick_commit()\"","startedAt":"2009-08-01T15:46:04Z","lastAt":"2009-08-01T15:46:04Z","messageCount":1,"participants":["Christian Couder"],"isPatch":true,"patchVersion":2,"patchTotal":5},"messages":[{"id":"119340","messageId":"20090801154607.20922.59485.chriscool@tuxfamily.org","threadId":"20331","inReplyTo":null,"subject":"[PATCH v2 3/5] pick: rename \"pick()\" to \"pick_commit()\"","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-08-01T15:46:04Z","receivedAt":"2009-08-01T15:46:04Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"\nSigned-off-by: Christian Couder <chriscool@tuxfamily.org>\n---\n builtin-revert.c |    2 +-\n pick.c           |    8 ++++----\n pick.h           |    2 +-\n 3 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/builtin-revert.c b/builtin-revert.c\nindex 6dd29a3..4797ac5 100644\n--- a/builtin-revert.c\n+++ b/builtin-revert.c\n@@ -206,7 +206,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)\n \t\t\t\t\tgit_commit_encoding, encoding)))\n \t\tcommit->buffer = reencoded_message;\n \n-\tfailed = pick(commit, mainline, flags, &msgbuf);\n+\tfailed = pick_commit(commit, mainline, flags, &msgbuf);\n \tif (failed < 0) {\n \t\texit(1);\n \t} else if (failed > 0) {\ndiff --git a/pick.c b/pick.c\nindex 6fea39c..13bf793 100644\n--- a/pick.c\n+++ b/pick.c\n@@ -60,16 +60,16 @@ static struct tree *empty_tree(void)\n }\n \n /*\n- * Pick changes introduced by pick_commit into current working tree\n- * and index.\n+ * Pick changes introduced by \"commit\" argument into current working\n+ * tree and index.\n  *\n  * Return 0 on success.\n  * Return negative value on error before picking,\n  * and a positive value after picking,\n  * and return 1 if and only if a conflict occurs but no other error.\n  */\n-int pick(struct commit *pick_commit, int mainline, int flags,\n-\t\t\t\t\t\tstruct strbuf *msg)\n+int pick_commit(struct commit *pick_commit, int mainline, int flags,\n+\t\tstruct strbuf *msg)\n {\n \tunsigned char head[20];\n \tstruct commit *base, *next, *parent;\ndiff --git a/pick.h b/pick.h\nindex 7eb0d3a..7a74ad8 100644\n--- a/pick.h\n+++ b/pick.h\n@@ -8,6 +8,6 @@\n #define PICK_ADD_NOTE  2 /* add note about original commit (unless conflict) */\n /* We don't need a PICK_QUIET. This is done by\n  *\tsetenv(\"GIT_MERGE_VERBOSITY\", \"0\", 1); */\n-extern int pick(struct commit *pick_commit, int mainline, int flags, struct strbuf *msg);\n+extern int pick_commit(struct commit *commit, int mainline, int flags, struct strbuf *msg);\n \n #endif\n-- \n1.6.4.133.g8a5c8\n"}]}