Stefano Lattarini writes:
> for example, an autotools old-timer that has run:
>
> ./configure --prefix /opt/git
>
> in the past, without running "make distclean" afterwards, would
> expect a "make install" issued after a "make clean" to rebuild and
> install git in '/opt/git';
I've been hit
On Wed, Jul 18, 2012 at 2:49 AM, Junio C Hamano wrote:
> There may be a hosting site with better code review features, but
> all the code review of Git happens on this mailing list, and that is
> not likely to change in the near future.
>
For me, you know, it's codereview, aka rietveld. [1]
[1] c
Except for miniscule nits in the the bottom two, I didn't find
anything objectionable---nicely done.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Stefano Lattarini writes:
> diff --git a/configure.ac b/configure.ac
> index 789926f..9472f6b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -29,13 +29,12 @@ AC_DEFUN([GIT_ARG_SET_PATH],
> # --without-PROGRAM is used.
> AC_DEFUN([GIT_CONF_APPEND_PATH],
> [m4_pushdef([GIT_UC_PROGRAM]
Stefano Lattarini writes:
> The new name fits better with the macro signature, and underlines the
> similarities with the autoconf-provided macro AC_SUBST (which will be
> made even more pronounced in planned future commits).
>
> Once again, no semantic change is intended, and indeed no change to
On 2012.7.18 3:58 AM, Eric Wong wrote:
> I agree with everything Jonathan said (and thank him for taking
> the time to point you in the right direction).
Thanks, you guys have been very nice to my flailing and failing. I'm going to
back off and send out a sort of overview email so we can figure o
Jeff King writes:
> I don't care too deeply either way, and it is technically a behavior
> change. So there is a chance of regression for something that nobody has
> actually complained about.
Thanks. I share the same feeling, but the code after the patch looks
much nicer, which is somewhat sad.
Jeff King writes:
> So leaving aside the --graph issues, we would need to decide what to
> show in the non-graph case. And I think your suggestion is good; there
> is no real need to dereference the blob (if you want that, you can turn
> on the pretty-printer).
>
> I'm just not sure what the outp
Those filed hold variables, settings and information set by the
configuration process run by './configure'; in Autotools-based
build system that kind of stuff should only be removed by
"make distclean". Having it removed by "make clean" is not only
inconsistent, but causes real confusion for that
This provides a reduced but still useful sibling of the Automake's
"automatic Makefile rebuild" feature. It's important to note that
we take care to enable the new rules only if the tree that has already
be configured with './configure', so that users relying on manual
configuration won't be negat
They are merely useless now, but would get in the way of future changes.
No semantic change is intended.
Signed-off-by: Stefano Lattarini
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9472f6b..5fb9734 100644
--- a/conf
This will allow "./config.status --recheck; ./config.status" to work
correctly as a mean of reconfiguring the tree with the same configure
argument used in the previous "./configure" invocation.
Signed-off-by: Stefano Lattarini
---
configure.ac | 25 -
1 file changed, 16
They are merely useless now, but would get in the way of future changes.
No semantic change is intended.
Signed-off-by: Stefano Lattarini
---
configure.ac | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index 789926f..9472f6b 100644
-
The new name fits better with the macro signature, and underlines the
similarities with the autoconf-provided macro AC_SUBST (which will be
made even more pronounced in planned future commits).
Once again, no semantic change is intended, and indeed no change to the
generated configure script is ex
From:
GIT_CONF_APPEND_LINE([VAR=VAL])
to:
GIT_CONF_APPEND_LINE([VAR], [VAL])
This is only a preparatory change in view of future refactorings.
No semantic change is intended. In fact, the generated configure
file doesn't change at all.
Signed-off-by: Stefano Lattarini
---
configure.ac
This series aims at improving the user experience for those people who
(like me) use that Autotools-based interface to the build system of Git.
The two actual improvements (equipped with proper explanations and
rationales) are implemented in the last two patches. The other five
patches are just p
Marcin Owsiany writes:
> PTAL:
>
> From: Marcin Owsiany
> Date: Sun, 24 Jun 2012 22:40:05 +0100
> Subject: [PATCH] git-svn: don't create master if another head exists
>
> git-svn insists on creating the "master" head (unless it exists) on every
> "fetch". It is useful that it gets created initia
On Tue, 2012-07-17 at 22:56 -0700, Junio C Hamano wrote:
> Ping on a seemingly stalled discussion (no need to rush but just
> checking).
I've implemented the feedback, but been slacking on writing the tests
which is what's stopped me from re-sending the series.
cmn
--
To unsubscribe from th
Quoting baluchen :
I verified the entries and they seems to be correct. But the clone and its
URL is still now showing when browsing project summary page via gitweb
well, unless you at least post the most relevant options of your
gitweb config, i'm afraid i cannot help you. maybe a snippet of m
On Wed, Jul 18, 2012 at 7:53 AM, Junio C Hamano wrote:
> Ping on seemingly stalled discussion.
Just to recap quickly from my point of view:
1. There's no regression.
2. There's room for improvement of the prompting on Windows.
3. I'm not entirely confident that I've found a safe way of improving
Jeff King writes:
> On Wed, Jul 18, 2012 at 08:57:41AM -0400, Jeff King wrote:
>
>> So since that is a non-issue, I think the second diff I provided above
>> is a bit nicer.
>
> And here is a replacement patch 4/4.
>
> -- >8 --
> Subject: mw-to-git: use git-credential's URL parser
Perfect, thank
Jeff King writes:
> So since that is a non-issue, I think the second diff I provided above
> is a bit nicer.
I like this one best too. It just lacks a comment saying why it should
be displayed first ;-).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send th
On Wed, Jul 18, 2012 at 08:57:41AM -0400, Jeff King wrote:
> So since that is a non-issue, I think the second diff I provided above
> is a bit nicer.
And here is a replacement patch 4/4.
-- >8 --
Subject: mw-to-git: use git-credential's URL parser
We can just feed our URL straight to git-creden
On Wed, Jul 18, 2012 at 02:37:27PM +0200, Matthieu Moy wrote:
> Jeff King writes:
>
> > I started with a version that did that, but there are two complications:
> >
> > 1. credential_write needs to know that the 'url' field must come
> > first, as it overwrites the other fields. So we end
On Wed, Jul 18, 2012 at 12:27:30AM -0700, Martin von Zweigbergk wrote:
> Extract the code that adds a possibly commented-out "pick" line to the
> todo file. This lets us reuse it more easily later.
> ---
> git-rebase--interactive.sh | 21 -
> 1 file changed, 12 insertions(+), 9
On Wed, Jul 18, 2012 at 11:27:22AM +, Eric Wong wrote:
> Marcin Owsiany wrote:
> > On Wed, Jul 11, 2012 at 03:56:43PM -0700, Junio C Hamano wrote:
> > > If the caller does not handle errors, it could be even clearer to
> > > write it like
> > >
> > > command_noisy(qw(update-ref HEAD), $gs->
Jeff King writes:
> I started with a version that did that, but there are two complications:
>
> 1. credential_write needs to know that the 'url' field must come
> first, as it overwrites the other fields. So we end up
> special-casing it either way.
Right, I didn't think of that. Bu
On Wed, Jul 18, 2012 at 02:24:13PM +0200, Matthieu Moy wrote:
> Jeff King writes:
>
> > @@ -216,7 +190,9 @@ sub credential_write {
> > sub credential_run {
> > my $op = shift;
> > my $credential = shift;
> > + my $url = shift;
> > my $pid = open2(my $reader, my $writer, "git crede
On Wed, Jul 18, 2012 at 02:24:01PM +0200, Matthieu Moy wrote:
> Jeff King writes:
>
> > $ echo https://u...@example.com | git credential ident
> > protocol=https
> > host=example.com
> > username=user
> >
> > since I had no use for it, but it would obviously be an easy one-liner
> > to w
Jeff King writes:
> @@ -216,7 +190,9 @@ sub credential_write {
> sub credential_run {
> my $op = shift;
> my $credential = shift;
> + my $url = shift;
> my $pid = open2(my $reader, my $writer, "git credential $op");
> + print $writer "url=$url\n" if defined $url;
>
Jeff King writes:
> $ echo https://u...@example.com | git credential ident
> protocol=https
> host=example.com
> username=user
>
> since I had no use for it, but it would obviously be an easy one-liner
> to write (it's just "fill" without the actual fill call).
I was thinking the same, e
On Wed, Jul 18, 2012 at 09:10:06AM +0200, Johannes Sixt wrote:
> Am 7/18/2012 8:20, schrieb Martin von Zweigbergk:
> > On Fri, Apr 20, 2012 at 7:36 AM, Neil Horman wrote:
> >> pick_one () {
> >> ff=--ff
> >> +
> >> case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac
> >> c
We can just feed our URL straight to git-credential and it
will parse it for us, saving us some code.
Signed-off-by: Jeff King
---
contrib/mw-to-git/git-remote-mediawiki | 32
1 file changed, 4 insertions(+), 28 deletions(-)
diff --git a/contrib/mw-to-git/git-re
The git-credential command requires that you feed it a
broken-down credential, which means that the client needs to
parse a URL itself. Since we have our own URL-parsing
routines, we can easily allow the caller to just give us the
URL as-is, saving them some code.
Signed-off-by: Jeff King
---
The
When writing a credential to git-credential, we omit fields
that do not have a true value. This will skip empty or
undefined fields (which we want), but will also accidentally
skip usernames or passwords which happen to have a non-true
value (e.g., "0"). Be more careful by checking for non-zero
len
The text in git-credential(1) was copied from
technical/api-credentials, so it still talks about the
input/output format as coming from git to the helper. Since
the surrounding text already indicates that this format is
used for reading and writing with git credential, we can
just remove the extran
Hi Matthieu,
Your initial credential plumbing series went by while I was on vacation,
and I finally got a chance to look at it in more detail. Overall it
looks very good; thank you (and your students) for working on it. It was
especially nice to have a test harness with complete instructions. :)
Marcin Owsiany wrote:
> On Wed, Jul 11, 2012 at 03:56:43PM -0700, Junio C Hamano wrote:
> > If the caller does not handle errors, it could be even clearer to
> > write it like
> >
> > command_noisy(qw(update-ref HEAD), $gs->refname) ||
> > die "Cannot update HEAD!!!";
>
> Turns o
Michael G Schwern wrote:
Hi Michael, thanks for taking your time to help with this.
I agree with everything Jonathan said (and thank him for taking
the time to point you in the right direction).
I too (very strongly) prefer email for code review. I doubt I would've
ever gotten involved if git
Tom,
I verified the entries and they seems to be correct. But the clone and its
URL is still now showing when browsing project summary page via gitweb
Thanks
Bala
--
View this message in context:
http://git.661346.n2.nabble.com/clone-URL-missing-in-gitweb-tp7563176p7563199.html
Sent from the gi
Quoting baluchen :
I verified and i have following line in my gitweb.cgi. But still i caould
not get cloan
and what does your configuration of gitweb look like?
and what do mean with "But still i caould not get cloan"?
are you trying to clone via gitweb?
bye,
tom.
--
Thomas "Duke" Hager
Thanks tom.
I verified and i have following line in my gitweb.cgi. But still i caould
not get cloan
our @git_base_url_list = grep { $_ ne '' } ("");
@url_list = map { "$_/$project" } @git_base_url_list unless
@url_list;
# use per project git URL list in $projectroot/$project/clo
Thanks for the review!
On Wed, Jul 11, 2012 at 03:56:43PM -0700, Junio C Hamano wrote:
> Marcin Owsiany writes:
>
> > Date: Sun, 24 Jun 2012 22:40:05 +0100
> > Subject: [PATCH] git-svn: don't create master if another head exists
> >
> > git-svn insists on creating the "master" head (unless it ex
mhag...@alum.mit.edu writes:
> * One email per commit [1]. For each reference change, the script
> first emits one email summarizing the reference change (including
> one-line summaries of the new commits), then emits a separate email
> for each new commit that was introduced, including pat
Since 0fbb95d (am: don't call mailinfo if $rebasing, 2012-06-26), the
patch body to apply when running 'git am --rebasing' is not taken from
the mbox, but directly from the commit. If such a commit is "empty",
'git am --rebasing' still happily applies it and commits. However,
since the input to 'gi
Argh! Sorry about the sendemail.chainreplyto=true. I must have read
that warning message incorrectly :-(.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jul 17, 2012 at 10:10:25PM -0700, Junio C Hamano wrote:
> Ping on a seemingly stalled thread.
Hrm. I could swear that Takeharu sent a follow-up using
pick_one_utf8_char directly that looked OK, but now I can't seem to find
it in the list archives. I wonder if it was off-list and I didn't
The different types of rebase use different ways of calculating the
patches to rebase.
'git rebase' (without -m/-i/-p) uses
git format-patch --ignore-if-in-upstream $upstream..$orig_head
'git rebase -m' uses
git rev-list $upstream..$orig_head
'git rebase -i' (without -p) uses
git rev-li
These seven patches replace the broken one I sent in
http://thread.gmane.org/gmane.comp.version-control.git/200644/focus=200648. I
hope I got the handling of empty commits right this time.
Martin von Zweigbergk (7):
git-rebase--am.sh: avoid special-casing --keep-empty
git-rebase--interactive.s
The todo file is generated using (more-or-less) 'git rev-list
$revisions --pretty=oneline --abbrev-commit --abbrev=7', i.e. by
letting 'git rev-list' output both the abbreviated sha1 and the
subject line. To allow us to more easily generate the list of commits
to rebase by using commands that don't
While generating the todo file, rebase -p calls 'git rev-list
--left-right a...b' (with 'a' equal to $upstream or $onto and 'b'
equal to $orig_head) and its output is piped through 'sed -n
"s/^>//p"', making it equivalent to 'git rev-list --right-only
a...b'. Change the invocation to exactly that.
While building the todo file, 'rebase -p' needs to find the
cherry-picked commits in the branch that is about to be rebased. For
this, it calculates the set difference between the full set of commits
and the non-cherry-picked ones (as reported by 'git rev-list
--left-right --cherry-pick'). Now that
Extract the code that adds a possibly commented-out "pick" line to the
todo file. This lets us reuse it more easily later.
---
git-rebase--interactive.sh | 21 -
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.
The code in git-rebase--interactive that creates the todo file
contains if-blocks that depend on whether $preserve_merges is
active. There is only a very small amount of code in between that is
shared with non-merge-preserving code path, so remove the repeated
conditions and duplicate the small amo
Quoting baluchen :
Hi,
hi,
But in my setup i coould not find "cloaning" option
cloneurl is a "per repository" option, which is set as config option
in your repository. see "man gitweb" for details.
what you're probably searching for is the global option
"git_base_url_list", which is used
On Mon, Jul 16, 2012 at 10:42:07PM -0700, Junio C Hamano wrote:
> > Just like log, the notes are part of the commit information to the right
> > of the graph. But this second hunk is for when we are not using the
> > pretty-printer at all, and the output looks like this:
> >
> > $ git rev-list -
On Wed, Jul 18, 2012 at 12:10 AM, Johannes Sixt wrote:
> Am 7/18/2012 8:20, schrieb Martin von Zweigbergk:
>> On Fri, Apr 20, 2012 at 7:36 AM, Neil Horman wrote:
>>> pick_one () {
>>> ff=--ff
>>> +
>>> case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac
>>> case "$force_r
Am 7/18/2012 8:20, schrieb Martin von Zweigbergk:
> On Fri, Apr 20, 2012 at 7:36 AM, Neil Horman wrote:
>> pick_one () {
>> ff=--ff
>> +
>> case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac
>> case "$force_rebase" in '') ;; ?*) ff= ;; esac
>> output git rev-parse
On Wed, Jul 18, 2012 at 02:23:29AM -0400, Jeff King wrote:
> > * The use of userdiff_find_by_path() in run_diff_cmd() may be iffy;
> >it is probably OK to override diff.external with a more specific
> >per-path configuration, but I think an external diff specified by
> >the GIT_EXTERN
59 matches
Mail list logo
