Re: Need help

2019-07-24 Thread Emily Shaffer
Hi Gobinda, if you have a consistent way to reproduce the issue, check out `git bisect`: https://git-scm.com/docs/git-bisect - Emily On Wed, Jul 24, 2019 at 12:11 AM Gobinda Nandi wrote: > > Hi, > > I have cloned a project using GIT. There I am facing one issue and nobody is > confident that

Need help

2019-07-24 Thread Gobinda Nandi
Hi, I have cloned a project using GIT. There I am facing one issue and nobody is confident that when that issue was not there. They are convinced that earlier it was working well but noe its not. I am trying revert the version but still I am finding the issue. I know this can depend upon severa

Re: Need help merging unrelated histories

2019-05-29 Thread Philip Oakley
Hi Robert, A few comments to look at, which may help. On 28/05/2019 19:26, Robert Dailey wrote: On Tue, May 28, 2019 at 8:35 AM Robert Dailey wrote: On Fri, May 24, 2019 at 12:11 PM Andreas Schwab wrote: On Mai 24 2019, Robert Dailey wrote: Can anyone provide some advice on how to properly

Re: Need help merging unrelated histories

2019-05-28 Thread Robert Dailey
On Tue, May 28, 2019 at 8:35 AM Robert Dailey wrote: > > On Fri, May 24, 2019 at 12:11 PM Andreas Schwab wrote: > > > > On Mai 24 2019, Robert Dailey wrote: > > > > > Can anyone provide some advice on how to properly restructure this > > > repository to create some ancestry, as if all along a `m

Re: Need help merging unrelated histories

2019-05-28 Thread Robert Dailey
On Fri, May 24, 2019 at 12:11 PM Andreas Schwab wrote: > > On Mai 24 2019, Robert Dailey wrote: > > > Can anyone provide some advice on how to properly restructure this > > repository to create some ancestry, as if all along a `master` existed > > and all release branches were based on this in a

Re: Need help merging unrelated histories

2019-05-24 Thread Andreas Schwab
On Mai 24 2019, Robert Dailey wrote: > Can anyone provide some advice on how to properly restructure this > repository to create some ancestry, as if all along a `master` existed > and all release branches were based on this in a linear fashion? How about using git replace --graft, then git filt

Re: Need help merging unrelated histories

2019-05-24 Thread Ævar Arnfjörð Bjarmason
On Fri, May 24 2019, Robert Dailey wrote: > Everything I'm going to describe is related to this repository: > > https://github.com/powervr-graphics/Native_SDK > > This repo has several distinct branches. None of them seem to be tied > to each other. Instead of having a `master` where they branch

Re: Need help merging unrelated histories

2019-05-24 Thread Robert Dailey
On Fri, May 24, 2019 at 9:04 AM Robert Dailey wrote: > > Everything I'm going to describe is related to this repository: > > https://github.com/powervr-graphics/Native_SDK > > This repo has several distinct branches. None of them seem to be tied > to each other. Instead of having a `master` where

Need help merging unrelated histories

2019-05-24 Thread Robert Dailey
Everything I'm going to describe is related to this repository: https://github.com/powervr-graphics/Native_SDK This repo has several distinct branches. None of them seem to be tied to each other. Instead of having a `master` where they branched off each of their releases (e.g. 3.1, 3.2, 4.0), it

Re: New to git. Need help!

2019-01-16 Thread Ævar Arnfjörð Bjarmason
On Tue, Jan 15 2019, Kaustubh Shankar wrote: > Hello everyone, > > I'm new to this mailing list and have also joined the IRC channel recently. > I want to start contributing by possibly fixing small bugs or errors. > I have gone through the suggested guidelines and documentation but it > is too

Re: New to git. Need help!

2019-01-16 Thread Duy Nguyen
On Wed, Jan 16, 2019 at 5:02 PM Kaustubh Shankar wrote: > > Hello everyone, > > I'm new to this mailing list and have also joined the IRC channel recently. > I want to start contributing by possibly fixing small bugs or errors. > I have gone through the suggested guidelines and documentation but i

New to git. Need help!

2019-01-15 Thread Kaustubh Shankar
Hello everyone, I'm new to this mailing list and have also joined the IRC channel recently. I want to start contributing by possibly fixing small bugs or errors. I have gone through the suggested guidelines and documentation but it is too large and I don't know where to start. If anybody could hel

Re: Need help debugging issue in git

2018-04-14 Thread Robert Dailey
On Mon, Apr 2, 2018 at 1:53 AM, Johannes Sixt wrote: > Am 02.04.2018 um 02:36 schrieb Robert Dailey: >> >> I'm struggling with a bug that I found introduced in git v2.13.2. The >> bug was not reproducible in v2.13.1. The issue is that using arguments >> like "@{-1}" to aliases causes those curly b

Re: Need help debugging issue in git

2018-04-01 Thread Johannes Sixt
Am 02.04.2018 um 02:36 schrieb Robert Dailey: I'm struggling with a bug that I found introduced in git v2.13.2. The bug was not reproducible in v2.13.1. The issue is that using arguments like "@{-1}" to aliases causes those curly braces to be removed, so once the command is executed after alias p

Need help debugging issue in git

2018-04-01 Thread Robert Dailey
I'm struggling with a bug that I found introduced in git v2.13.2. The bug was not reproducible in v2.13.1. The issue is that using arguments like "@{-1}" to aliases causes those curly braces to be removed, so once the command is executed after alias processing the argument looks like "@-1". This br

Re: Rewrite cat-file.c : need help to find a bug

2018-01-04 Thread Christian Couder
On Thu, Jan 4, 2018 at 11:23 PM, Оля Тележная wrote: > > So for now 2 of my last commits fail, and I am tired of searching for the > error. > I was also trying to leave cat_file_info variable and fill in both new > and old variables and then compare resulting values by printing them > into file.

Re: Rewrite cat-file.c : need help to find a bug

2018-01-04 Thread Оля Тележная
2017-12-29 17:04 GMT+03:00 Оля Тележная : > 2017-12-29 16:22 GMT+03:00 Jeff King : >> On Fri, Dec 29, 2017 at 01:05:50PM +0300, Оля Тележная wrote: >> >>> Hi everyone, >>> I am trying to reuse formatting logic from ref-filter in cat-file >>> command. Now cat-file uses its own formatting code. >>> I

Re: Rewrite cat-file.c : need help to find a bug

2017-12-29 Thread Оля Тележная
2017-12-29 16:22 GMT+03:00 Jeff King : > On Fri, Dec 29, 2017 at 01:05:50PM +0300, Оля Тележная wrote: > >> Hi everyone, >> I am trying to reuse formatting logic from ref-filter in cat-file >> command. Now cat-file uses its own formatting code. >> I am trying to achieve that step-by-step, now I wan

Re: Rewrite cat-file.c : need help to find a bug

2017-12-29 Thread Jeff King
On Fri, Dec 29, 2017 at 01:05:50PM +0300, Оля Тележная wrote: > Hi everyone, > I am trying to reuse formatting logic from ref-filter in cat-file > command. Now cat-file uses its own formatting code. > I am trying to achieve that step-by-step, now I want to invoke > populate_value function, and I h

Rewrite cat-file.c : need help to find a bug

2017-12-29 Thread Оля Тележная
Hi everyone, I am trying to reuse formatting logic from ref-filter in cat-file command. Now cat-file uses its own formatting code. I am trying to achieve that step-by-step, now I want to invoke populate_value function, and I have a bug somewhere. My code is here. https://github.com/telezhnaya/git/c

Re: Need help migrating workflow from svn to git.

2017-12-21 Thread Igor Djordjevic
Hi Josef, On 20/12/2017 12:43, Josef Wolf wrote: > >> $ git add -u >> $ git reset > > This would be added after the "git checkout -m -B master FETCH_HEAD" > command? Yes, so it would be something like this: git fetch origin master && #1 git checkout -m -B master F

Re: Need help migrating workflow from svn to git.

2017-12-20 Thread Josef Wolf
On Wed, Dec 20, 2017 at 12:43:37PM +0100, Josef Wolf wrote: > Thanks to you both for your patience with me. Sorry for the late reply, my day > job was needing me ;-) > > On Fri, Dec 15, 2017 at 07:58:14PM +0100, Igor Djordjevic wrote: > > On 15/12/2017 17:33, Junio C Hamano wrote: > > > > > >

Re: Need help migrating workflow from svn to git.

2017-12-20 Thread Josef Wolf
On Fri, Dec 15, 2017 at 11:09:17AM -0800, Junio C Hamano wrote: > Igor Djordjevic writes: > > > Junio, what about consecutive runs, while merge conflicts are still > > unresolved? > > The impression I got was that the original running with svn does not > deal with conflicting situation anyway,

Re: Need help migrating workflow from svn to git.

2017-12-20 Thread Josef Wolf
Thanks to you both for your patience with me. Sorry for the late reply, my day job was needing me ;-) On Fri, Dec 15, 2017 at 07:58:14PM +0100, Igor Djordjevic wrote: > On 15/12/2017 17:33, Junio C Hamano wrote: > > > > $ git fetch > > $ git checkout -m -B FETCH_HEAD For some reason,

Re: Need help migrating workflow from svn to git.

2017-12-15 Thread Igor Djordjevic
On 15/12/2017 20:09, Junio C Hamano wrote: > > > Junio, what about consecutive runs, while merge conflicts are still > > unresolved? > > The impression I got was that the original running with svn does not > deal with conflicting situation anyway, so I did not think about it > at all, and I pers

Re: Need help migrating workflow from svn to git.

2017-12-15 Thread Junio C Hamano
Igor Djordjevic writes: > Junio, what about consecutive runs, while merge conflicts are still > unresolved? The impression I got was that the original running with svn does not deal with conflicting situation anyway, so I did not think about it at all, and I personally do not care ;-)

Re: Need help migrating workflow from svn to git.

2017-12-15 Thread Igor Djordjevic
On 15/12/2017 17:33, Junio C Hamano wrote: > > $ git fetch > $ git checkout -m -B FETCH_HEAD ... aaand that`s how you do it[1] without a temporary branch :) Junio, what about consecutive runs, while merge conflicts are still unresolved? Seeing Josef having a pretty relaxed flow, and

Re: Need help migrating workflow from svn to git.

2017-12-15 Thread Igor Djordjevic
Hi Josef, Thank you for your patient answers. From what you said here and in that other reply[1], it looks like you know what you`re doing, you`re aware of circumstances, and you still prefer doing it that way. So, here it goes... :) On 15/12/2017 13:47, Josef Wolf wrote: > > > I`m thinking o

Re: Need help migrating workflow from svn to git.

2017-12-15 Thread Junio C Hamano
Josef Wolf writes: > With git, by contrast, this won't work. Git will refuse to pull anything as > long as there are ANY local modifications. The cron job would need to > >git stash >git pull >git stash pop I'd assume that this "pull" is expected to be fast-forward, as otherwise you

Re: Need help migrating workflow from svn to git.

2017-12-15 Thread Josef Wolf
On Fri, Dec 15, 2017 at 02:17:40AM +0100, Igor Djordjevic wrote: > > This said, and without having you to change your habits too much (nor > use Git in possibly awkward ways), I`m thinking you may actually > benefit of using `git worktree add `[1] to create a > temporary working tree ("working

Re: Need help migrating workflow from svn to git.

2017-12-15 Thread Josef Wolf
Thanks for your input, Igor! On Thu, Dec 14, 2017 at 11:27:09PM +0100, Igor Djordjevic wrote: > Aside "update and merge" working copy while you`re hacking on it, > what happens with "execute" part? It seems really strange that you > don`t mind cron job running the same scripts which you are acti

Re: Need help migrating workflow from svn to git.

2017-12-15 Thread Josef Wolf
Thanks for your answer, Randall, On Thu, Dec 14, 2017 at 04:07:15PM -0500, Randall S. Becker wrote: > > You might want to consider a slight modification to your approach as > follows. > Instead of using git pull, use git fetch. > Have each system on its own branch (sys1 = my-sys1-branch, for exa

Re: Need help migrating workflow from svn to git.

2017-12-14 Thread Igor Djordjevic
On 14/12/2017 23:27, Igor Djordjevic wrote: > > As you basically have a flow where two users (you and cron job) can > edit same files at the same time, desired outcome might be a bit > ambiguous, especially when scheduled execution of those files is > added to the mix. This said, and without h

Re: Need help migrating workflow from svn to git.

2017-12-14 Thread Igor Djordjevic
Hi Josef, I`m not a Git expert, and I know less of Subversion, but following your explanation, I might try to help, at least until more experienced people join. On 14/12/2017 14:09, Josef Wolf wrote: > > Every machine has a working copy of the repository in a specific > directory. A cron job

RE: Need help migrating workflow from svn to git.

2017-12-14 Thread Randall S. Becker
> On December 14, 2017 8:10 AM, Josef Wolf wrote: > Subject: Need help migrating workflow from svn to git. > > Hello folks, > > I am wondering whether/how my mode of work for a specific project > (currently based on SVN) could be transferred to git. > > I have a

Need help migrating workflow from svn to git.

2017-12-14 Thread Josef Wolf
Hello folks, I am wondering whether/how my mode of work for a specific project (currently based on SVN) could be transferred to git. I have a repository for maintaining configuration of hosts. This repository contains several hundered scripts. Most of those scripts are don't depend on each other.

Re: New to git, need help!

2016-11-15 Thread Pranit Bauva
Hey Mayank, On Tue, Nov 15, 2016 at 6:00 PM, Mayank Gupta wrote: > Hi All, > > I'm new to open source and have recently joined this mailing list. > Since I'm new at this, I think I can initially contribute to the > community by fixing some small bugs or errors but as the documentation > is too la

New to git, need help!

2016-11-15 Thread Mayank Gupta
Hi All, I'm new to open source and have recently joined this mailing list. Since I'm new at this, I think I can initially contribute to the community by fixing some small bugs or errors but as the documentation is too large, I don't know where to start. So if anybody could guide me on how to go ab

Re: Need help deciding between subtree and submodule

2015-03-19 Thread Robert Dailey
On Wed, Mar 18, 2015 at 6:04 PM, Doug Kelly wrote: > On Wed, Mar 18, 2015 at 3:20 AM, Chris Packham > wrote: >> My $0.02 based on $dayjob >> >> (disclaimer I've never used subtree) >> >> On Wed, Mar 18, 2015 at 11:14 AM, Robert Dailey >> wrote: >>> At my workplace, the team is using Atlassian S

Re: Need help deciding between subtree and submodule

2015-03-18 Thread Doug Kelly
On Wed, Mar 18, 2015 at 3:20 AM, Chris Packham wrote: > My $0.02 based on $dayjob > > (disclaimer I've never used subtree) > > On Wed, Mar 18, 2015 at 11:14 AM, Robert Dailey > wrote: >> At my workplace, the team is using Atlassian Stash + git >> >> We have a "Core" library that is our common cod

Re: Need help deciding between subtree and submodule

2015-03-18 Thread Chris Packham
My $0.02 based on $dayjob (disclaimer I've never used subtree) On Wed, Mar 18, 2015 at 11:14 AM, Robert Dailey wrote: > At my workplace, the team is using Atlassian Stash + git > > We have a "Core" library that is our common code between various > projects. To avoid a single monolithic repositor

Need help deciding between subtree and submodule

2015-03-17 Thread Robert Dailey
At my workplace, the team is using Atlassian Stash + git We have a "Core" library that is our common code between various projects. To avoid a single monolithic repository and to allow our apps and tools to be modularized into their own repos, I have considered moving Core to a subtree or submodul

Re: need help with syncing two bare repos

2012-08-03 Thread Junio C Hamano
Eugene Sajine writes: > On Fri, Aug 3, 2012 at 4:00 PM, Junio C Hamano wrote: >> Eugene Sajine writes: >> >>> I think the best variant would be to do something like: >>> >>> $ git pull --rebase /refs/heads/*:/refs/heads/* >>> $ git push origin /refs/heads/*:/refs/heads/* >> >> You perhaps meant

Re: need help with syncing two bare repos

2012-08-03 Thread Eugene Sajine
On Fri, Aug 3, 2012 at 4:00 PM, Junio C Hamano wrote: > Eugene Sajine writes: > >> I think the best variant would be to do something like: >> >> $ git pull --rebase /refs/heads/*:/refs/heads/* >> $ git push origin /refs/heads/*:/refs/heads/* > > You perhaps meant "worst" not "best" here. From th

Re: need help with syncing two bare repos

2012-08-03 Thread Junio C Hamano
Eugene Sajine writes: > I think the best variant would be to do something like: > > $ git pull --rebase /refs/heads/*:/refs/heads/* > $ git push origin /refs/heads/*:/refs/heads/* You perhaps meant "worst" not "best" here. From the point of view of people who have pushed into the "origin" repos

Re: need help with syncing two bare repos

2012-08-03 Thread Sitaram Chamarty
On Fri, Aug 3, 2012 at 11:59 PM, Eugene Sajine wrote: > Hi, > > Could somebody please advise about how to address the following: > > I have a bare repo (bareA) on one server in network1 and i have a > mirror of it on another server (bareB) in network2 > BareB is updated periodically - no problem h

Re: Need help to complete the proposed gsoc 2012 project

2012-08-01 Thread jaseem abid
On Wed, Aug 1, 2012 at 4:52 AM, Andrew Ardill wrote: > On Wednesday, August 1, 2012, jaseem abid wrote: >> >> [...] >> >> Any help will be greatly appreciated. > > > Was there anything in particular you wanted help with: code review, fixing > bugs, implementing features? 1. Code review, I don't w

Need help to complete the proposed gsoc 2012 project

2012-07-31 Thread jaseem abid
Dear list, Project : Use JavaScript library / framework in gitweb Project Description : https://github.com/peff/git/wiki/SoC-2012-Ideas Code: https://github.com/jaseemabid/git/commits/gitweb The pro