{"thread":{"id":"5021","subject":"[PATCH 5/6] merge-recur: Cleanup last mixedCase variables...","startedAt":"2006-07-27T17:13:47Z","lastAt":"2006-07-27T17:13:47Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"24228","messageId":"Pine.LNX.4.63.0607271913300.29667@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"5021","inReplyTo":null,"subject":"[PATCH 5/6] merge-recur: Cleanup last mixedCase variables...","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-07-27T17:13:47Z","receivedAt":"2006-07-27T17:13:47Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n merge-recursive.c |   46 +++++++++++++++++++++++-----------------------\n 1 files changed, 23 insertions(+), 23 deletions(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 645ef8c..b0f2ecc 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -609,7 +609,7 @@ static char *git_unpack_file(const unsig\n \n static struct merge_file_info merge_file(struct diff_filespec *o,\n \t\tstruct diff_filespec *a, struct diff_filespec *b,\n-\t\tconst char *branch1Name, const char *branch2Name)\n+\t\tconst char *branch1, const char *branch2)\n {\n \tstruct merge_file_info result;\n \tresult.merge = 0;\n@@ -651,8 +651,8 @@ static struct merge_file_info merge_file\n \t\t\tgit_unpack_file(a->sha1, src1);\n \t\t\tgit_unpack_file(b->sha1, src2);\n \n-\t\t\targv[2] = la = strdup(mkpath(\"%s/%s\", branch1Name, a->path));\n-\t\t\targv[6] = lb = strdup(mkpath(\"%s/%s\", branch2Name, b->path));\n+\t\t\targv[2] = la = strdup(mkpath(\"%s/%s\", branch1, a->path));\n+\t\t\targv[6] = lb = strdup(mkpath(\"%s/%s\", branch2, b->path));\n \t\t\targv[4] = lo = strdup(mkpath(\"orig/%s\", o->path));\n \t\t\targv[7] = src1;\n \t\t\targv[8] = orig;\n@@ -966,8 +966,8 @@ static unsigned char *has_sha(const unsi\n \n /* Per entry merge function */\n static int process_entry(const char *path, struct stage_data *entry,\n-\t\t\t const char *branch1Name,\n-\t\t\t const char *branch2Name)\n+\t\t\t const char *branch1,\n+\t\t\t const char *branch2)\n {\n \t/*\n \tprintf(\"processing entry, clean cache: %s\\n\", index_only ? \"yes\": \"no\");\n@@ -997,14 +997,14 @@ static int process_entry(const char *pat\n \t\t\tif (!a_sha) {\n \t\t\t\toutput(\"CONFLICT (delete/modify): %s deleted in %s \"\n \t\t\t\t       \"and modified in %s. Version %s of %s left in tree.\",\n-\t\t\t\t       path, branch1Name,\n-\t\t\t\t       branch2Name, branch2Name, path);\n+\t\t\t\t       path, branch1,\n+\t\t\t\t       branch2, branch2, path);\n \t\t\t\tupdate_file(0, b_sha, b_mode, path);\n \t\t\t} else {\n \t\t\t\toutput(\"CONFLICT (delete/modify): %s deleted in %s \"\n \t\t\t\t       \"and modified in %s. Version %s of %s left in tree.\",\n-\t\t\t\t       path, branch2Name,\n-\t\t\t\t       branch1Name, branch1Name, path);\n+\t\t\t\t       path, branch2,\n+\t\t\t\t       branch1, branch1, path);\n \t\t\t\tupdate_file(0, a_sha, a_mode, path);\n \t\t\t}\n \t\t}\n@@ -1019,14 +1019,14 @@ static int process_entry(const char *pat\n \t\tconst char *conf;\n \n \t\tif (a_sha) {\n-\t\t\tadd_branch = branch1Name;\n-\t\t\tother_branch = branch2Name;\n+\t\t\tadd_branch = branch1;\n+\t\t\tother_branch = branch2;\n \t\t\tmode = a_mode;\n \t\t\tsha = a_sha;\n \t\t\tconf = \"file/directory\";\n \t\t} else {\n-\t\t\tadd_branch = branch2Name;\n-\t\t\tother_branch = branch1Name;\n+\t\t\tadd_branch = branch2;\n+\t\t\tother_branch = branch1;\n \t\t\tmode = b_mode;\n \t\t\tsha = b_sha;\n \t\t\tconf = \"directory/file\";\n@@ -1060,8 +1060,8 @@ static int process_entry(const char *pat\n \t\t} else {\n \t\t\tconst char *new_path1, *new_path2;\n \t\t\tclean_merge = 0;\n-\t\t\tnew_path1 = unique_path(path, branch1Name);\n-\t\t\tnew_path2 = unique_path(path, branch2Name);\n+\t\t\tnew_path1 = unique_path(path, branch1);\n+\t\t\tnew_path2 = unique_path(path, branch2);\n \t\t\toutput(\"CONFLICT (add/add): File %s added non-identically \"\n \t\t\t       \"in both branches. Adding as %s and %s instead.\",\n \t\t\t       path, new_path1, new_path2);\n@@ -1085,7 +1085,7 @@ static int process_entry(const char *pat\n \t\tb.mode = b_mode;\n \t\t\n \t\tmfi = merge_file(&o, &a, &b,\n-\t\t\t\t branch1Name, branch2Name);\n+\t\t\t\t branch1, branch2);\n \n \t\tif (mfi.clean)\n \t\t\tupdate_file(1, mfi.sha, mfi.mode, path);\n@@ -1111,8 +1111,8 @@ static int process_entry(const char *pat\n static int merge_trees(struct tree *head,\n \t\t       struct tree *merge,\n \t\t       struct tree *common,\n-\t\t       const char *branch1Name,\n-\t\t       const char *branch2Name,\n+\t\t       const char *branch1,\n+\t\t       const char *branch2,\n \t\t       struct tree **result)\n {\n \tint code, clean;\n@@ -1143,13 +1143,13 @@ static int merge_trees(struct tree *head\n \t\tre_head  = get_renames(head, common, head, merge, entries);\n \t\tre_merge = get_renames(merge, common, head, merge, entries);\n \t\tclean = process_renames(re_head, re_merge,\n-\t\t\t\tbranch1Name, branch2Name);\n+\t\t\t\tbranch1, branch2);\n \t\tfor (i = 0; i < entries->nr; i++) {\n \t\t\tconst char *path = entries->items[i].path;\n \t\t\tstruct stage_data *e = entries->items[i].util;\n \t\t\tif (e->processed)\n \t\t\t\tcontinue;\n-\t\t\tif (!process_entry(path, e, branch1Name, branch2Name))\n+\t\t\tif (!process_entry(path, e, branch1, branch2))\n \t\t\t\tclean = 0;\n \t\t}\n \n@@ -1179,8 +1179,8 @@ static int merge_trees(struct tree *head\n static\n int merge(struct commit *h1,\n \t\t\t  struct commit *h2,\n-\t\t\t  const char *branch1Name,\n-\t\t\t  const char *branch2Name,\n+\t\t\t  const char *branch1,\n+\t\t\t  const char *branch2,\n \t\t\t  int call_depth /* =0 */,\n \t\t\t  struct commit *ancestor /* =None */,\n \t\t\t  struct commit **result)\n@@ -1236,7 +1236,7 @@ int merge(struct commit *h1,\n \t}\n \n \tclean = merge_trees(h1->tree, h2->tree, merged_common_ancestors->tree,\n-\t\t\t    branch1Name, branch2Name, &mrtree);\n+\t\t\t    branch1, branch2, &mrtree);\n \n \tif (!ancestor && (clean || index_only)) {\n \t\t*result = make_virtual_commit(mrtree, \"merged tree\");\n-- \n1.4.2.rc2.g6a4e\n"}]}