(Please add deavidsedice@xxxxxxxxx and desarrollo@xxxxxxxxxxxx to CC
because I'm not suscripted to this list)
Here I've a strange behaviour in GIT:
We noticed a file in our repo is empty:
facturacion/facturacion/scripts/lineasfacturascli.qs
We didn't found the reason using gitk --all --
facturacion/facturacion/scripts/lineasfacturascli.qs
With git bisect we found the problematic commit:
dac6a95f559604978ff9e1fac24ad752c54382ae
With git show, it doesn't show anything about the modification:
$ git show dac6a95f5 -p --pretty=raw --
facturacion/facturacion/scripts/lineasfacturascli.qs
commit dac6a95f559604978ff9e1fac24ad752c54382ae
tree f1472f1d289f9813df5fd691c9cea6ccb04313a7
parent 5dfdd78f24f4578cdfeed876b8bacb45790af9ef
parent 6ed54c8c6508b6d5551290b45785eaf44dd05d75
author David Martinez Marti <desarrollo@xxxxxxxxxxxx> 1260959309 +0100
committer David Martinez Marti <desarrollo@xxxxxxxxxxxx> 1260959309 +0100
Merge remote branch 'origin/infosial'
Conflicts:
contabilidad/informes/scripts/flcontinfo.qs
facturacion/almacen/forms/articulos.ui
facturacion/almacen/scripts/articulos.qs
facturacion/almacen/tables/factalma_general.mtd
facturacion/facturacion/forms/albaranescli.ui
facturacion/facturacion/forms/albaranesprov.ui
facturacion/facturacion/forms/facturasprov.ui
facturacion/facturacion/forms/pedidoscli.ui
facturacion/facturacion/forms/pedidosprov.ui
facturacion/facturacion/forms/presupuestoscli.ui
facturacion/facturacion/scripts/facturascli.qs
facturacion/facturacion/scripts/facturasprov.qs
facturacion/facturacion/scripts/flfacturac.qs
facturacion/facturacion/scripts/lineasalbaranescli.qs
facturacion/facturacion/scripts/lineasfacturascli.qs
facturacion/facturacion/scripts/lineaspresupuestoscli.qs
facturacion/informes/flfactinfo.xml
facturacion/informes/forms/i_reciboscli.ui
facturacion/informes/forms/i_recibosprov.ui
facturacion/informes/queries/i_reciboscli.qry
facturacion/informes/queries/i_recibosprov.qry
facturacion/informes/queries/i_resreciboscli.qry
facturacion/informes/queries/i_resrecibosprov.qry
facturacion/informes/scripts/flfactinfo.qs
facturacion/informes/scripts/i_masterinventario.qs
facturacion/principal/flfactppal.xml
facturacion/principal/forms/agentes.ui
facturacion/principal/forms/clientes.ui
facturacion/principal/forms/empresa.ui
facturacion/principal/forms/flfactppal.ui
facturacion/principal/forms/proveedores.ui
facturacion/principal/scripts/clientes.qs
facturacion/principal/scripts/proveedores.qs
facturacion/principal/tables/clientes.mtd
facturacion/principal/tables/proveedores.mtd
facturacion/tesoreria/tables/reciboscli.mtd
There was a conflict on that file but it doesn't show anything changed
about it. Gitk does the same.
git show commit^1:path and git show commit^2:path shows the files:
$ git show
dac6a95f5^1:facturacion/facturacion/scripts/lineasfacturascli.qs | head
/***************************************************************************
lineasfacturascli.qs - description
-------------------
begin : lun abr 26 2004
copyright : (C) 2004 by InfoSiAL S.L.
email : mail@xxxxxxxxxxxx
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or
modify *
$ git show
dac6a95f5^2:facturacion/facturacion/scripts/lineasfacturascli.qs | head
/***************************************************************************
lineasfacturascli.qs - description
-------------------
begin : lun abr 26 2004
copyright : (C) 2004 by InfoSiAL S.L.
email : mail@xxxxxxxxxxxx
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or
modify *
git show commit:path shows empty file:
$ git show
dac6a95f5:facturacion/facturacion/scripts/lineasfacturascli.qs | wc
0 0 0
I believe that changes *should* appear on git log -p and on gitk, and
they doesn't, so I think it may be a bug in some git tools.
Tell me if I can do anything to fdetermine if it's really a bug and
where it is to help GIT devs resovling it.
PD: I know my merge failed somehow, and I corrected it in a newer commit.
--
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