In a later change I mean to make values like -1 and +1 mean something
different, but right now they're implicitly parsed. Let's test for the
current behavior before changing it.
Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com>
---
t/t0014-abbrev.sh | 131 ++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 128 insertions(+), 3 deletions(-)
diff --git a/t/t0014-abbrev.sh b/t/t0014-abbrev.sh
index 5a99cbe434..6dee92f35e 100755
--- a/t/t0014-abbrev.sh
+++ b/t/t0014-abbrev.sh
@@ -74,7 +74,7 @@ test_expect_success 'abbrev non-integer value handling
differs ' '
! test -s stderr
'
-for i in -41 -20 -10 -1 0 1 2 3 41
+for i in -41 -20 -10 -1 -0 +0 0 1 2 3 41
do
test_expect_success "core.abbrev value $i out of range errors out" "
test_must_fail git -c core.abbrev=$i log -1 --pretty=format:%h
2>stderr &&
@@ -90,7 +90,7 @@ do
"
done
-for i in 0 1 2 3 4
+for i in 0 1 2 3 4 -0 +0 +1 +2 +3 +4
do
test_expect_success "non-negative --abbrev=$i value <MINIMUM_ABBREV
falls back on MINIMUM_ABBREV" "
git log --abbrev=$i -1 --pretty=format:%h >log &&
@@ -98,7 +98,7 @@ do
"
done
-for i in 41 9001
+for i in 41 9001 +41 +9001
do
test_expect_success "non-negative --abbrev=$i value >MINIMUM_ABBREV
falls back on 40" "
git log --abbrev=$i -1 --pretty=format:%h >log &&
@@ -116,6 +116,10 @@ do
git log --abbrev=$i -1 --pretty=format:%h >log &&
test_byte_count = $i log &&
+ # core.abbrev=+N is the same as core.abbrev=N
+ git -c core.abbrev=+$i log -1 --pretty=format:%h >log &&
+ test_byte_count = $i log &&
+
# The --abbrev option should take priority over
# core.abbrev
git -c core.abbrev=20 log --abbrev=$i -1 --pretty=format:%h
>log &&
@@ -172,16 +176,39 @@ do
"
done
+test_expect_success 'blame core.abbrev=[-+]1 and --abbrev=[-+]1' '
+ test_must_fail git -c core.abbrev=+1 blame A.t | cut_tr_d_n_field_n 1
>blame &&
+ test_must_fail git -c core.abbrev=-1 blame A.t | cut_tr_d_n_field_n 1
>blame &&
+
+ git blame --abbrev=-1 A.t | cut_tr_d_n_field_n 1 >blame &&
+ test_byte_count = 5 blame &&
+
+ git blame --abbrev=+1 A.t | cut_tr_d_n_field_n 1 >blame &&
+ test_byte_count = 5 blame
+'
+
for i in $(test_seq 4 40)
do
test_expect_success "branch core.abbrev=$i and --abbrev=$i" "
git -c core.abbrev=$i branch -v | cut_tr_d_n_field_n 3 >branch
&&
test_byte_count = $i branch &&
+
git branch --abbrev=$i -v | cut_tr_d_n_field_n 3 >branch &&
test_byte_count = $i branch
"
done
+test_expect_success 'branch core.abbrev=[-+]1 and --abbrev=[-+]1' '
+ test_must_fail git -c core.abbrev=+1 branch -v | cut_tr_d_n_field_n 3
>branch &&
+ test_must_fail git -c core.abbrev=-1 branch -v | cut_tr_d_n_field_n 3
>branch &&
+
+ git branch --abbrev=-1 -v | cut_tr_d_n_field_n 3 >branch &&
+ test_byte_count = 4 branch &&
+
+ git branch --abbrev=+1 -v | cut_tr_d_n_field_n 3 >branch &&
+ test_byte_count = 4 branch
+'
+
test_expect_success 'describe core.abbrev and --abbrev special cases' '
# core.abbrev=0 behaves as usual...
test_must_fail git -c core.abbrev=0 describe &&
@@ -203,6 +230,17 @@ do
"
done
+test_expect_success 'describe core.abbrev=[-+]1 and --abbrev=[-+]1' '
+ test_must_fail git -c core.abbrev=+1 describe | sed_g_tr_d_n >describe
&&
+ test_must_fail git -c core.abbrev=-1 describe | sed_g_tr_d_n >describe
&&
+
+ git describe --abbrev=-1 | sed_g_tr_d_n >describe &&
+ test_byte_count = 4 describe &&
+
+ git describe --abbrev=+1 | sed_g_tr_d_n >describe &&
+ test_byte_count = 4 describe
+'
+
for i in $(test_seq 4 40)
do
test_expect_success "log core.abbrev=$i and --abbrev=$i" "
@@ -213,6 +251,20 @@ do
"
done
+test_expect_success 'log core.abbrev=[-+]1 and --abbrev=[-+]1' '
+ test_must_fail git -c core.abbrev=+1 log --pretty=format:%h -1 2>stderr
&&
+ test_i18ngrep "abbrev length out of range" stderr &&
+
+ test_must_fail git -c core.abbrev=-1 log --pretty=format:%h -1 2>stderr
&&
+ test_i18ngrep "abbrev length out of range" stderr &&
+
+ git log --abbrev=+1 --pretty=format:%h -1 | tr_d_n >log &&
+ test_byte_count = 4 log &&
+
+ git log --abbrev=-1 --pretty=format:%h -1 | tr_d_n >log &&
+ test_byte_count = 40 log
+'
+
for i in $(test_seq 4 40)
do
test_expect_success "diff --no-index --raw core.abbrev=$i and
--abbrev=$i" "
@@ -244,6 +296,46 @@ do
"
done
+test_expect_success 'diff --no-index --raw core.abbrev=[-+]1 and
--abbrev=[-+]1' '
+ test_must_fail git -c core.abbrev=+1 diff --no-index --raw X Y 2>stderr
&&
+ test_i18ngrep "abbrev length out of range" stderr &&
+
+ test_must_fail git -c core.abbrev=-1 diff --no-index --raw X Y 2>stderr
&&
+ test_i18ngrep "abbrev length out of range" stderr &&
+
+ test_must_fail git diff --no-index --raw --abbrev=+1 X Y >diff &&
+ cut_tr_d_n_field_n 3 <diff >diff.3 &&
+ test_byte_count = 4 diff.3 &&
+ cut_tr_d_n_field_n 4 <diff >diff.4 &&
+ test_byte_count = 4 diff.4 &&
+
+ test_must_fail git diff --no-index --raw --abbrev=-1 X Y >diff &&
+ cut_tr_d_n_field_n 3 <diff >diff.3 &&
+ test_byte_count = 4 diff.3 &&
+ cut_tr_d_n_field_n 4 <diff >diff.4 &&
+ test_byte_count = 4 diff.4
+'
+
+test_expect_success 'diff --raw core.abbrev=[-+]1 and --abbrev=[-+]1' '
+ test_must_fail git -c core.abbrev=+1 diff HEAD~ 2>stderr &&
+ test_i18ngrep "abbrev length out of range" stderr &&
+
+ test_must_fail git -c core.abbrev=-1 diff HEAD~ 2>stderr &&
+ test_i18ngrep "abbrev length out of range" stderr &&
+
+ git diff --raw --abbrev=+1 HEAD~ >diff &&
+ cut_tr_d_n_field_n 3 <diff >diff.3 &&
+ test_byte_count = 4 diff.3 &&
+ cut_tr_d_n_field_n 4 <diff >diff.4 &&
+ test_byte_count = 4 diff.4 &&
+
+ git diff --raw --abbrev=-1 HEAD~ >diff &&
+ cut_tr_d_n_field_n 3 <diff >diff.3 &&
+ test_byte_count = 40 diff.3 &&
+ cut_tr_d_n_field_n 4 <diff >diff.4 &&
+ test_byte_count = 40 diff.4
+'
+
for i in $(test_seq 4 40)
do
test_expect_success "ls-files core.abbrev=$i and --abbrev=$i" "
@@ -254,6 +346,17 @@ do
"
done
+test_expect_success 'ls-files core.abbrev=[-+]1 and --abbrev=[-+]1' '
+ test_must_fail git -c core.abbrev=+1 ls-files --stage A.t |
cut_tr_d_n_field_n 2 >ls-files &&
+ test_must_fail git -c core.abbrev=-1 ls-files --stage A.t |
cut_tr_d_n_field_n 2 >ls-files &&
+
+ git ls-files --abbrev=-1 --stage A.t | cut_tr_d_n_field_n 2 >ls-files &&
+ test_byte_count = 4 ls-files &&
+
+ git ls-files --abbrev=+1 --stage A.t | cut_tr_d_n_field_n 2 >ls-files &&
+ test_byte_count = 4 ls-files
+'
+
for i in $(test_seq 4 40)
do
test_expect_success "ls-tree core.abbrev=$i and --abbrev=$i" "
@@ -264,6 +367,17 @@ do
"
done
+test_expect_success 'ls-tree core.abbrev=[-+]1 and --abbrev=[-+]1' '
+ test_must_fail git -c core.abbrev=+1 ls-tree HEAD A.t | cut -f 1 |
cut_tr_d_n_field_n 3 >ls-tree &&
+ test_must_fail git -c core.abbrev=-1 ls-tree HEAD A.t | cut -f 1 |
cut_tr_d_n_field_n 3 >ls-tree &&
+
+ git ls-tree --abbrev=-1 HEAD A.t | cut -f 1 | cut_tr_d_n_field_n 3
>ls-tree &&
+ test_byte_count = 4 ls-tree &&
+
+ git ls-tree --abbrev=+1 HEAD A.t | cut -f 1 | cut_tr_d_n_field_n 3
>ls-tree &&
+ test_byte_count = 4 ls-tree
+'
+
for i in $(test_seq 4 40)
do
test_expect_success "show-ref core.abbrev=$i and --abbrev=$i" "
@@ -276,4 +390,15 @@ do
"
done
+test_expect_success 'show-ref core.abbrev=[-+]1 and --abbrev=[-+]1' '
+ test_must_fail git -c core.abbrev=+1 show-ref --hash refs/heads/master
| tr_d_n >show-ref &&
+ test_must_fail git -c core.abbrev=-1 show-ref --hash refs/heads/master
| tr_d_n >show-ref &&
+
+ git show-ref --abbrev=-1 --hash refs/heads/master | tr_d_n >show-ref &&
+ test_byte_count = 4 show-ref &&
+
+ git show-ref --abbrev=+1 --hash refs/heads/master | tr_d_n >show-ref &&
+ test_byte_count = 4 show-ref
+'
+
test_done
--
2.17.0.290.gded63e768a
