| commit | ea63b393ec76484690733d6f589c9e67fedbaa78 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Fri, 7 Oct 2016 16:08:34 +0000 (7 18:08 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Oct 2016 16:29:31 +0000 (7 09:29 -0700) | ||
| tree | 7b6c869d072dca69598d0190c5de8be8db3e43c8 | treesnapshot (tar.gz zip) |
| parent | 338bc8d81897d19f4795114e4e6a59d6ca44d1db | commitdiff |
pull: make code more similar to the shell script again
When converting the pull command to a builtin, the
require_clean_work_tree() function was renamed and the pull-specific
parts hard-coded.
This makes it impossible to reuse the code, so let's modify the code to
make it more similar to the original shell script again.
Note: when the hint "Please commit or stash them" was introduced first,
Git did not have the convention of continuing error messages in lower
case, but now we do have that convention, therefore we reintroduce this
hint down-cased, obeying said convention.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When converting the pull command to a builtin, the
require_clean_work_tree() function was renamed and the pull-specific
parts hard-coded.
This makes it impossible to reuse the code, so let's modify the code to
make it more similar to the original shell script again.
Note: when the hint "Please commit or stash them" was introduced first,
Git did not have the convention of continuing error messages in lower
case, but now we do have that convention, therefore we reintroduce this
hint down-cased, obeying said convention.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/pull.c | diffblobblamehistory |