Re: [PATCH] pull: drop confusing prefix parameter of die_on_unclean_work_tree()

2016-03-14 Thread Junio C Hamano
Junio C Hamano writes: > For the purpose of letting "git pull --rebase" make sure that there > is no difference between the index and the working tree, we'd want a > tree-wide diff, so we do not want to limit the diff with pathspec. > Not passing "prefix" to init_revisions() _is_ the right thing.

Re: [PATCH] pull: drop confusing prefix parameter of die_on_unclean_work_tree()

2016-03-14 Thread Junio C Hamano
Johannes Schindelin writes: >> Another reason why it is more sensible to keep the prefix available, >> but not use it to limit the extent of diff, to has_*_changes() >> functions is that it would be easier for us to change our mind later >> to allow the users to ask for more detailed output. Ins

Re: [PATCH] pull: drop confusing prefix parameter of die_on_unclean_work_tree()

2016-03-14 Thread Johannes Schindelin
Hi Junio, On Thu, 10 Mar 2016, Junio C Hamano wrote: > Junio C Hamano writes: > > > I think this is quite subjective, as I tend to take the presence of > > "prefix" to mean "the callee assumes that the caller has gone up to > > the root level already", and take the absense of use of "prefix" in

Re: [PATCH] pull: drop confusing prefix parameter of die_on_unclean_work_tree()

2016-03-10 Thread Junio C Hamano
Junio C Hamano writes: > I think this is quite subjective, as I tend to take the presence of > "prefix" to mean "the callee assumes that the caller has gone up to > the root level already", and take the absense of use of "prefix" in > the callee to mean "the callee is working on the whole tree",

Re: [PATCH] pull: drop confusing prefix parameter of die_on_unclean_work_tree()

2016-03-10 Thread Junio C Hamano
Johannes Schindelin writes: > In cmd_pull(), when verifying that there are no changes preventing a > rebasing pull, we diligently pass the prefix parameter to the > die_on_unclean_work_tree() function which in turn diligently passes it > to the has_unstaged_changes() and has_uncommitted_changes()

[PATCH] pull: drop confusing prefix parameter of die_on_unclean_work_tree()

2016-03-10 Thread Johannes Schindelin
In cmd_pull(), when verifying that there are no changes preventing a rebasing pull, we diligently pass the prefix parameter to the die_on_unclean_work_tree() function which in turn diligently passes it to the has_unstaged_changes() and has_uncommitted_changes() functions. The casual reader might n