{"thread":{"id":"396","subject":"The big git command renaming..","startedAt":"2005-04-29T21:24:43Z","lastAt":"2005-04-30T14:24:45Z","messageCount":10,"participants":["Linus Torvalds","Dave Jones","Junio C Hamano","H. Peter Anvin","Nicolas Pitre"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"2191","messageId":"Pine.LNX.4.58.0504291416190.18901@ppc970.osdl.org","threadId":"396","inReplyTo":null,"subject":"The big git command renaming..","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2005-04-29T21:24:43Z","receivedAt":"2005-04-29T21:24:43Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\nOk, I hate to do this, since my fingers have already gotten used to the \nold names, but we clearly can't continue to use command names like \n\"update-cache\" or \"read-tree\" that are totally non-git-specific.\n\nSo I just pushed out a change that renames the commands to always have a \n\"git-\" prefix. In addition, I renamed \"show-diff\" to \"diff-files\", with \ntogether with the prefix means that it becomes \"git-diff-files\" when used.\n\nSince I end up using tab-completion for almost all my work, and since\n-within- the source directory there's no confusion, I didn't actually name\nthe source files with any git- prefix. Quite the reverse: I removed the\nprefix from the two .c files that already had it (so git-mktag.c is now\njust \"mktag.c\"), and the general rule for building the executable from a C \nfile is now\n\n\tgit-%: %.c $(LIB_FILE)\n\t\t$(CC) $(CFLAGS) -o $@ $(filter %.c,$^) $(LIBS)\n\n\nthis seemed to be a nice regular interface that means that binaries get \ninstalled with clear \"git-\" prefixes, but that I don't have to look at \nthem when I edit the sources.\n\nSorry to everybody else whose fingers have already learnt the old names. \nThe good news is that if you use cogito, you won't care.\n\n\t\tLinus\n"},{"id":"2193","messageId":"20050429213540.GA1691@redhat.com","threadId":"396","inReplyTo":"Pine.LNX.4.58.0504291416190.18901@ppc970.osdl.org","subject":"Re: The big git command renaming..","fromName":"Dave Jones","fromEmail":"davej@redhat.com","sentAt":"2005-04-29T21:35:40Z","receivedAt":"2005-04-29T21:35:40Z","isPatch":false,"sender":{"key":"davej@redhat.com","avatar":null},"body":"On Fri, Apr 29, 2005 at 02:24:43PM -0700, Linus Torvalds wrote:\n > \n > Ok, I hate to do this, since my fingers have already gotten used to the \n > old names, but we clearly can't continue to use command names like \n > \"update-cache\" or \"read-tree\" that are totally non-git-specific.\n > \n > So I just pushed out a change that renames the commands to always have a \n > \"git-\" prefix. In addition, I renamed \"show-diff\" to \"diff-files\", with \n > together with the prefix means that it becomes \"git-diff-files\" when used.\n > \n > Since I end up using tab-completion for almost all my work, and since\n > -within- the source directory there's no confusion, I didn't actually name\n > the source files with any git- prefix. Quite the reverse: I removed the\n > prefix from the two .c files that already had it (so git-mktag.c is now\n > just \"mktag.c\"), and the general rule for building the executable from a C \n > file is now\n > \n > \tgit-%: %.c $(LIB_FILE)\n > \t\t$(CC) $(CFLAGS) -o $@ $(filter %.c,$^) $(LIBS)\n > \n > \n > this seemed to be a nice regular interface that means that binaries get \n > installed with clear \"git-\" prefixes, but that I don't have to look at \n > them when I edit the sources.\n\nCan you push out a new tarball to kernel.org too please, to kill\nsome potential confusion in documentation/scripts ?\n\n\t\tDave\n\n\n"},{"id":"2195","messageId":"7vacnh45x0.fsf@assigned-by-dhcp.cox.net","threadId":"396","inReplyTo":"Pine.LNX.4.58.0504291416190.18901@ppc970.osdl.org","subject":"[PATCH] The big git command renaming fallout fix.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-04-29T21:41:31Z","receivedAt":"2005-04-29T21:41:31Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":">>>>> \"LT\" == Linus Torvalds <torvalds@osdl.org> writes:\n\nLT> Ok, I hate to do this, ...\n\nWell, it was time.  This fixes the git-export which calls diff-tree.\n\nSigned-off-by: Junio C Hamano <junkio@cox.net>\n---\ncd /opt/packrat/playpen/public/in-place/git/git.linus/\nshow-diff -p export.c\n--- k/export.c  (mode:100644)\n+++ l/export.c  (mode:100644)\n@@ -18,7 +18,7 @@ void show_commit(struct commit *commit)\n \t\tchar *against = sha1_to_hex(commit->parents->item->object.sha1);\n \t\tprintf(\"\\n\\n======== diff against %s ========\\n\", against);\n \t\tfflush(NULL);\n-\t\tsprintf(cmdline, \"diff-tree -p %s %s\", against, hex);\n+\t\tsprintf(cmdline, \"git-diff-tree -p %s %s\", against, hex);\n \t\tsystem(cmdline);\n \t}\n \tprintf(\"======== end ========\\n\\n\");\n\n\n\n\n"},{"id":"2199","messageId":"7v3bt945cw.fsf_-_@assigned-by-dhcp.cox.net","threadId":"396","inReplyTo":"7vacnh45x0.fsf@assigned-by-dhcp.cox.net","subject":"[PATCH] Makefile: The big git command renaming fallout fix.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-04-29T21:53:35Z","receivedAt":"2005-04-29T21:53:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here is another.  This one belongs to a clean-up category.\n\nSigned-off-by: Junio C Hamano <junkio@cox.net>\n---\ncd /opt/packrat/playpen/public/in-place/git/git.linus/\nshow-diff -p Makefile\n--- k/Makefile  (mode:100644)\n+++ l/Makefile  (mode:100644)\n@@ -59,8 +59,6 @@ CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'\n $(LIB_FILE): $(LIB_OBJS)\n \t$(AR) rcs $@ $(LIB_OBJS)\n \n-init-db: init-db.o\n-\n git-%: %.c $(LIB_FILE)\n \t$(CC) $(CFLAGS) -o $@ $(filter %.c,$^) $(LIBS)\n \n@@ -104,6 +102,7 @@ read-cache.o: $(LIB_H)\n sha1_file.o: $(LIB_H)\n usage.o: $(LIB_H)\n diff.o: $(LIB_H)\n+strbuf.o: $(LIB_H)\n \n clean:\n \trm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)\n\n\n"},{"id":"2202","messageId":"4272AE05.2070202@zytor.com","threadId":"396","inReplyTo":"20050429213540.GA1691@redhat.com","subject":"Re: The big git command renaming..","fromName":"H. Peter Anvin","fromEmail":"hpa@zytor.com","sentAt":"2005-04-29T21:58:29Z","receivedAt":"2005-04-29T21:58:29Z","isPatch":false,"sender":{"key":"hpa@zytor.com","avatar":null},"body":"Dave Jones wrote:\n> On Fri, Apr 29, 2005 at 02:24:43PM -0700, Linus Torvalds wrote:\n>  > \n>  > Ok, I hate to do this, since my fingers have already gotten used to the \n>  > old names, but we clearly can't continue to use command names like \n>  > \"update-cache\" or \"read-tree\" that are totally non-git-specific.\n>  > \n>  > So I just pushed out a change that renames the commands to always have a \n>  > \"git-\" prefix. In addition, I renamed \"show-diff\" to \"diff-files\", with \n>  > together with the prefix means that it becomes \"git-diff-files\" when used.\n>  > \n>  > Since I end up using tab-completion for almost all my work, and since\n>  > -within- the source directory there's no confusion, I didn't actually name\n>  > the source files with any git- prefix. Quite the reverse: I removed the\n>  > prefix from the two .c files that already had it (so git-mktag.c is now\n>  > just \"mktag.c\"), and the general rule for building the executable from a C \n>  > file is now\n>  > \n>  > \tgit-%: %.c $(LIB_FILE)\n>  > \t\t$(CC) $(CFLAGS) -o $@ $(filter %.c,$^) $(LIBS)\n>  > \n>  > \n>  > this seemed to be a nice regular interface that means that binaries get \n>  > installed with clear \"git-\" prefixes, but that I don't have to look at \n>  > them when I edit the sources.\n> \n> Can you push out a new tarball to kernel.org too please, to kill\n> some potential confusion in documentation/scripts ?\n\nOh yes, and can that tarball please be put in /pub/software/scm/git, and \nthe associated git tree be moved to /pub/scm/git?\n\n\t-hpa\n"},{"id":"2207","messageId":"Pine.LNX.4.58.0504291511410.18901@ppc970.osdl.org","threadId":"396","inReplyTo":"4272AE05.2070202@zytor.com","subject":"Re: The big git command renaming..","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2005-04-29T22:14:47Z","receivedAt":"2005-04-29T22:14:47Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Fri, 29 Apr 2005, H. Peter Anvin wrote:\n> \n> Oh yes, and can that tarball please be put in /pub/software/scm/git, and \n> the associated git tree be moved to /pub/scm/git?\n\nSure. \n\nJust a quick question: what are the \"rules\" for /pub/scm/git? \n\nShould I put just git in it, or is it meant for any \"git project\", and\nshould I also copy the 2.6.x kernel home from\n\n\t/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n\nto\n\n\t/pub/scm/git/linux-2.6.git\n\nor what?\n\nMe, I can do either or both, I just don't know what the intent was..\n\n\t\tLinus\n\n"},{"id":"2213","messageId":"4272BE9C.7090906@zytor.com","threadId":"396","inReplyTo":"Pine.LNX.4.58.0504291511410.18901@ppc970.osdl.org","subject":"Re: The big git command renaming..","fromName":"H. Peter Anvin","fromEmail":"hpa@zytor.com","sentAt":"2005-04-29T23:09:16Z","receivedAt":"2005-04-29T23:09:16Z","isPatch":false,"sender":{"key":"hpa@zytor.com","avatar":null},"body":"Linus Torvalds wrote:\n> \n> Sure. \n> \n> Just a quick question: what are the \"rules\" for /pub/scm/git? \n> \n> Should I put just git in it, or is it meant for any \"git project\", and\n> should I also copy the 2.6.x kernel home from\n> \n> \t/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n> \n> to\n> \n> \t/pub/scm/git/linux-2.6.git\n> \n> or what?\n> \n> Me, I can do either or both, I just don't know what the intent was..\n\n/pub/scm/git I created for your git project; don't move the kernel in there.\n\nIf you have any other non-kernel git projects, just let me know and I'll \nmake directories for them.\n\n\t-hpa\n\nP.S. Are you still updating the trees in \n/pub/linux/kernel/people/torvalds/?  They still show up on our change \nreports, and cause problems for the mirrors.  Perhaps you could replace \nthose trees with symlinks into /pub/scm.\n\n\t-hpa\n\n\n"},{"id":"2216","messageId":"Pine.LNX.4.58.0504291638260.18901@ppc970.osdl.org","threadId":"396","inReplyTo":"4272BE9C.7090906@zytor.com","subject":"Re: The big git command renaming..","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2005-04-29T23:39:43Z","receivedAt":"2005-04-29T23:39:43Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Fri, 29 Apr 2005, H. Peter Anvin wrote:\n> \n> If you have any other non-kernel git projects, just let me know and I'll \n> make directories for them.\n\nThe others are small and specialized (sparse, and the \"git-tools\" thing,\nand the latter is so much smaler than my BK tools used to be that I\nsuspect I should just move it into git as the \"apply mbox\" import thing it\nis)\n\n> P.S. Are you still updating the trees in \n> /pub/linux/kernel/people/torvalds/?  They still show up on our change \n> reports, and cause problems for the mirrors.  Perhaps you could replace \n> those trees with symlinks into /pub/scm.\n\nFixed.\n\n\t\tLinus\n"},{"id":"2217","messageId":"4272C683.4050704@zytor.com","threadId":"396","inReplyTo":"Pine.LNX.4.58.0504291638260.18901@ppc970.osdl.org","subject":"Re: The big git command renaming..","fromName":"H. Peter Anvin","fromEmail":"hpa@zytor.com","sentAt":"2005-04-29T23:42:59Z","receivedAt":"2005-04-29T23:42:59Z","isPatch":false,"sender":{"key":"hpa@zytor.com","avatar":null},"body":"Linus Torvalds wrote:\n> \n> On Fri, 29 Apr 2005, H. Peter Anvin wrote:\n> \n>>If you have any other non-kernel git projects, just let me know and I'll \n>>make directories for them.\n> \n> \n> The others are small and specialized (sparse, and the \"git-tools\" thing,\n> and the latter is so much smaler than my BK tools used to be that I\n> suspect I should just move it into git as the \"apply mbox\" import thing it\n> is)\n> \n\nI created /pub/scm/devel/sparse to go along with \n/pub/software/devel/sparse.  I agree with git-tools; just put it in the \ngit directory (after all, you can have more than one dir.git underneath it.)\n\n\t-hpa\n"},{"id":"2257","messageId":"Pine.LNX.4.62.0504301023060.14033@localhost.localdomain","threadId":"396","inReplyTo":"Pine.LNX.4.58.0504291416190.18901@ppc970.osdl.org","subject":"Re: The big git command renaming..","fromName":"Nicolas Pitre","fromEmail":"nico@cam.org","sentAt":"2005-04-30T14:24:45Z","receivedAt":"2005-04-30T14:24:45Z","isPatch":false,"sender":{"key":"nico@fluxnic.net","avatar":"https://avatars.githubusercontent.com/u/702790?v=4"},"body":"On Fri, 29 Apr 2005, Linus Torvalds wrote:\n\n> So I just pushed out a change that renames the commands to always have a \n> \"git-\" prefix. In addition, I renamed \"show-diff\" to \"diff-files\", with \n> together with the prefix means that it becomes \"git-diff-files\" when used.\n\nWhile at it, could you also rename show-files to ls-files?\n\n\nNicolas\n"}]}