Stefan Beller <sbeller@xxxxxxxxxx> writes: > Remove hard coded sha1 values, obtain the values using > 'git rev-parse HEAD' which should be future proof regardless > of the hash function used. > > Additionally future-proof the test by hard coding the > abbreviation length of the hash. > > Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx> > --- > >> Don't hardcoded lengths of the hashes defeat this future-proofing >> effort, though? It shouldn't be too hard to do the equivalent of >> the auto computation of abbreviation in this script, which would be >> true future-proofing, I guess. > > Added --abbrev=n to also hard code hash abbreviation. At first > I had the impression of a off-by-one-error, but after reading the > man page for both blame and rev-parse, I realize that blames > abbrev notion is different than rev-parse precisely for the > caret that may occur to indicate out-of-range. OK, and 17 hexdigits ought to be sufficient for a sample repository we create for the test---we shouldn't be picking a hash that would cause hash prefix collisions with such a small number of objects and reasonably long prefix anyway ;-) Thanks, will queue. > > t/t8008-blame-formats.sh | 30 ++++++++++++++++-------------- > 1 file changed, 16 insertions(+), 14 deletions(-) > > diff --git a/t/t8008-blame-formats.sh b/t/t8008-blame-formats.sh > index 92c8e792d1..ae4b579d24 100755 > --- a/t/t8008-blame-formats.sh > +++ b/t/t8008-blame-formats.sh > @@ -12,22 +12,25 @@ test_expect_success 'setup' ' > echo c >>file && > echo d >>file && > test_tick && > - git commit -a -m two > + git commit -a -m two && > + ID1=$(git rev-parse HEAD^) && > + shortID1="^$(git rev-parse HEAD^ |cut -c 1-17)" && > + ID2=$(git rev-parse HEAD) && > + shortID2="$(git rev-parse HEAD |cut -c 1-18)" > ' > > -cat >expect <<'EOF' > -^baf5e0b (A U Thor 2005-04-07 15:13:13 -0700 1) a > -8825379d (A U Thor 2005-04-07 15:14:13 -0700 2) b > -8825379d (A U Thor 2005-04-07 15:14:13 -0700 3) c > -8825379d (A U Thor 2005-04-07 15:14:13 -0700 4) d > +cat >expect <<EOF > +$shortID1 (A U Thor 2005-04-07 15:13:13 -0700 1) a > +$shortID2 (A U Thor 2005-04-07 15:14:13 -0700 2) b > +$shortID2 (A U Thor 2005-04-07 15:14:13 -0700 3) c > +$shortID2 (A U Thor 2005-04-07 15:14:13 -0700 4) d > EOF > test_expect_success 'normal blame output' ' > - git blame file >actual && > + git blame --abbrev=17 file >actual && > test_cmp expect actual > ' > > -ID1=baf5e0b3869e0b2b2beb395a3720c7b51eac94fc > -COMMIT1='author A U Thor > +COMMIT1="author A U Thor > author-mail <author@xxxxxxxxxxx> > author-time 1112911993 > author-tz -0700 > @@ -37,9 +40,8 @@ committer-time 1112911993 > committer-tz -0700 > summary one > boundary > -filename file' > -ID2=8825379dfb8a1267b58e8e5bcf69eec838f685ec > -COMMIT2='author A U Thor > +filename file" > +COMMIT2="author A U Thor > author-mail <author@xxxxxxxxxxx> > author-time 1112912053 > author-tz -0700 > @@ -48,8 +50,8 @@ committer-mail <committer@xxxxxxxxxxx> > committer-time 1112912053 > committer-tz -0700 > summary two > -previous baf5e0b3869e0b2b2beb395a3720c7b51eac94fc file > -filename file' > +previous $ID1 file > +filename file" > > cat >expect <<EOF > $ID1 1 1 1
