Files
git/builtin
Johannes Schindelin 338bc8d818 pull: drop confusing prefix parameter of die_on_unclean_work_tree()
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 now be curious (as this developer was) whether
that means that calling `git pull --rebase` in a subdirectory will
ignore unstaged changes in other parts of the working directory. And be
puzzled that `git pull --rebase` (correctly) complains about those
changes outside of the current directory.

The puzzle is easily resolved: while we take pains to pass around the
prefix and even pass it to init_revisions(), the fact that no paths are
passed to init_revisions() ensures that the prefix is simply ignored.

That, combined with the fact that we will *always* want a *full* working
directory check before running a rebasing pull, is reason enough to
simply do away with the actual prefix parameter and to pass NULL
instead, as if we were running this from the top-level working directory
anyway.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-10-07 09:29:27 -07:00
..
2016-06-07 17:43:39 -07:00
2016-07-13 11:24:10 -07:00
2016-08-31 10:03:50 -07:00
2016-07-25 14:13:32 -07:00
2016-02-26 13:37:16 -08:00
2016-09-08 21:49:50 -07:00
2015-11-20 08:02:05 -05:00
2016-08-03 15:10:28 -07:00
2016-08-30 16:09:41 -07:00
2016-06-17 15:46:10 -07:00
2015-10-21 15:59:34 -07:00
2016-02-26 13:37:16 -08:00
2016-07-14 15:50:41 -07:00
2016-07-25 14:13:33 -07:00
2016-07-13 11:24:10 -07:00
2015-10-05 13:20:08 -07:00
2016-04-29 12:59:09 -07:00