{"thread":{"id":"14333","subject":"[PATCH 1/2] must_commit_first: Make sure the index is up to date","startedAt":"2008-07-08T00:03:10Z","lastAt":"2008-07-08T01:28:29Z","messageCount":8,"participants":["Theodore Ts'o","Josef 'Jeff' Sipek","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"82507","messageId":"1215475392-26221-1-git-send-email-tytso@mit.edu","threadId":"14333","inReplyTo":null,"subject":"Two quick patches for guilt v0.30","fromName":"Theodore Ts'o","fromEmail":"tytso@mit.edu","sentAt":"2008-07-08T00:03:10Z","receivedAt":"2008-07-08T00:03:10Z","isPatch":false,"sender":{"key":"tytso@mit.edu","avatar":"https://avatars.githubusercontent.com/u/51416?v=4"},"body":"Hi Jeff, here are two quick patches for guilt, versus v0.30.  The\nsecond is needed for people using the latest git (on the master\nbranch), so it'd be great if you could get this out.\n\nThanks, regards,\n\n\t\t\t\t\t- Ted\n"},{"id":"82505","messageId":"1215475392-26221-2-git-send-email-tytso@mit.edu","threadId":"14333","inReplyTo":"1215475392-26221-1-git-send-email-tytso@mit.edu","subject":"[PATCH 1/2] must_commit_first: Make sure the index is up to date","fromName":"Theodore Ts'o","fromEmail":"tytso@mit.edu","sentAt":"2008-07-08T00:03:11Z","receivedAt":"2008-07-08T00:03:11Z","isPatch":true,"sender":{"key":"tytso@mit.edu","avatar":"https://avatars.githubusercontent.com/u/51416?v=4"},"body":"git diff-files can be confused if the index is not up to date, so make\nsure it is updated first.\n\nSigned-off-by: \"Theodore Ts'o\" <tytso@mit.edu>\n---\n guilt |    1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/guilt b/guilt\nindex 50414a4..cdf4e9b 100755\n--- a/guilt\n+++ b/guilt\n@@ -495,6 +495,7 @@ s/^\\([0-9]\\{4\\}\\)-\\([0-9]\\{2\\}\\)-\\([0-9]\\{2\\}\\) \\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\):\\(\n # usage: must_commit_first\n must_commit_first()\n {\n+\tgit update-index --refresh --unmerged -q > /dev/null\n \t[ `git diff-files | wc -l` -eq 0 ]\n \treturn $?\n }\n-- \n1.5.6.1.205.ge2c7.dirty\n"},{"id":"82506","messageId":"1215475392-26221-3-git-send-email-tytso@mit.edu","threadId":"14333","inReplyTo":"1215475392-26221-2-git-send-email-tytso@mit.edu","subject":"[PATCH 2/2] Make guilt work even after git-sh-setup is moved out of the user's path","fromName":"Theodore Ts'o","fromEmail":"tytso@mit.edu","sentAt":"2008-07-08T00:03:12Z","receivedAt":"2008-07-08T00:03:12Z","isPatch":true,"sender":{"key":"tytso@mit.edu","avatar":"https://avatars.githubusercontent.com/u/51416?v=4"},"body":"Signed-off-by: \"Theodore Ts'o\" <tytso@mit.edu>\n---\n guilt |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/guilt b/guilt\nindex cdf4e9b..d30d35a 100755\n--- a/guilt\n+++ b/guilt\n@@ -23,7 +23,7 @@ esac\n # we change directories ourselves\n SUBDIRECTORY_OK=1\n \n-. git-sh-setup\n+. $(git --exec-path)/git-sh-setup\n \n #\n # Git version check\n-- \n1.5.6.1.205.ge2c7.dirty\n"},{"id":"82510","messageId":"20080708003256.GB1880@josefsipek.net","threadId":"14333","inReplyTo":"1215475392-26221-3-git-send-email-tytso@mit.edu","subject":"Re: [PATCH 2/2] Make guilt work even after git-sh-setup is moved out of the user's path","fromName":"Josef 'Jeff' Sipek","fromEmail":"jeffpc@josefsipek.net","sentAt":"2008-07-08T00:32:56Z","receivedAt":"2008-07-08T00:32:56Z","isPatch":true,"sender":{"key":"jeffpc@josefsipek.net","avatar":null},"body":"On Mon, Jul 07, 2008 at 08:03:12PM -0400, Theodore Ts'o wrote:\n> Signed-off-by: \"Theodore Ts'o\" <tytso@mit.edu>\n> ---\n>  guilt |    2 +-\n>  1 files changed, 1 insertions(+), 1 deletions(-)\n> \n> diff --git a/guilt b/guilt\n> index cdf4e9b..d30d35a 100755\n> --- a/guilt\n> +++ b/guilt\n> @@ -23,7 +23,7 @@ esac\n>  # we change directories ourselves\n>  SUBDIRECTORY_OK=1\n>  \n> -. git-sh-setup\n> +. $(git --exec-path)/git-sh-setup\n\nThis seems wrong.\n\n\njeffpc@freyr:~$ git --version\ngit version 1.5.6.2.247.g923712\njeffpc@freyr:~$ git --exec-path\n/home/jeffpc/git-bin/bin\n\nAFAICT, it should be:\n\n/home/jeffpc/git-bin/libexec/git-core\n\n(which contains git-sh-setup)\n\nJosef 'Jeff' Sipek.\n\n-- \nI think there is a world market for maybe five computers.\n\t\t- Thomas Watson, chairman of IBM, 1943.\n"},{"id":"82513","messageId":"7vwsjxxkfd.fsf@gitster.siamese.dyndns.org","threadId":"14333","inReplyTo":"20080708003256.GB1880@josefsipek.net","subject":"Re: [PATCH 2/2] Make guilt work even after git-sh-setup is moved out of the user's path","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-07-08T00:56:54Z","receivedAt":"2008-07-08T00:56:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Josef 'Jeff' Sipek\" <jeffpc@josefsipek.net> writes:\n\n> On Mon, Jul 07, 2008 at 08:03:12PM -0400, Theodore Ts'o wrote:\n>> Signed-off-by: \"Theodore Ts'o\" <tytso@mit.edu>\n>> ---\n>>  guilt |    2 +-\n>>  1 files changed, 1 insertions(+), 1 deletions(-)\n>> \n>> diff --git a/guilt b/guilt\n>> index cdf4e9b..d30d35a 100755\n>> --- a/guilt\n>> +++ b/guilt\n>> @@ -23,7 +23,7 @@ esac\n>>  # we change directories ourselves\n>>  SUBDIRECTORY_OK=1\n>>  \n>> -. git-sh-setup\n>> +. $(git --exec-path)/git-sh-setup\n>\n> This seems wrong.\n>\n> jeffpc@freyr:~$ git --version\n> git version 1.5.6.2.247.g923712\n> jeffpc@freyr:~$ git --exec-path\n> /home/jeffpc/git-bin/bin\n\nHmm, it is yours that look wrong.\n\nWith 1.6.0 preview (aka 'master'):\n\n$ git --version\ngit version 1.5.6.2.255.gbed62\n$ git --exec-path\n/home/junio/git-master/libexec/git-core\n\nWith 1.5.6 maintenance track (aka 'maint'):\n\n$ ~/git-maint/bin/git --version\ngit version 1.5.6.2.15.g39f31\n$ ~/git-maint/bin/git --exec-path\n/home/junio/git-maint/bin\n"},{"id":"82517","messageId":"20080708011413.GC1880@josefsipek.net","threadId":"14333","inReplyTo":"7vwsjxxkfd.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH 2/2] Make guilt work even after git-sh-setup is moved out of the user's path","fromName":"Josef 'Jeff' Sipek","fromEmail":"jeffpc@josefsipek.net","sentAt":"2008-07-08T01:14:13Z","receivedAt":"2008-07-08T01:14:13Z","isPatch":true,"sender":{"key":"jeffpc@josefsipek.net","avatar":null},"body":"On Mon, Jul 07, 2008 at 05:56:54PM -0700, Junio C Hamano wrote:\n> \"Josef 'Jeff' Sipek\" <jeffpc@josefsipek.net> writes:\n...\n> > jeffpc@freyr:~$ git --version\n> > git version 1.5.6.2.247.g923712\n> > jeffpc@freyr:~$ git --exec-path\n> > /home/jeffpc/git-bin/bin\n> \n> Hmm, it is yours that look wrong.\n \nOk.\n\n> With 1.6.0 preview (aka 'master'):\n> \n> $ git --version\n> git version 1.5.6.2.255.gbed62\n\nA fresh clone (from master.kernel.org over ssh) gets me:\n\n$ git describe\nv1.5.6.2-247-g9237122\n$ git --version\ngit version 1.5.6.GIT\n$ git --exec-path\n/home/jeffpc/git-bin/bin\n\nYou seem to have a different HEAD for the master branch than I do.\n\nJosef 'Jeff' Sipek.\n\n-- \nDon't drink and derive. Alcohol and algebra don't mix.\n"},{"id":"82519","messageId":"7viqvhxjhc.fsf@gitster.siamese.dyndns.org","threadId":"14333","inReplyTo":"20080708011413.GC1880@josefsipek.net","subject":"Re: [PATCH 2/2] Make guilt work even after git-sh-setup is moved out of the user's path","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-07-08T01:17:19Z","receivedAt":"2008-07-08T01:17:19Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Josef 'Jeff' Sipek\" <jeffpc@josefsipek.net> writes:\n\n> A fresh clone (from master.kernel.org over ssh) gets me:\n>\n> $ git describe\n> v1.5.6.2-247-g9237122\n> $ git --version\n> git version 1.5.6.GIT\n> $ git --exec-path\n> /home/jeffpc/git-bin/bin\n>\n> You seem to have a different HEAD for the master branch than I do.\n\nOh, my private 'master' almost always is ahead of the public one after\nwork.\n\nBut I do not have any new changes around this area lately.  Promise ;-).\n"},{"id":"82521","messageId":"20080708012829.GD1880@josefsipek.net","threadId":"14333","inReplyTo":"7viqvhxjhc.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH 2/2] Make guilt work even after git-sh-setup is moved out of the user's path","fromName":"Josef 'Jeff' Sipek","fromEmail":"jeffpc@josefsipek.net","sentAt":"2008-07-08T01:28:29Z","receivedAt":"2008-07-08T01:28:29Z","isPatch":true,"sender":{"key":"jeffpc@josefsipek.net","avatar":null},"body":"On Mon, Jul 07, 2008 at 06:17:19PM -0700, Junio C Hamano wrote:\n> \"Josef 'Jeff' Sipek\" <jeffpc@josefsipek.net> writes:\n> \n> > A fresh clone (from master.kernel.org over ssh) gets me:\n> >\n> > $ git describe\n> > v1.5.6.2-247-g9237122\n> > $ git --version\n> > git version 1.5.6.GIT\n> > $ git --exec-path\n> > /home/jeffpc/git-bin/bin\n> >\n> > You seem to have a different HEAD for the master branch than I do.\n> \n> Oh, my private 'master' almost always is ahead of the public one after\n> work.\n> \n> But I do not have any new changes around this area lately.  Promise ;-).\n\nHeh.\n\nAlright, mystery solved. I had a GIT_EXEC_PATH set. Removing it from my\nbash_profile makes everything work just fine.\n\nSorry for the noise.\n\nJeff.\n\n-- \nPenguin : Linux version 2.6.25.4 on an i386 machine (6135.77 BogoMips).\n"}]}