On 23/01/2008, Karl Hasselström <kha@xxxxxxxxxxx> wrote: > On 2008-01-23 11:35:03 +0000, Catalin Marinas wrote: > > The 'goto' checks the local status before pushing but doesn't report > > this (and my machine is slow and it might wait even 20 seconds or > > more, it is useful to get some messages). > > No, it doesn't anymore, so it should be faster than before. Instead of > checking the entire tree for cleanliness, it just relies on > git-read-tree -u -m to abort without changes if any of the files that > need updating are dirty. Ah, OK. BTW, even if the tree was clean, a 'goto' failed on my Linux tree earlier today with the following message: $ stg goto realview-eb-header Popped realview-pb1176 -- realview-ioaddress fatal: Entry 'arch/arm/mach-realview/realview_pb11mp.c' not uptodate. Cannot merge. stg goto: Command aborted (all changes rolled back) It worked fine after running 'stg status' once (and not showing any changes). In the old GIT interface, we use to call refresh_index (i.e. 'git update-index -q --unmerged --refresh'). Does this still happen? The message above also shows what I meant with messages not being very clear. It reports "Popped" but actually failed. Showing "Popping ... done" would be better. -- Catalin - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
