{"thread":{"id":"3000","subject":"[PATCH 4/7] Add a test for rebase when a change was picked upstream","startedAt":"2006-01-08T00:39:48Z","lastAt":"2006-01-08T10:01:59Z","messageCount":3,"participants":["Yann Dirson","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":7},"messages":[{"id":"14279","messageId":"20060108003948.GL1113@nowhere.earth","threadId":"3000","inReplyTo":null,"subject":"[PATCH 4/7] Add a test for rebase when a change was picked upstream","fromName":"Yann Dirson","fromEmail":"ydirson@altern.org","sentAt":"2006-01-08T00:39:48Z","receivedAt":"2006-01-08T00:39:48Z","isPatch":true,"sender":{"key":"ydirson@altern.org","avatar":"https://avatars.githubusercontent.com/u/1190950?v=4"},"body":"This test exercises the standard feature that makes rebase useful.\n\nSigned-off-by: Yann Dirson \n\n\n---\n\n t/t3401-rebase-partial.sh | 57 +++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 57 insertions(+), 0 deletions(-)\n create mode 100755 t/t3401-rebase-partial.sh\n\n90bb1e981d99331bdc39acb2ab97ed0c88b06630\ndiff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh\nnew file mode 100755\nindex 0000000..7c2d7f9\n--- /dev/null\n+++ b/t/t3401-rebase-partial.sh\n@@ -0,0 +1,57 @@\n+#!/bin/sh\n+#\n+# Copyright (c) 2006 Yann Dirson, based on t3400 by Amos Waterland\n+#\n+\n+test_description='git rebase should detect patches integrated upstream\n+\n+This test cherry-picks one local change of two into master branch, and\n+checks that git rebase succeeds with only the second patch in the\n+local branch.\n+'\n+. ./test-lib.sh\n+\n+export GIT_AUTHOR_EMAIL=bogus_email_address\n+\n+test_expect_success \\\n+ 'prepare repository with topic branch' \\\n+ 'echo First > A &&\n+ git-update-index --add A &&\n+ git-commit -m \"Add A.\" &&\n+\n+ git-checkout -b my-topic-branch &&\n+\n+ echo Second > B &&\n+ git-update-index --add B &&\n+ git-commit -m \"Add B.\" &&\n+\n+ echo AnotherSecond > C &&\n+ git-update-index --add C &&\n+ git-commit -m \"Add C.\" &&\n+\n+ git-checkout -f master &&\n+\n+ echo Third >> A &&\n+ git-update-index A &&\n+ git-commit -m \"Modify A.\"\n+'\n+\n+test_expect_success \\\n+ 'pick top patch from topic branch into master' \\\n+ 'git-cherry-pick my-topic-branch^0 &&\n+ git-checkout -f my-topic-branch\n+'\n+\n+test_debug \\\n+ 'git-cherry master &&\n+ git-format-patch -k --stdout --full-index master >/dev/null &&\n+ gitk --all & sleep 1\n+'\n+\n+test_expect_success \\\n+ 'rebase topic branch against new master and check git-am did not get halted' \\\n+ 'sh -x git-rebase master &&\n+ test ! -d .dotest\n+'\n+\n+test_done\n-- \n1.0.6-g8ecb\n\n-- \nYann Dirson |\nDebian-related: | Support Debian GNU/Linux:\n | Freedom, Power, Stability, Gratis\n http://ydirson.free.fr/ | Check \n"},{"id":"14290","messageId":"7v7j9b7922.fsf@assigned-by-dhcp.cox.net","threadId":"3000","inReplyTo":"20060108003948.GL1113@nowhere.earth","subject":"Re: [PATCH 4/7] Add a test for rebase when a change was picked upstream","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-01-08T02:22:29Z","receivedAt":"2006-01-08T02:22:29Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Yann Dirson writes:\n\n> +export GIT_AUTHOR_EMAIL=bogus_email_address\n\nThis is probably not needed for this test, although it would not\nhurt.\n\n> +test_expect_success \\\n> + 'rebase topic branch against new master and check git-am did not get halted' \\\n> + 'sh -x git-rebase master &&\n> + test ! -d .dotest\n> +'\n\nSome people build git with SHELL_PATH=/bin/bash because their\n/bin/sh is not POSIX enough (e.g. Solaris). Perhaps emulate\nwhat t5501 does?\n"},{"id":"14301","messageId":"20060108100159.GE32585@nowhere.earth","threadId":"3000","inReplyTo":"7v7j9b7922.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH 4/7] Add a test for rebase when a change was picked upstream","fromName":"Yann Dirson","fromEmail":"ydirson@altern.org","sentAt":"2006-01-08T10:01:59Z","receivedAt":"2006-01-08T10:01:59Z","isPatch":true,"sender":{"key":"ydirson@altern.org","avatar":"https://avatars.githubusercontent.com/u/1190950?v=4"},"body":"On Sat, Jan 07, 2006 at 06:22:29PM -0800, Junio C Hamano wrote:\n> Yann Dirson writes:\n> \n> > +export GIT_AUTHOR_EMAIL=bogus_email_address\n> \n> This is probably not needed for this test, although it would not\n> hurt.\n\nInheritance from t3400 :)\n\n> > +test_expect_success \\\n> > + 'rebase topic branch against new master and check git-am did not get halted' \\\n> > + 'sh -x git-rebase master &&\n> > + test ! -d .dotest\n> > +'\n> \n> Some people build git with SHELL_PATH=/bin/bash because their\n> /bin/sh is not POSIX enough (e.g. Solaris). Perhaps emulate\n> what t5501 does?\n\nOh, that \"sh -x\" is only a forgotten debugging item, I'll drop it.\n\n-- \nYann Dirson |\nDebian-related: | Support Debian GNU/Linux:\n | Freedom, Power, Stability, Gratis\n http://ydirson.free.fr/ | Check \n"}]}