diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-05 14:39:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-10 11:31:33 -0700 |
| commit | 3c6b960ef9b4c31cbf00961e9b79306d722429ab (patch) | |
| tree | 30c47150a0a5a464f952480f0e595c1e21d47f3d | |
| parent | 01d0dd1b96d92c1d293f6c0303b6103df31209d1 (diff) | |
| download | git-mh/ref-directory-file-2.tar.gz | |
SQUASH???mh/ref-directory-file-2
| -rwxr-xr-x | t/t1404-update-ref-df-conflicts.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1404-update-ref-df-conflicts.sh b/t/t1404-update-ref-df-conflicts.sh index 11b6d5ba3d..66bafb5cf4 100755 --- a/t/t1404-update-ref-df-conflicts.sh +++ b/t/t1404-update-ref-df-conflicts.sh @@ -3,7 +3,7 @@ test_description='Test git update-ref with D/F conflicts' . ./test-lib.sh -test_update_rejected() { +test_update_rejected () { prefix="$1" && before="$2" && pack="$3" && @@ -27,7 +27,7 @@ Q="'" test_expect_success 'setup' ' - git commit --allow-empty -m Initial + git commit --allow-empty -m Initial && C=$(git rev-parse HEAD) ' |