Re: [git-users] So much spam!

2023-12-08 Thread Konstantin Khomoutov
On Fri, Dec 08, 2023 at 08:02:08AM +0100, mag...@therning.org wrote: > Can someone please make sure that the users spamming the list are banned? > > Is there some way of making sure they can't join the list to begin with? [1] lists a single person as an owner. Probably you could contact them

Re: [git-users] conflicting merges (git equivalent of hg resolve)

2023-11-21 Thread Konstantin Khomoutov
On Fri, Nov 17, 2023 at 10:39:41PM +0100, Uwe Brauer wrote: [...] > while as I learned right now, > git is more relaxed about it, > so I could proceed with other commands and git did not complain really. [...] > Ok, so no > git resolve --options > command > > but the add command takes care

Re: [git-users] conflicting merges (git equivalent of hg resolve)

2023-11-17 Thread Konstantin Khomoutov
On Fri, Nov 17, 2023 at 03:11:29PM +0100, Uwe Brauer wrote: [...] > It git I only obtain > > , > | git merge 8b3b5c18a86bc20ee9 > | error: Merging is not possible because you have unmerged files. > | hint: Fix them up in the work tree, and then use 'git add/rm ' > | hint: as appropriate to

Re: [git-users] how can i merge the specified commits, not the last N commits?

2023-11-17 Thread Konstantin Khomoutov
(Reformatted for the usual inline reply mode [1].) On Fri, Nov 17, 2023 at 02:09:11AM -0800, 凯夏 wrote: [...] >>> how can i merge test1 test2 into feature1? >>> e94e3c2 feature2 >>> f509e6e test4 >>> 9972849 test3 >>> d7f2f97 feature1 >>> 04ea2a1 test2 >>> 1c0f590 test1 >>> a777378 init >> >>

Re: [git-users] how can i merge the specified commits, not the last N commits?

2023-11-17 Thread Konstantin Khomoutov
On Fri, Nov 17, 2023 at 01:00:46PM +0300, Konstantin Khomoutov wrote: >> how can i merge test1 test2 into feature1? >> e94e3c2 feature2 >> f509e6e test4 >> 9972849 test3 >> d7f2f97 feature1 >> 04ea2a1 test2 >> 1c0f590 test1 >> a777378 ini

Re: [git-users] how can i merge the specified commits, not the last N commits?

2023-11-17 Thread Konstantin Khomoutov
On Fri, Nov 17, 2023 at 12:41:37AM -0800, 凯夏 wrote: > how can i merge test1 test2 into feature1? > e94e3c2 feature2 > f509e6e test4 > 9972849 test3 > d7f2f97 feature1 > 04ea2a1 test2 > 1c0f590 test1 > a777378 init Before we continue... Is this just a list of assorted commits with no inherent

Re: [git-users] What is the structure of Git tree, commit, and tag objects that get hashed to produce an object ID?

2023-11-14 Thread Konstantin Khomoutov
On Tue, Nov 14, 2023 at 10:10:00AM -0800, Andrew Lilley Brinker wrote: [...] > As part of this, I maintain the `gitoid` crate (package) for the Rust > ecosystem. Currently, this crate only really supports blob objects, because > that's all OmniBOR actually needs. But I'd like it to support all

Re: [git-users] Re: [gitlab forks (keys)]

2023-10-26 Thread Konstantin Khomoutov
On Thu, Oct 26, 2023 at 07:20:18PM +0200, Uwe Brauer wrote: > No: > > 1. A message appears, you are behind 2 commits (concerning the repo >you forked) > > 2. A button appears, saying update fork (since the fork, my >repository will only have new directories no merging

Re: [gitlab forks (keys)] (was: [git-users] how to exclude certain directories from push)

2023-10-26 Thread Konstantin Khomoutov
On Thu, Oct 26, 2023 at 06:20:07PM +0200, Uwe Brauer wrote: >>> If after one week I push again to my gitlab repository >>> (pushing the new subdirectory), >>> >>> 1. how will the students notice that in their forks? > >> Automatically? They won't in the sense they won't receive any

Re: [git-users] When running git fetch and git tag at the same time, the git tag does not take effect and does not fail.

2023-10-26 Thread Konstantin Khomoutov
On Thu, Oct 26, 2023 at 08:32:36AM -0700, Fuyuan Chu wrote: > Hi guys, I met a pretty weird staff when running the following code to > update tags. > Code: > > #!/usr/bin/env python > > from concurrent import futures > import sh [...] > sh.git("fetch", "--all", "--tags",

Re: [git-users] how to exclude certain directories from push

2023-10-25 Thread Konstantin Khomoutov
On Wed, Oct 25, 2023 at 02:15:43PM +0200, Uwe Brauer wrote: >> Do you mean the repository has to begin with zero or, say, one such >> subdirectory, and others have to appear there picemeal - as you add them? > > Right, and I think I explained my workflow poorly. So let me start > again. > >

Re: [git-users] how to exclude certain directories from push

2023-10-25 Thread Konstantin Khomoutov
On Tue, Oct 24, 2023 at 06:38:50PM +0200, Uwe Brauer wrote: [...] > Here is the situation. I want to create one single repository that > contains various (subdirectories). Each subdirectory contains several > files corresponding to certain sheets my students (numerical analysis) > have to solve.

Re: [git-users] [Outreachy]

2023-10-05 Thread Konstantin Khomoutov
(I'm replying to both emails which seemingly are both on the same subject - at once, for brewity.) On Tue, Oct 03, 2023 at 05:39:17AM -0700, khushi gautam wrote: > Hi everyone, I an outreachy applicant for december cohorot. I am interested > in working with your organization in the project "

Re: [git-users] Re: Git new branch listed in 'git branch' command only after 'git checkout '

2023-09-29 Thread Konstantin Khomoutov
On Fri, Sep 29, 2023 at 04:45:13AM -0700, Leonardo D'Alimonte wrote: > so basically the command "git branch" without params lists local branches > that are not yet checked out. This statement is a bit strange. A Git repository may only have a single branch checked out at any given time. The

Re: [git-users] Considerations regarding unsynced local git repo for 100s of GiBs of data?

2023-09-27 Thread Konstantin Khomoutov
On Tue, Sep 26, 2023 at 04:55:20PM -0700, Roke Beedell (RokeJulianLockhart) wrote: > I use cpe:/o:opensuse:tumbleweed:20230922 with a BTRFS data drive of > approximately 300 GiBs. I've rather wanted some form of file history, and > have absolutely loved using git for software development

Re: [git-users] GIT and posh-git

2023-08-21 Thread Konstantin Khomoutov
On Sat, Aug 19, 2023 at 12:47:40PM -0700, RHH wrote: > I followed the Mosh Hamadoni tutorial and managed to get GIT installed; > however, it resides in my user directory on the C: drive. I have a > partition for developing code other than the C: drive. ...while we're at it, since running Git

Re: [git-users] GIT and posh-git

2023-08-21 Thread Konstantin Khomoutov
On Mon, Aug 21, 2023 at 02:04:05PM +0300, Konstantin Khomoutov wrote: [...] > I have just downloaded Git for Windows from its official site [1], and the > first question the installer asked after having me agreed with the terms of > the software license was the question about the ins

Re: [git-users] GIT and posh-git

2023-08-21 Thread Konstantin Khomoutov
On Sat, Aug 19, 2023 at 12:47:40PM -0700, RHH wrote: > I followed the Mosh Hamadoni tutorial and managed to get GIT installed; > however, it resides in my user directory on the C: drive. I have a > partition for developing code other than the C: drive. I would like to > have GIT in that

Re: [git-users] Common submodules

2023-08-15 Thread Konstantin Khomoutov
On Fri, Aug 11, 2023 at 10:47:46PM -0700, Andy wrote: > How organize such code: > - editor component uses syntax highlighting component > - big file viewer uses the same syntax highlighting component > - main application uses Editor and big file viewer > > We have 'diamond" but submodule can be

Re: [git-users] How update submodules temporary local?

2023-08-10 Thread Konstantin Khomoutov
On Wed, Aug 09, 2023 at 11:21:49AM -0700, Andy wrote: > I have application and library. Library is a submodule 'mounted' to > subdirectory of application. > I am heavily modifying library. I am using application to test library. > Each commit I have to push to Github (or other) and update the

Re: [git-users] Advice on workflows?

2023-07-31 Thread Konstantin Khomoutov
On Mon, Jul 31, 2023 at 10:03:07AM -0700, David Aldrich wrote: > Hi, I am just getting started with Git. Our organization uses Subversion > and we are thinking of moving to Git for new projects. I think it will be > crucial to standardize on an agreed branching workflow, which should be as >

Re: [git-users] git - controlling user access to specific git repositories

2023-07-24 Thread Konstantin Khomoutov
On Mon, Jul 24, 2023 at 12:58:49AM -0700, aksrin...@gmail.com wrote: > I am new to the implementation of git and i had a requirement where i need > to control user access to specific git repositories. > > For ex: I have 3 different projects for which i create 3 different git > repositories

Re: [git-users] git pull --no-ff is not equivalent to git fetch+merge

2023-07-11 Thread Konstantin Khomoutov
On Tue, Jul 11, 2023 at 08:20:23PM +0200, Uwe Brauer wrote: >> Do I assume correctly that you have had that configuration option set in some >> of the Git configuration sources? > > Well I had in my global .gitconfigure file indeed the line > [pull] > rebase = true > > I forgot it

Re: [git-users] git pull --no-ff is not equivalent to git fetch+merge

2023-07-11 Thread Konstantin Khomoutov
On Mon, Jul 10, 2023 at 09:51:12PM +0200, Uwe Brauer wrote: [...] > I just realized also > > [pull] > rebase = true > > So I will set this to false and see what happens > that was the culprit. > > Thanks all of your for your patience. Should have checked by > configuration first  Do I

Re: [git-users] git pull --no-ff is not equivalent to git fetch+merge

2023-07-10 Thread Konstantin Khomoutov
On Mon, Jul 10, 2023 at 06:30:04PM +0200, Uwe Brauer wrote: > While in mercurial «hg fetch» is equivalent to «hg pull» and «hg merge» > > it seems that «git pull --no-ff» is not equivalent to > «git fetch» and «git merge». This might be wrong expectations. I'll try to explain in simple words.

Re: [git-users] gitlab: how to efficiently share repository and then delete the share

2023-07-05 Thread Konstantin Khomoutov
On Wed, Jul 05, 2023 at 01:46:02PM +0200, Uwe Brauer wrote: > > Hi > > This is more of gitlab, than a git question, so my apologies, but if > someone can suggest a better place to ask, then please let me know. > > I ended up (details below) in my gitlab account with around 150 > repositories I

Re: [git-users] How to print log tree

2023-06-07 Thread Konstantin Khomoutov
On Tue, Jun 06, 2023 at 05:52:13PM -0700, Zhanbang He wrote: > when run `git log`, it only show many commits. But can not show > commits with branch-tree. > So How can I print log tree? I fail to quite parse the "can not show commits with branch-tree" part, but have you tried git log

Re: [git-users] [ANNOUNCE] git-fc 0.1: new fork of git for users

2023-05-25 Thread Konstantin Khomoutov
On Wed, May 24, 2023 at 06:41:56PM -0500, Felipe Contreras wrote: [...] > My intention is not to flood the mailing list or reiterate anything. You literally just did exactly this, with copious amounts of text :-) > If nobody responds anymore, neither would I. OK, I admit I failed at that.

Re: [git-users] [ANNOUNCE] git-fc 0.1: new fork of git for users

2023-05-24 Thread Konstantin Khomoutov
On Tue, May 23, 2023 at 04:21:30PM -0500, Felipe Contreras wrote: [...] > > For completeness, there's the link to a message which can be served as an > > entry point to a different view on these matters which is also present in > > the > > Git developers' community [7]. > > > > I should note

Re: [git-users] [ANNOUNCE] git-fc 0.1: new fork of git for users

2023-05-23 Thread Konstantin Khomoutov
On Mon, May 22, 2023 at 05:12:04PM -0600, Felipe Contreras wrote: > git-fc is a fork of Junio Hamano's git. [...] > Take for example the "staging area", a term literally > everyone agrees [1] is superior to "the index". Not just people from the > teaching industry, but even the Pro Git book

Re: [git-users] Merge conflict not going away

2023-05-16 Thread Konstantin Khomoutov
Two clarifications - On Tue, May 16, 2023 at 03:46:27PM +0300, Konstantin Khomoutov wrote: [...] > Ah, that might indeed easily explain the observed behavior: `git rebase` > textually applies each commit from those your branch has compared to the > "base" branch, one-by-one, a

Re: [git-users] Merge conflict not going away

2023-05-16 Thread Konstantin Khomoutov
On Mon, May 15, 2023 at 03:22:09PM -0700, Dan Stromberg wrote: > But in summary, how can I get the merge conflict to go away? I'm surprised > that the > add+commit+rebase --continue isn't enough to deal with that file. > > > It turned out I needed to: > 2715 git add requirements.txt.m4 >

Re: [git-users] Merge conflict not going away

2023-05-15 Thread Konstantin Khomoutov
On Thu, May 11, 2023 at 11:02:44AM -0700, Dan Stromberg wrote: > I put together this little script to show what I'm seeing. > > The comments pretty much say what's going on. But in summary, how can I > get the merge conflict to go away? I'm surprised that the > add+commit+rebase --continue

Re: [git-users] How to delete an entry in a local git configuration file

2023-05-04 Thread Konstantin Khomoutov
On Thu, May 04, 2023 at 11:35:32AM -0400, Hugo Villeneuve wrote: [...] > > > > > For this, I do not want to use the global entries like smtpUser, > > > > > tocmd, etc. Unfortunately, these entries are set to the default value > > > > > in /etc/config. > > > > > > > > Yes, but you could

Re: [git-users] How to delete an entry in a local git configuration file

2023-05-04 Thread Konstantin Khomoutov
On Wed, May 03, 2023 at 03:53:57PM -0400, Hugo Villeneuve wrote: [...] > > > I have a global git settings in /etc/git/config that I use for most of > > > my projects: > > > > > > [sendemail] > > > smtpUser = my-username > > > smtpServer = mail.my-server.com > > >

Re: [git-users] Is exit code 255 on pager-quit intentional?

2023-05-03 Thread Konstantin Khomoutov
On Tue, May 02, 2023 at 07:11:14PM -0700, Dan Davison wrote: > If I do > > yes | less > # exit with q > echo $? > > The exit code is 0. > > However, if I do > > GIT_PAGER=less git log > # exit with q > echo $? > > The exit code is 255. > > Is this intentional, or would it be better for the

Re: [git-users] Is exit code 255 on pager-quit intentional?

2023-05-03 Thread Konstantin Khomoutov
On Tue, May 02, 2023 at 07:11:14PM -0700, Dan Davison wrote: > If I do > > yes | less > # exit with q > echo $? > > The exit code is 0. > > However, if I do > > GIT_PAGER=less git log > # exit with q > echo $? > > The exit code is 255. > > Is this intentional, or would it be better for the

Re: [git-users] what is the most efficient way to mirror a repository

2023-04-14 Thread Konstantin Khomoutov
On Fri, Apr 14, 2023 at 04:38:34PM +0200, Uwe Brauer wrote: > I would like to run a test and have a mirror of > matlab-emacs at sourgeforge > > At gitlab. > > So first step I clone the sourceforge repository > > git clone o...@git.code.sf.net/p/matlab-emacs/src > > Then > > git branch -a

Re: [git-users] DCSV in 2007: Linus Thorvalds talk

2023-03-02 Thread Konstantin Khomoutov
On Fri, Feb 24, 2023 at 02:51:30PM +0100, Uwe Brauer wrote: > Sorry if this off-topic but I got curious. I stumbled of the talk Linus > Thorvald gave in 2007 about git [...] Ah, just noticed - while we're at it, he's surname is Torvalds. A fun fact: that 'o' sounds pretty close to 'u' as he's

[git-users] Re: Git Business Model?

2023-03-01 Thread Konstantin Khomoutov
On Wed, Mar 01, 2023 at 01:45:08AM -0800, 'Sarah GOMEY' via Git for human beings wrote: Disclaimer (which might get a bit more obvious later on): I (and anyone else on this mailing list) do not "represent Git" in any way; anything written below is my personal opinion. > Hope this email finds

Re: [git-users] gitattributesLarge: .gitattributes too large to parse

2023-02-28 Thread Konstantin Khomoutov
Hi! On Mon, Feb 27, 2023 at 02:57:01AM -0800, Danny Smit wrote: > I'm running into a problem with git fsck and the .gitattributes file. With > more recent git versions, is reports the following error on my bare git > repository: [...] I'm afraid this is a highly technical question which

Re: [git-users] Re: DCSV in 2007: Linus Thorvalds talk

2023-02-24 Thread Konstantin Khomoutov
On Fri, Feb 24, 2023 at 06:41:02AM -0800, Philip Oakley wrote: > As I understand it, each of the Linux area maintainers made/provided their > own [public readable] server so that they could fetch (and merge, = pull) > from each other (see `git request-pull`) and could also push to some >

Re: [git-users] Fast method to get a range diff that excludes merges

2023-02-21 Thread Konstantin Khomoutov
On Mon, Feb 20, 2023 at 09:27:20PM -0800, 'Samuel Stern' via Git for human beings wrote: > This is an *extremely* specific question which I've been trying to get an > answer to for quite a while now, so hopefully someone here knows the answer. > > Let's say I am starting from nothing, an empty

Re: [git-users] slightly off topic: Windows11+git+https access (matlab) where are the credentials stored

2023-02-10 Thread Konstantin Khomoutov
On Fri, Feb 10, 2023 at 03:03:15PM +0100, Uwe Brauer wrote: [...] > > Maybe you would be better off utilizing GitLab for this? [...] > Ah I am not sure. It is not that the students are all working together > on one common project. This makes no difference - see below. > Basically they have to

Re: [git-users] slightly off topic: Windows11+git+https access (matlab) where are the credentials stored

2023-02-10 Thread Konstantin Khomoutov
On Thu, Feb 09, 2023 at 11:10:48PM +0100, Uwe Brauer wrote: [...] > Right now I am most worried about the situation in which the student > need to perform a merge. I regularly pull from their repos, check, write > my comments and push as soon as possible. Some day they want to push but > I have

Re: [git-users] slightly off topic: Windows11+git+https access (matlab) where are the credentials stored

2023-02-09 Thread Konstantin Khomoutov
On Wed, Feb 08, 2023 at 10:34:46PM +0100, Uwe Brauer wrote: [...] > It seems to me that the credential helper system might be helpful for a > single user szenario. > > But PC running Windows and only have one user for all students will > inevitably run into problems. So that looks a bit over

Re: [git-users] slightly off topic: Windows11+git+https access (matlab) where are the credentials stored

2023-02-08 Thread Konstantin Khomoutov
On Fri, Feb 03, 2023 at 09:15:16PM +0100, Uwe Brauer wrote: > My apologies if this is slightly off-topic. > I have convinced my students to use, this year matlab+git (using > matlab's git interface which is sufficient). > > The students will do of their work at the university with Desktops that

Re: [git-users] a new branch created, with interrupts the graph

2023-02-06 Thread Konstantin Khomoutov
On Mon, Feb 06, 2023 at 07:49:40PM +0100, Uwe Brauer wrote: > My answer was cut in the middle I resend it later sorry Quite possibly we've hit this very case where a real picture would help. I think you could make a screenshot of any GUI front-end to Git. Say, running gitk main default

Re: [git-users] a new branch created, with interrupts the graph

2023-02-06 Thread Konstantin Khomoutov
On Mon, Feb 06, 2023 at 03:13:55PM +0100, Uwe Brauer wrote: > I just pulled from a repository in which a user created a new branch (and he > should not) but interrupted the graph. So it looks using > > > git log --since=2years --graph --color=always --all --decorate --pretty=short > | git

Re: [git-users] Update a submodule to a selected commit.

2023-02-03 Thread Konstantin Khomoutov
On Thu, Feb 02, 2023 at 10:31:22PM -0800, José Luis Alcaraz Betoret wrote: > I'm making a repository with a submodule linked to it. > When the repository is cloned, I init the submodule and update it. > The problem is it points always to the last commit of the submodule repo. > > I can make the

Re: [git-users] Hi guys, I just converted a Java project from CVS to GIT, and since then I receive the following error: error reading commons-logging.jar

2023-01-27 Thread Konstantin Khomoutov
On Fri, Jan 27, 2023 at 05:56:45PM +0100, Uwe Brauer wrote: > > I wonder why the steps in that guide deviate from the official documentation > > of the csv2git. Did you check the latter? > > > Anyway, are your JAR (and other binary files) are actually marked as binary > > in > > the source

Re: [git-users] Hi guys, I just converted a Java project from CVS to GIT, and since then I receive the following error: error reading commons-logging.jar

2023-01-27 Thread Konstantin Khomoutov
On Fri, Jan 27, 2023 at 09:21:03PM +0530, Narendra Naren wrote: [...] > > You're still refusing to tell exactly how that conversion/migration was > > done, > > but that is the single most important piece of information in this > > question. > > > The exact process followed for migration from CVS

Re: [git-users] Hi guys, I just converted a Java project from CVS to GIT, and since then I receive the following error: error reading commons-logging.jar

2023-01-26 Thread Konstantin Khomoutov
(Reformatted in a sensible way. Please do not top-post.) On Wed, Jan 25, 2023 at 08:59:12PM +0530, Narendra Naren wrote: > > > I just converted a Java project from CVS to GIT, and since then I > > > receive the following error: error reading commons-logging.jar; invalid > > > END header (bad

Re: [git-users] Hi guys, I just converted a Java project from CVS to GIT, and since then I receive the following error: error reading commons-logging.jar

2023-01-25 Thread Konstantin Khomoutov
On Wed, Jan 25, 2023 at 06:51:24AM -0800, Narendra Naren wrote: > I just converted a Java project from CVS to GIT, and since then I receive > the following error: error reading commons-logging.jar; invalid END header > (bad central directory offset). You did not explain what exactly do you do

Re: [git-users] Re: git gc error with git 2.37.2?

2023-01-10 Thread Konstantin Khomoutov
On Tue, Jan 10, 2023 at 01:22:13PM -0800, Paul Wagland wrote: > Did this patch ever end up getting merged in? I am seeing the problem again > in my repo with git 2.39.0, so was just wondering if this managed to make > it upstream [...] I think it did not manage to come through yet [1]. You

Re: [git-users] Git default behaviour regarding submodules

2022-12-29 Thread Konstantin Khomoutov
On Thu, Dec 29, 2022 at 04:39:42AM -0800, Daniel Torrescusa Rubio wrote: (Rehashed the original text for easier commenting.) [...] > I mean, for example. if there is some submodule on a git repository, the > default behaviour should be to make it available when you clone the > repository, and

Re: [git-users] how to get list of tags on commits merged to branch X between tags Y and Z

2022-12-16 Thread Konstantin Khomoutov
On Thu, Dec 15, 2022 at 02:08:22PM -0800, Graham Menhennitt wrote: [...] >> Note that the branches are irrelevant for traversing. You can use branches >> to refer to commits, but any way to refer to them would do; the traversal >> process itself is only concerned with commits. [...] >

Re: [git-users] how to get list of tags on commits merged to branch X between tags Y and Z

2022-12-15 Thread Konstantin Khomoutov
On Tue, Dec 13, 2022 at 08:47:49PM -0800, Graham Menhennitt wrote: > Our development workflow consists of: > > Developer: > >- creates private branch off project’s ‘develop’ branch >- develops feature or fixes bug on private branch >- merges private branch to ‘develop’ branch >-

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-11 Thread Konstantin Khomoutov
On Sat, Dec 10, 2022 at 11:09:55PM +0100, Uwe Brauer wrote: [...] > [1] We tried out well mercurial not git for some weeks but most of my > collaborators find the idea of merging strange in the sense they > expected the server to merge conflicts for them, and that is I thing why > subversion is

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-10 Thread Konstantin Khomoutov
On Fri, Dec 09, 2022 at 05:53:43PM +0530, balaji marisetti wrote: > Wow. @Konstantin You are really helpful. I was just following along the > mail exchanges and the time you put in to understand and answer random > people’s questions is commendable. Thank you! Basically, the warm cozy feeling of

Re: [git-users] off topic, git host without ssh for pushing

2022-12-10 Thread Konstantin Khomoutov
On Fri, Dec 09, 2022 at 04:53:26PM +0100, Uwe Brauer wrote: > I sorry if this is slightly off topic. Next semester I want to run an > experiment and encourage my students to use a VC for their coding, and > since Matlab supports git (and svn) it will be git. > > However I encounter a problem: so

Re: [git-users] off topic, git host without ssh for pushing

2022-12-10 Thread Konstantin Khomoutov
On Fri, Dec 09, 2022 at 07:53:24PM +0100, Uwe Brauer wrote: >> Is it possible to have uni admins host a bunch of Git repositories on >> premises? Git is sort-of self-hosting in the sense you only need a web server >> which can do URL rewriting and CGI, so Apache and Nginx - top picks these >>

Re: [git-users] the underlying git version in gitlab/github and bitbucket.

2022-12-10 Thread Konstantin Khomoutov
On Fri, Dec 09, 2022 at 07:59:52PM +0100, Uwe Brauer wrote: [...] > (hg) push -f > > That is a forced push, github and bitbucket accept that, while gitlab tells > me > > abort: pushing refs/heads/main overwrites d30105a181c4 This stuff is configurable in GitLab, and I suspect that's what

Re: [git-users] off topic, git host without ssh for pushing

2022-12-09 Thread Konstantin Khomoutov
On Fri, Dec 09, 2022 at 04:53:26PM +0100, Uwe Brauer wrote: > I sorry if this is slightly off topic. Next semester I want to run an > experiment and encourage my students to use a VC for their coding, and > since Matlab supports git (and svn) it will be git. > > However I encounter a problem: so

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-08 Thread Konstantin Khomoutov
On Thu, Dec 08, 2022 at 03:33:21PM +0400, Konstantin Khomoutov wrote: [...] > 1. You should not clone a Git repository located on a local filesystem. > Clone the replica of such repository hosted by your Git hosting provider. > To say that in some other words, "clone

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-08 Thread Konstantin Khomoutov
On Tue, Dec 06, 2022 at 03:19:19PM +0100, rozanski.s...@gmail.com wrote: > First I did a "simple" clone from within Sourcetree to a "local" location - > executed correctly, showed the repo in the application - great. I executed > git worktree add .. - .git .gitign README.md files appeared in

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-04 Thread Konstantin Khomoutov
On Sun, Dec 04, 2022 at 02:40:05PM +0100, rozanski.s...@gmail.com wrote: > Yes, only we are still talking about "conscious action" here. - my goal is > to protect myself from "emergencies". Everything that is done is not sent > "online" to the GIT - there is a "gap" in time between the "current

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-04 Thread Konstantin Khomoutov
On Sun, Dec 04, 2022 at 06:16:08PM +0400, Konstantin Khomoutov wrote: > > How would it be possible to automatically move all changes in the project > > (repository) => I mean the situation when I change/add/delete a file or > > directory in the project not yet perform a co

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-04 Thread Konstantin Khomoutov
On Sun, Dec 04, 2022 at 02:26:52PM +0100, rozanski.s...@gmail.com wrote: > Thank you very much for the clarification. > While I still believe that from a user's point of view, the collaboration of > both tools (GIT and e.g.: OneDrive) is an idiosyncratic "complement", I > understand that there

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-04 Thread Konstantin Khomoutov
On Sun, Dec 04, 2022 at 02:26:52PM +0100, rozanski.s...@gmail.com wrote: > Thank you very much for the clarification. > While I still believe that from a user's point of view, the collaboration of > both tools (GIT and e.g.: OneDrive) is an idiosyncratic "complement", I > understand that there

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-04 Thread Konstantin Khomoutov
On Sun, Dec 04, 2022 at 02:32:01PM +0100, rozanski.s...@gmail.com wrote: > How would it be possible to automatically move all changes in the project > (repository) => I mean the situation when I change/add/delete a file or > directory in the project not yet perform a commit => automatically on

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-04 Thread Konstantin Khomoutov
On Sun, Dec 04, 2022 at 04:00:36PM +0400, Konstantin Khomoutov wrote: [...] > The best way to maintain an offline ("in the cloud") copy of a normal local > repository is using the `git bundle` command and have the cloud software sync > the produced single file - a bu

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-04 Thread Konstantin Khomoutov
On Sat, Dec 03, 2022 at 09:37:14PM +0100, Uwe Brauer wrote: > >> Wait, are you saying that you clone your repositories on OneDrive and > >> and there you act (commit pull and push) > > > Exactly - that's how I've been operating for a long time and I've never had > > any problems - everything

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-04 Thread Konstantin Khomoutov
On Sun, Dec 04, 2022 at 08:03:12AM +0100, Uwe Brauer wrote: > > Exactly - that's how I've been operating for a long time and I've never had > > any problems - everything has always worked correctly and I have the added > > security of a copy on the network + history on OneDrive, as if something >

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-04 Thread Konstantin Khomoutov
On Sun, Dec 04, 2022 at 04:00:36PM +0400, Konstantin Khomoutov wrote: [...] > > That is to say, I already have the culprit - in earlier versions of Git I > > could keep repositories in OneDrive without any problem and everything > > worked fine, but now it

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-04 Thread Konstantin Khomoutov
On Sat, Dec 03, 2022 at 08:38:32PM +0100, rozanski.s...@gmail.com wrote: [...] > That is to say, I already have the culprit - in earlier versions of Git I > could keep repositories in OneDrive without any problem and everything > worked fine, but now it is throwing errors :( :( :( :(. > > Any

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-03 Thread Konstantin Khomoutov
On Sat, Dec 03, 2022 at 09:24:31AM +0100, rozanski.s...@gmail.com wrote: > I am convinced that something serious has changed in the new version of git. > > I could afford it, so in one project I deleted the repository in Bitbucket > and set up a new one (renamed). Then I removed the .git from

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-02 Thread Konstantin Khomoutov
On Fri, Dec 02, 2022 at 02:42:27PM +0400, Konstantin Khomoutov wrote: [...] > Can you verify Git "barely works"? [...] To make my intent clear: in your original message you've referred to 3rd-party software like PHPStorm which can use Git in weird and unexpected ways, so we should t

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-02 Thread Konstantin Khomoutov
On Fri, Dec 02, 2022 at 08:48:46AM +0100, rozanski.s...@gmail.com wrote: >>> After an automatic git update for windows (the update program detected that >>> there is a new version and performed the update to: git version >>> 2.38.1.windows.1) all projects in git disappeared. >>> In PHPStorm it

Re: [git-users] no colors for graph

2022-11-19 Thread Konstantin Khomoutov
On Sat, Nov 19, 2022 at 02:14:36PM +0100, Uwe Brauer wrote: [...] >> git log --color=always ... > > That gives a strange result, namely > ESC[33mcommit 9dc21b3902a819796d1ba3bc7654733ab00e6e75 (feature)ESC[mESC[33m > (ESC[mESC[36mHEADESC[mESC[33m -> ESC[mESC[32mfeature > ESC[mESC[33m)ESC[m

Re: [git-users] no colors for graph

2022-11-19 Thread Konstantin Khomoutov
On Sat, Nov 19, 2022 at 04:40:43PM +0400, Konstantin Khomoutov wrote: [...] > > git log --graph --all --decorate --pretty=short | git name-rev --stdin | > > more [...] > - So, since a command pipelines as implemented in Unix and Windows shells >have no way to propagat

Re: [git-users] no colors for graph

2022-11-19 Thread Konstantin Khomoutov
On Sat, Nov 19, 2022 at 08:20:41AM +0100, Uwe Brauer wrote: > Being a mercurial user I want the git graph to look as close as possible to > mercurials, > > The following command/alias does this, but does not display colors, although > I used the decorate option > > git log --graph --all

Re: [git-users] an elementary question how to switch/checkout a remote branch

2022-11-17 Thread Konstantin Khomoutov
On Wed, Nov 16, 2022 at 03:55:54PM +0400, Konstantin Khomoutov wrote: [...] > Basically, that's the reason why all branches of a cloned repo become remote > branches in your local repo: because Git cannot read your mind and somehow > infrer which model you're about to implement abou

Re: [git-users] an elementary question how to switch/checkout a remote branch

2022-11-16 Thread Konstantin Khomoutov
On Wed, Nov 16, 2022 at 03:55:54PM +0400, Konstantin Khomoutov wrote: [...] > I think the key problem impeding understanding of this (you're certainly not > alone on this) is that provided how 99.9% of tutorial material on DVCSes is > written, many people maintain that if there is

Re: [git-users] an elementary question how to switch/checkout a remote branch

2022-11-16 Thread Konstantin Khomoutov
On Tue, Nov 15, 2022 at 10:26:04PM +0100, Uwe Brauer wrote: > >> I am sorry for such an elementary question, but using mainly hg, I found > >> the following very confusing. > > > No, the question is not elementary, and yes, the behavior is confusing. > > First of all thanks very much for this

Re: [git-users] an elementary question how to switch/checkout a remote branch

2022-11-15 Thread Konstantin Khomoutov
On Mon, Nov 14, 2022 at 05:57:27PM +0100, Uwe Brauer wrote: > I am sorry for such an elementary question, but using mainly hg, I found > the following very confusing. No, the question is not elementary, and yes, the behavior is confusing. > I cloned a repository for which > > git branch -a

Re: [git-users] git should not allow commit while in middle of rebase

2022-10-18 Thread Konstantin Khomoutov
On Tue, Oct 18, 2022 at 03:44:48AM -0700, Sameer Mahajan wrote: > git should not allow commit while in middle of rebase but allow only rebase > --continue until all conflicts are resolved. > > are there any use cases where someone may want to commit in middle of > rebase before rebase

Re: [git-users] git clone ssh key -i error

2022-10-06 Thread Konstantin Khomoutov
On Tue, Oct 04, 2022 at 10:51:48AM -0700, Philippe Couas wrote: > > > I use git 2.37 on Windows 10 and i have an problem with git clone ssh > > > > > > This command is Ok > > > > > > ssh g...@127.0.0.1 -v -p 2223 -i Z:\zpoubelle\tssh4\id_rsa > > > But following command failed > > > > > > set

Re: [git-users] git clone ssh key -i error

2022-10-04 Thread Konstantin Khomoutov
On Mon, Oct 03, 2022 at 10:24:39PM -0700, Philippe Couas wrote: > I use git 2.37 on Windows 10 and i have an problem with git clone ssh > > This command is Ok > > ssh git@127.0.0.1 -v -p 2223 -i Z:\zpoubelle\tssh4\id_rsa > But following command failed > > set GIT_SSH_COMMAND="ssh -p2223-i

Re: [git-users] Post-checkout hook command line arguments

2022-09-22 Thread Konstantin Khomoutov
On Thu, Sep 22, 2022 at 12:38:16PM +0300, Konstantin Khomoutov wrote: > > > .git/config: > > > > > > [filter "crypt"] > > > clean = openssl enc -pbkdf2 -iter 1 -aes-256-cbc -in %f && > > > shred %f > &g

Re: [git-users] Post-checkout hook command line arguments

2022-09-22 Thread Konstantin Khomoutov
On Wed, Sep 21, 2022 at 11:22:19PM -0700, Ronny Forberger wrote: > > I solved it like this: > > > > .git/config: > > > > [filter "crypt"] > > clean = openssl enc -pbkdf2 -iter 1 -aes-256-cbc -in %f && > > shred %f > > smudge = openssl enc -d -pbkdf2 -iter 1 -aes-256-cbc >

Re: [git-users] Post-checkout hook command line arguments

2022-09-12 Thread Konstantin Khomoutov
On Mon, Sep 12, 2022 at 08:15:14AM -0700, Ronny Forberger wrote: [...] > I am trying to implement some encryption function with ansible-vault > into git hooks. > For decryption, I need the list of files passed on the command line [...] > I mean, I just want a list of files that are

Re: [git-users] Post-checkout hook command line arguments

2022-09-12 Thread Konstantin Khomoutov
On Mon, Sep 12, 2022 at 06:42:15AM -0700, Ronny Forberger wrote: [...] > > > I am trying to implement some encryption function with ansible-vault > > > into git hooks. > > > For decryption, I need the list of files passed on the command line to > > > git checkout command. I am using the

Re: [git-users] Post-checkout hook command line arguments

2022-09-12 Thread Konstantin Khomoutov
On Fri, Sep 09, 2022 at 07:56:56PM -0700, Ronny Forberger wrote: > I am trying to implement some encryption function with ansible-vault into > git hooks. > For decryption, I need the list of files passed on the command line to git > checkout command. I am using the post-checkout hook here. > I

Re: [git-users] no such ref was fetched

2022-09-08 Thread Konstantin Khomoutov
On Thu, Sep 08, 2022 at 02:20:11PM +0300, Konstantin Khomoutov wrote: [...] > > $ /tools/git/2.37.2/bin/git pull > > Your configuration specifies to merge with the ref > > 'refs/heads/feature/switch-to-qt5' > > from the remote, but no such ref was fetched. > > Is

Re: [git-users] no such ref was fetched

2022-09-08 Thread Konstantin Khomoutov
On Tue, Sep 06, 2022 at 09:58:19AM -0700, Lana Deere wrote: > I'm trying to upgrade from 2.18.0 to 2.37.2 and ran into a problem where > 'git pull' says that no such ref was fetched. Some searching the web > suggests that this means the remote branch was deleted, but that it not > true in my

Re: [git-users] remote error when pushing from local file repo to local file repo

2022-09-05 Thread Konstantin Khomoutov
On Thu, Sep 01, 2022 at 11:48:10AM -0700, Frederick Brier wrote: > This is odd configuration. A git repo is created on a file share, or in a > directory on a machine. From another directory, you clone the repo, using a > folder path. In the cloned repo its remote origin is the first repo, >

Re: [git-users] Feature Request - Branch Metadata or Descriptions

2022-07-21 Thread Konstantin Khomoutov
On Thursday, July 21, 2022 at 4:07:37 PM UTC+3 philip...@iee.email wrote: [...] > > FWIW, a recent discussion on the main Git list [1] brought to my > attention > > that there exist support for setting textual branch descriptions: a > config > > setting branch..description, which can be

Re: [git-users] Feature Request - Branch Metadata or Descriptions

2022-07-21 Thread Konstantin Khomoutov
On Mon, Jul 18, 2022 at 02:34:44PM -0700, Dan Rosen wrote: > Adding metadata to branches would be helpful for third party APIs to > organize and tag branches without putting them in the branch name. For > example, project management software will use an issue key to search the > branch name

Re: [git-users] Feature idea: Warning for git reset --hard with unstaged local changes

2022-07-18 Thread Konstantin Khomoutov
On Mon, Jul 18, 2022 at 07:16:28PM +0300, Konstantin Khomoutov wrote: [...] > Another solution which seems logical at the first glance is using the "trash > bin" feature is the OS provides it but it also has practical problems: it is > never the core feature provided by

  1   2   3   4   5   6   7   8   9   10   >