Martin von Zweigbergk writes:
> Btw2, I'm migrating my email to martinv...@gmail.com (not y...@google.com
> ;-) which saves a few keystrokes and matches some of my other
> accounts, so these patches will be the first ones from the new
> address.
Please send in something like this, then.
.mailm
Hi,
I have a repo accessed through //server/share/foo/repo (Using msysgit).
.git/objects/info/alternates contains '../../../bare/objects'
Running 'git status' (or almost any other action) gives the following output:
error: object directory /server/share/foo/bare/objects does not exist;
check .gi
Junio C Hamano writes:
> Greg KH writes:
>
>> In the Linux kernel tree, commit 0136db586c028f71e7cc21cc183064ff0d5919
>> is a bit "odd".
>>
>> If I go to look to see what release it was in, I normally do:
>> $ git describe --contains 0136db586c028f71e7cc21cc183064ff0d5919
>> v3.6-rc1~5
When giving multiple individual revisions to cherry-pick or revert, as
in 'git cherry-pick A B' or 'git revert B A', one would expect them to
be picked/reverted in the order given on the command line. They are
instead ordered by their commit timestamp -- in chronological order
for "cherry-pick" and
Cherry-picking commits out of order (w.r.t. commit time stamp) doesn't
currently work. Add a test case to demonstrate it.
Signed-off-by: Martin von Zweigbergk
---
t/t3508-cherry-pick-many-commits.sh | 15 +++
1 file changed, 15 insertions(+)
diff --git a/t/t3508-cherry-pick-many-com
When 'git log' is passed the --no-walk option, no revision walk takes
place, naturally. Perhaps somewhat surprisingly, however, the provided
revisions still get sorted by commit date. So e.g 'git log --no-walk
HEAD HEAD~1' and 'git log --no-walk HEAD~1 HEAD' give the same result
(unless the two rev
I'm still working on a re-roll of my rebase-range series, but I think
these three are quite unrelated and shouldn't be held up by that other
series.
Junio, thanks for all the help with explaining revision walking. It
was a little blurry for a long time, but at least I feel more
comfortable with th
Michael Haggerty writes:
> But it also changes almost 600 *other* tests from "succeed even in the
> presence of symlinks" to "never tested in the presence of symlinks", and
> I think that is surrendering more ground than necessary.
Ouch. I did not know have 600+ tests that cares about CEILING.
Greg KH writes:
> In the Linux kernel tree, commit 0136db586c028f71e7cc21cc183064ff0d5919
> is a bit "odd".
>
> If I go to look to see what release it was in, I normally do:
> $ git describe --contains 0136db586c028f71e7cc21cc183064ff0d5919
> v3.6-rc1~59^2~56^2~76
> ...
> Any ideas?
Hi,
In the Linux kernel tree, commit 0136db586c028f71e7cc21cc183064ff0d5919
is a bit "odd".
If I go to look to see what release it was in, I normally do:
$ git describe --contains 0136db586c028f71e7cc21cc183064ff0d5919
v3.6-rc1~59^2~56^2~76
However, it really showed up first in t
On 08/27/2012 06:15 PM, Junio C Hamano wrote:
> Jiang Xin writes:
>
>> Some testcases will fail if current work directory is on a symlink.
>>
>> symlink$ sh ./t4035-diff-quiet.sh
>> $ sh ./t4035-diff-quiet.sh --root=/symlink
>> $ TEST_OUTPUT_DIRECTORY=/symlink sh ./t4035-diff-quiet.sh
Junio C Hamano writes:
> Junio C Hamano writes:
>
>> Junio C Hamano writes:
>>
>>> for (i = 0; i < cnt; i++) {
>>> - if (rslt[i])
>>> + /*
>>> +* Is rslt[i] an ancestor of any of the others?
>>> +* then it is not interesting to us.
>>> +
Mike Hommey writes:
> When rebasing the topic branches, I can hit conflict resolution that I
> already had to do for other topic branches on another upstream import
> branch. Here, git rerere is very helpful. But sometimes, the conflict
> resolution is just to skip the patch, because it was incor
On Tue, Aug 28, 2012 at 03:36:26PM -0700, Junio C Hamano wrote:
> > As a result, the flag would have no effect in "git log -p
> > --quiet" or "git show --quiet". Fix it by setting the
> > format flag before the call to setup_revisions.
>
> This also means that
>
> git show --name-status -
Jeff King writes:
> Yes, that is what's going on. But it's still a regression. There was
> some discussion of what --quiet should do here:
>
> http://thread.gmane.org/gmane.comp.version-control.git/171357
>
> which resulted in a patch that took away --quiet. But then this thread:
>
> http://t
Hi,
In one of my workflows, I constantly rebase topic branches on top of new
upstream imports. As there are several upstream import branches, I have
similar topic branches on top of different imports.
When rebasing the topic branches, I can hit conflict resolution that I
already had to do for othe
Junio C Hamano writes:
> Junio C Hamano writes:
>
>> for (i = 0; i < cnt; i++) {
>> -if (rslt[i])
>> +/*
>> + * Is rslt[i] an ancestor of any of the others?
>> + * then it is not interesting to us.
>> + */
>> +for (j =
On Tue, Aug 28, 2012 at 01:48:27PM -0400, Matthew Caron wrote:
> On 08/28/2012 01:38 PM, Matthew Caron wrote:
> >(otherwise, there was a very strange change made to its functionality,
> >which the documentation does not reflect)
>
> Never mind.
>
> I was looking in the wrong spot. The issue is n
When git is used to track only a subset of a directory, or
there is no sure way to divide files to ignore from files to track,
git user have to live with large number of untracked files. These files
present in file list, and should always be scrolled through
to handle real changes. Situation can be
Nguyễn Thái Ngọc Duy writes:
> checkout operates in three different modes. On top of that it tries to
> be smart by guessing the branch name for switching. This results in
> messy option handling code. This patch reorders it so:
>
> - easy option handling comes first
> - the big chunk of branc
"Joachim Schmitz" writes:
> Implementation includes getitimer(), but for now it is static.
> Supports ITIMER_REAL only.
>
> Signed-off-by: Joachim Schmitz
> ---
> May need a header file for ITIMER_*, struct itimerval and the prototypes,
> But for now, and the HP NonStop platform this isn't neede
From: "Junio C Hamano"
Sent: Tuesday, August 28, 2012 12:22 AM
"Philip Oakley" writes:
I searched for all occurrences of '[[' which would indicate a double
optional argument within the synopsis and only found git-read-tree.
Double-optional? That is not an issue.
For clarification, I was
Oswald Buddenhagen wrote:
> (...)so the second approach is the "bare aggregator repo" which adds
> all other repos as remotes, and the other repos link back via
> alternates. problems:
>
> - to actually share objects, one always needs to push to the aggregator
Run a cron job which frequently does
writes:
> Nicolas Sebrecht writes:
>
>> Do you expect one big merge of a very stable libgit2 at some point?
>
> I don't think there's any need to merge libgit2 into the git project
> source. As a library, it should be perfectly usable as a project of its
> own, just like libcurl and libz.
>
>>
Am 27.08.2012 22:59, schrieb Junio C Hamano:
> Jens Lehmann writes:
>> +{
>> +int i;
>> +int errs = 0;
>> +
>> +for (i = 0; i < list.nr; i++) {
>> +const char *name = list.entry[i].name;
>> +int pos;
>> +struct cache_entry *ce;
>> +struct
- Original Message -
> From: "Matthew Caron"
> Sent: Tuesday, August 28, 2012 1:41:51 PM
> Subject: Re: diff/merge tool that ignores whitespace changes
>
> > > I'm looking for a diff / merge tool that treats lines with only
> > > whitespace changes (trailing or leading whitespaces, linef
Jeff King writes:
> Most of our http requests go through the http_request()
> interface, which does some nice post-processing on the
> results. In particular, it handles prompting for missing
> credentials as well as approving and rejecting valid or
> invalid credentials. Unfortunately, it only h
Florian Achleitner writes:
> Use svnrdump_sim.py to emulate svnrdump without an svn server.
> Tests fetching, incremental fetching, fetching from file://,
> and the regeneration of fast-import's marks file.
>
> Signed-off-by: Florian Achleitner
> Signed-off-by: Junio C Hamano
> ---
> t/t9020-r
Florian Achleitner writes:
> The reference to update by the fast-import stream is hard-coded. When
> fetching from a remote the remote-helper shall update refs in a
> private namespace, i.e. a private subdir of refs/. This namespace is
> defined by the 'refspec' capability, that the remote-help
Florian Achleitner writes:
> fast-import mark files are stored outside the object database and are
> therefore not fetched and can be lost somehow else. marks provide a
> svn revision --> git sha1 mapping, while the notes that are attached
> to each commit when it is imported provide a git sha1
Florian Achleitner writes:
> Search for a note attached to the ref to update and read it's
> 'Revision-number:'-line. Start import from the next svn revision.
>
> If there is no next revision in the svn repo, svnrdump terminates with
> a message on stderr an non-zero return value. This looks a li
Florian Achleitner writes:
> Enable basic fetching from subversion repositories. When processing
> remote URLs starting with testsvn::, git invokes this remote-helper.
> It starts svnrdump to extract revisions from the subversion repository
> in the 'dump file format', and converts them to a git-
Florian Achleitner writes:
> For testing as well as for importing large, already available dumps,
> it's useful to bypass svnrdump and replay the svndump from a file
> directly.
>
> Add support for file:// urls in the remote url, e.g.
>
> svn::file:///path/to/dump
>
> When the remote helper fin
Florian Achleitner writes:
> The existing function only allows reading from a filename or from
> stdin. Allow passing of a FD and an additional FD for the back report
> pipe. This allows us to retrieve the name of the pipe in the caller.
>
> Signed-off-by: Florian Achleitner
> Signed-off-by: Jun
Nicolas Sebrecht writes:
> Do you expect one big merge of a very stable libgit2 at some point?
I don't think there's any need to merge libgit2 into the git project
source. As a library, it should be perfectly usable as a project of its
own, just like libcurl and libz.
> Otherwise, what about g
On 08/28/2012 01:38 PM, Matthew Caron wrote:
(otherwise, there was a very strange change made to its functionality,
which the documentation does not reflect)
Never mind.
I was looking in the wrong spot. The issue is not with --pretty=oneline,
it's with --quiet. In 1.7.0.4, --quiet worked like
(otherwise, there was a very strange change made to its functionality,
which the documentation does not reflect)
Old, working git:
===
$ git --version
git version 1.7.0.4
$ git show --quiet --abbrev-commit --pretty=oneline
47a7aee54553fb718c376cfa9d7de4389a391e33
47a7aee Fix hyperlinks for d
On 08/28/2012 01:40 PM, Stephen Bash wrote:
- Original Message -
From: "Enrico Weigelt"
Sent: Tuesday, August 28, 2012 12:26:39 PM
Subject: diff/merge tool that ignores whitespace changes
I'm looking for a diff / merge tool that treats lines with
only whitespace changes (trailing or le
- Original Message -
> From: "Enrico Weigelt"
> Sent: Tuesday, August 28, 2012 12:26:39 PM
> Subject: diff/merge tool that ignores whitespace changes
>
> I'm looking for a diff / merge tool that treats lines with
> only whitespace changes (trailing or leading whitespaces,
> linefeeds, etc
Florian Achleitner writes:
> The link-rule is a copy of the standard git$X rule but adds VCSSVN_LIB.
>
> Signed-off-by: Florian Achleitner
> Signed-off-by: Junio C Hamano
> ---
> Makefile |5 +
> 1 file changed, 5 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index 66e8216..1b09
Hi folks,
I'm looking for a diff / merge tool that treats lines with
only whitespace changes (trailing or leading whitespaces,
linefeeds, etc) as equal.
The goal is to make reviews as well as merging or rebasing
easier when things like indentions often change.
Does anybody know an solution for t
Thomas Rast writes:
> I'm also mildly surprised that it ended up being correct, albeit with
> some extra work from you :-)
I actually am not all that surprised. It just shows that the
original code was layered in more or less the right way. At the the
bottom layer we would want a way to paint
Hello,
I was looking for a french speaking place to discuss about Git, Hg, SVN
and all other SCM in use and did not find.
This is then an attempt to create one.
I created a Google group:
https://groups.google.com/forum/?fromgroups#!forum/sgcs-fr
I invite french sepaking people to join.
The g
This makes cmd_checkout() shorter, therefore easier to get the big
picture.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
In general I like it, except that parse_branchname_arg() pulls so many
options from cmd_checkout(). I would rather have update_new_branch()
that only takes "struct checkout_opts
checkout operates in three different modes. On top of that it tries to
be smart by guessing the branch name for switching. This results in
messy option handling code. This patch reorders it so:
- easy option handling comes first
- the big chunk of branch name guessing comes next
- mode detectio
This struct contains various switches to change checkout behavior and
it feels somewhat safer to have the compiler reassure us that nowhere
else changes it.
One field that is changed, writeout_error, is split out and passed as
another argument.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/ch
On Tue, Aug 28, 2012 at 10:55 AM, Junio C Hamano wrote:
> The surrounding code is somewhat tricky and the code structure is
> brittle; there are places that update the opts.new_branch so the new
> location of this check has to be after them, and there is one
> codepath that having a bad value in i
Split the decision of what to do and actually doing it in
handle_node() to allow for detection of branches from svn nodes.
Split it into handle_node() and apply_node().
svn dumps are structured in revisions, which contain multiple nodes.
Nodes represent operations on data. Currently the function
h
On Tuesday 28 August 2012 10:49:34 Florian Achleitner wrote:
> Reroll includes fixups by Ramsey. Thanks!
> Diff:
> [..]
> - improve compatibility of integer types.
> [..]
This line is wrong in this series. Just delete it. Sorry.
--
To unsubscribe from this list: send the line "unsubscribe git" in
The reference to update by the fast-import stream is hard-coded. When
fetching from a remote the remote-helper shall update refs in a
private namespace, i.e. a private subdir of refs/. This namespace is
defined by the 'refspec' capability, that the remote-helper advertises
as a reply to the 'capa
Search for a note attached to the ref to update and read it's
'Revision-number:'-line. Start import from the next svn revision.
If there is no next revision in the svn repo, svnrdump terminates with
a message on stderr an non-zero return value. This looks a little
weird, but there is no other way
For testing as well as for importing large, already available dumps,
it's useful to bypass svnrdump and replay the svndump from a file
directly.
Add support for file:// urls in the remote url, e.g.
svn::file:///path/to/dump
When the remote helper finds an url starting with file:// it tries to
Signed-off-by: Florian Achleitner
Signed-off-by: Junio C Hamano
---
Documentation/git-remote-helpers.txt | 21 -
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-remote-helpers.txt
b/Documentation/git-remote-helpers.txt
index f5836e4..5ce4cda
Enable basic fetching from subversion repositories. When processing
remote URLs starting with testsvn::, git invokes this remote-helper.
It starts svnrdump to extract revisions from the subversion repository
in the 'dump file format', and converts them to a git-fast-import stream
using the function
Reroll includes fixups by Ramsey. Thanks!
Diff:
- Add missing dependency to rule in Makefile.
- improve compatibility of integer types.
- t9020-*.sh: remove excess slash in urls that makes python on windows
interpret it as a network path.
- t9020-*.sh: skip if python isn't available.
- replace g
Junio C Hamano writes:
> Thomas Rast writes:
>
>> diff --git i/commit.c w/commit.c
>> index 65a8485..70427ab 100644
>> --- i/commit.c
>> +++ w/commit.c
>> @@ -837,10 +837,13 @@ int in_merge_bases(struct commit *commit, struct
>> commit **reference, int num)
>> struct commit_list *bases, *b
56 matches
Mail list logo
