diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-04-14 09:54:31 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-15 14:23:05 -0700 |
| commit | 1b4aee94aaffd5e6fdf3020434b3fa6f0c5cfb2b (patch) | |
| tree | 2f612082e38497b60242dec3c8c50ab9ffd33780 /git-mergetool.sh | |
| parent | e8dde3e5f9ddb7cf95a6ff3cea6cf07c3a2db80d (diff) | |
| download | git-1b4aee94aaffd5e6fdf3020434b3fa6f0c5cfb2b.tar.gz | |
t1507: add tests to document @{upstream} behaviour
In preparation for future changes, add tests which show error messages
with @{upstream} in various conditions:
- test branch@{u} with . as remote
- check error message for branch@{u} on a branch with
* no upstream,
* on a branch with a configured upstream which doesn't have a
remote-tracking branch
- check error message for branch@{u} when branch 'branch' does not
exist
- check error message for @{u} without the branch name
Right now the messages are very similar, but various cases can and
will be distinguished.
Note: test_i18ncmp is not used, because currently error output is not
internationalized. test_cmp will be switched to test_i18ncmp in a later
patch, when error messages are internationalized.
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions