search

jbrukh / ggit

ggit
17 stars 2 forks source link

Wrong commit drawn for a particular oid. #36

Closed jbrukh closed 11 years ago

jbrukh commented 11 years ago

At first it felt like packed objects are competing with loose objects. Here is the ggcompare output:

found a mismatch in object 925 (97a23ce6ac9e7fea65997922f626f379ea3d56a3)...
GIT -----------------------
tree f970bb3837c3ac7371131f25388611546e093c98
parent 6e10c523118a54f1f504f6b9a191ba0341ca9a12
author Jake Brukhman <brukhman@gmail.com> 1349387674 -0400
committer Jake Brukhman <brukhman@gmail.com> 1349387674 -0400

Refactored Format.

GGIT -----------------------
tree bea232cc311b6f04663be32f71926dd36cbbc781
parent 720a9bca5569f786c84a223d7f4dcc77d9f27eef
author Jake Brukhman <jbrukh@gmail.com> 1350279926 -0400
committer Jake Brukhman <jbrukh@gmail.com> 1350279926 -0400

Updated dotfile.

diff -----------------------
theirs: f970bb3837c3ac7371131f25388611546e093c98
ours:   bea232cc311b6f04663be32f71926dd36cbbc781

However, the object in question is not loose:

406c8f39ff02:ggit brukhman$ ls .git/objects/97a23ce6ac9e7fea65997922f626f379ea3d56a3
ls: .git/objects/97a23ce6ac9e7fea65997922f626f379ea3d56a3: No such file or directory
jbrukh commented 11 years ago

I was also thinking about running ggcompare as part of the standard test suite... it might put a damper on testing though, as it takes a while to complete. :(

MikeBosw commented 11 years ago

Interesting.

It would be .git/objects/97/ btw

jbrukh commented 11 years ago

Yeah, my bad. It is packed nonetheless:

406c8f39ff02:ggit brukhman$ ls .git/objects/97/a23ce6ac9e7fea65997922f626f379ea3d56a3
ls: .git/objects/97/a23ce6ac9e7fea65997922f626f379ea3d56a3: No such file or directory
MikeBosw commented 11 years ago

Damn, not happening for me. If you can still reproduce this with your repo, can you send me it? When I run cat-file -p with ggit vs git I get the same output for this oid.

Sent from my iPhone 5

On Oct 28, 2012, at 11:33 PM, jbrukh notifications@github.com wrote:

At first it felt like packed objects are competing with loose objects. Here is the ggcompare output:

found a mismatch in object 925 (97a23ce6ac9e7fea65997922f626f379ea3d56a3)... GIT ----------------------- tree f970bb3837c3ac7371131f25388611546e093c98 parent 6e10c523118a54f1f504f6b9a191ba0341ca9a12 author Jake Brukhman brukhman@gmail.com 1349387674 -0400 committer Jake Brukhman brukhman@gmail.com 1349387674 -0400

Refactored Format.

GGIT ----------------------- tree bea232cc311b6f04663be32f71926dd36cbbc781 parent 720a9bca5569f786c84a223d7f4dcc77d9f27eef author Jake Brukhman jbrukh@gmail.com 1350279926 -0400 committer Jake Brukhman jbrukh@gmail.com 1350279926 -0400

Updated dotfile.

diff ----------------------- theirs: f970bb3837c3ac7371131f25388611546e093c98 ours: bea232cc311b6f04663be32f71926dd36cbbc781 However, the object in question is not loose:

406c8f39ff02:ggit brukhman$ ls .git/objects/97a23ce6ac9e7fea65997922f626f379ea3d56a3 ls: .git/objects/97a23ce6ac9e7fea65997922f626f379ea3d56a3: No such file or directory — Reply to this email directly or view it on GitHub.

jbrukh commented 11 years ago

Attaching my zipped .git folder. I can't repro this on other repos either, even a packed ggit repo.

On Tue, Oct 30, 2012 at 6:10 PM, MikeBosw notifications@github.com wrote:

Damn, not happening for me. If you can still reproduce this with your repo, can you send me it? When I run cat-file -p with ggit vs git I get the same output for this oid.

Sent from my iPhone 5

On Oct 28, 2012, at 11:33 PM, jbrukh notifications@github.com wrote:

At first it felt like packed objects are competing with loose objects. Here is the ggcompare output:

found a mismatch in object 925 (97a23ce6ac9e7fea65997922f626f379ea3d56a3)... GIT ----------------------- tree f970bb3837c3ac7371131f25388611546e093c98 parent 6e10c523118a54f1f504f6b9a191ba0341ca9a12 author Jake Brukhman brukhman@gmail.com 1349387674 -0400 committer Jake Brukhman brukhman@gmail.com 1349387674 -0400

Refactored Format.

GGIT ----------------------- tree bea232cc311b6f04663be32f71926dd36cbbc781 parent 720a9bca5569f786c84a223d7f4dcc77d9f27eef author Jake Brukhman jbrukh@gmail.com 1350279926 -0400 committer Jake Brukhman jbrukh@gmail.com 1350279926 -0400

Updated dotfile.

diff ----------------------- theirs: f970bb3837c3ac7371131f25388611546e093c98 ours: bea232cc311b6f04663be32f71926dd36cbbc781 However, the object in question is not loose:

406c8f39ff02:ggit brukhman$ ls .git/objects/97a23ce6ac9e7fea65997922f626f379ea3d56a3 ls: .git/objects/97a23ce6ac9e7fea65997922f626f379ea3d56a3: No such file or directory — Reply to this email directly or view it on GitHub.

— Reply to this email directly or view it on GitHubhttps://github.com/jbrukh/ggit/issues/36#issuecomment-9924923.

MikeBosw commented 11 years ago

Runs smoothly on that .git repo now.

jbrukh commented 11 years ago

LGTM!

On Sat, Nov 3, 2012 at 10:53 PM, MikeBosw notifications@github.com wrote:

Runs smoothly on that .git repo now.

? Reply to this email directly or view it on GitHubhttps://github.com/jbrukh/ggit/issues/36#issuecomment-10046903.