summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Dennis Kaarsemaker <dennis@kaarsemaker.net>2013-06-15 23:35:02 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-17 12:59:50 -0700
commitd77fd050ab8579558d3e8e4e5467a9300546ef2c (patch)
tree5b497d5881e169441fed9434b530ce3a73980c57 /merge-recursive.c
parentfast-export: fix argument name in error messages (diff)
downloadtgif-d77fd050ab8579558d3e8e4e5467a9300546ef2c.tar.xz
tests: allow sha1's as part of the path
When running 'make test' from a path such as .../daily-build/master@bdff0e3a374617dce784f801b97500d9ba2e4705, the logic in fuzz.sed as generated by t5105-request-pull.sh was backwards, replacing object names before replacing urls, making the test fail. Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions