Re: [git-users] Beginner: delete 2 revisions

2017-07-21 Thread DynV Montrealer
I wanted to keep the same file path and delete 2 revisions. I already put
the file path some places and I rather kept it than delete the revisions.


On Fri, Jul 21, 2017 at 7:43 PM, Michael  wrote:

>
> On 2017-07-21, at 10:09 AM, Konstantin Khomoutov  wrote:
>
> > On Tue, Jul 11, 2017 at 10:23:12AM -0700, DynV Montrealer wrote:
> >
> >> I'd like to delete revision 2 & 5 on
> >> http://gist.github.com/WilliamCQ/4d734bf3e7c3ab59b08c949f1ab673d7 and
> have
> >> no idea how to proceed by command line and the web interface won't let
> me
> >> do it; it's support assured me it can only be done by command and they
> >> won't help with that. Please keep in mind I'm a beginner.
> >>
> >> Thank you kindly for your help
> >>
> >> PS: I'm not sure what's going on but it won't let me post with the
> >> following tags: gist, github, delete revision, remove revision, dump
> >> revision, clear revision, eradicate revision.
> >
> > From what I gather from the description and looking at the linked
> > resource, you're asking about removing a pair of revisions from a
> > Github's "gist" -- which is online (that is, web-based) collaborative
> > facility for editing text.  It has nothing to do with Git, which is a
> > VCS and has nothing to do with Github.
> >
> > Please try reaching for Github's help facilities:
> > https://help.github.com
>
> Gist.github.com is a web-based, simplified interface to git repositories
> that are designed to be used primarily for text.
>
> Each "gist" is actually a git repository with a single master and no other
> branches.
>
> It sounds like what he wants is instruction on how to clone it, commit a
> "revert 2 commits" commit, and then push that back to the original gist git.
>
>
> ---
> Entertaining minecraft videos
> http://YouTube.com/keybounce
>
> --
> You received this message because you are subscribed to a topic in the
> Google Groups "Git for human beings" group.
> To unsubscribe from this topic, visit https://groups.google.com/d/
> topic/git-users/9uUPnCXmtdE/unsubscribe.
> To unsubscribe from this group and all its topics, send an email to
> git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: [git-users] pull merge vs a local merge, what's different?

2017-07-21 Thread Michael

On 2017-07-20, at 4:11 PM, Jon Erickson  wrote:

> To start, the user that generated this error was advised to backout the 
> resulting munge and use a standard merge to fix his problems.  Following 
> standard merging practices fixed his problems but his original approach had 
> been nagging at me.  This user was using git pull to merge from master to his 
> personal development branch.  Here are the steps he was performing and the 
> resulting pop:
>  
> git checkout -b ticket/1976 origin/master
> git commit -m 'As requested, renamed files to reflect their type.'
> git commit -m 'Added convenience alias for commands.'
> git commit -m 'Modifications to support "use PAW" Banner display.'
> git pull origin master
> got the following:
> error: merge died of signal 11 (SEGV) plus a core file

Alright, so something is wrong with this sequence.

If this is the sequence, then each of those commits would have done nothing and 
would have given an warning message. You have no git add commands to indicate 
anything modified.

---
Entertaining minecraft videos
http://YouTube.com/keybounce

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: [git-users] pull merge vs a local merge, what's different?

2017-07-21 Thread Michael

On 2017-07-20, at 4:11 PM, Jon Erickson  wrote:

> To start, the user that generated this error was advised to backout the 
> resulting munge and use a standard merge to fix his problems.  Following 
> standard merging practices fixed his problems but his original approach had 
> been nagging at me.  This user was using git pull to merge from master to his 
> personal development branch.  Here are the steps he was performing and the 
> resulting pop:
>  
> git checkout -b ticket/1976 origin/master
> git commit -m 'As requested, renamed files to reflect their type.'
> git commit -m 'Added convenience alias for commands.'
> git commit -m 'Modifications to support "use PAW" Banner display.'
> git pull origin master
> got the following:
> error: merge died of signal 11 (SEGV) plus a core file

Alright, so something is wrong with this sequence.

If this is the sequence, then each of those commits would have done nothing and 
would have given an warning message. You have no git add commands to indicate 
anything modified.

---
Entertaining minecraft videos
http://YouTube.com/keybounce

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: [git-users] Beginner: delete 2 revisions

2017-07-21 Thread Michael

On 2017-07-21, at 10:09 AM, Konstantin Khomoutov  wrote:

> On Tue, Jul 11, 2017 at 10:23:12AM -0700, DynV Montrealer wrote:
> 
>> I'd like to delete revision 2 & 5 on 
>> http://gist.github.com/WilliamCQ/4d734bf3e7c3ab59b08c949f1ab673d7 and have 
>> no idea how to proceed by command line and the web interface won't let me 
>> do it; it's support assured me it can only be done by command and they 
>> won't help with that. Please keep in mind I'm a beginner.
>> 
>> Thank you kindly for your help
>> 
>> PS: I'm not sure what's going on but it won't let me post with the 
>> following tags: gist, github, delete revision, remove revision, dump 
>> revision, clear revision, eradicate revision.
> 
> From what I gather from the description and looking at the linked
> resource, you're asking about removing a pair of revisions from a
> Github's "gist" -- which is online (that is, web-based) collaborative
> facility for editing text.  It has nothing to do with Git, which is a
> VCS and has nothing to do with Github.
> 
> Please try reaching for Github's help facilities:
> https://help.github.com

Gist.github.com is a web-based, simplified interface to git repositories that 
are designed to be used primarily for text.

Each "gist" is actually a git repository with a single master and no other 
branches.

It sounds like what he wants is instruction on how to clone it, commit a 
"revert 2 commits" commit, and then push that back to the original gist git.


---
Entertaining minecraft videos
http://YouTube.com/keybounce

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: [git-users] Re: pull merge vs a local merge, what's different?

2017-07-21 Thread Konstantin Khomoutov
On Fri, Jul 21, 2017 at 05:46:44AM -0700, Jon Erickson wrote:

> > To start, the user that generated this error was advised to backout the 
> > resulting munge and use a standard merge to fix his problems.  Following 
> > standard merging practices fixed his problems but his original approach had 
> > been nagging at me.  This user was using git pull to merge from master to 
> > his personal development branch.  Here are the steps he was performing 
> > and the resulting pop:
> >
> > git checkout -b ticket/1976 origin/master
> >
> > git commit -m 'As requested, renamed files to reflect their type.'
> >
> > git commit -m 'Added convenience alias for commands.'
> >
> > git commit -m 'Modifications to support "use PAW" Banner display.'
> >
> > git pull origin master
> >
> > got the following:
> >
> > error: merge died of signal 11 (SEGV) plus a core file
> >
> Could SEGV mean segmentation fault i.e. out of memory error or am I way 
> off base?  

That's exactly what it means.

But to be honest, SIGSEGV seldom, if ever, means an out-of-memory error,
except when there's a bug in the software so when the C's malloc()
returns NULL -- it does to in the case of out-of-memory, -- that value
is not checked for being valid and is used right away.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: [git-users] Beginner: delete 2 revisions

2017-07-21 Thread Konstantin Khomoutov
On Tue, Jul 11, 2017 at 10:23:12AM -0700, DynV Montrealer wrote:

> I'd like to delete revision 2 & 5 on 
> http://gist.github.com/WilliamCQ/4d734bf3e7c3ab59b08c949f1ab673d7 and have 
> no idea how to proceed by command line and the web interface won't let me 
> do it; it's support assured me it can only be done by command and they 
> won't help with that. Please keep in mind I'm a beginner.
> 
> Thank you kindly for your help
> 
> PS: I'm not sure what's going on but it won't let me post with the 
> following tags: gist, github, delete revision, remove revision, dump 
> revision, clear revision, eradicate revision.

>From what I gather from the description and looking at the linked
resource, you're asking about removing a pair of revisions from a
Github's "gist" -- which is online (that is, web-based) collaborative
facility for editing text.  It has nothing to do with Git, which is a
VCS and has nothing to do with Github.

Please try reaching for Github's help facilities:
https://help.github.com

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: [git-users] Re: Repository corruption ...

2017-07-21 Thread Konstantin Khomoutov
On Wed, Jul 19, 2017 at 10:32:38PM -0700, Deepti Dua wrote:

> i am still facing error after changing permission
> 
> nitialized empty Git repository in /home/sushmitha/RBTool/test/lte_epc/.git/
> cm_ltepc@gurux's password:
> error: pack-objects died of signal 9
> error: git upload-pack: git-pack-objects died with error.
> fatal: git upload-pack: aborting due to possible repository corruption on 
> the remote side.
> remote: aborting due to possible repository corruption on the remote side.
> 
> fatal: early EOF
> fatal: index-pack failed

>From the git-upload-pack manual page, we get:

| Invoked by 'git fetch-pack', learns what
| objects the other side is missing, and sends them after packing.
| 
| This command is usually not invoked directly by the end user.
| The UI for the protocol is on the 'git fetch-pack' side, and the
| program pair is meant to be used to pull updates from a remote
| repository.  For push operations, see 'git send-pack'.

This means the upload-pack program runs on the remote side, and this
indicates that the problem is in the remote repo.

Try SSH'ing to the remote server and running `git fsck` in that repo.
But first be sure to recursively copy its whole directory to some other
place for backup purposes.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: [git-users] Re: Malicious Coder

2017-07-21 Thread Nelson Efrain A. Cruz
If you don't trust him don't give him direct access to the repo. Instead
you should accept changes that he send to you in the form of patches or
changes in a fork (a fork of the repo) through merge or pull requests[1],
the last depends on how you share your repo. This will allow you to do a
code review and deny any bad changes. Please read 1 for more explanation.

[1] -
https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project

El jue., 20 de jul. de 2017 a la(s) 14:14, Igor Djordjevic <
igor.d.djordje...@gmail.com> escribió:

> Hi Lucky Limey,
>
> On Thursday, July 20, 2017 at 4:46:20 PM UTC+2, Lucky Limey wrote:
>>
>> I have a private repository set up for a project. I may be heading for a
>> dispute with one of the coders How do I protect the repository from
>> vandalism? I would hate for him to delete all our work etc. etc.
>>
>
> By removing his write access to the repository? Or just making a clone, or
> a simple copy of it...?
>
> Otherwise, what are you exactly concerned with?
>
> One of the beauties of a distributed version control system, which Git is,
> makes for each repository clone being a full/original/authentic repository
> copy. So as long as at least one person has the repository (locally, or
> wherever), the code and its history can`t get lost/damaged, no matter if
> some repository you`ve declared "central" gets corrupted/deleted/lost - you
> would just clone it again from any other still existing repository.
>
> For example, if I have a GitHub repository, I`ll most probably have a
> local clone of it, the one which I`m working on, so even if my GitHub
> repository gets deleted/detroyed it won`t really matter as I still have
> everything in my local clone, and I can easily recreate GitHub repository
> as if the issue never happened.
>
> Only in case if I`m the only one having the GitHub clone, and I haven`t
> synchronized my local clone lately (through fetch/pull) and there were some
> changes on GitHub side which gets destroyed, I would lose those latest
> commits since my last synchronization, but that`s really the worst case
> scenario - usually more than one person would work on GitHub repo, and any
> of them might have a more recent clone (or s fully up to date one).
>
> Anyway, nothing beats regular/planned backups, just that Git might even
> save you when you (think you) don`t have one :)
>
> Regards,
> Buga
>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[git-users] Re: pull merge vs a local merge, what's different?

2017-07-21 Thread Jon Erickson


On Thursday, July 20, 2017 at 7:11:03 PM UTC-4, Jon Erickson wrote:
>
> To start, the user that generated this error was advised to backout the 
> resulting munge and use a standard merge to fix his problems.  Following 
> standard merging practices fixed his problems but his original approach had 
> been nagging at me.  This user was using git pull to merge from master to 
> his personal development branch.  Here are the steps he was performing 
> and the resulting pop:
>
>  
>
> git checkout -b ticket/1976 origin/master
>
> git commit -m 'As requested, renamed files to reflect their type.'
>
> git commit -m 'Added convenience alias for commands.'
>
> git commit -m 'Modifications to support "use PAW" Banner display.'
>
> git pull origin master
>
> got the following:
>
> error: merge died of signal 11 (SEGV) plus a core file
>
>  
>
> Could SEGV mean segmentation fault i.e. out of memory error or am I way 
> off base?  
>
 

> I know that pull does a fetch followed by a merge but is there anything 
> special about that merge that could explain the failure?  Does pull 
> assume that the branch your working on and the remote branch have the same 
> lineage?  I am really just interested in finding out if pulls merge is 
> different from a standard merge and if so how.  If it isn’t, then perhaps 
> this is a bug, albeit a bug that you really should never see using standard 
> merge practices.
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.