From: "David Martínez Martí" <desarrollo@gestiweb.com>
To: git@vger.kernel.org
Cc: deavidsedice@gmail.com
Subject: Possible bug in Git
Date: Thu, 15 Apr 2010 12:47:42 +0200 [thread overview]
Message-ID: <4BC6EECE.6060408@gestiweb.com> (raw)
(Please add deavidsedice@gmail.com and desarrollo@gestiweb.com 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@gestiweb.com> 1260959309 +0100
committer David Martinez Marti <desarrollo@gestiweb.com> 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@infosial.com
***************************************************************************/
/***************************************************************************
* *
* 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@infosial.com
***************************************************************************/
/***************************************************************************
* *
* 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.
next reply other threads:[~2010-04-15 10:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-15 10:47 David Martínez Martí [this message]
2010-04-15 12:59 ` [PATCH] combined diff: correctly handle truncated file Thomas Rast
2010-04-15 23:45 ` Possible bug in Git Avery Pennarun
2010-04-16 0:01 ` Junio C Hamano
2010-04-16 0:06 ` Avery Pennarun
2010-04-16 0:13 ` Avery Pennarun
2010-04-16 0:38 ` Jay Soffian
2010-04-16 0:45 ` Avery Pennarun
2010-04-16 15:53 ` Linus Torvalds
2010-04-16 16:39 ` Thomas Rast
2010-04-16 16:56 ` Junio C Hamano
2010-04-16 17:00 ` Thomas Rast
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BC6EECE.6060408@gestiweb.com \
--to=desarrollo@gestiweb.com \
--cc=deavidsedice@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).