* Re: [PATCH 0/10] re-based and expanded tree-walker cleanup patches
From: Junio C Hamano @ 2006-05-31 22:53 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Git Mailing List
In-Reply-To: <Pine.LNX.4.64.0605292112530.5623@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
> (a) git-rev-list --pretty=oneline "$upstream"..ORIG_HEAD > rev-list
>
> (b) edit the rev-list, moving the single lines around, deleting them, etc
>
> (c) cat rev-list |
> git-format-patch -k --stdout --stdin --full_index |
> git-am
>
> because the "--pretty=oneline" format is actually very nice as a way to
> re-order things and select single commits to be deleted or whatever..
I am thinking about doing "format-patch --stdin" while I am
futzing with it for other reasons, and one issue is where to
"tac" the revision list.
We could internally reverse topo-sort what we read from --stdin
inside format-patch, but that would defeat the reordering that
is done in the step (b) above, so that is not a useful thing to
do.
If we wanted to make rev-list piped straight to format-patch
equilvalent to giving the arguments you would have given rev-list
directly to format-patch, then format-patch should read --stdin
and reverse the list before emitting them out.
However, that would mean in the step (b) above the user needs to
be conscious that the list being edited is in the reverse order,
so if the list of commits needs to be reordered (and that is one
of the reasons the user is doing this step) what comes earlier
in the edited list will be output later in the result.
Tentatively my feeling is that we should make it known that the
list format-patch takes from --stdin is supposed to be _not_
reversed, and do nothing in format-patch. In other words, the
list fed is a moral equivalent to quilt "series" file.
What this means is:
git-format-patch $revargs
is not equivalent to
git-rev-list $revargs | git-format-patch --stdin
but is equivalent to
git-rev-list $revargs | tac | git-format-patch --stdin
Thoughts from the list?
^ permalink raw reply
* Re: [PATCH] format-patch --signoff
From: Johannes Schindelin @ 2006-05-31 22:42 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Geoff Russell, Marco Costalba, git, Seth Falcon
In-Reply-To: <7v4pz5zvtc.fsf_-_@assigned-by-dhcp.cox.net>
Hi,
On Wed, 31 May 2006, Junio C Hamano wrote:
> This resurrects --signoff option to format-patch.
Sorry; I was in cinema, so I missed all the action.
> + const char *committer = git_committer_info(1);
> + const char *endpos = strchr(committer, '>');
> + if (!endpos)
> + die("bogos committer info %s\n", committer);
> + add_signoff = xmalloc(endpos - committer + 2);
> + memcpy(add_signoff, committer, endpos - committer + 1);
> + add_signoff[endpos - committer + 1] = 0;
> + }
I don't know, but it may be a good idea to make this more general: Why not
build the sign-off line here, so that you could also add more than one
sign-off lines ('--signoff="The great committer <ter@mit.com>"'), and
maybe even Acked-by's?
> + /* First see if we already have the sign-off by the signer */
> + while (1) {
> + cp = strstr(cp, signed_off_by);
> + if (!cp)
> + break;
> + cp += strlen(signed_off_by);
> + if ((cp + signoff_len < buf + at) &&
> + !strncmp(cp, signoff, signoff_len) &&
> + isspace(cp[signoff_len]))
> + return at; /* we already have him */
> + }
Okay, this would be a little harder with multiple sign-offs. But the check
could be easier, i.e. if we say
rev.add_signoff = xmalloc(enough_room);
strcpy(rev.add_signoff, "\nSigned-off-by: ");
strcat(rev.add_signoff, committer_ident);
strcat(rev.add_signoff, "\n");
then a simple
p = strstr(commit_buffer, rev.add_signoff);
if (p)
return (int)(p - commit_buffer);
would do the trick.
And shouldn't we error out if there is not enough room for a sign-off?
Sorry for all the nit-picking.
Ciao,
Dscho
^ permalink raw reply
* [PATCH] format-patch --signoff
From: Junio C Hamano @ 2006-05-31 22:14 UTC (permalink / raw)
To: Geoff Russell, Marco Costalba, Johannes Schindelin; +Cc: git, Seth Falcon
In-Reply-To: <7vejyayq46.fsf@assigned-by-dhcp.cox.net>
This resurrects --signoff option to format-patch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
builtin-log.c | 18 ++++++++++++++++--
log-tree.c | 35 +++++++++++++++++++++++++++++++++++
revision.h | 1 +
3 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/builtin-log.c b/builtin-log.c
index db1912a..ac4822d 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -150,6 +150,7 @@ int cmd_format_patch(int argc, const cha
int numbered = 0;
int start_number = -1;
int keep_subject = 0;
+ char *add_signoff = NULL;
init_revisions(&rev);
rev.commit_format = CMIT_FMT_EMAIL;
@@ -179,11 +180,13 @@ int cmd_format_patch(int argc, const cha
if (i == argc)
die("Need a number for --start-number");
start_number = strtol(argv[i], NULL, 10);
- } else if (!strcmp(argv[i], "-k") ||
+ }
+ else if (!strcmp(argv[i], "-k") ||
!strcmp(argv[i], "--keep-subject")) {
keep_subject = 1;
rev.total = -1;
- } else if (!strcmp(argv[i], "-o")) {
+ }
+ else if (!strcmp(argv[i], "-o")) {
if (argc < 3)
die ("Which directory?");
if (mkdir(argv[i + 1], 0777) < 0 && errno != EEXIST)
@@ -192,6 +195,16 @@ int cmd_format_patch(int argc, const cha
output_directory = strdup(argv[i + 1]);
i++;
}
+ else if (!strcmp(argv[i], "--signoff") ||
+ !strcmp(argv[i], "-s")) {
+ const char *committer = git_committer_info(1);
+ const char *endpos = strchr(committer, '>');
+ if (!endpos)
+ die("bogos committer info %s\n", committer);
+ add_signoff = xmalloc(endpos - committer + 2);
+ memcpy(add_signoff, committer, endpos - committer + 1);
+ add_signoff[endpos - committer + 1] = 0;
+ }
else if (!strcmp(argv[i], "--attach"))
rev.mime_boundary = git_version_string;
else if (!strncmp(argv[i], "--attach=", 9))
@@ -230,6 +243,7 @@ int cmd_format_patch(int argc, const cha
total = nr;
if (numbered)
rev.total = total + start_number - 1;
+ rev.add_signoff = add_signoff;
while (0 <= --nr) {
int shown;
commit = list[nr];
diff --git a/log-tree.c b/log-tree.c
index 58b0163..e86e16b 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -12,6 +12,37 @@ static void show_parents(struct commit *
}
}
+static int append_signoff(char *buf, int buf_sz, int at, const char *signoff)
+{
+ int signoff_len = strlen(signoff);
+ static const char signed_off_by[] = "Signed-off-by: ";
+ char *cp = buf;
+
+ /* Do we have enough space to add it? */
+ if (buf_sz - at <= strlen(signed_off_by) + signoff_len + 2)
+ return at;
+
+ /* First see if we already have the sign-off by the signer */
+ while (1) {
+ cp = strstr(cp, signed_off_by);
+ if (!cp)
+ break;
+ cp += strlen(signed_off_by);
+ if ((cp + signoff_len < buf + at) &&
+ !strncmp(cp, signoff, signoff_len) &&
+ isspace(cp[signoff_len]))
+ return at; /* we already have him */
+ }
+
+ strcpy(buf + at, signed_off_by);
+ at += strlen(signed_off_by);
+ strcpy(buf + at, signoff);
+ at += signoff_len;
+ buf[at++] = '\n';
+ buf[at] = 0;
+ return at;
+}
+
void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
{
static char this_header[16384];
@@ -111,6 +142,10 @@ void show_log(struct rev_info *opt, stru
* And then the pretty-printed message itself
*/
len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev, subject, after_subject);
+
+ if (opt->add_signoff)
+ len = append_signoff(this_header, sizeof(this_header), len,
+ opt->add_signoff);
printf("%s%s%s", this_header, extra, sep);
}
diff --git a/revision.h b/revision.h
index bdbdd23..75796bc 100644
--- a/revision.h
+++ b/revision.h
@@ -60,6 +60,7 @@ struct rev_info {
struct log_info *loginfo;
int nr, total;
const char *mime_boundary;
+ const char *add_signoff;
/* special limits */
int max_count;
--
1.3.3.g1361-dirty
^ permalink raw reply related
* Re: irc usage..
From: Martin Langhoff @ 2006-05-31 22:03 UTC (permalink / raw)
To: antarus
Cc: Donnie Berkholz, Linus Torvalds, Yann Dirson, Git Mailing List,
Matthias Urlichs, Johannes Schindelin
In-Reply-To: <447DA028.3040606@gentoo.org>
On 6/1/06, Alec Warner <antarus@gentoo.org> wrote:
> I have a dual opteron with 4gb of ram "on loan" from work :)
>
> It still dies though, using git cvsimport or parsecvs.
The machine I am running this is more constrained than that, and it
doesn't die. It just takes maybe 30hs. Make sure it's not a bad cvs
binary you got there (latest from gentoo seems to leak memory).
And if it's still dying... give us some more details ;-)
cheers,
martin
^ permalink raw reply
* Re: git --version
From: Paolo Ciarrocchi @ 2006-05-31 20:19 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Junio C Hamano, git
In-Reply-To: <Pine.LNX.4.64.0605311311480.24646@g5.osdl.org>
On 5/31/06, Linus Torvalds <torvalds@osdl.org> wrote:
>
>
> On Wed, 31 May 2006, Paolo Ciarrocchi wrote:
> >
> > Don't know whay $PATH are different
>
> See ENVIRONMENT in the sudo man-page:
>
> PATH Set to a sane value if sudo was configured with
> the --with-secure-path option
>
> so apparently your distro builds sudo with "--with-secure-path".
Yup, you must be correct. Thanks.
My distro is Ubuntu Dapper.
Ciao,
--
Paolo
http://paolociarrocchi.googlepages.com
^ permalink raw reply
* Re: git --version
From: Linus Torvalds @ 2006-05-31 20:16 UTC (permalink / raw)
To: Paolo Ciarrocchi; +Cc: Junio C Hamano, git
In-Reply-To: <4d8e3fd30605311308j6a784635g91e2721258f53c9f@mail.gmail.com>
On Wed, 31 May 2006, Paolo Ciarrocchi wrote:
>
> Don't know whay $PATH are different
See ENVIRONMENT in the sudo man-page:
PATH Set to a sane value if sudo was configured with
the --with-secure-path option
so apparently your distro builds sudo with "--with-secure-path".
Linus
^ permalink raw reply
* Re: git --version
From: Paolo Ciarrocchi @ 2006-05-31 20:08 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Junio C Hamano, git
In-Reply-To: <4d8e3fd30605311256o67e45d06ve0efeff65fcf4851@mail.gmail.com>
On 5/31/06, Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> wrote:
> On 5/31/06, Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> wrote:
> [...]
> > And even more intersting:
> > make clean && make && sudo make install
> > git --version
> > git version 1.3.GIT
> >
> > make install
> > [...]
> > mv git-cherry-pick+ git-cherry-pick
> > mv: sovrascrivo `git-cherry-pick' ignorando il modo 0755?
> > that in english is something like:
> > mv: overwrite `git-cherry-pick' ignoring mod 0755?
> >
> > Wow...of course, make clean && make install fix everything
> >
>
> Thanks to loops on #git for asking me to do the following test:
>
> <PaoloC> paolo@Italia:~/git$ sudo ./GIT-VERSION-GEN
> <PaoloC> GIT_VERSION = 1.3.GIT
> <PaoloC> paolo@Italia:~/git$ ./GIT-VERSION-GEN
> <PaoloC> GIT_VERSION = 1.3.3.g2186
>
> I don't know why it's happening...
Ok, thanks to the people living in #git!!
the problem is the following, from GIT-VERSION-GEN:
#!/bin/sh
GVF=GIT-VERSION-FILE
DEF_VER=v1.3.GIT
# First try git-describe, then see if there is a version file
# (included in release tarballs), then default
if VN=$(git describe --abbrev=4 HEAD 2>/dev/null); then
VN=$(echo "$VN" | sed -e 's/-/./g');
elif test -f version
then
VN=$(cat version) || VN="$DEF_VER"
else
VN="$DEF_VER"
fi
paolo@Italia:~/git$ git describe --abbrev=4 HEAD
v1.3.3-g2186
but...
paolo@Italia:~/git$ sudo git describe --abbrev=4 HEAD
sudo: git: command not found
that's because:
paolo@Italia:~/git$ echo $PATH
/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games:/home/paolo/bin
but...
paolo@Italia:~/git$ sudo sh
sh-3.1# echo $PATH
/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin
Don't know whay $PATH are different but at least why I know why git
has that strange behaviour.
Ciao,
--
Paolo
http://paolociarrocchi.googlepages.com
^ permalink raw reply
* Re: git --version
From: Linus Torvalds @ 2006-05-31 20:08 UTC (permalink / raw)
To: Paolo Ciarrocchi; +Cc: Junio C Hamano, git
In-Reply-To: <4d8e3fd30605311256o67e45d06ve0efeff65fcf4851@mail.gmail.com>
On Wed, 31 May 2006, Paolo Ciarrocchi wrote:
>
> Thanks to loops on #git for asking me to do the following test:
>
> <PaoloC> paolo@Italia:~/git$ sudo ./GIT-VERSION-GEN
> <PaoloC> GIT_VERSION = 1.3.GIT
> <PaoloC> paolo@Italia:~/git$ ./GIT-VERSION-GEN
> <PaoloC> GIT_VERSION = 1.3.3.g2186
>
> I don't know why it's happening...
Heh. You don't have git in your PATH as root. So as root you don't know
what version of git you have ;)
Linus
^ permalink raw reply
* Re: git --version
From: Paolo Ciarrocchi @ 2006-05-31 19:56 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Junio C Hamano, git
In-Reply-To: <4d8e3fd30605311249l6ba4ff74l72778ffe60462263@mail.gmail.com>
On 5/31/06, Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> wrote:
[...]
> And even more intersting:
> make clean && make && sudo make install
> git --version
> git version 1.3.GIT
>
> make install
> [...]
> mv git-cherry-pick+ git-cherry-pick
> mv: sovrascrivo `git-cherry-pick' ignorando il modo 0755?
> that in english is something like:
> mv: overwrite `git-cherry-pick' ignoring mod 0755?
>
> Wow...of course, make clean && make install fix everything
>
Thanks to loops on #git for asking me to do the following test:
<PaoloC> paolo@Italia:~/git$ sudo ./GIT-VERSION-GEN
<PaoloC> GIT_VERSION = 1.3.GIT
<PaoloC> paolo@Italia:~/git$ ./GIT-VERSION-GEN
<PaoloC> GIT_VERSION = 1.3.3.g2186
I don't know why it's happening...
--
Paolo
http://paolociarrocchi.googlepages.com
^ permalink raw reply
* Re: git --version
From: Paolo Ciarrocchi @ 2006-05-31 19:49 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Junio C Hamano, git
In-Reply-To: <4d8e3fd30605311243q5a93a7a9l827c55827817602f@mail.gmail.com>
On 5/31/06, Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> wrote:
> On 5/31/06, Linus Torvalds <torvalds@osdl.org> wrote:
> > On Wed, 31 May 2006, Paolo Ciarrocchi wrote:
> > > >
> > > > git describe
> > >
> > > paolo@Italia:~/git$ git describe
> > > v1.3.3-g2186d56
> >
> > Ok.
> >
> > > > ./git --version
> > >
> > > paolo@Italia:~/git$ ./git --version
> > > git version 1.3.3.g2186
> > >
> > > Doh..
> >
> > Ok, that's also good.
> >
> > > > which git
> > >
> > > paolo@Italia:~/git$ which git
> > > /home/paolo/bin/git
> >
> > I think I know what's up.
> >
> > Your "sudo" made "$HOME" be /root. So by doing "sudo make install", you
> > installed the git in _roots_ ~/bin, ie /root/bin/.
> >
>
> Doh... not sure to follow you, just did:
> sudo make install
> paolo@Italia:~/git$ ls /root/
> paolo@Italia:~/git$ git --version
> git version 1.3.GIT
And even more intersting:
make clean && make && sudo make install
git --version
git version 1.3.GIT
make install
[...]
mv git-cherry-pick+ git-cherry-pick
mv: sovrascrivo `git-cherry-pick' ignorando il modo 0755?
that in english is something like:
mv: overwrite `git-cherry-pick' ignoring mod 0755?
Wow...of course, make clean && make install fix everything
Ciao,
--
Paolo
http://paolociarrocchi.googlepages.com
^ permalink raw reply
* Re: format-patch signoff argument no longer works
From: Seth Falcon @ 2006-05-31 19:43 UTC (permalink / raw)
To: git
In-Reply-To: <7vejyayq46.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> writes:
> Seth Falcon <sethfalcon@gmail.com> writes:
>> When should one commit _without_ signoff?
>
> Please, calm down and read Documentation/SubmittingPatches,
> item (6), to understand what sign-off means. It does not have
> anything to do with the result of the commit "working". I do
> not use -s when making commits during my day-job, for example.
Doh! In glancing through the Documentation dir I missed the
SubmittingPatches file. [weak excuse: there are many doc files in that
dir and most are for the commands themselves. I expected this to be
in howto/.]
Anyhow, much calmer now (apologies if I sounded un-calm, that wasn't
my intention). The SubmittingPatches doc was _exactly_ what I was
looking for when I posted my original question [*]. My bad for not
finding it when it was staring me in the face. Thanks for bearing
with me and pointing me to the fine manual :-)
[*] http://marc.theaimsgroup.com/?l=git&m=114884854119660&w=2
^ permalink raw reply
* Re: git --version
From: Paolo Ciarrocchi @ 2006-05-31 19:43 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Junio C Hamano, git
In-Reply-To: <Pine.LNX.4.64.0605311233030.24646@g5.osdl.org>
On 5/31/06, Linus Torvalds <torvalds@osdl.org> wrote:
> On Wed, 31 May 2006, Paolo Ciarrocchi wrote:
> > >
> > > git describe
> >
> > paolo@Italia:~/git$ git describe
> > v1.3.3-g2186d56
>
> Ok.
>
> > > ./git --version
> >
> > paolo@Italia:~/git$ ./git --version
> > git version 1.3.3.g2186
> >
> > Doh..
>
> Ok, that's also good.
>
> > > which git
> >
> > paolo@Italia:~/git$ which git
> > /home/paolo/bin/git
>
> I think I know what's up.
>
> Your "sudo" made "$HOME" be /root. So by doing "sudo make install", you
> installed the git in _roots_ ~/bin, ie /root/bin/.
>
Doh... not sure to follow you, just did:
sudo make install
paolo@Italia:~/git$ ls /root/
paolo@Italia:~/git$ git --version
git version 1.3.GIT
--
Paolo
http://paolociarrocchi.googlepages.com
^ permalink raw reply
* Re: git --version
From: Linus Torvalds @ 2006-05-31 19:35 UTC (permalink / raw)
To: Paolo Ciarrocchi; +Cc: Junio C Hamano, git
In-Reply-To: <4d8e3fd30605311230h53981e57x8a417b176bedba86@mail.gmail.com>
On Wed, 31 May 2006, Paolo Ciarrocchi wrote:
> >
> > git describe
>
> paolo@Italia:~/git$ git describe
> v1.3.3-g2186d56
Ok.
> > ./git --version
>
> paolo@Italia:~/git$ ./git --version
> git version 1.3.3.g2186
>
> Doh..
Ok, that's also good.
> > which git
>
> paolo@Italia:~/git$ which git
> /home/paolo/bin/git
I think I know what's up.
Your "sudo" made "$HOME" be /root. So by doing "sudo make install", you
installed the git in _roots_ ~/bin, ie /root/bin/.
Linus
^ permalink raw reply
* Re: git --version
From: Paolo Ciarrocchi @ 2006-05-31 19:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Junio C Hamano, git
In-Reply-To: <4d8e3fd30605311230h53981e57x8a417b176bedba86@mail.gmail.com>
On 5/31/06, Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> wrote:
> On 5/31/06, Linus Torvalds <torvalds@osdl.org> wrote:
> >
> >
> > On Wed, 31 May 2006, Paolo Ciarrocchi wrote:
> > >
> > > Tried with:
> > > make clean
> > > make && sudo make install
> > > [...]
> > > paolo@Italia:~/git$ git --version
> > > git version 1.3.GIT
> > > paolo@Italia:~/git$ ./GIT-VERSION-GEN
> > > GIT_VERSION = 1.3.3.g2186
> >
> > What does
> >
> > git describe
>
> paolo@Italia:~/git$ git describe
> v1.3.3-g2186d56
>
> > ./git --version
>
> paolo@Italia:~/git$ ./git --version
> git version 1.3.3.g2186
>
> Doh..
>
> > which git
>
> paolo@Italia:~/git$ which git
> /home/paolo/bin/git
>
Ok...
make && make install
Now I get:
paolo@Italia:~$ git --version
git version 1.3.3.g2186
That is correct.
But I'm still wondering why doing sudo make install caused that
problem, git was correcly installed in /home/paolo/git
Really puzzled.
Ciao,
--
Paolo
http://paolociarrocchi.googlepages.com
^ permalink raw reply
* Re: git --version
From: Paolo Ciarrocchi @ 2006-05-31 19:30 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Junio C Hamano, git
In-Reply-To: <Pine.LNX.4.64.0605311224360.24646@g5.osdl.org>
On 5/31/06, Linus Torvalds <torvalds@osdl.org> wrote:
>
>
> On Wed, 31 May 2006, Paolo Ciarrocchi wrote:
> >
> > Tried with:
> > make clean
> > make && sudo make install
> > [...]
> > paolo@Italia:~/git$ git --version
> > git version 1.3.GIT
> > paolo@Italia:~/git$ ./GIT-VERSION-GEN
> > GIT_VERSION = 1.3.3.g2186
>
> What does
>
> git describe
paolo@Italia:~/git$ git describe
v1.3.3-g2186d56
> ./git --version
paolo@Italia:~/git$ ./git --version
git version 1.3.3.g2186
Doh..
> which git
paolo@Italia:~/git$ which git
/home/paolo/bin/git
Ciao,
--
Paolo
http://paolociarrocchi.googlepages.com
^ permalink raw reply
* Re: git --version
From: Paolo Ciarrocchi @ 2006-05-31 19:26 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Junio C Hamano, git
In-Reply-To: <Pine.LNX.4.64.0605311222010.24646@g5.osdl.org>
On 5/31/06, Linus Torvalds <torvalds@osdl.org> wrote:
>
>
> On Wed, 31 May 2006, Paolo Ciarrocchi wrote:
> > [...]
> > install git gitk '/home/paolo/bin'
>
> Why are you doing a "sudo" when you install in your own ~/bin (the default
> for git).
Good question :-)
Just because I'm used to do that but you are absolutelly right saying
that is wrong.
> The whole point of installing in ~/bin is to not need any elevated
> priorities.
>
> I get the feeling that you might have installed something in /usr/bin/ or
> /usr/local/bin earlier, and that they are before ~/bin in your PATH.
I don't think so since:
paolo@Italia:~/git$ which git
/home/paolo/bin/git
But I'll do a make && make install in a minute.
Thanks!
Ciao,
--
Paolo
http://paolociarrocchi.googlepages.com
^ permalink raw reply
* Re: git --version
From: Linus Torvalds @ 2006-05-31 19:25 UTC (permalink / raw)
To: Paolo Ciarrocchi; +Cc: Junio C Hamano, git
In-Reply-To: <4d8e3fd30605311220t17d319efyd5234dd4eb74fc96@mail.gmail.com>
On Wed, 31 May 2006, Paolo Ciarrocchi wrote:
>
> Tried with:
> make clean
> make && sudo make install
> [...]
> paolo@Italia:~/git$ git --version
> git version 1.3.GIT
> paolo@Italia:~/git$ ./GIT-VERSION-GEN
> GIT_VERSION = 1.3.3.g2186
What does
git describe
./git --version
which git
say?
Linus
^ permalink raw reply
* Re: git --version
From: Linus Torvalds @ 2006-05-31 19:23 UTC (permalink / raw)
To: Paolo Ciarrocchi; +Cc: Junio C Hamano, git
In-Reply-To: <4d8e3fd30605311213m6f2f2660u90701ad6bd5daabc@mail.gmail.com>
On Wed, 31 May 2006, Paolo Ciarrocchi wrote:
> [...]
> install git gitk '/home/paolo/bin'
Why are you doing a "sudo" when you install in your own ~/bin (the default
for git).
The whole point of installing in ~/bin is to not need any elevated
priorities.
I get the feeling that you might have installed something in /usr/bin/ or
/usr/local/bin earlier, and that they are before ~/bin in your PATH.
Linus
^ permalink raw reply
* Re: git --version
From: Paolo Ciarrocchi @ 2006-05-31 19:20 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <4d8e3fd30605311213m6f2f2660u90701ad6bd5daabc@mail.gmail.com>
On 5/31/06, Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> wrote:
> So yes, it's correctly installed (I pull, compile and install almost
> daily always without any problem).
>
Tried with:
make clean
make && sudo make install
[...]
paolo@Italia:~/git$ git --version
git version 1.3.GIT
paolo@Italia:~/git$ ./GIT-VERSION-GEN
GIT_VERSION = 1.3.3.g2186
Puzzled.
--
Paolo
http://paolociarrocchi.googlepages.com
^ permalink raw reply
* Re: format-patch signoff argument no longer works
From: J. Bruce Fields @ 2006-05-31 19:19 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Seth Falcon
In-Reply-To: <7vejyayq46.fsf@assigned-by-dhcp.cox.net>
On Wed, May 31, 2006 at 12:02:33PM -0700, Junio C Hamano wrote:
> Now, we could do that by re-adding "format-patch -s" option, or
> alternatively we could add that to "send-email". We might want
> to do both ;-)
Personally, just to give myself the best change of catching problems
with the outgoing email, I'd prefer to have as much as possible be done
*before* send-email, so whatever I review is as close to what's sent out
as possible.
--b.
^ permalink raw reply
* Re: git --version
From: Paolo Ciarrocchi @ 2006-05-31 19:13 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vac8yypxc.fsf@assigned-by-dhcp.cox.net>
On 5/31/06, Junio C Hamano <junkio@cox.net> wrote:
> "Paolo Ciarrocchi" <paolo.ciarrocchi@gmail.com> writes:
>
> > paolo@Italia:~$ cd git/
> > paolo@Italia:~/git$ git --version
> > git version 1.3.GIT
> > paolo@Italia:~/git$ make >/dev/null
> > paolo@Italia:~/git$ sudo make install >/dev/null
> > Password:
> > GIT_VERSION = 1.3.GIT
>
> Unfortunate is we cannot see what this "sudo" did -- does it
> successfully run (installed) git to check the "full" version and
> manage to store it in ./GIT-VERSION-FILE?
Just the few last lines:
install git-checkout-index git-clone-pack git-convert-objects
git-fetch-pack git-fsck-objects git-hash-object git-index-pack
git-local-fetch git-mailinfo git-merge-base git-merge-index git-mktag
git-mktree git-pack-objects git-patch-id git-peek-remote
git-prune-packed git-receive-pack git-rev-parse git-send-pack
git-shell git-show-index git-ssh-fetch git-ssh-upload git-unpack-file
git-unpack-objects git-update-index git-update-server-info
git-upload-pack git-verify-pack git-write-tree git-update-ref
git-symbolic-ref git-name-rev git-pack-redundant git-repo-config
git-var git-describe git-merge-tree git-blame git-imap-send
git-ssh-pull git-ssh-push git-http-fetch git-http-push
git-get-tar-commit-id git-mailsplit git-stripspace git-daemon
git-bisect git-branch git-checkout git-cherry git-clean git-clone
git-commit git-fetch git-ls-remote git-merge-one-file git-parse-remote
git-prune git-pull git-rebase git-repack git-request-pull git-reset
git-resolve git-revert git-sh-setup git-tag git-verify-tag
git-applymbox git-applypatch git-am git-merge git-merge-stupid
git-merge-octopus git-merge-resolve git-merge-ours git-lost-found
git-quiltimport git-archimport git-cvsimport git-relink git-shortlog
git-fmt-merge-msg git-rerere git-annotate git-cvsserver git-svnimport
git-mv git-cvsexportcommit git-send-email git-merge-recursive
git-cherry-pick git-status '/home/paolo/bin'
install git gitk '/home/paolo/bin'
make -C templates install
make[1]: Entering directory `/home/paolo/git/templates'
: no custom templates yet
install -d -m755 '/home/paolo/share/git-core/templates/'
(cd blt && tar cf - .) | \
(cd '/home/paolo/share/git-core/templates/' && tar xf -)
make[1]: Leaving directory `/home/paolo/git/templates'
install -d -m755 '/home/paolo/share/git-core/python'
install gitMergeCommon.py '/home/paolo/share/git-core/python'
if test 'z/home/paolo/bin' != 'z/home/paolo/bin'; \
then \
ln -f '/home/paolo/bin/git' \
'/home/paolo/bin/git' || \
cp '/home/paolo/bin/git' \
'/home/paolo/bin/git'; \
fi
rm -f '/home/paolo/bin/git-log' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-log' ; rm -f '/home/paolo/bin/git-whatchanged'
&& ln '/home/paolo/bin/git' '/home/paolo/bin/git-whatchanged' ; rm -f
'/home/paolo/bin/git-show' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-show' ; rm -f
'/home/paolo/bin/git-count-objects' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-count-objects' ; rm -f
'/home/paolo/bin/git-diff' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-diff' ; rm -f '/home/paolo/bin/git-push' && ln
'/home/paolo/bin/git' '/home/paolo/bin/git-push' ; rm -f
'/home/paolo/bin/git-grep' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-grep' ; rm -f '/home/paolo/bin/git-add' && ln
'/home/paolo/bin/git' '/home/paolo/bin/git-add' ; rm -f
'/home/paolo/bin/git-rm' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-rm' ; rm -f '/home/paolo/bin/git-rev-list' && ln
'/home/paolo/bin/git' '/home/paolo/bin/git-rev-list' ; rm -f
'/home/paolo/bin/git-check-ref-format' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-check-ref-format' ; rm -f
'/home/paolo/bin/git-init-db' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-init-db' ; rm -f '/home/paolo/bin/git-tar-tree'
&& ln '/home/paolo/bin/git' '/home/paolo/bin/git-tar-tree' ; rm -f
'/home/paolo/bin/git-upload-tar' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-upload-tar' ; rm -f
'/home/paolo/bin/git-format-patch' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-format-patch' ; rm -f
'/home/paolo/bin/git-ls-files' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-ls-files' ; rm -f '/home/paolo/bin/git-ls-tree'
&& ln '/home/paolo/bin/git' '/home/paolo/bin/git-ls-tree' ; rm -f
'/home/paolo/bin/git-read-tree' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-read-tree' ; rm -f
'/home/paolo/bin/git-commit-tree' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-commit-tree' ; rm -f '/home/paolo/bin/git-apply'
&& ln '/home/paolo/bin/git' '/home/paolo/bin/git-apply' ; rm -f
'/home/paolo/bin/git-show-branch' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-show-branch' ; rm -f
'/home/paolo/bin/git-diff-files' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-diff-files' ; rm -f
'/home/paolo/bin/git-diff-index' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-diff-index' ; rm -f
'/home/paolo/bin/git-diff-stages' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-diff-stages' ; rm -f
'/home/paolo/bin/git-diff-tree' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-diff-tree' ; rm -f
'/home/paolo/bin/git-cat-file' && ln '/home/paolo/bin/git'
'/home/paolo/bin/git-cat-file' ;
paolo@Italia:~/git$ git --version
So yes, it's correctly installed (I pull, compile and install almost
daily always without any problem).
Ciao and thanks!
--
Paolo
http://paolociarrocchi.googlepages.com
^ permalink raw reply
* Re: git --version
From: Junio C Hamano @ 2006-05-31 19:06 UTC (permalink / raw)
To: git
In-Reply-To: <4d8e3fd30605311158n9d669dgd6c392ee8d194b78@mail.gmail.com>
"Paolo Ciarrocchi" <paolo.ciarrocchi@gmail.com> writes:
> paolo@Italia:~$ cd git/
> paolo@Italia:~/git$ git --version
> git version 1.3.GIT
> paolo@Italia:~/git$ make >/dev/null
> paolo@Italia:~/git$ sudo make install >/dev/null
> Password:
> GIT_VERSION = 1.3.GIT
Unfortunate is we cannot see what this "sudo" did -- does it
successfully run (installed) git to check the "full" version and
manage to store it in ./GIT-VERSION-FILE?
^ permalink raw reply
* Re: format-patch signoff argument no longer works
From: Junio C Hamano @ 2006-05-31 19:02 UTC (permalink / raw)
To: git; +Cc: Seth Falcon
In-Reply-To: <m2mzcycn4f.fsf@ziti.fhcrc.org>
Seth Falcon <sethfalcon@gmail.com> writes:
> Matthias Kestenholz <lists@spinlock.ch> writes:
>
>> * Geoff Russell (geoffrey.russell@gmail.com) wrote:
>>> It appears to have got lost when the shell script got converted to C.
>>>
>> Yes, this was intentional. You should sign off your changes while
>> committing (git commit -s|--signoff)
A bit on this later, but first to clear one thing up...
> When should one commit _without_ signoff?
>
> The obvious answer is: when one doesn't approve of the changes in the
> commit... But in my usual workflow, commit means
> works-for-me-I-think-it-is-good. :-)
Please, calm down and read Documentation/SubmittingPatches,
item (6), to understand what sign-off means. It does not have
anything to do with the result of the commit "working". I do
not use -s when making commits during my day-job, for example.
We do not want to make sign-off the default. It has to be a
concious act on the signer's part to add one. Otherwise it
would not carry much weight.
About the droppage of "format-patch -s", I have come to think of
it as a mistake (yes, I can change my mind). Consider:
* You are the leader of a group of people who hack on a part of
the kernel, internally in your company. You and other
developers make improvements and make commits, with "git
commit -s".
* As the in-company integrator, you maintain the canonical
"company tree" by pulling from others in your group.
* It's time to send good pieces to Linus and/or Andrew and as
the group lead you are responsible for sending them out. The
commits would have Sign-off's by the original committers, but
as the contact person (representative) of your group, your
name is better recognizable in the outside community, and as
the leader of your group, it is a good practice for _you_ to
vouch for what your group did.
In that scenario, in addition to what "commit -s" gives us, it
is handy for the person who is sending the patches out via
e-mail to add his own sign-off.
Now, we could do that by re-adding "format-patch -s" option, or
alternatively we could add that to "send-email". We might want
to do both ;-)
^ permalink raw reply
* Re: git --version
From: Paolo Ciarrocchi @ 2006-05-31 18:58 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vu077ywmw.fsf@assigned-by-dhcp.cox.net>
On 5/31/06, Junio C Hamano <junkio@cox.net> wrote:
> "Paolo Ciarrocchi" <paolo.ciarrocchi@gmail.com> writes:
>
> > I'm confused by the following:
> > paolo@Italia:~/git$ ./GIT-VERSION-GEN
> > GIT_VERSION = 1.3.3.g2186
> >
> > paolo@Italia:~/git$ git --version
> > git version 1.3.GIT
> >
> > Why git --version is not reporting the "full" version number?
>
> There is a bit of chicken and egg problem involved. The build
> procedure wants to have an already installed git to figure out
> the "full" version number. If you are bootstrapping, make clean
> and rebuild after you install git once would give you a git
> binary that knows what version it is.
Either I didn't understand your answer or something is wrong with my
git installation:
paolo@Italia:~$ cd git/
paolo@Italia:~/git$ git --version
git version 1.3.GIT
paolo@Italia:~/git$ make >/dev/null
paolo@Italia:~/git$ sudo make install >/dev/null
Password:
GIT_VERSION = 1.3.GIT
paolo@Italia:~/git$ git --version
git version 1.3.GIT
paolo@Italia:~/git$
--
Paolo
http://paolociarrocchi.googlepages.com
^ permalink raw reply
* Re: [PATCH] Update documentation for git-format-patch
From: Dennis Stosberg @ 2006-05-31 17:24 UTC (permalink / raw)
To: git
In-Reply-To: <e5kcfi$124$1@sea.gmane.org>
Jakub Narebski wrote:
> Dennis Stosberg wrote:
>
> > - Display suspicious lines in the patch. The definition
> > - of 'suspicious lines' is currently the lines that has
> > - trailing whitespaces, and the lines whose indentation
> > - has a SP character immediately followed by a TAB
> > - character.
>
> So is this option also lost in built-in git-format-patch?
Johannes Schindelin made that one a diff option, so it can be used in
other ways, too. I think it should be documented in diff-options.txt.
> > -CONFIGURATION
> > -You can specify extra mail header lines to be added to each
> > -message in the repository configuration as follows:
> > -
> > -[format]
> > - headers = "Organization: git-foo\n"
>
> So is this configuration option also lost in built-in git-format-patch?
Grep'ing the sources, I couldn't find any trace of it.
Regards,
Dennis
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox