Merge branch 'jk/push-progress'
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 23:01:00 +0000 (15:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 23:01:00 +0000 (15:01 -0800)
* jk/push-progress:
  push: pass --progress down to git-pack-objects
  t5523-push-upstream: test progress messages
  t5523-push-upstream: add function to ensure fresh upstream repo
  test_terminal: ensure redirections work reliably
  test_terminal: catch use without TTY prerequisite
  test-lib: allow test code to check the list of declared prerequisites
  tests: test terminal output to both stdout and stderr
  tests: factor out terminal handling from t7006

1  2 
builtin/send-pack.c
t/test-lib.sh
t/test-terminal.perl

Simple merge
diff --cc t/test-lib.sh
Simple merge
Simple merge