diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-09-07 18:19:41 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-09-21 08:44:41 -0700 |
| commit | b829b9439adc12fa4fb33338694e7f1ad40254c1 (patch) | |
| tree | b7718c1f6996471f382dd5d8b02c95ab303e37bb /merge-recursive.c | |
| parent | checkout.txt: document a common case that ignores ambiguation rules (diff) | |
| download | tgif-b829b9439adc12fa4fb33338694e7f1ad40254c1.tar.xz | |
checkout: fix ambiguity check in subdir
The two functions in parse_branchname_arg(), verify_non_filename and
check_filename, need correct prefix in order to reconstruct the paths
and check for their existence. With NULL prefix, they just check paths
at top dir instead.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions