author | Christian Couder <chriscool@tuxfamily.org> | |
Wed, 27 May 2009 05:14:09 +0000 (07:14 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 1 Jun 2009 00:03:40 +0000 (17:03 -0700) | ||
commit | 4e65b538acc97dd853e19a1692893f5fd47043e6 | |
tree | a5860e969726e7dbc19f7ec2f886ff7724692f9a | tree | snapshot |
parent | 0f3a5bfd34bfc9f710d6d7d259ad0a38b37a2334 | commit | diff |
t6050: check pushing something based on a replaced commit
When using something like:
$ git push $there 04a8c^2:master
we need to parse 04a8c to find its second parent and then start
discussing what object to send with the other end. "04a8c^2" is a direct
user input and should mean the same commit as git show "04a8c^2" would
give the user, so it obviously needs to obey the replace rules (making
04a8c parsed), but the object transfer should not look at replace at all.
This patch adds some tests to check that the above is working well.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When using something like:
$ git push $there 04a8c^2:master
we need to parse 04a8c to find its second parent and then start
discussing what object to send with the other end. "04a8c^2" is a direct
user input and should mean the same commit as git show "04a8c^2" would
give the user, so it obviously needs to obey the replace rules (making
04a8c parsed), but the object transfer should not look at replace at all.
This patch adds some tests to check that the above is working well.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6050-replace.sh | diff | blob | history |