From dfbf3ca90e423b284a3bdc38730718f52c9159b0 Mon Sep 17 00:00:00 2001
From: Stephen Haberman <stephen@exigencecorp.com>
Date: Sat, 23 Aug 2008 22:32:24 -0500
Subject: [PATCH] Trying a gc prefix.

---
 scripts/{add => gc-add}           | 0
 scripts/{checkout => gc-checkout} | 0
 scripts/{pull => gc-pull}         | 0
 scripts/{push => gc-push}         | 0
 scripts/{remerge => gc-remerge}   | 0
 tests/t5000-script-checkout.sh    | 6 +++---
 tests/t5100-script-push.sh        | 6 +++---
 tests/t5200-script-pull.sh        | 8 ++++----
 tests/t5300-script-add.sh         | 6 +++---
 9 files changed, 13 insertions(+), 13 deletions(-)
 rename scripts/{add => gc-add} (100%)
 rename scripts/{checkout => gc-checkout} (100%)
 rename scripts/{pull => gc-pull} (100%)
 rename scripts/{push => gc-push} (100%)
 rename scripts/{remerge => gc-remerge} (100%)

diff --git a/scripts/add b/scripts/gc-add
similarity index 100%
rename from scripts/add
rename to scripts/gc-add
diff --git a/scripts/checkout b/scripts/gc-checkout
similarity index 100%
rename from scripts/checkout
rename to scripts/gc-checkout
diff --git a/scripts/pull b/scripts/gc-pull
similarity index 100%
rename from scripts/pull
rename to scripts/gc-pull
diff --git a/scripts/push b/scripts/gc-push
similarity index 100%
rename from scripts/push
rename to scripts/gc-push
diff --git a/scripts/remerge b/scripts/gc-remerge
similarity index 100%
rename from scripts/remerge
rename to scripts/gc-remerge
diff --git a/tests/t5000-script-checkout.sh b/tests/t5000-script-checkout.sh
index 937143d..56fb794 100644
--- a/tests/t5000-script-checkout.sh
+++ b/tests/t5000-script-checkout.sh
@@ -18,7 +18,7 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'checkout a new branch clones stable' '
-	checkout topic1 &&
+	gc-checkout topic1 &&
 	git branch | grep topic1 &&
 	git branch -r | grep origin/topic1 &&
 	git config --list | grep "branch.topic1.merge=refs/heads/topic1"
@@ -31,14 +31,14 @@ test_expect_success 'checkout an existing remote branch' '
 	git commit -a -m "Made topic2 on server" &&
 	cd .. &&
 
-	checkout topic2
+	gc-checkout topic2
 	git branch | grep topic2
 	git branch -r | grep origin/topic2
 	git config --list | grep "branch.topic2.merge=refs/heads/topic2"
 '
 
 test_expect_success 'checkout an existing local branch' '
-	checkout topic1
+	gc-checkout topic1
 '
 
 test_done
diff --git a/tests/t5100-script-push.sh b/tests/t5100-script-push.sh
index 49e1027..7ca75e8 100644
--- a/tests/t5100-script-push.sh
+++ b/tests/t5100-script-push.sh
@@ -22,17 +22,17 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'push only does one branch' '
-	checkout topic1 &&
+	gc-checkout topic1 &&
 	echo "$test_name" >a &&
 	git commit -a -m "move topic1" &&
 	git rev-parse HEAD >head.topic1 &&
 
-	checkout topic2 &&
+	gc-checkout topic2 &&
 	echo "$test_name" >a &&
 	git commit -a -m "move topic2" &&
 	git rev-parse HEAD >head.topic2 &&
 
-	push &&
+	gc-push &&
 	git rev-parse origin/topic2 >head.origin.topic2 &&
 	git rev-parse origin/topic1 >head.origin.topic1 &&
 
diff --git a/tests/t5200-script-pull.sh b/tests/t5200-script-pull.sh
index 7ecbe47..3bfd5e4 100644
--- a/tests/t5200-script-pull.sh
+++ b/tests/t5200-script-pull.sh
@@ -18,7 +18,7 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'pull does a rebase' '
-	checkout topic1 &&
+	gc-checkout topic1 &&
 	echo "$test_name" >a.topic1 &&
 	git add a.topic1 &&
 	git commit -m "move topic1" &&
@@ -31,13 +31,13 @@ test_expect_success 'pull does a rebase' '
 	cd .. &&
 
 	# Only one parent
-	pull &&
+	gc-pull &&
 	git cat-file commit $(git rev-parse HEAD) | grep parent | wc -l | grep 1
 '
 
 #test_expect_success 'pull does a rebase but does not fuck up merges' '
 #	# Change "a" itself so we will eventually conflict
-#	checkout topic2 &&
+#	gc-checkout topic2 &&
 #	echo "$test_name on topic2" >a &&
 #	git commit -a -m "move topic2" &&
 #
@@ -70,7 +70,7 @@ test_expect_success 'pull does a rebase' '
 #	git merge origin/stable
 #
 #	# Now pull and see what happens
-#	# pull
+#	# gc-pull
 #'
 
 test_done
diff --git a/tests/t5300-script-add.sh b/tests/t5300-script-add.sh
index 82ed134..76fdca2 100644
--- a/tests/t5300-script-add.sh
+++ b/tests/t5300-script-add.sh
@@ -19,19 +19,19 @@ test_expect_success 'setup' '
 
 test_expect_success 'add picks up new files' '
 	echo "$test_name" >a.new &&
-	add &&
+	gc-add &&
 	git commit -m "add"
 '
 
 test_expect_success 'add picks up changed files' '
 	echo "$test_name" >a.new &&
-	add &&
+	gc-add &&
 	git commit -m "change"
 '
 
 test_expect_success 'add picks up removed files' '
 	rm a.new &&
-	add &&
+	gc-add &&
 	git commit -m "remove"
 '
 
-- 
2.39.5