{"thread":{"id":"16411","subject":"[TopGit PATCH] README: Fix spelling","startedAt":"2008-11-20T13:51:02Z","lastAt":"2008-11-20T15:07:54Z","messageCount":8,"participants":["Jonas Fonseca","martin f krafft","Petr Baudis"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"96243","messageId":"1227189062-11951-1-git-send-email-fonseca@diku.dk","threadId":"16411","inReplyTo":null,"subject":"[TopGit PATCH] README: Fix spelling","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2008-11-20T13:51:02Z","receivedAt":"2008-11-20T13:51:02Z","isPatch":true,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Signed-off-by: Jonas Fonseca <fonseca@diku.dk>\n\n---\n README\u001b[m |   11 \u001b[32m+++++\u001b[m\u001b[31m------\u001b[m\n 1 files changed, 5 insertions(+), 6 deletions(-)\u001b[m\n\n\u001b[1mdiff --git a/README b/README\u001b[m\n\u001b[1mindex 5bfe3ee..9e291da 100644\u001b[m\n\u001b[1m--- a/README\u001b[m\n\u001b[1m+++ b/README\u001b[m\n\u001b[36m@@ -22,7 +22,7 @@ version control of patches (reordering of patches is not\u001b[m\n version-controlled at all). But there are several disadvantages -\u001b[m\n for one, these tools (especially StGIT) do not actually fit well\u001b[m\n with plain Git at all: it is basically impossible to take advantage\u001b[m\n\u001b[31m-of the index efectively when using StGIT. But more importantly,\u001b[m\n\u001b[32m+\u001b[m\u001b[32mof the index effectively when using StGIT. But more importantly,\u001b[m\n these tools horribly fail in the face of distributed environment.\u001b[m\n \u001b[m\n TopGit has been designed around three main tenets:\u001b[m\n\u001b[36m@@ -45,7 +45,7 @@ them.\u001b[m\n \u001b[m\n As mentioned above, the main intended use-case for TopGit is tracking\u001b[m\n third-party patches, where each patch is effectively a single topic\u001b[m\n\u001b[31m-branch.  In order to flexibly accomodate even complex scenarios when\u001b[m\n\u001b[32m+\u001b[m\u001b[32mbranch.  In order to flexibly accommodate even complex scenarios when\u001b[m\n you track many patches where many are independent but some depend\u001b[m\n on others, TopGit ignores the ancient Quilt heritage of patch series\u001b[m\n and instead allows the patches to freely form graphs (DAGs just like\u001b[m\n\u001b[36m@@ -222,7 +222,7 @@ tg create\u001b[m\n \u001b[m\n \tAfter `tg create`, you should insert the patch description\u001b[m\n \tto the '.topmsg' file, which will already contain some\u001b[m\n\u001b[31m-\tpre-filled bits. You can set topgit.to, topgit.cc and topgit.bcc\u001b[m\n\u001b[32m+\u001b[m\t\u001b[32mprefilled bits. You can set topgit.to, topgit.cc and topgit.bcc\u001b[m\n \tconfiguration variables in order to have `tg create`\u001b[m\n \tadd these headers with given default values to '.topmsg'.\u001b[m\n \u001b[m\n\u001b[36m@@ -350,7 +350,7 @@ tg export\u001b[m\n \tin the cleaned up history (corresponding basically exactly\u001b[m\n \tto `tg patch` output for the topic branch).\u001b[m\n \u001b[m\n\u001b[31m-\tThe command has two posible outputs now - either a Git branch\u001b[m\n\u001b[32m+\u001b[m\t\u001b[32mThe command has two possible outputs now - either a Git branch\u001b[m\n \twith the collapsed history, or a quilt series in new directory.\u001b[m\n \u001b[m\n \tIn case of producing collapsed history in new branch,\u001b[m\n\u001b[36m@@ -455,7 +455,6 @@ tg update\u001b[m\n \u001b[m\n \tTODO: tg update -a for updating all topic branches\u001b[m\n \u001b[m\n\u001b[31m-TODO: tg depend for adding/removing dependencies smoothly\u001b[m\n TODO: tg rename\u001b[m\n \u001b[m\n \u001b[m\n\u001b[36m@@ -485,7 +484,7 @@ whatever Cc headers you choose or the post-three-dashes message.\u001b[m\n When mailing out your patch, basically only few extra headers\u001b[m\n mail headers are inserted and the patch itself is appended.\u001b[m\n Thus, as your patches evolve, you can record nuances like whether\u001b[m\n\u001b[31m-the paricular patch should have To-list/Cc-maintainer or vice\u001b[m\n\u001b[32m+\u001b[m\u001b[32mthe particular patch should have To-list/Cc-maintainer or vice\u001b[m\n versa and similar nuances, if your project is into that.\u001b[m\n From is prefilled from your current GIT_AUTHOR_IDENT, other headers\u001b[m\n can be prefilled from various optional topgit.* config options.\u001b[m\n-- \ntg: (f17218e..) jf/readme-update (depends on: master)\n"},{"id":"96244","messageId":"2c6b72b30811200552h46004299w881ad61134ec5555@mail.gmail.com","threadId":"16411","inReplyTo":"1227189062-11951-1-git-send-email-fonseca@diku.dk","subject":"Re: [TopGit PATCH] README: Fix spelling","fromName":"Jonas Fonseca","fromEmail":"jonas.fonseca@gmail.com","sentAt":"2008-11-20T13:52:13Z","receivedAt":"2008-11-20T13:52:13Z","isPatch":true,"sender":{"key":"jonas.fonseca@gmail.com","avatar":"https://gravatar.com/avatar/9b7fa23cce50269e5d164312b6ac5ae818a180f837b38f28f3bdf689dd7f96cd?d=mp&s=160"},"body":"Oops sorry about this one!!! :-/\n\nOn Thu, Nov 20, 2008 at 14:51, Jonas Fonseca <fonseca@diku.dk> wrote:\n> Signed-off-by: Jonas Fonseca <fonseca@diku.dk>\n>\n> ---\n>  README [m |   11  [32m+++++ [m [31m------ [m\n>  1 files changed, 5 insertions(+), 6 deletions(-) [m\n>\n>  [1mdiff --git a/README b/README [m\n>  [1mindex 5bfe3ee..9e291da 100644 [m\n>  [1m--- a/README [m\n>  [1m+++ b/README [m\n>  [36m@@ -22,7 +22,7 @@ version control of patches (reordering of patches is not [m\n>  version-controlled at all). But there are several disadvantages - [m\n>  for one, these tools (especially StGIT) do not actually fit well [m\n>  with plain Git at all: it is basically impossible to take advantage [m\n>  [31m-of the index efectively when using StGIT. But more importantly, [m\n>  [32m+ [m [32mof the index effectively when using StGIT. But more importantly, [m\n>  these tools horribly fail in the face of distributed environment. [m\n>  [m\n>  TopGit has been designed around three main tenets: [m\n>  [36m@@ -45,7 +45,7 @@ them. [m\n>  [m\n>  As mentioned above, the main intended use-case for TopGit is tracking [m\n>  third-party patches, where each patch is effectively a single topic [m\n>  [31m-branch.  In order to flexibly accomodate even complex scenarios when [m\n>  [32m+ [m [32mbranch.  In order to flexibly accommodate even complex scenarios when [m\n>  you track many patches where many are independent but some depend [m\n>  on others, TopGit ignores the ancient Quilt heritage of patch series [m\n>  and instead allows the patches to freely form graphs (DAGs just like [m\n>  [36m@@ -222,7 +222,7 @@ tg create [m\n>  [m\n>        After `tg create`, you should insert the patch description [m\n>        to the '.topmsg' file, which will already contain some [m\n>  [31m-  pre-filled bits. You can set topgit.to, topgit.cc and topgit.bcc [m\n>  [32m+ [m        [32mprefilled bits. You can set topgit.to, topgit.cc and topgit.bcc [m\n>        configuration variables in order to have `tg create` [m\n>        add these headers with given default values to '.topmsg'. [m\n>  [m\n>  [36m@@ -350,7 +350,7 @@ tg export [m\n>        in the cleaned up history (corresponding basically exactly [m\n>        to `tg patch` output for the topic branch). [m\n>  [m\n>  [31m-  The command has two posible outputs now - either a Git branch [m\n>  [32m+ [m        [32mThe command has two possible outputs now - either a Git branch [m\n>        with the collapsed history, or a quilt series in new directory. [m\n>  [m\n>        In case of producing collapsed history in new branch, [m\n>  [36m@@ -455,7 +455,6 @@ tg update [m\n>  [m\n>        TODO: tg update -a for updating all topic branches [m\n>  [m\n>  [31m-TODO: tg depend for adding/removing dependencies smoothly [m\n>  TODO: tg rename [m\n>  [m\n>  [m\n>  [36m@@ -485,7 +484,7 @@ whatever Cc headers you choose or the post-three-dashes message. [m\n>  When mailing out your patch, basically only few extra headers [m\n>  mail headers are inserted and the patch itself is appended. [m\n>  Thus, as your patches evolve, you can record nuances like whether [m\n>  [31m-the paricular patch should have To-list/Cc-maintainer or vice [m\n>  [32m+ [m [32mthe particular patch should have To-list/Cc-maintainer or vice [m\n>  versa and similar nuances, if your project is into that. [m\n>  From is prefilled from your current GIT_AUTHOR_IDENT, other headers [m\n>  can be prefilled from various optional topgit.* config options. [m\n> --\n> tg: (f17218e..) jf/readme-update (depends on: master)\n>\n\n\n\n-- \nJonas Fonseca\n"},{"id":"96245","messageId":"20081120135710.GA16303@diku.dk","threadId":"16411","inReplyTo":"1227189062-11951-1-git-send-email-fonseca@diku.dk","subject":"[TopGit PATCH] tg patch: disable pager and colors for git-diff","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2008-11-20T13:57:10Z","receivedAt":"2008-11-20T13:57:10Z","isPatch":true,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"When output is not redirected to a file, git brings up the pager for\nonly the diff, which can be confusing, so disable with --no-pager.\ngit-diff is a porcelain command and thus subject to color options. Use\n--no-color, to avoid the patch being corrupted with terminal escape\ncharacters when color.diff=always.\n\nSigned-off-by: Jonas Fonseca <fonseca@diku.dk>\n---\n tg-patch.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\n Jonas Fonseca <fonseca@diku.dk> wrote Thu, Nov 20, 2008:\n > Signed-off-by: Jonas Fonseca <fonseca@diku.dk>\n > \n > ---\n >  README\u001b[m |   11 \u001b[32m+++++\u001b[m\u001b[31m------\u001b[m\n >  1 files changed, 5 insertions(+), 6 deletions(-)\u001b[m\n > \n > \u001b[1mdiff --git a/README b/README\u001b[m\n > \u001b[1mindex 5bfe3ee..9e291da 100644\u001b[m\n > \u001b[1m--- a/README\u001b[m\n > \u001b[1m+++ b/README\u001b[m\n\n I hope this demonstrates the point of this patch. ;)\n\ndiff --git a/tg-patch.sh b/tg-patch.sh\nindex 97338ab..c2f1b56 100644\n--- a/tg-patch.sh\n+++ b/tg-patch.sh\n@@ -34,7 +34,7 @@ git diff-tree --name-only \"$base_rev\" \"$name\" |\n \tfgrep -vx \".topdeps\" |\n \tfgrep -vx \".topmsg\" >\"$git_is_stupid\" || : # fgrep likes to fail randomly?\n if [ -s \"$git_is_stupid\" ]; then\n-\tcat \"$git_is_stupid\" | xargs git diff --patch-with-stat \"$base_rev\" \"$name\" --\n+\tcat \"$git_is_stupid\" | xargs git --no-pager diff --no-color --patch-with-stat \"$base_rev\" \"$name\" --\n else\n \techo \"No changes.\"\n fi\n-- \ntg: (f17218e..) jf/patch-no-pager-and-color (depends on: master)\n\n-- \nJonas Fonseca\n"},{"id":"96250","messageId":"20081120141725.GB25425@piper.oerlikon.madduck.net","threadId":"16411","inReplyTo":"2c6b72b30811200552h46004299w881ad61134ec5555@mail.gmail.com","subject":"Re: [TopGit PATCH] README: Fix spelling","fromName":"martin f krafft","fromEmail":"madduck@debian.org","sentAt":"2008-11-20T14:17:25Z","receivedAt":"2008-11-20T14:17:25Z","isPatch":true,"sender":{"key":"madduck@debian.org","avatar":null},"body":"also sprach Jonas Fonseca <jonas.fonseca@gmail.com> [2008.11.20.1452 +0100]:\n> Oops sorry about this one!!! :-/\n\nWhat about it? The patch seems perfectly alright. Only the quoted\nversion is broken, which I think is your fault.\n\nShould I apply the README patch?\n\n-- \n .''`.   martin f. krafft <madduck@debian.org>\n: :'  :  proud Debian developer, author, administrator, and user\n`. `'`   http://people.debian.org/~madduck - http://debiansystem.info\n  `-  Debian - when you have better things to do than fixing systems\n \na Hooloovoo is a superintelligent shade of the color blue.\n            -- douglas adams, \"the hitchhiker's guide to the galaxy\"\n"},{"id":"96252","messageId":"2c6b72b30811200623t3326f69bu4c8570a3c41cc764@mail.gmail.com","threadId":"16411","inReplyTo":"20081120141725.GB25425@piper.oerlikon.madduck.net","subject":"Re: [TopGit PATCH] README: Fix spelling","fromName":"Jonas Fonseca","fromEmail":"jonas.fonseca@gmail.com","sentAt":"2008-11-20T14:23:51Z","receivedAt":"2008-11-20T14:23:51Z","isPatch":true,"sender":{"key":"jonas.fonseca@gmail.com","avatar":"https://gravatar.com/avatar/9b7fa23cce50269e5d164312b6ac5ae818a180f837b38f28f3bdf689dd7f96cd?d=mp&s=160"},"body":"On Thu, Nov 20, 2008 at 15:17, martin f krafft <madduck@debian.org> wrote:\n> also sprach Jonas Fonseca <jonas.fonseca@gmail.com> [2008.11.20.1452 +0100]:\n>> Oops sorry about this one!!! :-/\n>\n> What about it? The patch seems perfectly alright. Only the quoted\n> version is broken, which I think is your fault.\n\nWell, it looks very broken in Gmail ...\n\n> Should I apply the README patch?\n\nYes, if you can salvage it. Else it is also available in branch\njf/readme-update at\n\n  git://repo.or.cz/topgit/fonseca.git\n\n-- \nJonas Fonseca\n"},{"id":"96254","messageId":"20081120143455.GH10544@machine.or.cz","threadId":"16411","inReplyTo":"20081120135710.GA16303@diku.dk","subject":"Re: [TopGit PATCH] tg patch: disable pager and colors for git-diff","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2008-11-20T14:34:55Z","receivedAt":"2008-11-20T14:34:55Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"On Thu, Nov 20, 2008 at 02:57:10PM +0100, Jonas Fonseca wrote:\n> When output is not redirected to a file, git brings up the pager for\n> only the diff, which can be confusing, so disable with --no-pager.\n> git-diff is a porcelain command and thus subject to color options. Use\n> --no-color, to avoid the patch being corrupted with terminal escape\n> characters when color.diff=always.\n> \n> Signed-off-by: Jonas Fonseca <fonseca@diku.dk>\n\nI still don't understand how did that color thing happen - shouldn't\ngit diff avoid spewing out colors when the output is not a tty? And when\nit is, I want the colors myself, too.\n\nGood point with the --no-pager, but in that case, tg patch itself should\nby default invoke the pager, since it really is very desirable.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nPeople who take cold baths never have rheumatism, but they have\ncold baths.\n"},{"id":"96258","messageId":"2c6b72b30811200655o770efd63u4101f44683f2bc0d@mail.gmail.com","threadId":"16411","inReplyTo":"20081120143455.GH10544@machine.or.cz","subject":"Re: [TopGit PATCH] tg patch: disable pager and colors for git-diff","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2008-11-20T14:55:47Z","receivedAt":"2008-11-20T14:55:47Z","isPatch":true,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"On Thu, Nov 20, 2008 at 15:34, Petr Baudis <pasky@suse.cz> wrote:\n> On Thu, Nov 20, 2008 at 02:57:10PM +0100, Jonas Fonseca wrote:\n>> When output is not redirected to a file, git brings up the pager for\n>> only the diff, which can be confusing, so disable with --no-pager.\n>> git-diff is a porcelain command and thus subject to color options. Use\n>> --no-color, to avoid the patch being corrupted with terminal escape\n>> characters when color.diff=always.\n>>\n>> Signed-off-by: Jonas Fonseca <fonseca@diku.dk>\n>\n> I still don't understand how did that color thing happen - shouldn't\n> git diff avoid spewing out colors when the output is not a tty? And when\n> it is, I want the colors myself, too.\n\nAs I wrote in the commit message, git diff always spews out colors\nwith color.diff=always. This was what I for experimental reasons had\nin my .git/config (and forgotten all about) before sending the README\nupdate patch. Topgit could check the git color configuration but that\nseems more hacky.\n\n> Good point with the --no-pager, but in that case, tg patch itself should\n> by default invoke the pager, since it really is very desirable.\n\nYes, probably.\n\n-- \nJonas Fonseca\n"},{"id":"96259","messageId":"20081120150754.GH10491@machine.or.cz","threadId":"16411","inReplyTo":"2c6b72b30811200655o770efd63u4101f44683f2bc0d@mail.gmail.com","subject":"Re: [TopGit PATCH] tg patch: disable pager and colors for git-diff","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2008-11-20T15:07:54Z","receivedAt":"2008-11-20T15:07:54Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"On Thu, Nov 20, 2008 at 03:55:47PM +0100, Jonas Fonseca wrote:\n> On Thu, Nov 20, 2008 at 15:34, Petr Baudis <pasky@suse.cz> wrote:\n> > On Thu, Nov 20, 2008 at 02:57:10PM +0100, Jonas Fonseca wrote:\n> >> When output is not redirected to a file, git brings up the pager for\n> >> only the diff, which can be confusing, so disable with --no-pager.\n> >> git-diff is a porcelain command and thus subject to color options. Use\n> >> --no-color, to avoid the patch being corrupted with terminal escape\n> >> characters when color.diff=always.\n> >>\n> >> Signed-off-by: Jonas Fonseca <fonseca@diku.dk>\n> >\n> > I still don't understand how did that color thing happen - shouldn't\n> > git diff avoid spewing out colors when the output is not a tty? And when\n> > it is, I want the colors myself, too.\n> \n> As I wrote in the commit message, git diff always spews out colors\n> with color.diff=always. This was what I for experimental reasons had\n> in my .git/config (and forgotten all about) before sending the README\n> update patch. Topgit could check the git color configuration but that\n> seems more hacky.\n\nThis shows just that color.diff=always is asking for trouble. ;-)\nI think we shouldn't try to outsmart the user if they _force_ that they\nreally always want the colors.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nPeople who take cold baths never have rheumatism, but they have\ncold baths.\n"}]}