diff options
author | Paul Tan <pyokagan@gmail.com> | 2015-05-18 21:32:52 +0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-05-18 10:38:44 -0700 |
commit | d12f455e44bc3c90bf06b7123cebe0c82a039c63 (patch) | |
tree | 16121bbb386710a51fe8488904662066eb8861e6 /t/t2103-update-index-ignore-missing.sh | |
parent | t5520: prevent field splitting in content comparisons (diff) | |
download | tgif-d12f455e44bc3c90bf06b7123cebe0c82a039c63.tar.xz |
t5520: test no merge candidates cases
a8c9bef (pull: improve advice for unconfigured error case, 2009-10-05)
fully established the current advices given by git-pull for the
different cases where git-fetch will not have anything marked for merge:
1. We fetched from a specific remote, and a refspec was given, but it
ended up not fetching anything. This is usually because the user
provided a wildcard refspec which had no matches on the remote end.
2. We fetched from a non-default remote, but didn't specify a branch to
merge. We can't use the configured one because it applies to the
default remote, and thus the user must specify the branches to merge.
3. We fetched from the branch's or repo's default remote, but:
a. We are not on a branch, so there will never be a configured branch
to merge with.
b. We are on a branch, but there is no configured branch to merge
with.
4. We fetched from the branch's or repo's default remote, but the
configured branch to merge didn't get fetched (either it doesn't
exist, or wasn't part of the configured fetch refspec)
Implement tests for the above 5 cases to ensure that the correct code
paths are triggered for each of these cases.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2103-update-index-ignore-missing.sh')
0 files changed, 0 insertions, 0 deletions