{"thread":{"id":"9793","subject":"builtin commit series sent","startedAt":"2007-09-06T00:45:27Z","lastAt":"2007-09-06T02:09:53Z","messageCount":2,"participants":["Kristian Høgsberg","Shawn O. Pearce"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"52663","messageId":"1189039527.20311.24.camel@hinata.boston.redhat.com","threadId":"9793","inReplyTo":null,"subject":"builtin commit series sent","fromName":"Kristian Høgsberg","fromEmail":"krh@redhat.com","sentAt":"2007-09-06T00:45:27Z","receivedAt":"2007-09-06T00:45:27Z","isPatch":false,"sender":{"key":"krh@redhat.com","avatar":"https://gravatar.com/avatar/763dee6f9594ac474f725b137a39565792928e583ddf59b32befc2907409027e?d=mp&s=160"},"body":"Hi,\n\nI finally sat down and finished the last details in my git-commit.sh\nport and made it pass the test suite.  The test suite is cruel, but\nawesome.  There's one test that doesn't look right to me:\nt1400-update-ref.sh.  The 'creating initial files' case does a git\ncommit --amend and apparently expect to commit the changed contents of\nthe file F, even though it hasn't been added to the index.  Similarly,\nthere's a git commit -F M just below it that does the same thing.  I'm\nnot sure how they pass with the shell script commit...\n\nAlso, there is some overlap in the patch set with Pierre's nice strbuf\nwork, but it's mostly just naming, and should be easy to work out.  I\nhave a couple of places where I manually add a NUL terminator, but I\nlike Pierres approach of always implicitly doing that.\n\nI didn't work on this for a couple of weeks, and keeping up-to-date with\nthe various git-commit.sh changes that happened in the meantime\n(templates, different option semantics etc) wasn't fun.  Also I don't\nreally have the time to maintain this out of tree, these days, so I'd\nreally appreciate, now that the work is finished, if we can get it in.\n\ncheers,\nKristian\n"},{"id":"52668","messageId":"20070906020953.GD18160@spearce.org","threadId":"9793","inReplyTo":"1189039527.20311.24.camel@hinata.boston.redhat.com","subject":"Re: builtin commit series sent","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-09-06T02:09:53Z","receivedAt":"2007-09-06T02:09:53Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Kristian Hgsberg <krh@redhat.com> wrote:\n> There's one test that doesn't look right to me:\n> t1400-update-ref.sh.  The 'creating initial files' case does a git\n> commit --amend and apparently expect to commit the changed contents of\n> the file F, even though it hasn't been added to the index.  Similarly,\n> there's a git commit -F M just below it that does the same thing.  I'm\n> not sure how they pass with the shell script commit...\n\nYea.  It doesn't actually matter in this test.  The following\npatch can be applied and the test will still pass:\n\ndiff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh\nindex c4c0dfa..ce045b2 100755\n--- a/t/t1400-update-ref.sh\n+++ b/t/t1400-update-ref.sh\n@@ -198,11 +198,9 @@ test_expect_success \\\n \t GIT_AUTHOR_DATE=\"2005-05-26 23:41\" \\\n \t GIT_COMMITTER_DATE=\"2005-05-26 23:41\" git-commit -F M -a &&\n \t h_OTHER=$(git rev-parse --verify HEAD) &&\n-\t echo FIXED >F &&\n \t GIT_AUTHOR_DATE=\"2005-05-26 23:44\" \\\n \t GIT_COMMITTER_DATE=\"2005-05-26 23:44\" git-commit --amend &&\n \t h_FIXED=$(git rev-parse --verify HEAD) &&\n-\t echo TEST+FIXED >F &&\n \t echo Merged initial commit and a later commit. >M &&\n \t echo $h_TEST >.git/MERGE_HEAD &&\n \t GIT_AUTHOR_DATE=\"2005-05-26 23:45\" \\\n\nThe reason is the test is looking for a very specific date and\ntime in the branch's reflog.  The reflog entry is not impacted by\nediting F.  Since the commit date is different here the --amend\ncreated a different commit object, which was all that mattered.\n\nActually I think we probably should just apply the above patch\nto clean up this test case.  I'll submit it under a different\ncover so Junio can more easily apply it.\n\n-- \nShawn.\n"}]}