{"action":"created","issue":{"url":"https://api.github.com/repos/gushphp/gush/issues/371","labels_url":"https://api.github.com/repos/gushphp/gush/issues/371/labels{/name}","comments_url":"https://api.github.com/repos/gushphp/gush/issues/371/comments","events_url":"https://api.github.com/repos/gushphp/gush/issues/371/events","html_url":"https://github.com/gushphp/gush/issues/371","id":52538835,"number":371,"title":"pull-request merge making changes not made in PR","user":{"login":"tmilos","id":1818373,"avatar_url":"https://avatars.githubusercontent.com/u/1818373?v=3","gravatar_id":"","url":"https://api.github.com/users/tmilos","html_url":"https://github.com/tmilos","followers_url":"https://api.github.com/users/tmilos/followers","following_url":"https://api.github.com/users/tmilos/following{/other_user}","gists_url":"https://api.github.com/users/tmilos/gists{/gist_id}","starred_url":"https://api.github.com/users/tmilos/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tmilos/subscriptions","organizations_url":"https://api.github.com/users/tmilos/orgs","repos_url":"https://api.github.com/users/tmilos/repos","events_url":"https://api.github.com/users/tmilos/events{/privacy}","received_events_url":"https://api.github.com/users/tmilos/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":4,"created_at":"2014-12-19T23:07:10Z","updated_at":"2015-01-11T08:12:57Z","closed_at":null,"body":"Made a test repo https://github.com/aerialship/test\r\nForked it to https://github.com/tmilos/test \r\n\r\nMade first test PR https://github.com/aerialship/test/pull/2 and it produced merged changes https://github.com/aerialship/test/commit/8cea6dc5b002ea80275ab48aea3addf24ba1885e ... All well\r\n\r\nProblematic is next PR https://github.com/aerialship/test/pull/3/files with changes on only one file, but after ```gush pull:merge --squash 3``` it makes changes on 3 files https://github.com/aerialship/test/commit/15b0e158d848f3b74f2545e01f296c09be3d9078\r\n\r\nHere's the log\r\n\r\n```\r\nd:\\www\\home\\aerial\\test>gush pull:merge --squash 3 -vvv\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.aerialship.url\"\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.aerialship.url\"\r\n\r\n[INFO] Adding remote 'aerialship' with 'git@github.com:aerialship/test.git' to git local config.\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.aerialship.url\"\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.aerialship.url\"\r\nCMD \"git\" \"config\" \"remote.aerialship.url\" \"https://github.com/aerialship/test.git\" \"--local\"\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.aerialship.pushurl\"\r\nCMD \"git\" \"config\" \"remote.aerialship.pushurl\" \"git@github.com:aerialship/test.git\" \"--local\"\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.tmilos.url\"\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.tmilos.url\"\r\n\r\n[INFO] Adding remote 'tmilos' with 'git@github.com:tmilos/test.git' to git local config.\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.tmilos.url\"\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.tmilos.url\"\r\nCMD \"git\" \"config\" \"remote.tmilos.url\" \"https://github.com/tmilos/test.git\" \"--local\"\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.tmilos.pushurl\"\r\nCMD \"git\" \"config\" \"remote.tmilos.pushurl\" \"git@github.com:tmilos/test.git\" \"--local\"\r\nCMD \"git\" \"rev-parse\" \"--abbrev-ref\" \"HEAD\"\r\nCMD \"git\" \"status\" \"--porcelain\" \"--untracked-files=no\"\r\nCMD \"git\" \"rev-parse\" \"--abbrev-ref\" \"HEAD\"\r\nCMD \"git\" \"rev-parse\" \"--abbrev-ref\" \"HEAD\"\r\nCMD \"git\" \"remote\" \"update\" \"aerialship\"\r\nCMD \"git\" \"reset\" \"--hard\" \"HEAD~1\"\r\nCMD \"git\" \"pull\" \"-u\" \"aerialship\" \"master\"\r\nCMD \"git\" \"remote\" \"update\" \"tmilos\"\r\nCMD \"git\" \"checkout\" \"tmilos/bar\"\r\nCMD \"git\" \"checkout\" \"-b\" \"tmp--tmilos--bar\"\r\nCMD \"git\" \"status\" \"--porcelain\" \"--untracked-files=no\"\r\nCMD \"git\" \"rev-parse\" \"--abbrev-ref\" \"HEAD\"\r\nCMD \"git\" \"checkout\" \"tmp--tmilos--bar\"\r\nCMD \"git\" \"--no-pager\" \"log\" \"--oneline\" \"--no-color\" \"--format=%ae\" \"master..tmp--tmilos--bar\"\r\nCMD \"git\" \"--no-pager\" \"log\" \"--oneline\" \"--no-color\" \"--format=%H\" \"--reverse\" \"master..tmp--tmilos--bar\"\r\nCMD \"git\" \"--no-pager\" \"show\" \"--format=%an <%ae>%n%s%n%n%b\" \"--no-color\" \"--no-patch\" \"031aa4a219758134cb1bea02b7cc9ae393cd9af8\"\r\nCMD \"git\" \"reset\" \"--soft\" \"master\"\r\nCMD \"git\" \"commit\" \"-F\" \"C:\\Users\\mtomic\\AppData\\Local\\Temp\\gush\\571E.tmp\" \"-a\" \"--author\" \"Milos Tomic <tmilos@gmail.com>\"\r\nCMD \"git\" \"--no-pager\" \"log\" \"--oneline\" \"--no-color\" \"--format=%H\" \"--reverse\" \"master..tmp--tmilos--bar\"\r\nCMD \"git\" \"--no-pager\" \"show\" \"--format=%an <%ae>%n%s%n%b\" \"--no-color\" \"--no-patch\" \"110e31b813faeef9f4a4784d5e4d116ad5965b9d\"\r\nCMD \"git\" \"status\" \"--porcelain\" \"--untracked-files=no\"\r\nCMD \"git\" \"rev-parse\" \"--abbrev-ref\" \"HEAD\"\r\nCMD \"git\" \"checkout\" \"master\"\r\nCMD \"git\" \"merge\" \"--no-ff\" \"--no-commit\" \"tmp--tmilos--bar\"\r\nOUT Removing doc/foo.md\r\nOUT Automatic merge went well; stopped before committing as requested\r\nCMD \"git\" \"commit\" \"-F\" \"C:\\Users\\mtomic\\AppData\\Local\\Temp\\gush\\5804.tmp\"\r\nOUT [master 15b0e15] merge #3 Bar (tmilos)\r\nCMD \"git\" \"rev-parse\" \"HEAD\"\r\nCMD \"git\" \"push\" \"aerialship\" \"master\"\r\nCMD \"git\" \"remote\" \"update\" \"aerialship\"\r\nCMD \"git\" \"notes\" \"--ref=github-comments\" \"add\" \"-F\" \"C:\\Users\\mtomic\\AppData\\Local\\Temp\\gush\\94B3.tmp\" \"15b0e158d848f3b74f2545e01\r\nf296c09be3d9078\"\r\nCMD \"git\" \"push\" \"aerialship\" \"refs/notes/github-comments\"\r\nThis PR was squashed before being merged into the master branch (closes #3).\r\nCMD \"git\" \"branch\" \"-D\" \"tmp--tmilos--bar\"\r\n\r\nd:\\www\\home\\aerial\\test>\r\n```\r\ngush 1.14.1, php 5.4.19, windows 7 x64\r\n\r\nJust to be sure, tried it three times :) but always same results"},"comment":{"url":"https://api.github.com/repos/gushphp/gush/issues/comments/69486979","html_url":"https://github.com/gushphp/gush/issues/371#issuecomment-69486979","issue_url":"https://api.github.com/repos/gushphp/gush/issues/371","id":69486979,"user":{"login":"tmilos","id":1818373,"avatar_url":"https://avatars.githubusercontent.com/u/1818373?v=3","gravatar_id":"","url":"https://api.github.com/users/tmilos","html_url":"https://github.com/tmilos","followers_url":"https://api.github.com/users/tmilos/followers","following_url":"https://api.github.com/users/tmilos/following{/other_user}","gists_url":"https://api.github.com/users/tmilos/gists{/gist_id}","starred_url":"https://api.github.com/users/tmilos/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tmilos/subscriptions","organizations_url":"https://api.github.com/users/tmilos/orgs","repos_url":"https://api.github.com/users/tmilos/repos","events_url":"https://api.github.com/users/tmilos/events{/privacy}","received_events_url":"https://api.github.com/users/tmilos/received_events","type":"User","site_admin":false},"created_at":"2015-01-11T08:12:57Z","updated_at":"2015-01-11T08:12:57Z","body":"Did nothing with this so far, but now tried it again and reproduced it, this time with one merge only - the first one. \r\n\r\nNot sure where exactly the problem is, don't have time to dig into it, but seems the problem is with outdated base of the PR, and merge reverting changes made on upstream after PR base, probably resetting on to the wrong base. \r\n\r\nHere's what I did\r\n\r\nMade new repo https://github.com/aerialship/test2\r\nCreated index.md and pushed it https://github.com/aerialship/test2/commit/8420a7bd17b201b90c18574948e5cfca2fb25cc5\r\nForked it to https://github.com/tmilos/test2\r\nOn main https://github.com/aerialship/test2 repo, created two additional commits:\r\n * foo - added foo.md https://github.com/aerialship/test2/commit/cce3ebbf0a0107678919a66777ba7f3b842b605d\r\n * bar - added bar.md https://github.com/aerialship/test2/commit/4b681cce62ba95b64886f1803b7adf02c3bdf3b1\r\n\r\nThen on the fork https://github.com/tmilos/test2 (which is still on old base https://github.com/aerialship/test2/commit/8420a7bd17b201b90c18574948e5cfca2fb25cc5 where index.md was created, w/out foo.md and bar.md) made changes to index.md and created a PR https://github.com/aerialship/test2/pull/3\r\nAfter running ```gush pull:merge --squash 3``` files foo.md and bar.md were deleted https://github.com/aerialship/test2/commit/271ce298200379a594a08c7d97d3449351972cab\r\n\r\nSo, it was something like this\r\n\r\nBefore merge\r\n```\r\n* aerislhip/master bar.md added\r\n* foo.md added\r\n| * tmilos/aaa pr/3 index.md changes\r\n|/\r\n* index.md\r\n* initial\r\n```\r\n\r\nAfter merge\r\n```\r\n* aerialship/master merge #3\r\n|\\\r\n| * index.md.changes - index.md modified (ok), foo.md and bar.md deleted (wrong)\r\n|/\r\n* bar.md added\r\n* foo.md added\r\n| * tmilos/aaa index.md some more changes\r\n| * index.md changes\r\n|/\r\n* index.md\r\n* initial\r\n```\r\n\r\nHere's the log\r\n```\r\nD:\\www\\home\\aerial\\test2>gush pull:merge --squash -vvv 3\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.aerialship.url\"\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.aerialship.url\"\r\n\r\n[INFO] Adding remote 'aerialship' with 'git@github.com:aerialship/test2.git' to git local config.\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.aerialship.url\"\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.aerialship.url\"\r\nCMD \"git\" \"config\" \"remote.aerialship.url\" \"https://github.com/aerialship/test2.git\" \"--local\"\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.aerialship.pushurl\"\r\nCMD \"git\" \"config\" \"remote.aerialship.pushurl\" \"git@github.com:aerialship/test2.git\" \"--local\"\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.tmilos.url\"\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.tmilos.url\"\r\n\r\n[INFO] Adding remote 'tmilos' with 'git@github.com:tmilos/test2.git' to git local config.\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.tmilos.url\"\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.tmilos.url\"\r\nCMD \"git\" \"config\" \"remote.tmilos.url\" \"https://github.com/tmilos/test2.git\" \"--local\"\r\nCMD \"git\" \"config\" \"--local\" \"--get\" \"remote.tmilos.pushurl\"\r\nCMD \"git\" \"config\" \"remote.tmilos.pushurl\" \"git@github.com:tmilos/test2.git\" \"--local\"\r\nCMD \"git\" \"rev-parse\" \"--abbrev-ref\" \"HEAD\"\r\nCMD \"git\" \"status\" \"--porcelain\" \"--untracked-files=no\"\r\nCMD \"git\" \"rev-parse\" \"--abbrev-ref\" \"HEAD\"\r\nCMD \"git\" \"rev-parse\" \"--abbrev-ref\" \"HEAD\"\r\nCMD \"git\" \"remote\" \"update\" \"aerialship\"\r\nCMD \"git\" \"reset\" \"--hard\" \"HEAD~1\"\r\nCMD \"git\" \"pull\" \"-u\" \"aerialship\" \"master\"\r\nCMD \"git\" \"remote\" \"update\" \"tmilos\"\r\nCMD \"git\" \"checkout\" \"tmilos/aaa\"\r\nCMD \"git\" \"checkout\" \"-b\" \"tmp--tmilos--aaa\"\r\nCMD \"git\" \"status\" \"--porcelain\" \"--untracked-files=no\"\r\nCMD \"git\" \"rev-parse\" \"--abbrev-ref\" \"HEAD\"\r\nCMD \"git\" \"checkout\" \"tmp--tmilos--aaa\"\r\nCMD \"git\" \"--no-pager\" \"log\" \"--oneline\" \"--no-color\" \"--format=%ae\" \"master..tmp--tmilos--aaa\"\r\nCMD \"git\" \"--no-pager\" \"log\" \"--oneline\" \"--no-color\" \"--format=%H\" \"--reverse\" \"master..tmp--tmilos--aaa\"\r\nCMD \"git\" \"--no-pager\" \"show\" \"--format=%an <%ae>%n%s%n%n%b\" \"--no-color\" \"--no-patch\" \"18f256d70ee042fbd2faf3833ce37ae6c3495710\"\r\nCMD \"git\" \"reset\" \"--soft\" \"master\"\r\nCMD \"git\" \"commit\" \"-F\" \"C:\\Users\\mtomic\\AppData\\Local\\Temp\\gush\\1931.tmp\" \"-a\" \"--author\" \"Milos Tomic <tmilos@gmail.com>\"\r\nCMD \"git\" \"--no-pager\" \"log\" \"--oneline\" \"--no-color\" \"--format=%H\" \"--reverse\" \"master..tmp--tmilos--aaa\"\r\nCMD \"git\" \"--no-pager\" \"show\" \"--format=%an <%ae>%n%s%n%b\" \"--no-color\" \"--no-patch\" \"271ce298200379a594a08c7d97d3449351972cab\"\r\nCMD \"git\" \"status\" \"--porcelain\" \"--untracked-files=no\"\r\nCMD \"git\" \"rev-parse\" \"--abbrev-ref\" \"HEAD\"\r\nCMD \"git\" \"checkout\" \"master\"\r\nCMD \"git\" \"merge\" \"--no-ff\" \"--no-commit\" \"tmp--tmilos--aaa\"\r\nOUT Removing foo.md\r\nRemoving bar.md\r\nOUT Automatic merge went well; stopped before committing as requested\r\nCMD \"git\" \"commit\" \"-F\" \"C:\\Users\\mtomic\\AppData\\Local\\Temp\\gush\\1B5E.tmp\"\r\nOUT [master bf24526] merge #3 Aaa (tmilos)\r\nCMD \"git\" \"rev-parse\" \"HEAD\"\r\nCMD \"git\" \"push\" \"aerialship\" \"master\"\r\nThis PR was squashed before being merged into the master branch (closes #3).\r\nCMD \"git\" \"branch\" \"-D\" \"tmp--tmilos--aaa\"\r\n\r\nD:\\www\\home\\aerial\\test2>\r\n```\r\n\r\nHope this will give you enough info to reproduce and solve it.\r\n"}}