Hi Git community,
I'm new to GIT and responsible of a project to migrate our SVN repo to GIT.
I've made the migration with the git-svn tools ... it was long, but everything
seems fine ; source code is correct and all its history is there.
It happen with our delivery workflow that we will have
On Wed, 2016-12-14 at 00:31 +0100, Beat Bolli wrote:
> + ( cd uniset && git checkout 4b186196dd )
Micronit, but this is perhaps better written as
git -C uniset checkout 4b186196dd
to avoid the subshell and cd.
D.
On Tue, Dec 13, 2016 at 9:05 PM, Junio C Hamano wrote:
> Christian Couder writes:
>
>> In general I think that having a lot of refs is really a big problem
>> right now in Git as many big organizations using Git are facing this
>> problem in one form or another.
>> So I think that support for a b
On Thu, Dec 15, 2016 at 08:30:52AM +0100, Torsten Bögershausen wrote:
> > > Would it be reasonable to
> > > write:
> > >
> > >/* Copy initial part of absolute path, converting separators on
> > > Windows */
> > >const char *end = src + offset_1st_component(src);
> > >while (src < end
It's a bit clunky but it works!!
Usage:
- mark commit one (e.g. v45)
- Select commit two.
- Switch the gdttype to the option, "git-cherry between marked commit and:"
Signed-off-by: Pierre Dumuid
---
gitk | 110 +--
1 file change
A suggested name is provided when creating a new "following" branch.
Signed-off-by: Pierre Dumuid
---
gitk | 86
1 file changed, 82 insertions(+), 4 deletions(-)
diff --git a/gitk b/gitk
index 50d1ef4..36cba49 100755
--- a/git
Signed-off-by: Pierre Dumuid
---
gitk | 19 ++-
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/gitk b/gitk
index 0903d2d..6f50b06 100755
--- a/gitk
+++ b/gitk
@@ -6731,22 +6731,28 @@ proc drawtags {id x xt y1} {
set yb [expr {$yt + $linespc - 1}]
set xval
Signed-off-by: Pierre Dumuid
---
gitk | 17 +
1 file changed, 17 insertions(+)
diff --git a/gitk b/gitk
index a894f1d..5f27716 100755
--- a/gitk
+++ b/gitk
@@ -2661,6 +2661,9 @@ proc makewindow {} {
{mc "Diff this -> marked commit" command {diffvsmark 0}}
{mc "Dif
Previously, there was no easy way to save a particular file from the
currently selected revision.
This patch adds a menu item "Save file as" to the file list popup
menu, which opens a file selection dialog to determine the name under
which a file should be saved. The default filename is of the fo
Signed-off-by: Pierre Dumuid
---
gitk | 117 +++
1 file changed, 117 insertions(+)
diff --git a/gitk b/gitk
index 36cba49..a894f1d 100755
--- a/gitk
+++ b/gitk
@@ -2089,6 +2089,10 @@ proc makewindow {} {
{mc "Reread re&f
Would patches introducing new git hooks, e.g. for post-fetch, be
eligible for acceptance?
If a more detailed explanation about a specific use case is required,
I'd be happy to provide it.
Btw, the link in the README
http://news.gmane.org/gmane.comp.version-control.git/ is dead.
Chiel
On Thu, Dec 15, 2016 at 02:57:18PM +0100, Chiel ten Brinke wrote:
> Would patches introducing new git hooks, e.g. for post-fetch, be
> eligible for acceptance?
The general guidelines for adding hooks is laid out here:
http://public-inbox.org/git/7vbq7ibxhh@gitster.siamese.dyndns.org/
-Pef
On Thu, Dec 15, 2016 at 02:57:18PM +0100, Chiel ten Brinke wrote:
> Btw, the link in the README
> http://news.gmane.org/gmane.comp.version-control.git/ is dead.
Yes, the status of gmane was up in the air for a while, but I think we
can give it up as dead now (at least for our purposes).
-- >8 --
On Thu, Dec 15, 2016 at 09:14:30AM -0500, Jeff King wrote:
> On Thu, Dec 15, 2016 at 02:57:18PM +0100, Chiel ten Brinke wrote:
>
> > Would patches introducing new git hooks, e.g. for post-fetch, be
> > eligible for acceptance?
>
> The general guidelines for adding hooks is laid out here:
>
>
From: George Vanburgh
When importing from multiple perforce paths - we may attempt to import a
changelist that contains files from two (or more) of these depot paths.
Currently, this results in multiple git commits - one containing the changes,
and the other(s) as empty commits. This behavior
Jeff King writes:
> On Wed, Dec 14, 2016 at 02:39:51PM -0800, Brandon Williams wrote:
>
>> Always warn if libcurl version is too old because:
>>
>> 1. Even without a protocol whitelist, newer versions of curl have all
>>non-http protocols disabled by default.
>
> Technically, non-http and no
Chris Packham writes:
> On Thu, Dec 15, 2016 at 7:04 AM, Junio C Hamano wrote:
>> The last one 3/3 is a nice touch that makes sure that we do not
>> forget what we discovered during the discussion. Very much
>> appreciated.
>>
>> Will queue. Thanks.
>
> Did you want me to send a v4 to mark the
Jeff King writes:
> I don't have an opinion either way on what Windows would want, but note
> that the function already _does_ convert separators to slashes. With
> Johannes's original patch, you'd end up with a mix, like:
>
> \\server\share/dir1/file
>
> So this conversion is really just retai
On Thu, Dec 15, 2016 at 09:36:17AM -0800, Junio C Hamano wrote:
> > Did you want me to send a v4 to mark the strings for translation or
> > will you apply a fixup your end?
>
> I didn't follow the _() discussion (was there any?)
I think the discussion was just "we should do that".
> I do not th
Dennis Kaarsemaker writes:
> On Wed, 2016-12-14 at 00:31 +0100, Beat Bolli wrote:
>> + ( cd uniset && git checkout 4b186196dd )
>
> Micronit, but this is perhaps better written as
>
> git -C uniset checkout 4b186196dd
>
> to avoid the subshell and cd.
>
> D.
In the context of this script,
Dear Sir/Madam.
Assalamu`Alaikum.
I am Dr mohammad ouattara, I have ($10.6 Million us dollars) to transfer into
your account,
I will send you more details about this deal and the procedures to follow when
I receive a positive response from you,
Have a great day,
Dr mohammad ouattara.
Alexander Mills writes:
> basically it is doing the merge with this line:
>
> git merge --squash -Xtheirs dev -m "squashing" &&
The order of command line parameters are "dashed options and their
arguments first, then refs (and then pathspecs if exists), so you
should make it a habit to move that
Johannes Schindelin writes:
> diff --git a/sequencer.c b/sequencer.c
> index f6e20b142a..271c21581d 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -45,6 +45,35 @@ static GIT_PATH_FUNC(rebase_path_todo,
> "rebase-merge/git-rebase-todo")
> */
> static GIT_PATH_FUNC(rebase_path_done, "rebas
Johannes Schindelin writes:
> For users' convenience, most rebase commands can be abbreviated, e.g.
> 'p' instead of 'pick' and 'x' instead of 'exec'. Let's teach the
> sequencer to handle those abbreviated commands just fine.
>
> Signed-off-by: Johannes Schindelin
> ---
Sensible.
Johannes Schindelin writes:
> + strbuf_addstr(&buf, "GIT_AUTHOR_NAME='");
> + while (*message && *message != '\n' && *message != '\r')
> + if (skip_prefix(message, " <", &message))
> + break;
> + else if (*message != '\'')
> +
On Thu, Dec 15, 2016 at 10:42:53AM -0800, Junio C Hamano wrote:
> > + sprintf((char *)p, "%d", ++count);
>
> Do we know the area pointed at p (which is inside buf) long enough
> not to overflow? If the original were 9 and you incremented to get
> 10, you would need one extra byte.
Eve
On Tue, Dec 13, 2016 at 04:30:01PM +0100, Johannes Schindelin wrote:
> + else {
> + unsigned char head[20];
> + struct commit *head_commit;
> + const char *head_message, *body;
> +
> + if (get_sha1("HEAD", head))
> + return er
On Thu, Dec 15, 2016 at 11:03 AM, Jeff King wrote:
> wonder if it would be helpful to send that output to the list.
Sure we can try.
Another project I used to run through coverity (Gerrit), shows
similar characteristics w.r.t. false positives, so people complained
when I was force feeding them t
Johannes Schindelin writes:
> When an interactive rebase is interrupted, the user may stage changes
> before continuing, and we need to commit those changes in that case.
>
> Please note that the nested "if" added to the sequencer_continue() is
> not combined into a single "if" because it will be
On Thu, Dec 15, 2016 at 11:07:34AM -0800, Stefan Beller wrote:
> On Thu, Dec 15, 2016 at 11:03 AM, Jeff King wrote:
> > wonder if it would be helpful to send that output to the list.
>
> Sure we can try.
>
> Another project I used to run through coverity (Gerrit), shows
> similar characteristic
On Thu, Dec 15, 2016 at 11:20 AM, Jeff King wrote:
> On Thu, Dec 15, 2016 at 11:07:34AM -0800, Stefan Beller wrote:
>
>> On Thu, Dec 15, 2016 at 11:03 AM, Jeff King wrote:
>> > wonder if it would be helpful to send that output to the list.
>>
>> Sure we can try.
>>
>> Another project I used to ru
Lars Schneider recommended I ask you this question.
My question:
Let's say I have a code change that I want to 'bake' for a while locally, just
to make sure some edge case doesn't pop up while I am working on other things.
Is there any practical way of doing that?
I could constantly merge tha
Running git on 'next', you can trigger a BUG:
$ cd /some/repo
$ git pack-objects --all --stdout /tmp/foo.pack
$ cd /not-a-git-repo
$ git index-pack --stdin
Just a ping on this patch..
On Tue, Oct 11, 2016 at 11:45 AM, Linus Torvalds
wrote:
> In some situations you may want to group the commits not by author,
> but by committer instead.
>
> For example, when I just wanted to look up what I'm still missing from
> linux-next in the current merge window
Jeff King wrote:
> On Thu, Dec 15, 2016 at 02:57:18PM +0100, Chiel ten Brinke wrote:
>
> > Btw, the link in the README
> > http://news.gmane.org/gmane.comp.version-control.git/ is dead.
>
> Yes, the status of gmane was up in the air for a while, but I think we
> can give it up as dead now (at le
At 20:14 + 15 Dec 2016, Larry Minton wrote:
Let's say I have a code change that I want to 'bake' for a while
locally, just to make sure some edge case doesn't pop up while I am
working on other things. Is there any practical way of doing that?
I could constantly merge that 'bake me' branch
Pass a list of suppressions to cppcheck so that legitimate errors are
more obvious.
Signed-off-by: Chris Packham
---
On Thu, Dec 15, 2016 at 12:24 AM, Jeff King wrote:
> The patch itself is OK to me, I guess. The interesting part will be
> whether people start actually _using_ cppcheck and sque
Larry Minton writes:
> Lars Schneider recommended I ask you this question.
>
> My question:
>
> Let's say I have a code change that I want to 'bake' for a while
> locally, just to make sure some edge case doesn't pop up while I
> am working on other things. Is there any practical way of doing
> t
Jeff King writes:
> In older versions of git will just blindly write into
> ".git/objects/pack", even though there's no repository there.
>
> So I think complaining to the user is the right thing to do here. I
> started to write a patch to have index-pack notice when it needs a repo
> and doesn't
Linus Torvalds writes:
> Just a ping on this patch..
>
> Jeff had apparently done something similar as part of a bigger
> patch-series, but I don't see that either. I really don't care very
> much how this is done, but I do find this very useful, ...
>
> Yes, I can just maintain this myself, and
On Thu, Dec 15, 2016 at 04:13:38PM -0800, Junio C Hamano wrote:
> > So I think complaining to the user is the right thing to do here. I
> > started to write a patch to have index-pack notice when it needs a repo
> > and doesn't have one, but the logic is actually a bit unclear. Do we
> > need to
On Thu, Dec 15, 2016 at 4:19 PM, Junio C Hamano wrote:
>
> This fell off the radar partly because of the distractions like
> "there are other attempts and other ways", and also because the
> message was not a text-plain that can be reviewed inline. Let me
> try to dig it up from the mail archive
From: Linus Torvalds
Subject: Allow "git shortlog" to group by committer information
Date: Tue, 11 Oct 2016 11:45:58 -0700
In some situations you may want to group the commits not by author, but by
committer instead.
For example, when I just wanted to look up what I'm still missing from
linux
On Thu, Dec 15, 2016 at 5:51 PM, Stephen & Linda Smith wrote:
>
> Why does gmail make it unnecessarily hard?
I read email with the gmail web interface, which is wonderful because
of the server-side searching etc. The only real downside is the weak
threading, but you get used to it.
I personally
On Thursday, December 15, 2016 5:39:53 PM MST Linus Torvalds wrote:
> On Thu, Dec 15, 2016 at 4:19 PM, Junio C Hamano wrote:
>
> Sorry, I'll just re-send it without the attachment. I prefer inline
> myself, but I thought you didn't care (and gmail makes it
> unnecessarily hard).
>
>
On Thu, Dec 15, 2016 at 08:37:28PM -0500, Jeff King wrote:
> But if this case really is just "if (from_stdin)" that's quite easy,
> too.
So here is that patch (with some associated refactoring and cleanups).
This is conceptually independent of jk/no-looking-at-dotgit-outside-repo-final,
though it
This function abstracts the idea of running a command
outside of any repository (which is slightly awkward to do
because even if you make a non-repo directory, git may keep
walking up outside of the trash directory). There are
several scripts that use the same technique, so let's make
the function
The index-pack builtin is marked as RUN_SETUP_GENTLY,
because it's perfectly fine to index a pack in the
filesystem outside of any repository. However, --stdin mode
will write the result to the object database, which does not
make sense outside of a repository. Doing so creates a bogus
".git" direc
Many tests want to run a command outside of any git repo;
with the nongit() function this is now a one-liner. It saves
a few lines, but more importantly, it's immediately obvious
what the code is trying to accomplish.
This doesn't convert every such case in the test suite; it
just covers those tha
On Thu, 2016-12-15 at 18:10 -0800, Linus Torvalds wrote:
> On Thu, Dec 15, 2016 at 5:57 PM, Joe Perches wrote:
> > >
> > > In fact, I thought we already upped the check-patch limit to 100?
> >
> > Nope, CodingStyle neither.
> >
> > Last time I tried was awhile ago.
>
> Ok, it must have been ju
Linus Torvalds writes:
> On Thu, Dec 15, 2016 at 4:19 PM, Junio C Hamano wrote:
>>
>> This fell off the radar partly because of the distractions like
>> "there are other attempts and other ways", and also because the
>> message was not a text-plain that can be reviewed inline. Let me
>> try to
Joe Perches writes:
> grep 2.5.4 was the last version that supported the -P option to
> grep through for multiple lines.
Does anybody know why it was dropped?
On Thu, 2016-12-15 at 21:00 -0800, Junio C Hamano wrote:
> Joe Perches writes:
>
> > grep 2.5.4 was the last version that supported the -P option to
> > grep through for multiple lines.
>
> Does anybody know why it was dropped?
perl compatible regexes in grep have always been "experimental"
and
53 matches
Mail list logo
