{"thread":{"id":"31272","subject":"[BUG] filter-branch --parent-filter in bare repository","startedAt":"2012-08-17T16:27:21Z","lastAt":"2012-08-17T16:27:21Z","messageCount":1,"participants":["Wolfgang Rohdewald"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"197186","messageId":"2079016.4kHNMXxD8A@i5","threadId":"31272","inReplyTo":null,"subject":"[BUG] filter-branch --parent-filter in bare repository","fromName":"Wolfgang Rohdewald","fromEmail":"wolfgang@rohdewald.de","sentAt":"2012-08-17T16:27:21Z","receivedAt":"2012-08-17T16:27:21Z","isPatch":false,"sender":{"key":"wolfgang@rohdewald.de","avatar":null},"body":"Using git version 1.7.12.rc2.18.g61b472e\n(1.7.9 has the same problem)\n\nIf I run (directly in the bare repository)\n\ngit filter-branch -d ../localrewrite --parent-filter cat\n\nI get this error message on the last line, nothing unusual before:\nerror: Untracked working tree file 'AUTHORS' would be overwritten by merge.\n\nbut if I run (directly in the bare repository)\n\ngit filter-branch -d .localrewrite --parent-filter cat\n\neverything works fine. Depending on the path of the temporary directory,\nthe error may also point to some other file. AUTHORS is in the root directory,\nbut it is never untracked.\n\nIf I do a clone and run the same command in the clone, it also works with any\ntemp directory.\n\nAnd this only happens with one specific repository - a KDE game, converted with\nsvn2git. No other game has this problem. git fsck only finds dangling tags.\n\nThe resulting repositories are identical, so I can ignore the error message for now.\nBut still - why can't I run this in the bare repository? git help filter-branch does not\nmention something like that.\n\nYou can get the repository here:\nhttp://www.rohdewald.de/oss/tst.tbz\n\n\n\nMaybe related:\n\nI run this directly in the bare repository. If the command succeeds, I find\na checkout directly there (everything was clean before), so I have all this\nintermixed - IMHO a bug.\n\nbranches  description  HEAD  hooks  info  objects  refs\nPLUS all directories and files right in there:\nAUTHORS                  History.h                ksokobanui.rc        MapDelta.h        PathFinder.cpp\nBookmark.cpp             hooks                    LevelCollection.cpp  Map.h             PathFinder.h\nBookmark.h               HtmlPrinter.cpp          LevelCollection.h    Messages.sh       PlayField.cpp\nbranches                 HtmlPrinter.h            LevelMap.cpp         ModalLabel.cpp    PlayField.h\nCMakeLists.txt           ImageData.cpp            LevelMap.h           ModalLabel.h      Queue.h\nconfig-ksokoban.h.cmake  ImageData.h              levels               Move.cpp          README\ndata                     images                   main.cpp             Move.h            refs\ndescription              index                    MainWindow.cpp       MoveSequence.cpp  StaticImage.cpp\ndoc                      info                     MainWindow.h         MoveSequence.h    StaticImage.h\nHEAD                     InternalCollections.cpp  Map.cpp              NEWS              TODO\nHistory.cpp              InternalCollections.h    MapDelta.cpp         objects\n\n\n\n-- \nWolfgang\n"}]}