On Tue, 4 Dec 2007, Salikh Zakirov wrote: > Jakub Narebski wrote: >>> Salikh Zakirov <salikh@xxxxxxxxx> writes: >>>> This combination leads to the confusing user experience >>>> if the branch changes independently of the working directory. >>>> This can happen in following cases: >> >> All those cases are cases of not recommended workflows. > > I guess those cases are not recommended exactly because > there are prone to causing confusion with current git. BTW. I think for each such workflow there is alternative in git, which does not cause those problems. > I use multiple workdirs quite often, and by now learned > not to check out the same branch in different workdirs, > but it would very convenient if it would not be necessary > to remember it. Those cases are not recommended because they would _always_ cause confusion, whether the user is informed that somehow working copy or current branch has changed while he/she was working or not. Currently git tries to follow "merge when ready" (i.e. you explicitely ask to merge or rebase), not "merge when needed" (like in old, broken CVS workflow where 'cvs update' might have _forced_ a merge before being allowed to save his/her finished work). >> BTW. how in your proposal would you detach HEAD? > > Deleting .git/BRANCH should be enough. Hmmm... > But I cannot see the workflow that would need it. Checking out tag. Checking out remote-tracking branch. You cannot commit on top of either (immovable) tag, or (externally controlled) remote-tracking branch. Besides rebase now uses detached HEAD, and I guess that bisect would too. -- Jakub Narebski Poland - 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
