While at it, also fix a few instances where a cd was done outside of a subshell. Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> --- t/t5505-remote.sh | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 4fc62f5..e1e0a18 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -94,4 +94,38 @@ test_expect_success 'remove remote' ' ) ' +cat > test/expect << EOF +* remote origin + URL: $(pwd)/one/.git + Remote branch(es) merged with 'git pull' while on branch master + master + New remote branches (next fetch will store in remotes/origin) + master + Tracked remote branches + side master +EOF + +test_expect_success 'show' ' + (cd test && + git config --add remote.origin.fetch \ + refs/heads/master:refs/heads/upstream && + git fetch && + git branch -d -r origin/master && + (cd ../one && + echo 1 > file && + git commit -m update file) && + git remote show origin > output && + git diff expect output) +' + +test_expect_success 'prune' ' + (cd one && + git branch -m side side2) && + (cd test && + git fetch origin && + git remote prune origin && + git rev-parse refs/remotes/origin/side2 && + ! git rev-parse refs/remotes/origin/side) +' + test_done -- 1.5.4.3.431.g066fa -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
