{"thread":{"id":"34932","subject":"[PATCH 0/5] Trivial cleanups","startedAt":"2013-09-14T06:38:32Z","lastAt":"2013-09-14T06:38:37Z","messageCount":6,"participants":["Felipe Contreras"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"227676","messageId":"1379140717-12940-1-git-send-email-felipe.contreras@gmail.com","threadId":"34932","inReplyTo":null,"subject":"[PATCH 0/5] Trivial cleanups","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-14T06:38:32Z","receivedAt":"2013-09-14T06:38:32Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Felipe Contreras (5):\n branch: trivial style fix\n sha1-name: trivial style cleanup\n merge: simplify ff-only option\n t: replace pulls with merges\n pull: cleanup documentation\n\n Documentation/git-pull.txt | 4 ++--\n builtin/branch.c | 3 +--\n builtin/merge.c | 11 ++---------\n sha1_name.c | 1 -\n t/annotate-tests.sh | 2 +-\n t/t4200-rerere.sh | 2 +-\n t/t9114-git-svn-dcommit-merge.sh | 2 +-\n t/t9500-gitweb-standalone-no-errors.sh | 2 +-\n 8 files changed, 9 insertions(+), 18 deletions(-)\n\n-- \n1.8.4-fc\n"},{"id":"227677","messageId":"1379140717-12940-2-git-send-email-felipe.contreras@gmail.com","threadId":"34932","inReplyTo":"1379140717-12940-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 1/5] branch: trivial style fix","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-14T06:38:33Z","receivedAt":"2013-09-14T06:38:33Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n builtin/branch.c | 3 +--\n 1 file changed, 1 insertion(+), 2 deletions(-)\n\ndiff --git a/builtin/branch.c b/builtin/branch.c\nindex 0836890..c5aa0ba 100644\n--- a/builtin/branch.c\n+++ b/builtin/branch.c\n@@ -968,9 +968,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)\n \t\t\tdie(_(\"no such branch '%s'\"), argv[0]);\n \t\t}\n \n-\t\tif (!branch_has_merge_config(branch)) {\n+\t\tif (!branch_has_merge_config(branch))\n \t\t\tdie(_(\"Branch '%s' has no upstream information\"), branch->name);\n-\t\t}\n \n \t\tstrbuf_addf(&buf, \"branch.%s.remote\", branch->name);\n \t\tgit_config_set_multivar(buf.buf, NULL, NULL, 1);\n-- \n1.8.4-fc\n"},{"id":"227678","messageId":"1379140717-12940-3-git-send-email-felipe.contreras@gmail.com","threadId":"34932","inReplyTo":"1379140717-12940-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 2/5] sha1-name: trivial style cleanup","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-14T06:38:34Z","receivedAt":"2013-09-14T06:38:34Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n sha1_name.c | 1 -\n 1 file changed, 1 deletion(-)\n\ndiff --git a/sha1_name.c b/sha1_name.c\nindex 65ad066..9f3e340 100644\n--- a/sha1_name.c\n+++ b/sha1_name.c\n@@ -343,7 +343,6 @@ static int get_short_sha1(const char *name, int len, unsigned char *sha1,\n \treturn status;\n }\n \n-\n int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data)\n {\n \tchar hex_pfx[40];\n-- \n1.8.4-fc\n"},{"id":"227679","messageId":"1379140717-12940-4-git-send-email-felipe.contreras@gmail.com","threadId":"34932","inReplyTo":"1379140717-12940-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 3/5] merge: simplify ff-only option","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-14T06:38:35Z","receivedAt":"2013-09-14T06:38:35Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"No functional changes.\n\nSigned-off-by: Felipe Contreras \n---\n builtin/merge.c | 11 ++---------\n 1 file changed, 2 insertions(+), 9 deletions(-)\n\ndiff --git a/builtin/merge.c b/builtin/merge.c\nindex 34a6166..da9fc08 100644\n--- a/builtin/merge.c\n+++ b/builtin/merge.c\n@@ -186,13 +186,6 @@ static int option_parse_n(const struct option *opt,\n \treturn 0;\n }\n \n-static int option_parse_ff_only(const struct option *opt,\n-\t\t\t const char *arg, int unset)\n-{\n-\tfast_forward = FF_ONLY;\n-\treturn 0;\n-}\n-\n static struct option builtin_merge_options[] = {\n \t{ OPTION_CALLBACK, 'n', NULL, NULL, NULL,\n \t\tN_(\"do not show a diffstat at the end of the merge\"),\n@@ -210,9 +203,9 @@ static struct option builtin_merge_options[] = {\n \tOPT_BOOL('e', \"edit\", &option_edit,\n \t\tN_(\"edit message before committing\")),\n \tOPT_SET_INT(0, \"ff\", &fast_forward, N_(\"allow fast-forward (default)\"), FF_ALLOW),\n-\t{ OPTION_CALLBACK, 0, \"ff-only\", NULL, NULL,\n+\t{ OPTION_SET_INT, 0, \"ff-only\", &fast_forward, NULL,\n \t\tN_(\"abort if fast-forward is not possible\"),\n-\t\tPARSE_OPT_NOARG | PARSE_OPT_NONEG, option_parse_ff_only },\n+\t\tPARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, FF_ONLY },\n \tOPT_RERERE_AUTOUPDATE(&allow_rerere_auto),\n \tOPT_BOOL(0, \"verify-signatures\", &verify_signatures,\n \t\tN_(\"Verify that the named commit has a valid GPG signature\")),\n-- \n1.8.4-fc\n"},{"id":"227680","messageId":"1379140717-12940-5-git-send-email-felipe.contreras@gmail.com","threadId":"34932","inReplyTo":"1379140717-12940-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 4/5] t: replace pulls with merges","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-14T06:38:36Z","receivedAt":"2013-09-14T06:38:36Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"This is what the code intended.\n\nNo functional changes.\n\nSigned-off-by: Felipe Contreras \n---\n t/annotate-tests.sh | 2 +-\n t/t4200-rerere.sh | 2 +-\n t/t9114-git-svn-dcommit-merge.sh | 2 +-\n t/t9500-gitweb-standalone-no-errors.sh | 2 +-\n 4 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/t/annotate-tests.sh b/t/annotate-tests.sh\nindex d4e7f47..01deece 100644\n--- a/t/annotate-tests.sh\n+++ b/t/annotate-tests.sh\n@@ -92,7 +92,7 @@ test_expect_success 'blame 2 authors + 1 branch2 author' '\n '\n \n test_expect_success 'merge branch1 & branch2' '\n-\tgit pull . branch1\n+\tgit merge branch1\n '\n \n test_expect_success 'blame 2 authors + 2 merged-in authors' '\ndiff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh\nindex 7f6666f..cf19eb7 100755\n--- a/t/t4200-rerere.sh\n+++ b/t/t4200-rerere.sh\n@@ -172,7 +172,7 @@ test_expect_success 'first postimage wins' '\n \tgit show second^:a1 | sed \"s/To die: t/To die! T/\" >a1 &&\n \tgit commit -q -a -m third &&\n \n-\ttest_must_fail git pull . first &&\n+\ttest_must_fail git merge first &&\n \t# rerere kicked in\n \t! grep \"^=======\\$\" a1 &&\n \ttest_cmp expect a1\ndiff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh\nindex f524d2f..d33d714 100755\n--- a/t/t9114-git-svn-dcommit-merge.sh\n+++ b/t/t9114-git-svn-dcommit-merge.sh\n@@ -62,7 +62,7 @@ test_expect_success 'setup git mirror and merge' '\n \techo friend > README &&\n \tcat tmp >> README &&\n \tgit commit -a -m \"friend\" &&\n-\tgit pull . merge\n+\tgit merge merge\n \t'\n \n test_debug 'gitk --all & sleep 1'\ndiff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh\nindex 6fca193..3864388 100755\n--- a/t/t9500-gitweb-standalone-no-errors.sh\n+++ b/t/t9500-gitweb-standalone-no-errors.sh\n@@ -328,7 +328,7 @@ test_expect_success \\\n \t git add b &&\n \t git commit -a -m \"On branch\" &&\n \t git checkout master &&\n-\t git pull . b &&\n+\t git merge b &&\n \t git tag merge_commit'\n \n test_expect_success \\\n-- \n1.8.4-fc\n"},{"id":"227681","messageId":"1379140717-12940-6-git-send-email-felipe.contreras@gmail.com","threadId":"34932","inReplyTo":"1379140717-12940-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 5/5] pull: cleanup documentation","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-14T06:38:37Z","receivedAt":"2013-09-14T06:38:37Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"'origin/master' is very clear, no need to specify the 'remotes/' prefix,\nor babysit the user.\n\nSigned-off-by: Felipe Contreras \n---\n Documentation/git-pull.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 6ef8d59..4dd941d 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -39,7 +39,7 @@ Assume the following history exists and the current branch is\n \"`master`\":\n \n ------------\n-\t A---B---C master on origin\n+\t A---B---C origin/master\n \t /\n D---E---F---G master\n ------------\n@@ -51,7 +51,7 @@ result in a new commit along with the names of the two parent commits\n and a log message from the user describing the changes.\n \n ------------\n-\t A---B---C remotes/origin/master\n+\t A---B---C origin/master\n \t / \\\n D---E---F---G---H master\n ------------\n-- \n1.8.4-fc\n"}]}