{"thread":{"id":"35607","subject":"[Bug report] 'git status' always says \"Your branch is up-to-date with 'origin/master'\"","startedAt":"2014-01-04T17:25:29Z","lastAt":"2014-01-06T05:31:08Z","messageCount":2,"participants":["Thomas Ackermann","Jiang Xin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"232645","messageId":"86886772.1529128.1388856329849.JavaMail.ngmail@webmail08.arcor-online.net","threadId":"35607","inReplyTo":null,"subject":"[Bug report] 'git status' always says \"Your branch is up-to-date with 'origin/master'\"","fromName":"Thomas Ackermann","fromEmail":"th.acker@arcor.de","sentAt":"2014-01-04T17:25:29Z","receivedAt":"2014-01-04T17:25:29Z","isPatch":false,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":"Since f223459 \"status: always show tracking branch even no change\" \n'git status' (and 'git checkout master' always says \n\"Your branch is up-to-date with 'origin/master'\"\neven if 'origin/master' is way ahead from local 'master'.\n\n\n---\nThomas\n"},{"id":"232689","messageId":"CANYiYbG7Dh6npaMYajAeSMsR75SJM6kke9z7_4Q_z14nHY9KSg@mail.gmail.com","threadId":"35607","inReplyTo":"86886772.1529128.1388856329849.JavaMail.ngmail@webmail08.arcor-online.net","subject":"Re: [Bug report] 'git status' always says \"Your branch is up-to-date with 'origin/master'\"","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2014-01-06T05:31:08Z","receivedAt":"2014-01-06T05:31:08Z","isPatch":false,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"2014/1/5 Thomas Ackermann <th.acker@arcor.de>:\n> Since f223459 \"status: always show tracking branch even no change\"\n> 'git status' (and 'git checkout master' always says\n> \"Your branch is up-to-date with 'origin/master'\"\n> even if 'origin/master' is way ahead from local 'master'.\n\nHi, Thomas\n\nCan you provide your operations so that I can reproduce this issue?\n\nIn the commit you mentioned above, there was a new test case named\n'checkout (up-to-date with upstream)' added in 't6040'. I also add two\ntest-cases locally in order to reproduce the issue you report, and run\nthem in arbitrary orders, but they all look fine:\n\n    ok 4 - checkout (behind upstream)\n    ok 5 - checkout (ahead upstream)\n    ok 6 - checkout (diverged from upstream)\n    ok 7 - checkout with local tracked branch\n    ok 8 - checkout (upstream is gone)\n    ok 9 - checkout (up-to-date with upstream)\n    ok 10 - checkout (upstream is gone)\n    ok 11 - checkout with local tracked branch\n    ok 12 - checkout (diverged from upstream)\n    ok 13 - checkout (ahead upstream)\n    ok 14 - checkout (behind upstream)\n    ok 15 - checkout (diverged from upstream)\n    ok 16 - checkout (upstream is gone)\n    ok 17 - checkout (ahead upstream)\n    ok 18 - checkout with local tracked branch\n    ok 19 - checkout (behind upstream)\n\n\nThe two additional test cases I used locally are:\n\n    checkout_test1() {\n    test_expect_success 'checkout (behind upstream)' '\n            (\n                    cd test && git checkout b3\n            ) >actual &&\n            test_i18ngrep \"is behind .* by 1 commit, and can be\nfast-forwarded\" actual\n    '\n    }\n\n    checkout_test_2() {\n    test_expect_success 'checkout (ahead upstream)' '\n            (\n                    cd test && git checkout b4\n            ) >actual &&\n            test_i18ngrep \"is ahead of .* by 2 commits\" actual\n    '\n    }\n\n-- \nJiang Xin\n"}]}