summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2010-02-09 18:01:29 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-09 19:25:36 -0800
commit6b3fa7e7d13a3c8fddba43ad6e8acb314d1985ac (patch)
treeb31293fda40b8b7fe6ed45566d231e2cdeead46d /merge-index.c
parentreceive-pack: Send hook output over side band #2 (diff)
downloadtgif-6b3fa7e7d13a3c8fddba43ad6e8acb314d1985ac.tar.xz
t5401: Use a bare repository for the remote peer
We want to avoid the warnings (or later, test failures) about updating the current branch. It was never my intention to have this test deal with a repository with a working directory, and it is a very old bug that the test even used a non-bare repository for the remote side of the push operations. This fixes the interleaved output error we were seeing as a test failure by avoiding the giant warning message we were getting back about updating the current branch being risky. Its not a real fix, but is something we should do no matter what, because the behavior will change in the future to reject, and the test would break at that time. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions