diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2012-11-28 22:24:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-03 17:57:16 (GMT) |
| commit | f28e7c904ac82b0c5e43805529e7d5296fa4d13b (patch) | |
| tree | 602de6ff18dc2b91a17cb747c2ae248cdeaaf783 /t/t5801-remote-helpers.sh | |
| parent | 49266e8a11cffa1bb41217021470e33d26109bb2 (diff) | |
| download | git-f28e7c904ac82b0c5e43805529e7d5296fa4d13b.zip git-f28e7c904ac82b0c5e43805529e7d5296fa4d13b.tar.gz git-f28e7c904ac82b0c5e43805529e7d5296fa4d13b.tar.bz2 | |
fast-export: make sure updated refs get updated
When an object has already been exported (and thus is in the marks) it's
flagged as SHOWN, so it will not be exported again, even if in a later
time it's exported through a different ref.
We don't need the object to be exported again, but we want the ref
updated, which doesn't happen.
Since we can't know if a ref was exported or not, let's just assume that
if the commit was marked (flags & SHOWN), the user still wants the ref
updated.
IOW: If it's specified in the command line, it will get updated,
regardless of whether or not the object was marked.
So:
% git branch test master
% git fast-export $mark_flags master
% git fast-export $mark_flags test
Would export 'test' properly.
Additionally, this fixes issues with remote helpers; now they can push
refs whose objects have already been exported, and a few other issues as
well. Update the tests accordingly.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5801-remote-helpers.sh')
| -rwxr-xr-x | t/t5801-remote-helpers.sh | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index ece8fd5..f387027 100755 --- a/t/t5801-remote-helpers.sh +++ b/t/t5801-remote-helpers.sh @@ -63,18 +63,6 @@ test_expect_success 'fetch new branch' ' compare_refs server HEAD local FETCH_HEAD ' -# -# This is only needed because of a bug not detected by this script. It will be -# fixed shortly, but for now lets not cause regressions. -# -test_expect_success 'bump commit in server' ' - (cd server && - git checkout master && - echo content >>file && - git commit -a -m four) && - compare_refs server HEAD server HEAD -' - test_expect_success 'fetch multiple branches' ' (cd local && git fetch @@ -170,4 +158,12 @@ test_expect_success 'push all with existing object' ' compare_refs local dup2 server dup2 ' +test_expect_success 'push ref with existing object' ' + (cd local && + git branch dup master && + git push origin dup + ) && + compare_refs local dup server dup +' + test_done |