{"thread":{"id":"41744","subject":"[RFC] git-log should use the same diff-options as git-show","startedAt":"2016-03-18T21:47:03Z","lastAt":"2016-03-18T21:54:27Z","messageCount":2,"participants":["Henning Moll","Stefan Beller"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"281183","messageId":"loom.20160318T222303-528@post.gmane.org","threadId":"41744","inReplyTo":null,"subject":"[RFC] git-log should use the same diff-options as git-show","fromName":"Henning Moll","fromEmail":"newsscott@gmx.de","sentAt":"2016-03-18T21:47:03Z","receivedAt":"2016-03-18T21:47:03Z","isPatch":false,"sender":{"key":"newsscott@gmx.de","avatar":null},"body":"Hi\n\nRecently i stumbled upon an old stash entry. It was clear to me that the\nstash only contained non-indexed worktree changes. So i assumed to get\ninsight by doing\n\n    $ git log -1 -p stash@{0}\n\nBut surprisingly the result was \"no patch\" (The problem which i was not\naware at that time was the fact that a stash commit is a merge). So i asked\na question on stackoverflow (1) an learned that there are different default\noptions used depending on the git command used:\n\n    $ git show stash@{0}\n    $ git diff stash@{0}^..stash@{0}\n\nwork with default, but for git-log i need to \n\n    $ git log -1 -p --cc stash@{0}\n\nto make it behave the same. This does not seem reasonable to me, though i\nread about commit 1aec791 (2) in git's own repository. What do you think?\n\nMaybe - as a compromise - just show any kind of hint instead of nothing?\n\nBest regards\nHenning\n\n(1) -\nhttp://stackoverflow.com/questions/36089674/git-log-1-p-stash0-shows-empty-patch\n(2) -\nhttps://git.kaarsemaker.net/git/commit/1aec7917dc52901c6df301ddc8fea70f5ce0db09/\n"},{"id":"281184","messageId":"CAGZ79kb8xcNymJ3=nE2C60BGdsAXEaF_CYpwy54DZ-MDc8ktsg@mail.gmail.com","threadId":"41744","inReplyTo":"loom.20160318T222303-528@post.gmane.org","subject":"Re: [RFC] git-log should use the same diff-options as git-show","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2016-03-18T21:54:27Z","receivedAt":"2016-03-18T21:54:27Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Fri, Mar 18, 2016 at 2:47 PM, Henning Moll <newsScott@gmx.de> wrote:\n> Hi\n>\n> Recently i stumbled upon an old stash entry. It was clear to me that the\n> stash only contained non-indexed worktree changes. So i assumed to get\n> insight by doing\n>\n>     $ git log -1 -p stash@{0}\n>\n> But surprisingly the result was \"no patch\" (The problem which i was not\n> aware at that time was the fact that a stash commit is a merge). So i asked\n> a question on stackoverflow (1) an learned that there are different default\n> options used depending on the git command used:\n>\n>     $ git show stash@{0}\n>     $ git diff stash@{0}^..stash@{0}\n>\n> work with default, but for git-log i need to\n>\n>     $ git log -1 -p --cc stash@{0}\n>\n> to make it behave the same. This does not seem reasonable to me, though i\n> read about commit 1aec791 (2) in git's own repository. What do you think?\n>\n> Maybe - as a compromise - just show any kind of hint instead of nothing?\n\nJunio did some slight tweaks to --cc and -p,\nsee 82dee4160cc6d1b0d792c9f07b5803cd42abc610/\nand its parent. That should be live in the upcoming 2.8.\n\n>\n> Best regards\n> Henning\n>\n> (1) -\n> http://stackoverflow.com/questions/36089674/git-log-1-p-stash0-shows-empty-patch\n> (2) -\n> https://git.kaarsemaker.net/git/commit/1aec7917dc52901c6df301ddc8fea70f5ce0db09/\n>\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n"}]}