Because we haven't settled on what the exit status from
"git push" command itself should be in such a partial
failure case, do not check the exit status from it for
now.
Signed-off-by: Alex Riesen <raa.lkml@xxxxxxxxx>
---
Junio C Hamano, Wed, Nov 14, 2007 22:52:19 +0100:
> Alex Riesen <raa.lkml@xxxxxxxxx> writes:
>
> > Ignore exit code of git push in t5404, as it is not relevant for the
> > test: it already checks whether the references updated correctly.
>
> I think the Subject: goes a lot better with a description like this:
>
> Add test that checks the case where X does Y and make
> sure Z happens.
Add test that checks diverse aspects of updating remote and tracking
branches.
> Because we haven't settled on what the exit status from
> "git push" command itself should be in such a partial
> failure case, do not check the exit status from it for
> now.
This I'll leave as is.
> > + git branch b3 &&
>
> So it makes another ref "b3" point at the initial commit,...
Right
> > + b3=$(git rev-parse origin/b3) &&
>
> ... then records what was cloned,...
Precisely
> > + test "$(git rev-parse origin/b3)" = "$b3" &&
>
> ... and checks that untouched "b3" stays the same (iow, tests
> up-to-date case).
Yep.
> > +
> > +test_expect_success 'delete remote branch' '
> > + git push origin :refs/heads/b3
> > + {
> > + git rev-parse origin/b3
> > + test $? != 0 || \
> > + say "Hmm... Maybe tracking ref should be deleted?"
> > + } &&
>
> Ah, you meant that tracking should be deleted so this should be
> fixed in the code but the test is disabled for now. Let's be a
> bit more explicit about such a temporary disabled test, like
> this:
>
> git push origin :refs/heads/b3
>
> # The remote-tracking branch origin/b3 should be deleted;
> # we need to update the code and enable this test.
> : git rev-parse --verify origin/b3 &&
Nice, will take this. Except we have to check for absence of the
tracking branch. git-rev-parse must fail.
t/t5404-tracking-branches.sh | 64 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 deletions(-)
create mode 100755 t/t5404-tracking-branches.sh
diff --git a/t/t5404-tracking-branches.sh b/t/t5404-tracking-branches.sh
new file mode 100755
index 0000000..d861a14
--- /dev/null
+++ b/t/t5404-tracking-branches.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+test_description='tracking branch update checks for git push'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ echo 1 >file &&
+ git add file &&
+ git commit -m 1 &&
+ git branch b1 &&
+ git branch b2 &&
+ git branch b3 &&
+ git clone . aa &&
+ git checkout b1 &&
+ echo b1 >>file &&
+ git commit -a -m b1 &&
+ git checkout b2 &&
+ echo b2 >>file &&
+ git commit -a -m b2
+'
+
+start_dir="$(pwd)"
+
+test_expect_success 'check tracking branches updated correctly after push' '
+ cd aa &&
+ b1=$(git rev-parse origin/b1) &&
+ b2=$(git rev-parse origin/b2) &&
+ b3=$(git rev-parse origin/b3) &&
+ git checkout -b b1 origin/b1 &&
+ echo aa-b1 >>file &&
+ git commit -a -m aa-b1 &&
+ git checkout -b b2 origin/b2 &&
+ echo aa-b2 >>file &&
+ git commit -a -m aa-b2 &&
+ git checkout master &&
+ echo aa-master >>file &&
+ git commit -a -m aa-master &&
+ {
+ git push
+ test "$(git rev-parse origin/b1)" = "$b1" &&
+ test "$(git rev-parse origin/b2)" = "$b2" &&
+ test "$(git rev-parse origin/b3)" = "$b3" &&
+ test "$(git rev-parse origin/master)" = \
+ "$(git rev-parse master)"
+ }
+'
+
+test_expect_success 'delete remote branch' '
+ git push origin :refs/heads/b3
+ {
+ # The remote-tracking branch origin/b3 should be deleted;
+ # we need to update the code and enable this test.
+ : git rev-parse --verify origin/b3
+ : test $? != 0
+ } &&
+ cd "$start_dir" &&
+ {
+ git rev-parse refs/heads/b3
+ test $? != 0
+ }
+'
+
+test_done
--
1.5.3.5.692.ge1737
-
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
