diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:58:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:58:10 -0700 |
| commit | 32341b9df528e4fce87f53dee7bf8487009d01c3 (patch) | |
| tree | b1f8d670788d85cac381850a4cf4030a0e824104 /t | |
| parent | Merge branch 'nd/struct-pathspec' (diff) | |
| parent | Prepare for 1.7.5.2 (diff) | |
| download | tgif-32341b9df528e4fce87f53dee7bf8487009d01c3.tar.xz | |
Merge branch 'maint'
* maint:
Prepare for 1.7.5.2
t5400: Fix a couple of typos
Conflicts:
RelNotes
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5400-send-pack.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh index b0b2684a1f..0eace37a03 100755 --- a/t/t5400-send-pack.sh +++ b/t/t5400-send-pack.sh @@ -190,7 +190,7 @@ test_expect_success 'pushing explicit refspecs respects forcing' ' +refs/heads/master:refs/heads/master ) && parent_head=$(cd parent && git rev-parse --verify master) && - child_head=$(cd parent && git rev-parse --verify master) && + child_head=$(cd child && git rev-parse --verify master) && test "$parent_head" = "$child_head" ' @@ -210,7 +210,7 @@ test_expect_success 'pushing wildcard refspecs respects forcing' ' "+refs/heads/*:refs/heads/*" ) && parent_head=$(cd parent && git rev-parse --verify master) && - child_head=$(cd parent && git rev-parse --verify master) && + child_head=$(cd child && git rev-parse --verify master) && test "$parent_head" = "$child_head" ' |