{"thread":{"id":"56605","subject":"Commit is marked as new, despite on it already on branch","startedAt":"2021-09-28T13:36:28Z","lastAt":"2021-09-29T06:31:53Z","messageCount":2,"participants":["Eugen Konkov","Bagas Sanjaya"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"437304","messageId":"691467377.20210928163616@yandex.ru","threadId":"56605","inReplyTo":null,"subject":"Commit is marked as new, despite on it already on branch","fromName":"Eugen Konkov","fromEmail":"kes-kes@yandex.ru","sentAt":"2021-09-28T13:36:16Z","receivedAt":"2021-09-28T13:36:28Z","isPatch":false,"sender":{"key":"kes-kes@yandex.ru","avatar":null},"body":"Hi.\n\nHere is comparison of two branches. All same commits are marked as '='\nBut in my situaltion commit is marked as new '>'\n\nHere is my main 'dev' branch\n*   8fd53c7d (HEAD -> dev, local/dev) Merge branch 'frontend' into test-dev\n|\\  \n| * 3da9e49c (local/frontend, frontend) 'Save/sync' button is active always\n| * d192d9a7 Added library 'materialize' and facelifted the contractor table\n|/  \n* 0cb280f5 Do not export test data\n*   ce1df25f Merge branch 'frontend' into dev\n|\\  \n| * da78b64f Display disabled element title\n| * 5f741628 Gen podio ref using document or agreement info\n| * 2d756923 Added ref to 'Podio'\n| * 129c972d Clean forms when load o reload the page\n| * d96c45e4 Use production and test modes in parallel\n| * 20bf7186 Added refs to download document and sandbox link for agreement\n* | a0e338cb Display only tick for user experience\n* | 2b2fb1d5 Merge branch 'frontend' into dev\n|\\| \n| * d868d72b Added fonts link and some changes for user experience\n| * 74426fd0 Added message to say \"The docn has been used. Use another docn.\"\n| * b183803b Fill client passport form by parsed passport data\n| * b40234ed Fill client form by parsed client data string\n|/  \n* ed3f3026 Invert data to show provider as 'true' value\n\nHere we see our interesting commit:\na0e338cb Display only tick for user experience\n\nHere is branch I do comparison to:\n*   ec655271 (HEAD, xtucha/dev) Merge branch 'frontend' into dev\n|\\  \n| * a6085d95 'Save/sync' button is active always\n| * bbca694b Added library 'materialize' and facelifted the contractor table\n| * 92103b2d Display only tick for user experience\n| *   4f0a1881 Merge branch 'frontend' into dev\n| |\\  \n* | | 0cb280f5 Do not export test data\n* | |   ce1df25f Merge branch 'frontend' into dev\n|\\ \\ \\  \n| | |/  \n| |/|   \n| * | da78b64f Display disabled element title\n| * | 5f741628 Gen podio ref using document or agreement info\n| * | 2d756923 Added ref to 'Podio'\n| * | 129c972d Clean forms when load o reload the page\n| * | d96c45e4 Use production and test modes in parallel\n| * | 20bf7186 Added refs to download document and sandbox link for agreement\n* | | a0e338cb Display only tick for user experience\n* | | 2b2fb1d5 Merge branch 'frontend' into dev\n|\\| | \n| |/  \n|/|   \n| * d868d72b Added fonts link and some changes for user experience\n| * 74426fd0 Added message to say \"The docn has been used. Use another docn.\"\n| * b183803b Fill client passport form by parsed passport data\n| * b40234ed Fill client form by parsed client data string\n|/  \n* ed3f3026 Invert data to show provider as 'true' value\n\n\n$git log --graph --decorate --pretty=oneline --abbrev-commit --cherry-mark --boundary --left-right dev...xtucha/dev\n<   8fd53c7d (HEAD -> dev, local/dev) Merge branch 'frontend' into test-dev\n|\\  \n| = 3da9e49c (local/frontend, frontend) 'Save/sync' button is active always\n| = d192d9a7 Added library 'materialize' and facelifted the contractor table\n|/  \n| > ec655271 (xtucha/dev) Merge branch 'frontend' into dev\n|/| \n| = a6085d95 'Save/sync' button is active always\n| = bbca694b Added library 'materialize' and facelifted the contractor table\n| > 92103b2d Display only tick for user experience\n| >   4f0a1881 Merge branch 'frontend' into dev\n| |\\  \n| | o da78b64f Display disabled element title\n| o ed3f3026 Invert data to show provider as 'true' value\no 0cb280f5 Do not export test data\n\nHere you can see that '92103b2d Display only tick for user experience' commit is marked as new\n\nIf I do explicite comarison of a0e338cb and 92103b2d, then we see that is marked as '='\n\ngit range-diff a0e338cb...92103b2d\n-:  -------- > 1:  20bf7186 Added refs to download document and sandbox link for agreement\n-:  -------- > 2:  d96c45e4 Use production and test modes in parallel\n-:  -------- > 3:  129c972d Clean forms when load o reload the page\n-:  -------- > 4:  2d756923 Added ref to 'Podio'\n-:  -------- > 5:  5f741628 Gen podio ref using document or agreement info\n-:  -------- > 6:  da78b64f Display disabled element title\n1:  a0e338cb = 7:  92103b2d Display only tick for user experience\n\nif I do range-diff between branches dev...xtucha/dev\ngit range-diff 8fd53c7d...ec655271\n-:  -------- > 1:  92103b2d Display only tick for user experience\n1:  d192d9a7 = 2:  bbca694b Added library 'materialize' and facelifted the contractor tabl\n2:  3da9e49c = 3:  a6085d95 'Save/sync' button is active always\n\nWe again see 'Display only tick for user experience' commit as new\n\n\nI think problem arise because git does not see that all three commits:\n   \n| | o da78b64f Display disabled element title\n| o ed3f3026 Invert data to show provider as 'true' value\no 0cb280f5 Do not export test data\n\nhave same fork-point  \"ed3f3026 Invert data to show provider as 'true' value\"\n\n\nProbably because git merge-base get analyzed only left branch and not right:\n$ git merge-base ec655271 8fd53c7d\n0cb280f544113926e1059568811f99c311489d4c\n\n\n\n\n\nI expect that end of out should look like this:\n\n| |  |\n| |  * da78b64f Display disabled element title\n| * |   0cb280f5 Do not export test data\n| |  |\n........\n| |  /\n---  \n|/  \no ed3f3026 Invert data to show provider as 'true' value\n\n\n\n\n\n-- \nBest regards,\nEugen Konkov\n\n"},{"id":"437437","messageId":"7ebed419-8588-7574-c25a-9018d07881c7@gmail.com","threadId":"56605","inReplyTo":"691467377.20210928163616@yandex.ru","subject":"Re: Commit is marked as new, despite on it already on branch","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2021-09-29T06:31:47Z","receivedAt":"2021-09-29T06:31:53Z","isPatch":false,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"On 28/09/21 20.36, Eugen Konkov wrote:\n> Hi.\n> \n> Here is comparison of two branches. All same commits are marked as '='\n> But in my situaltion commit is marked as new '>'\n> \n> Here is my main 'dev' branch\n> *   8fd53c7d (HEAD -> dev, local/dev) Merge branch 'frontend' into test-dev\n> |\\\n> | * 3da9e49c (local/frontend, frontend) 'Save/sync' button is active always\n> | * d192d9a7 Added library 'materialize' and facelifted the contractor table\n> |/\n> * 0cb280f5 Do not export test data\n> *   ce1df25f Merge branch 'frontend' into dev\n> |\\\n> | * da78b64f Display disabled element title\n> | * 5f741628 Gen podio ref using document or agreement info\n> | * 2d756923 Added ref to 'Podio'\n> | * 129c972d Clean forms when load o reload the page\n> | * d96c45e4 Use production and test modes in parallel\n> | * 20bf7186 Added refs to download document and sandbox link for agreement\n> * | a0e338cb Display only tick for user experience\n> * | 2b2fb1d5 Merge branch 'frontend' into dev\n> |\\|\n> | * d868d72b Added fonts link and some changes for user experience\n> | * 74426fd0 Added message to say \"The docn has been used. Use another docn.\"\n> | * b183803b Fill client passport form by parsed passport data\n> | * b40234ed Fill client form by parsed client data string\n> |/\n> * ed3f3026 Invert data to show provider as 'true' value\n> \n> Here we see our interesting commit:\n> a0e338cb Display only tick for user experience\n> \n> Here is branch I do comparison to:\n> *   ec655271 (HEAD, xtucha/dev) Merge branch 'frontend' into dev\n> |\\\n> | * a6085d95 'Save/sync' button is active always\n> | * bbca694b Added library 'materialize' and facelifted the contractor table\n> | * 92103b2d Display only tick for user experience\n> | *   4f0a1881 Merge branch 'frontend' into dev\n> | |\\\n> * | | 0cb280f5 Do not export test data\n> * | |   ce1df25f Merge branch 'frontend' into dev\n> |\\ \\ \\\n> | | |/\n> | |/|\n> | * | da78b64f Display disabled element title\n> | * | 5f741628 Gen podio ref using document or agreement info\n> | * | 2d756923 Added ref to 'Podio'\n> | * | 129c972d Clean forms when load o reload the page\n> | * | d96c45e4 Use production and test modes in parallel\n> | * | 20bf7186 Added refs to download document and sandbox link for agreement\n> * | | a0e338cb Display only tick for user experience\n> * | | 2b2fb1d5 Merge branch 'frontend' into dev\n> |\\| |\n> | |/\n> |/|\n> | * d868d72b Added fonts link and some changes for user experience\n> | * 74426fd0 Added message to say \"The docn has been used. Use another docn.\"\n> | * b183803b Fill client passport form by parsed passport data\n> | * b40234ed Fill client form by parsed client data string\n> |/\n> * ed3f3026 Invert data to show provider as 'true' value\n> \n> \n> $git log --graph --decorate --pretty=oneline --abbrev-commit --cherry-mark --boundary --left-right dev...xtucha/dev\n> <   8fd53c7d (HEAD -> dev, local/dev) Merge branch 'frontend' into test-dev\n> |\\\n> | = 3da9e49c (local/frontend, frontend) 'Save/sync' button is active always\n> | = d192d9a7 Added library 'materialize' and facelifted the contractor table\n> |/\n> | > ec655271 (xtucha/dev) Merge branch 'frontend' into dev\n> |/|\n> | = a6085d95 'Save/sync' button is active always\n> | = bbca694b Added library 'materialize' and facelifted the contractor table\n> | > 92103b2d Display only tick for user experience\n> | >   4f0a1881 Merge branch 'frontend' into dev\n> | |\\\n> | | o da78b64f Display disabled element title\n> | o ed3f3026 Invert data to show provider as 'true' value\n> o 0cb280f5 Do not export test data\n> \n> Here you can see that '92103b2d Display only tick for user experience' commit is marked as new\n> \n> If I do explicite comarison of a0e338cb and 92103b2d, then we see that is marked as '='\n> \n> git range-diff a0e338cb...92103b2d\n> -:  -------- > 1:  20bf7186 Added refs to download document and sandbox link for agreement\n> -:  -------- > 2:  d96c45e4 Use production and test modes in parallel\n> -:  -------- > 3:  129c972d Clean forms when load o reload the page\n> -:  -------- > 4:  2d756923 Added ref to 'Podio'\n> -:  -------- > 5:  5f741628 Gen podio ref using document or agreement info\n> -:  -------- > 6:  da78b64f Display disabled element title\n> 1:  a0e338cb = 7:  92103b2d Display only tick for user experience\n> \n> if I do range-diff between branches dev...xtucha/dev\n> git range-diff 8fd53c7d...ec655271\n> -:  -------- > 1:  92103b2d Display only tick for user experience\n> 1:  d192d9a7 = 2:  bbca694b Added library 'materialize' and facelifted the contractor tabl\n> 2:  3da9e49c = 3:  a6085d95 'Save/sync' button is active always\n> \n> We again see 'Display only tick for user experience' commit as new\n> \n> \n> I think problem arise because git does not see that all three commits:\n>     \n> | | o da78b64f Display disabled element title\n> | o ed3f3026 Invert data to show provider as 'true' value\n> o 0cb280f5 Do not export test data\n> \n> have same fork-point  \"ed3f3026 Invert data to show provider as 'true' value\"\n> \n> \n> Probably because git merge-base get analyzed only left branch and not right:\n> $ git merge-base ec655271 8fd53c7d\n> 0cb280f544113926e1059568811f99c311489d4c\n> \n> \n> \n> \n> \n> I expect that end of out should look like this:\n> \n> | |  |\n> | |  * da78b64f Display disabled element title\n> | * |   0cb280f5 Do not export test data\n> | |  |\n> ........\n> | |  /\n> ---\n> |/\n> o ed3f3026 Invert data to show provider as 'true' value\n> \n> \n> \n> \n> \n\nCan you create minimal reproducible case so that everyone here can test it?\n\n-- \nAn old man doll... just what I always wanted! - Clara\n"}]}