SONARTFS-1 Properly support local changes and files with a single commit