{"thread":{"id":"34129","subject":"[PATCH 0/3] Support :/quuxery in rebase (early preview)","startedAt":"2013-06-13T18:15:59Z","lastAt":"2013-06-13T18:16:02Z","messageCount":4,"participants":["Ramkumar Ramachandra"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"220757","messageId":"1371147362-26962-1-git-send-email-artagnon@gmail.com","threadId":"34129","inReplyTo":null,"subject":"[PATCH 0/3] Support :/quuxery in rebase (early preview)","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-06-13T18:15:59Z","receivedAt":"2013-06-13T18:15:59Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Hi,\n\nSo this is a series to make git rebase [-i] :/quuxery possible.  It is\nan early preview, because I have not tested that :/quuxery works as\nthe <onto>, <upstream>, and <branch>.\n\nThanks.\n\nRamkumar Ramachandra (3):\n  t/rebase: add failing tests for a peculiar revision\n  sh-setup: add new peel_committish() helper\n  rebase: use peel_committish() where appropriate\n\n git-rebase.sh                 |  6 +++---\n git-sh-setup.sh               | 13 +++++++++++++\n t/t3400-rebase.sh             |  8 ++++++++\n t/t3404-rebase-interactive.sh |  8 ++++++++\n 4 files changed, 32 insertions(+), 3 deletions(-)\n\n-- \n1.8.3.1.381.g31c8856.dirty\n"},{"id":"220758","messageId":"1371147362-26962-2-git-send-email-artagnon@gmail.com","threadId":"34129","inReplyTo":"1371147362-26962-1-git-send-email-artagnon@gmail.com","subject":"[PATCH 1/3] t/rebase: add failing tests for a peculiar revision","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-06-13T18:16:00Z","receivedAt":"2013-06-13T18:16:00Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"The following commands fail, even if :/quuxery resolves to a perfectly\nvalid commit:\n\n  $ git rebase :/quuxery\n  $ git rebase -i :/quuxery\n\nThis is because rebase [-i] attempts to rev-parse ${REV}^0 to verify\nthat the given revision resolves to a commit.  Add tests to document\nthese failures.\n\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n---\n t/t3400-rebase.sh             | 8 ++++++++\n t/t3404-rebase-interactive.sh | 8 ++++++++\n 2 files changed, 16 insertions(+)\n\ndiff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh\nindex b58fa1a..890f159 100755\n--- a/t/t3400-rebase.sh\n+++ b/t/t3400-rebase.sh\n@@ -88,6 +88,14 @@ test_expect_success 'rebase fast-forward to master' '\n \ttest_i18ngrep \"Fast-forwarded HEAD to my-topic-branch\" out\n '\n \n+test_expect_failure 'rebase against revision specified as :/quuxery' '\n+\tgit checkout my-topic-branch^ &&\n+\tsha1=$(git rev-parse \":/Add B\") &&\n+\tgit rebase $sha1 &&\n+\tgit checkout my-topic-branch^ &&\n+\tgit rebase \":/Add B\"\n+'\n+\n test_expect_success 'the rebase operation should not have destroyed author information' '\n \t! (git log | grep \"Author:\" | grep \"<>\")\n '\ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex 79e8d3c..ca4ee92 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -947,4 +947,12 @@ test_expect_success 'rebase -i respects core.commentchar' '\n \ttest B = $(git cat-file commit HEAD^ | sed -ne \\$p)\n '\n \n+test_expect_failure 'rebase -i against revision specified as :/quuxery' '\n+\tgit checkout branch1 &&\n+\tsha1=$(git rev-parse \":/J\") &&\n+\tgit rebase $sha1 &&\n+\tgit checkout branch1 &&\n+\tgit rebase \":/J\"\n+'\n+\n test_done\n-- \n1.8.3.1.381.g31c8856.dirty\n"},{"id":"220759","messageId":"1371147362-26962-3-git-send-email-artagnon@gmail.com","threadId":"34129","inReplyTo":"1371147362-26962-1-git-send-email-artagnon@gmail.com","subject":"[PATCH 2/3] sh-setup: add new peel_committish() helper","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-06-13T18:16:01Z","receivedAt":"2013-06-13T18:16:01Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"The normal way to check whether a certain revision resolves to a valid\ncommit is:\n\n  $ git rev-parse --verify $REV^0\n\nUnfortunately, this does not work when $REV is of the type :/quuxery.\nWrite a helper to work around this limitation.\n\nSuggested-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n---\n git-sh-setup.sh | 13 +++++++++++++\n 1 file changed, 13 insertions(+)\n\ndiff --git a/git-sh-setup.sh b/git-sh-setup.sh\nindex 2f78359..6ae19a6 100644\n--- a/git-sh-setup.sh\n+++ b/git-sh-setup.sh\n@@ -313,3 +313,16 @@ then\n \t}\n \t: ${GIT_OBJECT_DIRECTORY=\"$GIT_DIR/objects\"}\n fi\n+\n+peel_committish () {\n+\ttest $# -gt 1 && quiet=\"--quiet\" || quiet=\"\"\n+\tcase \"$1\" in\n+\t:/*)\n+\t\tpeeltmp=$(git rev-parse --verify $quiet \"$1\") &&\n+\t\tgit rev-parse --verify \"${peeltmp}^0\"\n+\t\t;;\n+\t*)\n+\t\tgit rev-parse --verify \"${1}^0\"\n+\t\t;;\n+\tesac\n+}\n-- \n1.8.3.1.381.g31c8856.dirty\n"},{"id":"220760","messageId":"1371147362-26962-4-git-send-email-artagnon@gmail.com","threadId":"34129","inReplyTo":"1371147362-26962-1-git-send-email-artagnon@gmail.com","subject":"[PATCH 3/3] rebase: use peel_committish() where appropriate","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-06-13T18:16:02Z","receivedAt":"2013-06-13T18:16:02Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"The failing tests in t/rebase and t/rebase-interactive pass as a result.\n\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n---\n git-rebase.sh                 | 6 +++---\n t/t3400-rebase.sh             | 2 +-\n t/t3404-rebase-interactive.sh | 2 +-\n 3 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex d0c11a9..28e8d47 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -434,7 +434,7 @@ then\n \t\tshift\n \t\t;;\n \tesac\n-\tupstream=`git rev-parse --verify \"${upstream_name}^0\"` ||\n+\tupstream=$(peel_committish \"${upstream_name}\") ||\n \tdie \"$(eval_gettext \"invalid upstream \\$upstream_name\")\"\n \tupstream_arg=\"$upstream_name\"\n else\n@@ -470,7 +470,7 @@ case \"$onto_name\" in\n \tfi\n \t;;\n *)\n-\tonto=$(git rev-parse --verify \"${onto_name}^0\") ||\n+\tonto=$(peel_committish \"$onto_name\") ||\n \tdie \"$(eval_gettext \"Does not point to a valid commit: \\$onto_name\")\"\n \t;;\n esac\n@@ -490,7 +490,7 @@ case \"$#\" in\n \t   orig_head=$(git rev-parse -q --verify \"refs/heads/$1\")\n \tthen\n \t\thead_name=\"refs/heads/$1\"\n-\telif orig_head=$(git rev-parse -q --verify \"$1\")\n+\telif orig_head=$(peel_committish \"$1\" quiet)\n \tthen\n \t\thead_name=\"detached HEAD\"\n \telse\ndiff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh\nindex 890f159..272f0f5 100755\n--- a/t/t3400-rebase.sh\n+++ b/t/t3400-rebase.sh\n@@ -88,7 +88,7 @@ test_expect_success 'rebase fast-forward to master' '\n \ttest_i18ngrep \"Fast-forwarded HEAD to my-topic-branch\" out\n '\n \n-test_expect_failure 'rebase against revision specified as :/quuxery' '\n+test_expect_success 'rebase against revision specified as :/quuxery' '\n \tgit checkout my-topic-branch^ &&\n \tsha1=$(git rev-parse \":/Add B\") &&\n \tgit rebase $sha1 &&\ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex ca4ee92..c9a5d56 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -947,7 +947,7 @@ test_expect_success 'rebase -i respects core.commentchar' '\n \ttest B = $(git cat-file commit HEAD^ | sed -ne \\$p)\n '\n \n-test_expect_failure 'rebase -i against revision specified as :/quuxery' '\n+test_expect_success 'rebase -i against revision specified as :/quuxery' '\n \tgit checkout branch1 &&\n \tsha1=$(git rev-parse \":/J\") &&\n \tgit rebase $sha1 &&\n-- \n1.8.3.1.381.g31c8856.dirty\n"}]}