No need to calculate a new $c with a space if we are not going to do
anything it with it.
There should be no functional changes, except that a word "foo " with no
suffixes can't be matched. But $cur cannot have a space at the end
anyway. So it's safe.
Based on the code from SZEDER Gábor.
Signed-
There's no point in calling a separate function that is only used in one
place. Specially considering that there's no need to call compgen, and
we traverse the words ourselves both in __gitcompadd, and __gitcomp_1.
So lets squash the functions together, and traverse only once.
This improves perfo
The functionality we use from compgen is not much, we can do the same
manually, with drastical improvements in speed, specially when dealing
with only a few words.
This patch also has the sideffect that brekage reported by Jeroen Meijer
and SZEDER Gábor gets fixed because we no longer expand the r
Original patch by SZEDER Gábor.
Signed-off-by: Felipe Contreras
---
t/t9902-completion.sh | 60 +++
1 file changed, 60 insertions(+)
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 99d5c01..b752f4d 100755
--- a/t/t9902-completion.
There's no functional reason for those, the only purpose they are
supposed to serve is to say "we don't provide any words here", but even
for that it's not used consitently.
Signed-off-by: Felipe Contreras
---
contrib/completion/git-completion.bash | 21 -
1 file changed, 21
The idea is to never touch the COMPREPLY variable directly.
This allows other completion systems (i.e. zsh) to override
__gitcompadd, and do something different instead.
Also, this allows further optimizations down the line.
There should be no functional changes.
Signed-off-by: Felipe Contreras
Instead of passing a dummy "", let's check if the last character is a
space, and then move the _cword accordingly.
Apparently we were passing "" all the way to compgen, which fortunately
expanded it to nothing.
Lets do the right thing though.
Signed-off-by: Felipe Contreras
---
t/t9902-complet
Hi,
I sent these some time ago for comments, but I think they are ready. Basically
some reorganization in order to achieve some performance improvements, also,
fix a few bugs.
Felipe Contreras (7):
completion: trivial test improvement
completion: get rid of empty COMPREPLY assignments
compl
Hi,
I am using git with Gitlab/Gitolite configuration. Git version is
1.7.9.5 in Ubuntu 12.04. There has been a consistent git crash
recently and have attached the /var/crash/_usr_lib_git-core_
git.1001.crash file.
The crash output is pasted in the following link
http://pastebin.com/uAQS81BX
I
Greetings,
I use git-daemon as the keeper of all source (love it). git is a normal
user, running as git:daemon, with all repositories living in ~git.
git-daemon is started like so:
/usr/lib/git/git-daemon --syslog --detach --reuseaddr --user=git --group=daemon
--pid-file=/var/run/git-daemon.pi
On Tue, Apr 09, 2013 at 12:40:44PM -0700, rh wrote:
> > does not support hardlinks or symlinks). But I'm not sure which error
> > you are talking about. We can figure out inside the program which
> > program was invoked by checking argv, but I do not see us printing
> > remote-http anywhere.
>
>
On Tue, Apr 09, 2013 at 05:55:08PM -0700, John Koleszar wrote:
> Filter the list of refs returned via the dumb HTTP protocol according
> to the active namespace, consistent with other clients of the
> upload-pack service.
Thanks, this version looks good to me.
> Updates to generate HEAD. Drops m
On Tue, Apr 09, 2013 at 06:19:01PM -0700, Junio C Hamano wrote:
> > git push -- master next; # push two refs to default remote
>
> ... or default "push remote" if there is one, I presume?
>
> As you are giving what to push, I am assuming that
> branch.$name.remote would not come into play in
On Tue, Apr 09, 2013 at 04:13:32PM -0700, Jonathan Nieder wrote:
> Random idea: today you can do
>
> git push origin master; # push branch master to remote origin
> git push --multiple origin korg; # push default refspec to 2 remotes
Can we do "git push --multiple" today? My git does
Jonathan Nieder writes:
> Junio C Hamano wrote:
>
>> And I think now I agree that indeed is a sensible assumption. I am
>> not sure '-' is a good token for that, but I do not offhand think of
>> a reason why '-' would be a _bad_ token for that, either.
>
> Random idea: today you can do
>
>
Thanks; will replace the previous one that has been in 'pu'.
--
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
Filter the list of refs returned via the dumb HTTP protocol according
to the active namespace, consistent with other clients of the
upload-pack service.
Signed-off-by: John Koleszar
---
Updates to generate HEAD. Drops my original tests, since they were under the
flawed assumption that both the du
Jonathan Nieder wrote:
> today you can do
>
> git push origin master; # push branch master to remote origin
> git push --multiple origin korg; # push default refspec to 2 remotes
Pretend I said "fetch". ;-)
--
To unsubscribe from this list: send the line "unsubscribe git"
Junio C Hamano wrote:
> And I think now I agree that indeed is a sensible assumption. I am
> not sure '-' is a good token for that, but I do not offhand think of
> a reason why '-' would be a _bad_ token for that, either.
Random idea: today you can do
git push origin master; # push bran
Jens Lehmann writes:
> diff --git a/submodule.c b/submodule.c
> index 975bc87..eba9b42 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -1001,3 +1001,67 @@ int merge_submodule(unsigned char result[20], const
> char *path,
> ...
> + if (!fp)
> + die(_("Could not create git link
Filipe Cabecinhas writes:
>
> Testing with dd bs=INT_MAX+1 count=1 also gets me an “Invalid
> argument” error, while bs=INT_MAX will do what's expected.
>
> I have a preliminary patch that fixes it, but it may not be the
> preferred way. The code is not ifdef'ed out and I'm doing the fix in
> wri
Aaron Schrab writes:
> Here's the third version of my series for dealing with gitfiles in clone
> --reference.
>
> The first patch is unchanged from the previous version except for the
> addition of a Reviewed-by line.
>
> The second patch has been modified so that it now supports having a .git
>
Hi all,
While “git svn fetch”ing a subversion repository (private, sorry),
I've encoutered a bug that appears in several git versions (always
with the same symptoms):
git from master (from 2013-04-08)
git version 1.8.2.1 (compiled from homebrew)
git version 1.7.12.4 (Apple Git-37)
The only symp
Try reading gitfile files when processing --reference options to clone.
This will allow, among other things, using a submodule checked out with
a recent version of git as a reference repository without requiring the
user to have internal knowledge of submodule layout.
Signed-off-by: Aaron Schrab
Do not report that an argument to clone's --reference option is not a
local directory. Nothing checks for the existence or type of the path
as supplied by the user; checks are only done for particular contents of
the supposed directory, so we have no way to know the status of the
supplied path. T
Here's the third version of my series for dealing with gitfiles in clone
--reference.
The first patch is unchanged from the previous version except for the
addition of a Reviewed-by line.
The second patch has been modified so that it now supports having a .git
file supplied as the argument to the
On Mon, Apr 8, 2013 at 2:45 PM, Jeff King wrote:
> On Mon, Apr 08, 2013 at 11:25:39PM +0200, Thomas Rast wrote:
>
>> At the risk of repeating something that's been said already -- I only
>> skimmed the thread -- this test breaks in today's pu on my machine. I
>> get:
>> [...]
>> --- expect201
Jakub Narębski writes:
> On 08.04.2013, Junio C Hamano wrote:
>> j...@blackdown.de (Jürgen Kreileder) writes:
>>
>>> Fixes the encoding for several _plain actions and for text/* and */*+xml
>>> blobs.
>>>
>>> Signed-off-by: Jürgen Kreileder
>
> I see that this patch does (or tries to do) two
On Tue, Apr 09, 2013 at 11:38:05PM +0200, Thomas Rast wrote:
> Two out of six of these loops quit within 1 and 2 iterations,
> respectively, both with an error along the lines of:
>
> expecting success:
> (GIT_REMOTE_TESTGIT_FAILURE=1 &&
> export GIT_REMOTE_TESTGIT_FAILURE
Signed-off-by: Simon Ruderich
---
On Tue, Apr 09, 2013 at 12:16:56PM -0700, Junio C Hamano wrote:
> Sign-off?
Sorry, forgot it.
> Perhaps adding "... to keep the state for inspection by the tester
> to diagnose the bug" or something is in order?
Good idea.
Revised patch is attached.
Regards
S
Felipe Contreras writes:
> If a push fails because the remote-helper died (with fast-export), the
> user won't see any error message. So let's add one.
>
> At the same time lets add tests to ensure this error is reported, and
> while we are at it, check the error from fast-import
[...]
> +# We sl
John Keeping writes:
> It's not guessing on all of "$@" in git-submodule - we know that
> everything left is a path.
OK, then.
--
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/
On Tue, Apr 09, 2013 at 02:00:52PM -0700, Junio C Hamano wrote:
> John Keeping writes:
>
> > + eval "set $(git rev-parse --sq --prefix "$wt_prefix" -- "$@")"
>
> This may be handier than having to do the "for arg" loop git-am uses
> yourself.
>
> > (
> > git ls-files --error-u
On Tue, Apr 09, 2013 at 01:57:21PM -0700, Junio C Hamano wrote:
> John Keeping writes:
>
> > This adds a prefix string to any filename arguments encountered after it
> > has been specified.
> >
> > Signed-off-by: John Keeping
> > ---
>
> Stale subject?
Yep. Sorry.
> > +--prefix ::
> > + Be
Amit Bakshi writes:
> Hi,
>
> In the help for git-archive it states:
>
>--worktree-attributes
>Look for attributes in .gitattributes in working directory too.
> ...
The worktree-attributes should read from the worktree. It should
not pay any attention to where you are in th
John Keeping writes:
> + eval "set $(git rev-parse --sq --prefix "$wt_prefix" -- "$@")"
This may be handier than having to do the "for arg" loop git-am uses
yourself.
> (
> git ls-files --error-unmatch --stage -- "$@" ||
> echo "unmatched pathspec exists"
>
John Keeping writes:
> This adds a prefix string to any filename arguments encountered after it
> has been specified.
>
> Signed-off-by: John Keeping
> ---
Stale subject?
> +--prefix ::
> + Behave as if 'git rev-parse' was invoked from the ``
> + subdirectory of the working tree. Any
Hi,
In the help for git-archive it states:
--worktree-attributes
Look for attributes in .gitattributes in working directory too.
This doesn't seem to be the case. I have a use case where I need to
archive a remote I don't have write access too (via --remote=), and I
wish to ig
Ramkumar Ramachandra writes:
> Junio C Hamano wrote:
>> But there are other cases to attempt to add a path that do not
>> belong to our project, which do not have to involve a symbolic link
>> in the leading path.
>
> The reader is now wondering what this could possibly be, and why you
> didn't s
Use the new rev-parse --prefix option to process all paths given to the
submodule command, dropping the requirement that it be run from the
top-level of the repository.
Signed-off-by: John Keeping
---
git-submodule.sh | 7 +++
t/t7400-submodule-basic.sh | 26 ++
This adds a prefix string to any filename arguments encountered after it
has been specified.
Signed-off-by: John Keeping
---
Documentation/git-rev-parse.txt | 16
builtin/rev-parse.c | 24 ---
t/t1513-rev-parse-prefix.sh | 90 +
Since version 1, patch 1 has been completely re-written using the
approach proposed by Jonathan and Junio.
Also, there's now a documentation update and some tests.
John Keeping (2):
rev-parse: add --filename-prefix option
submodule: drop the top-level requirement
Documentation/git-rev-parse
Jakub Narębski writes:
> W dniu 08.04.2013 22:10, Jürgen Kreileder pisze:
>
>> Fix broken blob action parameters on blobdiff and commitdiff pages by
>> explicitly passing variables instead of relying on global ones.
>
> Do I understand it correctly that those variables (e.g. $hash variable
> in g
Jeff King writes:
> +static inline int *slab_at(struct commit_slab *s, const struct commit *c)
> +{
> + if (s->alloc <= c->index) {
> + int new_alloc = alloc_nr(s->alloc);
> + if (new_alloc <= c->index)
> + new_alloc = c->index + 1;
> +
> +
W dniu 09.04.2013 21:22, Jürgen Kreileder napisał:
> Jakub Narębski writes:
>> W dniu 09.04.2013 19:40, Jürgen Kreileder napisał:
>>> Jakub Narębski writes:
Jürgen Kreileder wrote:
> Properly encode site and project names for RSS and Atom feeds.
>>> Good point. But it doesn't fix
This morning, I was struggling (not for the first time) to produce a Git
command that would identify a merge commit that dropped a change. I
could see where it was added, but couldn't automate finding out why it
wasn't any longer in HEAD.
All the permutations of "--full-history", "-m", "-S", "
Am 08.04.2013 23:05, schrieb Jeff King:
> On Mon, Apr 08, 2013 at 02:36:05PM -0400, BJ Hargrave wrote:
>
>> Git 1.8.2.1 includes commit bd54cf17 - archive: handle commits with an
>> empty tree
>>
>> Test 2 of t5004-archive-corner-cases, "tar archive of empty tree is
>> empty", fails on Mac OS X 10
Ramkumar Ramachandra writes:
> Junio C Hamano wrote:
>> What is bad about saying "push origin ...the rest..."?
>
> I don't know which remote to push to: all I know is that the remote to
> push to is configured somewhere in the web of ...
Ahh, and then the recent triangular stuff makes it even wo
Jakub Narębski writes:
> W dniu 09.04.2013 19:40, Jürgen Kreileder napisał:
>> Jakub Narębski writes:
>>> Jürgen Kreileder wrote:
>>>
Properly encode site and project names for RSS and Atom feeds.
>
- my $title = "$site_name - $project/$action";
+ my $title = to_utf8($site_name)
Simon Ruderich writes:
> On Sun, Apr 07, 2013 at 03:32:00PM -0700, Jonathan Nieder wrote:
>>> I'm not sure if it's better to use test_when_finished with rm or
>>> just && rm -rf tmp at the end of the test in case someone wants
>>> to look at the output.
>>
>> test_when_finished is better here, si
Jakub Narębski writes:
> Junio C Hamano wrote:
>> Jakub Narębski writes:
>>
>>> W dniu 09.04.2013 19:34, Junio C Hamano pisze:
>>>
- if (has_symlink_leading_path(path, len))
- return error("'%s' is beyond a symbolic link", path);
+ if (path_outside_our_project(path, le
Junio C Hamano writes:
> Ramkumar Ramachandra writes:
>
>> The reader is now wondering what this could possibly be, and why you
>> didn't send this patch earlier.
>
> Because it wasn't written back then?
>
>> Perhaps clarify with: s/there are
>> cases/there may be cases/ and append "One such ca
Junio C Hamano wrote:
> Jakub Narębski writes:
>
>> W dniu 09.04.2013 19:34, Junio C Hamano pisze:
>>
>>> - if (has_symlink_leading_path(path, len))
>>> - return error("'%s' is beyond a symbolic link", path);
>>> + if (path_outside_our_project(path, len))
>>> + return erro
"Constantine A. Murenin" writes:
> Well, I now know this, but it wasn't clear from the documentation that
> that was the behaviour.
Yes, the message "after you _resolved_, please tell me you are now done"
is too fuzzy. What it wants to say is:
I punted, because the patch does not apply
Jakub Narębski writes:
> W dniu 09.04.2013 19:34, Junio C Hamano pisze:
>
>> -if (has_symlink_leading_path(path, len))
>> -return error("'%s' is beyond a symbolic link", path);
>> +if (path_outside_our_project(path, len))
>> +return error("'%s' is outside our worki
Ramkumar Ramachandra writes:
> The reader is now wondering what this could possibly be, and why you
> didn't send this patch earlier.
Because it wasn't written back then?
> Perhaps clarify with: s/there are
> cases/there may be cases/ and append "One such case that we currently
> don't handle
Ramkumar Ramachandra writes:
> Junio C Hamano wrote:
>> I think what the callers of this function care about is if the name
>> is a path that should not be added to our index (i.e. points
>> "outside the repository"). If you had a symlink d that points at e
>> when our project does have a subdir
On 8 April 2013 10:49, Junio C Hamano wrote:
> "Constantine A. Murenin" writes:
>
>> However, what I've faced with, is that when a conflict happens, and I
>> resolve, and do `git add`, and `git am --resolved`, then the rest of
>> the `format-patch` email where the conflict has occurred is discard
W dniu 09.04.2013 19:34, Junio C Hamano pisze:
> - if (has_symlink_leading_path(path, len))
> - return error("'%s' is beyond a symbolic link", path);
> + if (path_outside_our_project(path, len))
> + return error("'%s' is outside our working tree", path);
>
Don't
W dniu 09.04.2013 19:40, Jürgen Kreileder napisał:
> Jakub Narębski writes:
>> Jürgen Kreileder wrote:
>>
>>> Properly encode site and project names for RSS and Atom feeds.
>>> - my $title = "$site_name - $project/$action";
>>> + my $title = to_utf8($site_name) . " - " . to_utf8($project) .
Junio C Hamano wrote:
> But there are other cases to attempt to add a path that do not
> belong to our project, which do not have to involve a symbolic link
> in the leading path.
The reader is now wondering what this could possibly be, and why you
didn't send this patch earlier. Perhaps clarify
Ramkumar Ramachandra wrote:
> [...]
Let's not do anything too complex, and just aim for a more pleasant
experience for the simple case of force-pushing some refs without the
: counterpart. Then, all we have to do is verify that what is
specified is not a valid remote, and is not a valid local pat
On 9 April 2013 18:01, Jeff King wrote:
> On Tue, Apr 09, 2013 at 08:03:24AM +0200, Johannes Sixt wrote:
>> If A mentions B (think of cherry-pick -x), then you must ensure that the
>> branch containing B was traversed first.
>
> Yeah, you're right. Multiple passes are necessary to get it
> complet
Junio C Hamano wrote:
> What is bad about saying "push origin ...the rest..."?
I don't know which remote to push to: all I know is that the remote to
push to is configured somewhere in the web of branch.remote,
remote.pushdefault, and branch..pushremote, and I don't want to
have to figure that out
W dniu 09.04.2013 19:54, Jürgen Kreileder napisał:
> Jakub Narębski writes:
>
>> Jürgen Kreileder wrote:
>>
>>> Don't add js parameters to links outside of gitweb itself.
>>
>> Hmmm... this limits adding ';js=(0|1)' to only links which begin with
>> $my_url, i.e. absolute links beginning with git
Ramkumar Ramachandra writes:
> Junio C Hamano wrote:
>> host:foo/bar (take my "host" branch, push it to their "foo/bar"
>> branch) could be tricky, no? It could be trying to go over the ssh
>> to "host" and access repository at $HOME/foo/bar. The git_connect()
>> call may even succeed and you c
Junio C Hamano wrote:
> I think what the callers of this function care about is if the name
> is a path that should not be added to our index (i.e. points
> "outside the repository"). If you had a symlink d that points at e
> when our project does have a subdirectory e with file f,
>
> che
Sorry for repeated rerolls. I had missed another instance in t0008
and also the explanation was lacking.
-- >8 --
Subject: [PATCH] symlinks: rename has_symlink_leading_path() to
path_outside_our_project()
The purpose of the function is to prevent a path from getting added
to our project when it
On Tue, Apr 09, 2013 at 10:41:34AM -0700, rh wrote:
> > git-remote-http does not touch the openssl code itself at all. We only
> > talk to curl, which handles all of the ssl (and may even be built on
> > gnutls). So if that is the problem, then I think it may be a libcurl
> > bug, not a git one.
>
Junio C Hamano wrote:
> The first step (renaming and adjusting comments) would look like
> this.
Thanks for this! I like the name die_if_path_outside_our_project().
I'll take care of the rest.`
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...
Junio C Hamano writes:
>> I looked at the output from "grep has_symlink_leading_path" and also
>> for "die_if_path_beyond"; all of these places are checking "I have
>> this multi-level path; I want to know if the path does not (should
>> not) be part of the current project", I think. Certainly t
Jakub Narębski writes:
> Jürgen Kreileder wrote:
>
>> Properly encode site and project names for RSS and Atom feeds.
>>
>> Signed-off-by: Jürgen Kreileder
>> ---
>> gitweb/gitweb.perl |2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/gitweb/gitweb.perl b/gitweb/gi
Junio C Hamano wrote:
> host:foo/bar (take my "host" branch, push it to their "foo/bar"
> branch) could be tricky, no? It could be trying to go over the ssh
> to "host" and access repository at $HOME/foo/bar. The git_connect()
> call may even succeed and you cannot use the failure as a hint to
>
Junio C Hamano writes:
> Ramkumar Ramachandra writes:
>
>> Currently, git add has the logic for refusing to add gitlinks using
>> treat_path(), which in turn calls check_path_for_gitlink(). However,
>> this only checks for an in-index submodule (or gitlink cache_entry).
>> A path inside a git r
Ramkumar Ramachandra writes:
> Jeff King wrote:
>> So you would need some heuristics based on whether something was a valid
>> refspec, or could be a valid remote name or URL.
>
> All refspecs conform to a very simple format:
>
> quux
> +quux
> quux:baz
> +quux:baz
>
> All of them
On Tue, 9 Apr 2013, Jeff King wrote:
git-remote-http does not touch the openssl code itself at all. We only talk
to curl, which handles all of the ssl (and may even be built on gnutls). So
if that is the problem, then I think it may be a libcurl bug, not a git one.
... and if/when you do make
On Tue, Apr 09, 2013 at 08:47:18AM -0700, rh wrote:
> The symptoms that this patch addresses look similar:
>
> http://article.gmane.org/gmane.mail.postfix.user/217790
>
> Quote from that thread:
> "This behavior is actually documented (SSL_set_fd() destroys
> a BIO already on the SSL handle, and
On Tue, Apr 09, 2013 at 07:45:53AM +0200, Magnus Therning wrote:
> I've been trying to set up git-http-backend+lighttpd. I've managed to
> set up anonymous read-only access, and I then successfully configured
> authentication for both read and write. Then I get stuck. The
> man-page for git-htt
Ramkumar Ramachandra writes:
> Currently, git add has the logic for refusing to add gitlinks using
> treat_path(), which in turn calls check_path_for_gitlink(). However,
> this only checks for an in-index submodule (or gitlink cache_entry).
> A path inside a git repository in the worktree still
Change a binary file whose filename contains an ampersand, then view
the commitdiff page in gitweb.
Git outputs a message like "Binary files a/b&w.dll and b/b&w.dll differ"
Gitweb format_diff_from_to_header() doesn't notice anything in that
output which needs escaping, and writes it directly to t
On Tue, Apr 09, 2013 at 08:03:24AM +0200, Johannes Sixt wrote:
> Am 4/8/2013 23:54, schrieb Jeff King:
> > Yeah, it would make sense for filter-branch to have a "--map-commit-ids"
> > option or similar that does the update. At first I thought it might take
> > two passes, but I don't think it is n
On Tue, Apr 09, 2013 at 02:51:37PM +0530, Ramkumar Ramachandra wrote:
> Currently, git add has the logic for refusing to add gitlinks using
> treat_path(), which in turn calls check_path_for_gitlink(). However,
> this only checks for an in-index submodule (or gitlink cache_entry).
> A path inside
At 09:47 -0700 09 Apr 2013, Junio C Hamano wrote:
Aaron Schrab writes:
But if others disagree, I could be convinced to add support for that.
If M/.git weren't a gitfile that points elsewhere, that request
ought to work, no? A gitfile is the moral equilvalent of a symbolic
link, meant to hel
Aaron Schrab writes:
> At 17:24 -0700 08 Apr 2013, Jonathan Nieder wrote:
>>> +test_expect_success 'clone using repo with gitfile as a reference' '
>>> + git clone --separate-git-dir=L A M &&
>>> + git clone --reference=M A N &&
>>
>>What should happen if I pass --reference=M/.git?
>
> That
At 17:24 -0700 08 Apr 2013, Jonathan Nieder wrote:
+test_expect_success 'clone using repo with gitfile as a reference' '
+ git clone --separate-git-dir=L A M &&
+ git clone --reference=M A N &&
What should happen if I pass --reference=M/.git?
That isn't supported and I wouldn't e
On Tue, Apr 09, 2013 at 02:49:24PM +0530, Ramkumar Ramachandra wrote:
> On the wording issue, a submodule is a submodule whether in-index or
> otherwise. I would write two different tests: one for in-worktree
> submodule and another for in-index submodule, and name them
> appropriately. Does tha
Jeremy Rosen writes:
> is there a way to "teach" rerere about existing merge commits, or do I
> have to re-solve all the existing merge manually once ?
There is a tool that does the "re-solve manually" for you.
$ git ls-files | grep rerere-train
contrib/rerere-train.sh
It uses your working tr
W dniu 08.04.2013 22:10, Jürgen Kreileder pisze:
> Fix broken blob action parameters on blobdiff and commitdiff pages by
> explicitly passing variables instead of relying on global ones.
Do I understand it correctly that those variables (e.g. $hash variable
in git_patchset_body in second chunk be
Not Sure writes:
> Starting with the newest git version 1.8.2.1, the signature checking
[...]
> Missing from output is the machine parsable GPG information:
>
> [GNUPG:] SIG_ID sorvifhoerui/asidunb 2013-04-09 23947273
> [GNUPG:] GOODSIG 4338111324 User
> [GNUPG:] VALIDSIG ddd
thanks a lot, that solves my problem.
I'm a bit suprised that it's not part of the git-rerere command but that's good
enough for me...
Cordialement
Jérémy Rosen
fight key loggers : write some perl using vim
- Mail original -
> Jeremy Rosen writes:
>
> > is there a way to "te
Jürgen Kreileder wrote:
> Properly encode site and project names for RSS and Atom feeds.
>
> Signed-off-by: Jürgen Kreileder
> ---
> gitweb/gitweb.perl |2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 9cfe5b5..09294eb 1
Jeremy Rosen writes:
> is there a way to "teach" rerere about existing merge commits, or do I
> have to re-solve all the existing merge manually once ?
See src/contrib/rerere-train.sh and Junio's blog.
http://git-blame.blogspot.com/2012/04/rebuilding-git-integration-environment.html
--
To unsu
Hi,
On Tue, Apr 9, 2013 at 10:55 AM, Jeremy Rosen wrote:
> looking a little bit more into this, I was very suprised
>
> there seems to be little/no tools in the git ecosystem that studies the
> dependencies between commits based on the file they modified and/or the
> conflict they would cau
W dniu 07.04.2013 19:46, Felipe Contreras pisze:
> @@ -212,7 +212,8 @@ my %config_bool_settings = (
> "signedoffbycc" => [\$signed_off_by_cc, undef],
> "signedoffcc" => [\$signed_off_by_cc, undef], # Deprecated
> "validate" => [\$validate, 1],
> -"multiedit" => [\$multiedit,
On 09.04.2013, Ramkumar Ramachandra wrote:
> Jakub Narębski wrote:
>> Hmmm... I used to do (and still do) such not-recommended thing,
>> i.e. keeping git/gitweb/TODO etc. in git/gitweb/.git repository,
>> while having git/gitweb/gitweb.perl in git/.git repository.
>
> Why don't you put the gitweb
On Sun, Apr 07, 2013 at 03:32:00PM -0700, Jonathan Nieder wrote:
>> I'm not sure if it's better to use test_when_finished with rm or
>> just && rm -rf tmp at the end of the test in case someone wants
>> to look at the output.
>
> test_when_finished is better here, since it means later tests can
> r
On 09.04.2013, Magnus Therning wrote:
> I've been trying to set up git-http-backend+lighttpd. I've managed to
> set up anonymous read-only access, and I then successfully configured
> authentication for both read and write. Then I get stuck. The
> man-page for git-http-backend says that the fol
Starting with the newest git version 1.8.2.1, the signature checking
code somehow ignores GPG's status-fd and status-file options, which are
THE way to machine parse GPG's output (seee [1])
How to reproduce:
1. Put the following line in your ~/.gnupg/gpg.conf file:
status-fd 1
2. Produce a sing
Jakub Narębski wrote:
> Hmmm... I used to do (and still do) such not-recommended thing,
> i.e. keeping git/gitweb/TODO etc. in git/gitweb/.git repository,
> while having git/gitweb/gitweb.perl in git/.git repository.
Why don't you put the gitweb/TODO in a different branch in the git.git
repository
Junio C Hamano wrote:
> Ramkumar Ramachandra wrote:
>> 2. If we want to make git-submodule a part of git-core (which I think
>>everyone agrees with), we will need to make the information in
>>.gitmodules available more easily to the rest of git-core.
> Care to define "more easily" which i
1 - 100 of 109 matches
Mail list logo
