* [PATCH v4 0/3] refspec: make @ a synonym of HEAD
@ 2020-11-26 0:16 Felipe Contreras
2020-11-26 0:16 ` [PATCH v4 1/3] tests: push: improve cleanup of HEAD tests Felipe Contreras
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Felipe Contreras @ 2020-11-26 0:16 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Jeff King, Brandon Williams, Jacob Keller,
Tomo Krajina, Felipe Contreras
Basically $subject.
Since v3 the body of the tests was changed to single quotes, as Junio suggested.
Felipe Contreras (3):
tests: push: improve cleanup of HEAD tests
tests: push: trivial cleanup
refspec: make @ a synonym of HEAD
refspec.c | 5 +-
t/t5511-refspec.sh | 2 +
t/t5516-fetch-push.sh | 106 ++++++++++++++++++++++--------------------
3 files changed, 62 insertions(+), 51 deletions(-)
--
2.29.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v4 1/3] tests: push: improve cleanup of HEAD tests
2020-11-26 0:16 [PATCH v4 0/3] refspec: make @ a synonym of HEAD Felipe Contreras
@ 2020-11-26 0:16 ` Felipe Contreras
2020-11-26 0:16 ` [PATCH v4 2/3] tests: push: trivial cleanup Felipe Contreras
2020-11-26 0:16 ` [PATCH v4 3/3] refspec: make @ a synonym of HEAD Felipe Contreras
2 siblings, 0 replies; 4+ messages in thread
From: Felipe Contreras @ 2020-11-26 0:16 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Jeff King, Brandon Williams, Jacob Keller,
Tomo Krajina, Felipe Contreras
So that we are not left in an inconsistent state between them.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
t/t5516-fetch-push.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index d11382f769..4077471937 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -449,6 +449,7 @@ test_expect_success 'push with HEAD nonexisting at remote' '
mk_test testrepo heads/master &&
git checkout -b local master &&
+ test_when_finished "git checkout master; git branch -D local" &&
git push testrepo HEAD &&
check_push_result testrepo $the_commit heads/local
'
@@ -457,8 +458,8 @@ test_expect_success 'push with +HEAD' '
mk_test testrepo heads/master &&
git checkout master &&
- git branch -D local &&
git checkout -b local &&
+ test_when_finished "git checkout master; git branch -D local" &&
git push testrepo master local &&
check_push_result testrepo $the_commit heads/master &&
check_push_result testrepo $the_commit heads/local &&
@@ -488,6 +489,7 @@ test_expect_success 'push with config remote.*.push = HEAD' '
mk_test testrepo heads/local &&
git checkout master &&
git branch -f local $the_commit &&
+ test_when_finished "git branch -D local" &&
(
cd testrepo &&
git checkout local &&
--
2.29.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v4 2/3] tests: push: trivial cleanup
2020-11-26 0:16 [PATCH v4 0/3] refspec: make @ a synonym of HEAD Felipe Contreras
2020-11-26 0:16 ` [PATCH v4 1/3] tests: push: improve cleanup of HEAD tests Felipe Contreras
@ 2020-11-26 0:16 ` Felipe Contreras
2020-11-26 0:16 ` [PATCH v4 3/3] refspec: make @ a synonym of HEAD Felipe Contreras
2 siblings, 0 replies; 4+ messages in thread
From: Felipe Contreras @ 2020-11-26 0:16 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Jeff King, Brandon Williams, Jacob Keller,
Tomo Krajina, Felipe Contreras
No need to do two checkouts.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
t/t5516-fetch-push.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 4077471937..245eafb170 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -457,8 +457,7 @@ test_expect_success 'push with HEAD nonexisting at remote' '
test_expect_success 'push with +HEAD' '
mk_test testrepo heads/master &&
- git checkout master &&
- git checkout -b local &&
+ git checkout -b local master &&
test_when_finished "git checkout master; git branch -D local" &&
git push testrepo master local &&
check_push_result testrepo $the_commit heads/master &&
--
2.29.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v4 3/3] refspec: make @ a synonym of HEAD
2020-11-26 0:16 [PATCH v4 0/3] refspec: make @ a synonym of HEAD Felipe Contreras
2020-11-26 0:16 ` [PATCH v4 1/3] tests: push: improve cleanup of HEAD tests Felipe Contreras
2020-11-26 0:16 ` [PATCH v4 2/3] tests: push: trivial cleanup Felipe Contreras
@ 2020-11-26 0:16 ` Felipe Contreras
2 siblings, 0 replies; 4+ messages in thread
From: Felipe Contreras @ 2020-11-26 0:16 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Jeff King, Brandon Williams, Jacob Keller,
Tomo Krajina, Felipe Contreras
Since commit 9ba89f484e git learned how to push to a remote branch using
the source @, for example:
git push origin @:master
However, if the right-hand side is missing, the push fails:
git push origin @
It is obvious what is the desired behavior, and allowing the push makes
things more consistent.
Additionally, @:master now has the same semantics as HEAD:master.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
refspec.c | 5 +-
t/t5511-refspec.sh | 2 +
t/t5516-fetch-push.sh | 107 ++++++++++++++++++++++--------------------
3 files changed, 62 insertions(+), 52 deletions(-)
diff --git a/refspec.c b/refspec.c
index c49347c2d7..adbfb3283a 100644
--- a/refspec.c
+++ b/refspec.c
@@ -71,7 +71,10 @@ static int parse_refspec(struct refspec_item *item, const char *refspec, int fet
}
item->pattern = is_glob;
- item->src = xstrndup(lhs, llen);
+ if (llen == 1 && *lhs == '@')
+ item->src = xstrdup("HEAD");
+ else
+ item->src = xstrndup(lhs, llen);
flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
if (item->negative) {
diff --git a/t/t5511-refspec.sh b/t/t5511-refspec.sh
index f541f30bc2..f808649de4 100755
--- a/t/t5511-refspec.sh
+++ b/t/t5511-refspec.sh
@@ -58,6 +58,8 @@ test_refspec fetch 'HEAD~4:refs/remotes/frotz/new' invalid
test_refspec push 'HEAD'
test_refspec fetch 'HEAD'
+test_refspec push '@'
+test_refspec fetch '@'
test_refspec push 'refs/heads/ nitfol' invalid
test_refspec fetch 'refs/heads/ nitfol' invalid
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 245eafb170..01004ff680 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -436,71 +436,76 @@ test_expect_success 'push ref expression with non-existent, incomplete dest' '
'
-test_expect_success 'push with HEAD' '
+for head in HEAD @
+do
- mk_test testrepo heads/master &&
- git checkout master &&
- git push testrepo HEAD &&
- check_push_result testrepo $the_commit heads/master
+ test_expect_success "push with $head" '
-'
+ mk_test testrepo heads/master &&
+ git checkout master &&
+ git push testrepo $head &&
+ check_push_result testrepo $the_commit heads/master
-test_expect_success 'push with HEAD nonexisting at remote' '
+ '
- mk_test testrepo heads/master &&
- git checkout -b local master &&
- test_when_finished "git checkout master; git branch -D local" &&
- git push testrepo HEAD &&
- check_push_result testrepo $the_commit heads/local
-'
+ test_expect_success "push with $head nonexisting at remote" '
-test_expect_success 'push with +HEAD' '
+ mk_test testrepo heads/master &&
+ git checkout -b local master &&
+ test_when_finished "git checkout master; git branch -D local" &&
+ git push testrepo $head &&
+ check_push_result testrepo $the_commit heads/local
+ '
- mk_test testrepo heads/master &&
- git checkout -b local master &&
- test_when_finished "git checkout master; git branch -D local" &&
- git push testrepo master local &&
- check_push_result testrepo $the_commit heads/master &&
- check_push_result testrepo $the_commit heads/local &&
+ test_expect_success "push with +$head" '
- # Without force rewinding should fail
- git reset --hard HEAD^ &&
- test_must_fail git push testrepo HEAD &&
- check_push_result testrepo $the_commit heads/local &&
+ mk_test testrepo heads/master &&
+ git checkout -b local master &&
+ test_when_finished "git checkout master; git branch -D local" &&
+ git push testrepo master local &&
+ check_push_result testrepo $the_commit heads/master &&
+ check_push_result testrepo $the_commit heads/local &&
- # With force rewinding should succeed
- git push testrepo +HEAD &&
- check_push_result testrepo $the_first_commit heads/local
+ # Without force rewinding should fail
+ git reset --hard $head^ &&
+ test_must_fail git push testrepo $head &&
+ check_push_result testrepo $the_commit heads/local &&
-'
+ # With force rewinding should succeed
+ git push testrepo +$head &&
+ check_push_result testrepo $the_first_commit heads/local
-test_expect_success 'push HEAD with non-existent, incomplete dest' '
+ '
- mk_test testrepo &&
- git checkout master &&
- git push testrepo HEAD:branch &&
- check_push_result testrepo $the_commit heads/branch
+ test_expect_success "push $head with non-existent, incomplete dest" '
-'
+ mk_test testrepo &&
+ git checkout master &&
+ git push testrepo $head:branch &&
+ check_push_result testrepo $the_commit heads/branch
-test_expect_success 'push with config remote.*.push = HEAD' '
+ '
- mk_test testrepo heads/local &&
- git checkout master &&
- git branch -f local $the_commit &&
- test_when_finished "git branch -D local" &&
- (
- cd testrepo &&
- git checkout local &&
- git reset --hard $the_first_commit
- ) &&
- test_config remote.there.url testrepo &&
- test_config remote.there.push HEAD &&
- test_config branch.master.remote there &&
- git push &&
- check_push_result testrepo $the_commit heads/master &&
- check_push_result testrepo $the_first_commit heads/local
-'
+ test_expect_success "push with config remote.*.push = $head" '
+
+ mk_test testrepo heads/local &&
+ git checkout master &&
+ git branch -f local $the_commit &&
+ test_when_finished "git branch -D local" &&
+ (
+ cd testrepo &&
+ git checkout local &&
+ git reset --hard $the_first_commit
+ ) &&
+ test_config remote.there.url testrepo &&
+ test_config remote.there.push $head &&
+ test_config branch.master.remote there &&
+ git push &&
+ check_push_result testrepo $the_commit heads/master &&
+ check_push_result testrepo $the_first_commit heads/local
+ '
+
+done
test_expect_success 'push with remote.pushdefault' '
mk_test up_repo heads/master &&
--
2.29.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-26 0:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-26 0:16 [PATCH v4 0/3] refspec: make @ a synonym of HEAD Felipe Contreras
2020-11-26 0:16 ` [PATCH v4 1/3] tests: push: improve cleanup of HEAD tests Felipe Contreras
2020-11-26 0:16 ` [PATCH v4 2/3] tests: push: trivial cleanup Felipe Contreras
2020-11-26 0:16 ` [PATCH v4 3/3] refspec: make @ a synonym of HEAD Felipe Contreras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).