diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-12 03:11:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-12 03:11:00 (GMT) |
| commit | afb6b561e3dad13df5d9df9731751a3d310c0854 (patch) | |
| tree | 9c79be5a0cab9f0ee7994334c66e2e2290348a60 /t | |
| parent | 804e97fc77b3398db5461fdd79f2f96f6acf467d (diff) | |
| parent | 37475f97d1fbab0842c17b175263eeba6cd5e318 (diff) | |
| download | git-afb6b561e3dad13df5d9df9731751a3d310c0854.zip git-afb6b561e3dad13df5d9df9731751a3d310c0854.tar.gz git-afb6b561e3dad13df5d9df9731751a3d310c0854.tar.bz2 | |
Merge branch 'maint-1.7.6' into maint-1.7.7
* maint-1.7.6:
attr: fix leak in free_attr_elem
t2203: fix wrong commit command
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2203-add-intent.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh index 58a3299..2543529 100755 --- a/t/t2203-add-intent.sh +++ b/t/t2203-add-intent.sh @@ -41,7 +41,7 @@ test_expect_success 'cannot commit with i-t-a entry' ' echo frotz >nitfol && git add rezrov && git add -N nitfol && - test_must_fail git commit + test_must_fail git commit -m initial ' test_expect_success 'can commit with an unrelated i-t-a entry in index' ' |