{"thread":{"id":"484","subject":"Plumbing pull request","startedAt":"2005-05-05T06:07:30Z","lastAt":"2005-05-05T06:07:30Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"2610","messageId":"7vr7gmkxy5.fsf@assigned-by-dhcp.cox.net","threadId":"484","inReplyTo":null,"subject":"Plumbing pull request","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-05-05T06:07:30Z","receivedAt":"2005-05-05T06:07:30Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Linus, please pull from\n\n    http://members.cox.net/junkio/git-jc.git\n\nwhich will update the following files:\n\ndiff-cache.c           |   23 ++++++-\ndiff.c                 |   58 ++++++++++++++------\ngit-apply-patch-script |  141 +++++++++++++++++++++++++++++++++++--------------\nupdate-cache.c         |   42 +++++++++++++-\n4 files changed, 202 insertions(+), 62 deletions(-)\n\nvia the following commits:\n\n----------------------------------------------------------------\nPrepare git-apply-patch-script for symbolic links.\n\nThis patch prepares the git-apply-patch-script for the upcoming change\nto store the symbolic links in the cache, being worked on by Kay\nSievers.\n\nIt currently is very anal about symbolic link changes.  It refuses to\nchange between a regular file and a symbolic link, and only allows\nsymbolic link changes if the patch is based on the same original.\n----------------------------------------------------------------\nPrepare diff side for upcoming symlink work.\n\nThis patch prepares the external diff interface engine for the\nchange to store the symbolic links in the cache, being worked on\nby Kay Sievers.\n\nThe main thing it does is when comparing with the work tree, it\nprepares the counterpart to the blob being compared by doing a\nreadlink followed by sending that result to a temporary file to\nbe diffed.\n----------------------------------------------------------------\ndiff-cache shows differences for unmerged paths without --cache.\n\nWhile manually resolving a merge conflict, being able to run\ndiff-cache without --cache option between files in the work tree\nand either of the ancestor trees is helpful to verify the hand\nmerge result.  However, diff-cache refuses to handle unmerged\npaths, even when run without --cache option.\n\nThis changes the behaviour so that the above use case will\nreport the differences between the compared tree and the magic\n0{40} SHA1 (i.e. \"look at the work tree\").  When there is no\ncorresponding file in the work tree, or when the command is run\nwith \"--cache\" option, it continues to report \"unmerged\".\n----------------------------------------------------------------\nDo not write out new index if nothing has changed.\n\nThe git-update-cache command, especially with --refresh, may not change\nanything.  In such a case, writing 1.6MB of the same thing is a waste.\n----------------------------------------------------------------\nMake git-prune-script executable again.\n\nI do not know why the executable bit was lost since the change went in as\nGIT pull, not via e-mail patch, but here is a fix.\n----------------------------------------------------------------\n\n"}]}