diff options
| author |  Paul Tan <pyokagan@gmail.com> | 2015-06-18 18:54:04 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-06-18 13:17:16 -0700 |
| commit | 4a4cf9e821f604b79817bc37b475828f3fb8b0a4 (patch) | |
| tree | 99cb30bd03852e51ee2a2077c8a26815cfdc40ab /t/t5002-archive-attr-pattern.sh | |
| parent | pull: support pull.ff config (diff) | |
| download | tgif-4a4cf9e821f604b79817bc37b475828f3fb8b0a4.tar.xz | |
pull: check if in unresolved merge state
Since d38a30d (Be more user-friendly when refusing to do something
because of conflict., 2010-01-12), git-pull will error out with
user-friendly advices if the user is in the middle of a merge or has
unmerged files.
Re-implement this behavior. While the "has unmerged files" case can be
handled by die_resolve_conflict(), we introduce a new function
die_conclude_merge() for printing a different error message for when
there are no unmerged files but the merge has not been finished.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5002-archive-attr-pattern.sh')
0 files changed, 0 insertions, 0 deletions