t3430: avoid hard-coded object IDs

Compute the object IDs used in the todo list instead of hard-coding
them.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index 7b6c4847ad6b0993bc192f53dec4671edfdf7f91..c1ea2ee2973571830dcaa936cc46a2c9fcf5f652 100755 (executable)
--- a/t/t3430-rebase-merges.sh
+++ b/t/t3430-rebase-merges.sh
@@ -37,20 +37,27 @@ test_expect_success 'setup' '
        test_commit A &&
        git checkout -b first &&
        test_commit B &&
        test_commit A &&
        git checkout -b first &&
        test_commit B &&

+       b=$(git rev-parse --short HEAD) &&

        git checkout master &&
        test_commit C &&
        git checkout master &&
        test_commit C &&

+       c=$(git rev-parse --short HEAD) &&

        test_commit D &&
        test_commit D &&

+       d=$(git rev-parse --short HEAD) &&

        git merge --no-commit B &&
        test_tick &&
        git commit -m E &&
        git tag -m E E &&
        git merge --no-commit B &&
        test_tick &&
        git commit -m E &&
        git tag -m E E &&

+       e=$(git rev-parse --short HEAD) &&

        git checkout -b second C &&
        test_commit F &&
        git checkout -b second C &&
        test_commit F &&

+       f=$(git rev-parse --short HEAD) &&

        test_commit G &&
        test_commit G &&

+       g=$(git rev-parse --short HEAD) &&

        git checkout master &&
        git merge --no-commit G &&
        test_tick &&
        git commit -m H &&
        git checkout master &&
        git merge --no-commit G &&
        test_tick &&
        git commit -m H &&

+       h=$(git rev-parse --short HEAD) &&

        git tag -m H H &&
        git checkout A &&
        test_commit conflicting-G G.t
        git tag -m H H &&
        git checkout A &&
        test_commit conflicting-G G.t


@@ -93,24 +100,24 @@ test_expect_success 'create completely different structure' '
 '
 
 test_expect_success 'generate correct todo list' '
 '
 
 test_expect_success 'generate correct todo list' '

-       cat >expect <<-\EOF &&
+       cat >expect <<-EOF &&

        label onto
 
        reset onto
        label onto
 
        reset onto

-       pick d9df450 B
+       pick $b B

        label E
 
        reset onto
        label E
 
        reset onto

-       pick 5dee784 C
+       pick $c C

        label branch-point
        label branch-point

-       pick ca2c861 F
-       pick 088b00a G
+       pick $f F
+       pick $g G

        label H
 
        reset branch-point # C
        label H
 
        reset branch-point # C

-       pick 12bd07b D
-       merge -C 2051b56 E # E
-       merge -C 233d48a H # H
+       pick $d D
+       merge -C $e E # E
+       merge -C $h H # H

 
        EOF
 
 
        EOF