diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-10 08:39:20 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-10 08:39:20 -0700 |
| commit | e782e12f89955dfb0be82098af3cfdd8dd0eaf80 (patch) | |
| tree | beaefcdcab01a967d65e5f7373d2a7997fda8335 /t/test-lib.sh | |
| parent | 23abd3f48cb217d1558fa1984bfa8c502717c08f (diff) | |
| parent | ff74126c03a8dfd04e7533573a5c420f2a7112ac (diff) | |
| download | git-e782e12f89955dfb0be82098af3cfdd8dd0eaf80.tar.gz git-e782e12f89955dfb0be82098af3cfdd8dd0eaf80.tar.xz | |
Merge branch 'maint'
* maint:
rebase -i: do not fail when there is no commit to cherry-pick
test-lib: fix color reset in say_color()
fix pread()'s short read in index-pack
Conflicts:
csum-file.c
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index e2b106cb6..fb8974112 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -112,8 +112,9 @@ if test -n "$color"; then *) test -n "$quiet" && return;; esac shift - echo "* $*" + printf "* $*" tput sgr0 + echo ) } else |