{"thread":{"id":"2408","subject":"[cogito] cg-merge does not remove files removed upstream on fast-forward","startedAt":"2005-11-09T00:08:33Z","lastAt":"2005-11-09T22:54:09Z","messageCount":2,"participants":["Blaisorblade","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"11361","messageId":"200511090108.51776.blaisorblade@yahoo.it","threadId":"2408","inReplyTo":null,"subject":"[cogito] cg-merge does not remove files removed upstream on fast-forward","fromName":"Blaisorblade","fromEmail":"blaisorblade@yahoo.it","sentAt":"2005-11-09T00:08:33Z","receivedAt":"2005-11-09T00:08:33Z","isPatch":false,"sender":{"key":"blaisorblade@yahoo.it","avatar":null},"body":"Once again, (not the first time) when doing \"cg-merge origin\" (or cg-update I \nguess, too) I find a tons of files which were removed upstream and cogito \ndidn't remove. It was a fast-forward merge on Linus' tree:\n\n$ cg merge origin\nFast-forwarding d83c671fb7023f69a9582e622d01525054f23b66 -> \na52e8381c430896d3bd6065a34fda99cb5c74c82\n        on top of d83c671fb7023f69a9582e622d01525054f23b66...\n\ncg version\ncogito-0.15.1 (b07f98ba4cabdd9d208da28be932e547675e5cdf)\n(The base id is ab91bd11258f8987fc8d537871c733e04f8c8248, I've added a trivial \npatch to add more options to cg-diff and cg-mkpatch, i.e. unrelated).\n\nBelow there is the excerpt of code in tree_timewarp:\n\n       # Kill gone files\n        git-diff-tree -z -r $base $branch | xargs -0 bash -c '\n                while [ \"$1\" ]; do\n                        header=\"$1\"; shift\n                        file=\"$1\"; shift\n\n                        # match \":100755 000000 14d43b1abf... 000000000... D\"\n                        if echo \"$header\" | egrep \"^:([^ ][^ ]* ){4}D\" \n>/dev/null; then\n                                rm -- \"$file\"\n                        fi\n                done\n        ' padding\n\nI must say I also saw git-ls-files --deleted running with top (probably from \ncg-patch), but it didn't seem to help.\n-- \nInform me of my mistakes, so I can keep imitating Homer Simpson's \"Doh!\".\nPaolo Giarrusso, aka Blaisorblade (Skype ID \"PaoloGiarrusso\", ICQ 215621894)\nhttp://www.user-mode-linux.org/~blaisorblade\n\n\t\t\n___________________________________ \nYahoo! Messenger: chiamate gratuite in tutto il mondo \nhttp://it.messenger.yahoo.com\n"},{"id":"11419","messageId":"20051109225409.GH30496@pasky.or.cz","threadId":"2408","inReplyTo":"200511090108.51776.blaisorblade@yahoo.it","subject":"Re: [cogito] cg-merge does not remove files removed upstream on fast-forward","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-11-09T22:54:09Z","receivedAt":"2005-11-09T22:54:09Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Wed, Nov 09, 2005 at 01:08:33AM CET, I got a letter\nwhere Blaisorblade <blaisorblade@yahoo.it> said that...\n> Once again, (not the first time) when doing \"cg-merge origin\" (or cg-update I \n> guess, too) I find a tons of files which were removed upstream and cogito \n> didn't remove. It was a fast-forward merge on Linus' tree:\n> \n> $ cg merge origin\n> Fast-forwarding d83c671fb7023f69a9582e622d01525054f23b66 -> \n> a52e8381c430896d3bd6065a34fda99cb5c74c82\n>         on top of d83c671fb7023f69a9582e622d01525054f23b66...\n\nStrange. I've just added a test against this, and it seems to work fine\nfor me. Hmm.\n\nCould you please test any post-1936f62c0756d8051bd3a8ee4214e058f168d395\nCogito version?\n\nThanks,\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nVI has two modes: the one in which it beeps and the one in which\nit doesn't.\n"}]}