IRCloggy #git 2020-09-19

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2020-09-19

← jstein left00:01
→ Cabanossi joined00:02
→ R2robot joined00:03
← thansen left00:04
→ thansen joined00:07
← greggerz left00:08
→ Eryn_1983_FL joined00:08
← h3ck left00:11
← tiin57 left00:13
← arcatech left00:15
→ Xenguy joined00:15
→ tiin57 joined00:16
→ octav1a joined00:16
← cliluw left00:17
→ cliluw joined00:17
→ mindCrime_ joined00:18
← maxzor left00:19
→ arcatech joined00:22
← bilb_ono left00:32
→ tilpner_ joined00:33
→ cim209 joined00:34
← Isla_de_Muerte left00:34
← tilpner left00:36
tilpner_ → tilpner00:36
← kantlivelong left00:38
← lmat left00:39
→ lmat joined00:41
→ kantlivelong joined00:42
← tiin57 left00:43
← shokohsc left00:43
← leeN left00:45
→ h3ck_ joined00:46
← rafasc left00:46
→ tiin57 joined00:46
→ bilb_ono joined00:52
→ mirrorbird joined00:55
← kent\n left00:57
← arcatech left00:57
→ kent\n joined00:58
→ shokohsc joined00:58
← cliluw left01:00
→ Ranhir joined01:01
→ cliluw joined01:01
← Aki-lucky left01:01
← tiin57 left01:13
→ vngx joined01:14
→ kupi joined01:14
← meropyri left01:16
→ tiin57 joined01:17
← dfee left01:20
→ init joined01:21
← Case_Of left01:23
→ Case_Of joined01:23
← F0rTex left01:23
→ F0rTex joined01:25
→ dustli joined01:28
← mirrorbird left01:30
→ justanotheruser joined01:32
← HourGate left01:35
← bilb_ono left01:38
← Betal left01:38
→ arcatech joined01:40
← mindCrime_ left01:40
→ HourGate joined01:40
→ mindCrime_ joined01:41
← bvdw left01:42
→ bvdw joined01:42
← tiin57 left01:43
→ tiin57 joined01:47
→ tavito joined01:48
← gschanuel left01:57
→ Betal joined01:59
→ gschanuel joined01:59
← [Brain] left02:00
← Trieste left02:04
← dustli left02:05
→ dustli joined02:09
→ meropyri joined02:11
lagothrix → Guest5106402:12
← Guest51064 left02:12
→ lagothrix joined02:13
← tiin57 left02:13
→ Trieste joined02:15
→ tiin57 joined02:16
→ Argorok joined02:18
Argorok I have created a branch for a new feature. Commited and pushed. After a while, master got updated by other things and I merged master into my branch, to keep it updated. But, all of a sudden, all my changes are gone. I can still see them in git logs, but the code isn't there anymore (and, on git, I can't see the commits I made to that branch with the new feature). How can I recover?02:19
← gschanuel left02:22
← arcatech left02:22
→ gschanuel joined02:24
← vngx left02:25
← miklcct left02:27
→ Muimi joined02:28
← Phylock left02:29
→ miklcct joined02:32
← dustli left02:33
← cbreak left02:34
→ bilb_ono joined02:34
→ dfee joined02:34
← gschanuel left02:35
→ gschanuel joined02:35
→ cbreak joined02:35
← meropyri left02:38
rewt Argorok, you may be able to use `git reflog` to see the commits you had checked out, and checkout a "good" one (by hash), and then make your branch there02:38
Argorok, also a gui tool like gitk (or similar) can also help out to see where you're at02:39
Argorok rewt: How? I used git log --authorMyName --all and got all six commits hashes that are missing. I can go to the git page, type their hashes in url and see them02:39
rewt `git log` and `git reflog` are different02:40
Argorok Reflog gave me nothing interesting02:40
rewt it should list the refs you had checked out recently... one of them should be a commit that has what you're missing02:41
→ meropyri_ joined02:42
meropyri_ → meropyri02:43
← tiin57 left02:43
Argorok rewt: I am on the feature branch. Can't just revert the 3 last "merge master to featurebranch"?02:44
(Noob here)02:44
rewt you could02:45
Argorok Or, maybe, create another branch from the updated master and just apply the 6 commits I did to the destroyed feature branch?02:45
→ tiin57 joined02:46
rewt I suggested gitk, because it is really helpful to find a "good" commit, and reset your branch to it02:46
← bilb_ono left02:48
← tavito left02:51
→ bilb_ono joined02:53
← Cabanossi left02:56
→ Cabanossi joined02:58
→ kleisli_ joined02:59
← kleisli__ left03:01
→ drbean joined03:12
← bilb_ono left03:12
← tiin57 left03:13
→ tiin57 joined03:16
→ EvanCarroll joined03:18
← bn_work left03:25
→ Goplat joined03:26
→ mat001 joined03:32
← octav1a left03:34
← ueberall left03:37
→ oatmealraisin joined03:40
← tiin57 left03:43
→ tiin57 joined03:46
← EvanCarroll left03:48
← Gurkenglas left03:52
← gast0n left03:55
→ mat001_ joined04:00
→ inkbottle joined04:00
← zebrag left04:02
← mat001 left04:02
← clara97 left04:02
→ zulutango joined04:04
← dfee left04:05
Argorok rewt: seems that I managed to fix it through cherry-pick over the updated master. Thanks. Weird that my git log does not show the commits even with --all, only a server that was not updated after merges04:05
← mir100 left04:05
→ mirrorbird joined04:05
← donofrio_ left04:11
← tiin57 left04:13
→ a-l-e joined04:13
→ arcatech joined04:15
→ tiin57 joined04:16
→ dfee joined04:17
← arcatech left04:19
← zulutango left04:24
→ zulutango joined04:24
→ jaziz joined04:28
← dfee left04:32
← wagle left04:41
← tiin57 left04:43
→ pspace joined04:43
← kerframil left04:43
→ wagle joined04:44
→ tiin57 joined04:46
← fling left04:48
← zulutango left04:50
← justanotheruser left04:52
→ octav1a joined04:56
→ ferdna joined04:56
← Jookia left04:58
→ Jookia joined05:01
← Metalsutton left05:03
← a-l-e left05:04
→ bocaneri joined05:11
← tiin57 left05:13
← pspace left05:14
→ fling joined05:14
→ tiin57 joined05:16
→ mat001 joined05:20
← mat001_ left05:22
→ Busterx joined05:22
← mirrorbird left05:30
← nivag left05:33
← Busterx left05:34
→ darkbit joined05:40
← vicfred left05:42
← tiin57 left05:43
→ tiin57 joined05:46
→ fatalhalt joined05:47
→ mns joined05:52
← oatmealraisin left05:54
← deAtog left05:58
← heyitsrama left06:05
→ mat001_ joined06:10
← tiin57 left06:13
← mat001 left06:14
→ hussam joined06:16
→ tiin57 joined06:16
→ tarkus joined06:18
→ Guest20 joined06:22
← Decobus left06:26
← mns left06:27
→ feriman joined06:30
→ realtime joined06:33
→ h3ck joined06:33
→ h3ck__ joined06:33
→ vicfred joined06:34
← h3ck_ left06:35
← KnoP left06:36
← h3ck left06:37
← kleisli_ left06:37
→ h3ck joined06:38
← h3ck__ left06:41
← tiin57 left06:43
→ htrap joined06:46
→ tiin57 joined06:46
← Goplat left06:48
→ mirrorbird joined06:49
→ matelot joined06:50
← feriman left06:51
← matelot left06:52
← kupi left06:53
→ zulutango joined06:54
→ kleisli joined06:54
kleisli → dillon06:55
dillon → endorphin06:57
← wrksx_ left06:57
→ wrksx joined06:57
← unluckyshrubbery left07:02
← htrap left07:07
Seveas_ → Seveas07:08
→ Metalsutton joined07:08
← Metalsutton left07:10
← tiin57 left07:13
→ tiin57 joined07:15
← ferdna left07:18
← FH_thecat left07:21
← zulutango left07:24
→ zulutango joined07:24
← Nokurn left07:24
→ ferdna joined07:28
← mindCrime_ left07:29
→ feriman joined07:32
← fatalhalt left07:33
← irc_user left07:37
← epoll left07:38
← Guest20 left07:38
→ epoll joined07:38
← epoll left07:39
← feriman left07:40
→ epoll joined07:40
← tiin57 left07:43
→ tiin57 joined07:46
→ wrobinso1 joined07:48
← wrobinson left07:51
→ PJBoy joined07:57
→ cosimone joined08:05
← drbean left08:06
← Xenguy left08:12
← tiin57 left08:13
→ Xenguy joined08:13
→ tiin57 joined08:17
→ calcul0n joined08:26
→ Phylock joined08:29
← sunyibo left08:30
→ nivag joined08:33
→ unluckyshrubbery joined08:34
← cliluw left08:34
→ sunyibo joined08:35
← init left08:41
← cbreak left08:41
← h3ck left08:41
→ h3ck joined08:42
→ cbreak joined08:42
← tiin57 left08:43
→ tiin57 joined08:46
← rgbmt left08:48
← shabius_ left08:57
← cd left09:02
→ shabius joined09:02
← p-core left09:06
→ p-core joined09:06
→ Guest20 joined09:08
← Blukunfando left09:09
← tiin57 left09:13
→ tiin57 joined09:16
← ferdna left09:18
← PJBoy left09:21
← lagothrix left09:22
→ lagothrix joined09:22
→ FH_thecat joined09:24
→ saveNexit joined09:25
← Betal left09:25
← cbreak left09:28
← p-core left09:29
→ wootehfoot joined09:29
→ p-core joined09:29
← p-core left09:34
→ p-core joined09:35
← Guest20 left09:36
← tiin57 left09:43
← saveNexit left09:43
→ saveNexit joined09:43
→ leeN joined09:45
← Muimi left09:45
→ tiin57 joined09:46
← saveNexit left09:46
→ kleisli_ joined09:50
← endorphin left09:52
→ OnkelBlade joined09:56
→ CoolerX joined09:57
CoolerX can git diff diff with a git repo?09:57
I have 2 local repos that I want to diff09:57
I could do git fetch but that messes up the graph09:57
j416 man git-diff09:59
gitinfo the git-diff manpage is available at https://gitirc.eu/git-diff.html09:59
osse Not directly, no. fetch only messes up the graph if you make git log show the graph. you can also fetch and delete it again.09:59
→ feriman joined09:59
→ minhaj-sixbyte joined10:01
→ sixbyte joined10:01
← minhaj-sixbyte left10:01
CoolerX osse, delete what?10:02
all the commits you fetched?10:03
ikke delete the remote10:03
osse yes10:03
git remote add tmp http/whatever; git fetch tmp; git diff master tmp/master (or whatever it is you need); git remote rm tmp10:04
← wootehfoot left10:04
→ cbreak joined10:04
osse you can also only fetch exactly what you want to diff, but unless the repo is huge I wouldn't bother. ACtually, I wouldn't bother in any case, probably.10:05
CoolerX that will remove all the commits?10:06
ikke Not immediately10:06
CoolerX actually I tried it it's not very useful in my case10:06
ikke but they won't show up in git log10:06
CoolerX the commits have different commiters10:06
the ids are different10:06
commit message have a slightly different format10:07
← crose left10:07
← sixbyte left10:07
CoolerX the folder diff isn't much better10:08
all the stuff inside .git shows up first as being different10:08
Jookia CoolerX: what are you trying to diff exactly10:08
← leeN left10:09
→ mrk joined10:09
← OnkelBlade left10:09
→ benfelin joined10:09
mrk hello im not able to fo git push because of remote how to fix it ?10:10
it showing this ---- "fatal: invalid gitfile format: hello.html10:11
fatal: Could not read from remote repository.10:11
Please make sure you have the correct access rights10:11
and the repository exists.10:11
"10:11
← bocaneri left10:11
bremner ask the server admin?10:11
also, check your URL10:12
← mirrorbird left10:12
CoolerX Jookia, well my repo got recreated10:12
→ aliss joined10:12
CoolerX not my, "our" repo10:12
the .git folder was deleted and recreated10:12
mrk i added ssh key and then removed then thats happend!!10:13
← tiin57 left10:13
CoolerX Jookia, I was trying to diff the old repo and the new repo10:13
Jookia CoolerX: what do you mean 'deleted and recreated'10:13
CoolerX cp -r repo/ newrepo/; rm -rf newrepo/.git/; cd newrepo/; git init10:14
I tried git diff --no-index repo/ newrepo/10:14
the newrepo/ only has the master branch10:15
I was trying to diff a feature branch in the old repo with the master branch in the newrepo/10:15
→ tiin57 joined10:16
← j7k6 left10:18
Jookia CoolerX: uh. as osse said, you can add newrepo's commits to the current repo and diff them i guess? but why have a new repo if you care about the old one?10:22
→ j7k6 joined10:24
→ bocaneri joined10:24
→ OnkelBlade joined10:24
← Celelibi left10:25
← mrk left10:25
→ leeN joined10:26
CoolerX Jookia, don't really care about the old one10:26
we are migrating10:26
so until that's finished10:26
→ pinpox joined10:27
Jookia CoolerX: why don't you add the feature branch to the new repo?10:28
CoolerX Jookia, I am not sure I can10:35
Jookia CoolerX: why not? can't you copy the files?10:35
CoolerX I did a git fetch inside newrepo/ but looking at the graph it's totally disconnected10:35
the commit ids are different10:35
→ Nokurn joined10:36
Jookia yeah, it's a new repo10:36
CoolerX the committer is different, the parents of the commits have different ids now10:36
even though it's all the same content10:36
Jookia yeah, it's a different git repo10:36
different history10:36
CoolerX yeah so I am not sure how you go about that10:36
osse you can still diff as normal10:36
Jookia you can copy files10:36
CoolerX yeah I am copying files over manually10:37
Jookia maybe you could copy them using git checkout and stuff10:37
CoolerX I guess git checkout oldrepo/feature; git rebase newrepo/master;10:37
something like that?10:37
Jookia why do you want to preserve history?10:38
CoolerX we don't want the old repo's history, etc. so it shouldn't be a merge10:38
Jookia rebasing would preserve history, or attempt to10:38
CoolerX hmm10:38
Jookia you could just checkout oldrepo/feature then git reset and git commit as a single new commit10:38
CoolerX Jookia, well forget history, rebase won't preserve the parent right/10:39
we are re basing10:39
so new parent10:39
Jookia there's no point in rebasing here10:39
unless you want to preserve history10:39
CoolerX well like I said I am not sure how to go about it10:40
doing it manually for now10:40
Jookia checkout the files, reset branch, commit as single commit10:41
or manually copy files10:41
rebasing takes a commit history and puts it on top of another commit history10:41
← tiin57 left10:43
Jookia CoolerX: ideally you'd check out a branch in to your working directory + staging tree, then reset HEAD to the new master while preserving those, then commit10:43
or main, whatever the branch is10:43
CoolerX Jookia, reset HEAD?10:45
to the new master? HEAD of newrepo/ is already at newrepo/master10:45
Jookia CoolerX: yeah, like 'git checkout old-branch; git reset --soft new-branch; git status' to see10:46
→ tiin57 joined10:46
CoolerX ah10:46
← g00s left10:46
CoolerX yeah that makes sense, and afterwards git remote rm repo/ ?10:47
Jookia if you want yeah10:47
CoolerX ok10:47
can reset --soft result in merge conflicts?10:48
Jookia i don't think so10:49
CoolerX I mean I would want it to result in merge conflicts, if the alternative is overwriting10:49
Jookia that will overwrite it10:49
CoolerX we are basically pulling changes from a feature branch into master10:49
although slightly more unsual10:50
Jookia your feature branch doesn't exist any more though10:50
CoolerX ik10:50
hmm10:50
Jookia you need to remake the feature branch10:50
CoolerX so git checkout repo/feature; git checkout -n newrepo/feature; git rebase newrepo/master10:51
← yonder left10:51
CoolerX something like that?10:51
Jookia no10:51
CoolerX checkout -b10:51
→ Gurkenglas joined10:52
CoolerX I guess avoid the rebase and do what you said earlier10:52
Jookia why do you want to rebase?10:52
CoolerX or maybe git merge?10:52
Jookia why do you want to git merge?10:52
CoolerX the other thing is I don't want the merge commit really10:52
I just want the changes from the feature branch10:53
but with merge conflict resolution so I can see what is happening10:53
don't just thrash the newrepo/master10:53
Jookia you can't use git's merge conflict resolution without a common parent10:53
CoolerX yeah10:53
Jookia you could rebase to re-apply some commits on top of a branch10:54
CoolerX that's why I was thinking of pulling the changes from oldrepo/feature into newrepo/feature10:54
Jookia which just turns your commits in to patches that get re-applied10:54
CoolerX and the git checkout newrepo/feature; git rebase newrepo/master10:54
Jookia what would git rebase do there?10:54
CoolerX rebase gives me merge conflict resolution10:55
if there are conflicts10:55
instead of just thrashing the newrepo/master10:55
Jookia not quite10:55
rebase doesn't give anything merge-related, it gives patch-related conflicts10:55
→ uebera|| joined10:55
CoolerX sure10:56
but it atleast tells you there are conflicts and let's you see and resolve them10:56
← Ranhir left10:56
Jookia you could try rebasing just the feature branch on to the new master10:57
→ Ranhir joined10:57
CoolerX isn't that what I said?10:57
Jookia no, you were going to rebase the entire commit history on to the new repo10:57
if it would even work at all10:58
you need to use --onto probably10:58
CoolerX ah10:59
Jookia, ok what about this10:59
<Jookia> you could just checkout oldrepo/feature then git reset and git commit as a single new commit10:59
do that10:59
hmm wait11:00
I was thinking of pulling all the changes into a branch off of newrepo/master11:00
then rebase that newrepo/feaure onto newrepo/master11:00
that way you don't rebase the entire history of the old repo11:00
Jookia you can selectively rebase commits. see the git rebase man page11:01
CoolerX " pulling all the changes into a single commit on branch off of newrepo/master"11:01
→ KnoP joined11:01
CoolerX Jookia, you mean with rebase -i HEAD~10 ?11:01
Jookia git checkout -b oldrepo/feature feature; git rebase --onto newrepo/master oldrepo/master11:01
CoolerX: or something like that, yes11:02
with --onto11:02
CoolerX Jookia, I am looking at --onto but the example they give is a connected graph11:07
in my case the graph is disconnected11:07
Jookia CoolerX: worth trying anyway11:08
CoolerX oldrepo/feature isn't connected in any way to the newrepo/master11:08
hmm11:08
Jookia no real downside to trying things11:08
CoolerX git checkout oldrepo/feature; git rebase --onto newrepo/master oldrepo/master oldrepo/feature;11:08
?11:08
Jookia you don't need to checkout the oldrepo/feature first, but yeah11:09
CoolerX oh you can do it from anywhere?11:09
I guess since git rebase --onto has all the information it needs11:10
Jookia it'll check out the branch first11:10
CoolerX oh no I screwed up11:10
I forgot to sign the commit11:10
what is it git amend -s -S ?11:11
Jookia sign using GPG or signed-off11:11
CoolerX using GPG11:11
both actually11:11
Jookia then yeah i think11:11
CoolerX I did set the thing where it should sign all commits automatically11:12
← tiin57 left11:13
CoolerX oh it did sign11:13
only the signed off is missing11:13
← Gurkenglas left11:14
CoolerX so does git amend create a new commit?11:14
Jookia yes11:15
you can't modify existing commits11:15
→ silverwhitefish joined11:15
CoolerX git amend is not a git command11:15
?11:15
is it an extension?11:15
Jookia no, git amend creates a new commit11:16
CoolerX oh wait it's git commit --amend11:16
→ tiin57 joined11:16
→ mirrorbird joined11:25
← cosimone left11:28
CoolerX my -s and -S use different emails11:31
how can I change -s to use a different email?11:31
just for this repo11:31
← Phylock left11:32
Jookia i don't know if you can. maybe ask your boss if it's really worth changing?11:32
CoolerX it's a legal problem?11:33
I would think the signed off message and GPG sign email not matching would be a bigger problem11:33
Jookia why? they're separate things11:33
← benfelin left11:41
→ dionysus69 joined11:41
← tiin57 left11:42
→ Phylock joined11:43
CoolerX unrelated to all that11:44
what do you think of this fix?11:44
let11:44
let's say I am looking at the master branch, I see something that needs to be fixed, I make a change and commit11:45
now I meant to make the change in a branch but it's already too late11:45
so what I usually do is git checkout -b bugfix; git checkout master; git reset --hard <previous commit hash>;11:46
→ tiin57 joined11:46
CoolerX probably the first 2 commands could be compressed into one since I just want to create a new branch there11:46
osse That is perfectly fine11:46
CoolerX now sometimes I also accidentally push11:47
so origin/master needs to be fixed as well11:47
so after the above set of command I do git push --force from the master branch11:47
Jookia CoolerX: don't commit to master if you're prone to accidentally pushing11:47
CoolerX: ideally never commit to master, only have stuff merged in11:47
osse That is a bit hairy. I sometimes do it if I know anyone else hasn't pulled yet.11:48
But I try not to11:48
CoolerX osse, origin is my fork11:48
my fork of the upstream open source repo11:48
Jookia you don't own the master branch so you shouldn't be comitting on it11:48
osse CoolerX: In that case I think that is fine as well11:49
CoolerX ok11:50
Jookia, it's an accidental commit11:50
I don't usually commit to master11:50
Jookia yeah but you're making two accidents that lead to trouble11:51
osse It's useful to keep in mind that master, origin/master and upstream/master are three different things11:52
Jookia yeah, but if you're prone to make mistakes you want to minimize the impact they can have11:52
osse master isn't one global ephemeral thing that magically appears on everone's computers at the same time.11:52
→ HumanG33k joined11:53
osse Since a fork is involved it sounds likely that they don't have push access to the one master that really matters11:53
Jookia pushing accidental commits is eventually going to cause problems11:53
← rustyshackleford left11:53
osse Some time in the future it might. But going out of one's way with a convoluted workflow to avoid that potential problem is also not very efficient.11:55
In my mind it's a balance11:55
j416 osse: that depends a lot on how things are set up though11:55
osse of course11:55
← KnoP left11:55
j416 pushing branch master in our setup means deploy to production11:55
Jookia osse: 'dont commit to mater' = convoluted? ;)11:55
master*11:55
→ malmalmal joined11:55
osse No that's not convoluted11:56
In isolation that's not. But treating your local master with silk gloves also sounds like a hassle... sometimes11:56
One way around it is to simple not have a local master at all.11:57
Jookia Yeah, that's what I do11:57
→ PJBoy joined11:58
Jookia i find local branches like that more hassle than they're worth11:58
osse Agreed11:58
→ m0viefreak joined11:58
j416 for larger projects I tend to work on a separate branch as things mature and when ready I squash into a useful commit for master, loop repeat12:03
I find it helps to have a version of the project in a buildable state at any given time, by simply checking out master12:04
← kleisli_ left12:06
→ cosimone joined12:09
← tiin57 left12:13
→ kleisli_ joined12:13
→ tiin57 joined12:16
→ drbean joined12:20
→ wootehfoot joined12:22
→ h3ck_ joined12:31
← p-core left12:33
← h3ck left12:33
CoolerX sure12:34
→ h3ck joined12:35
← malmalmal left12:36
→ h3ck__ joined12:37
← h3ck_ left12:38
← h3ck left12:40
← tiin57 left12:43
← jaziz left12:46
→ tiin57 joined12:46
← PJBoy left12:50
← axsuul left12:51
→ axsuul joined12:53
→ EvanCarroll joined12:58
← CoolerX left13:01
→ magic_ninja joined13:12
→ KnoP joined13:12
← tiin57 left13:13
→ tiin57 joined13:16
→ CoolerX joined13:17
cbreak I don't like squashing into a single commit13:17
I usually commit / commit --fixup / commit --amend during development13:17
and when I'm happy with a branch, merge --no-ff it into the main dev branch13:17
← feriman left13:17
← osse left13:19
← Thorn left13:25
← bodom left13:27
← tiin57 left13:42
→ htrap joined13:45
→ tiin57 joined13:46
→ CodeSlingerPaul joined13:49
← htrap left13:51
→ benfelin joined13:53
← drbean left13:58
→ Gurkenglas joined13:58
← CoolerX left14:01
← aliss left14:03
→ aliss joined14:03
nikivi how can I get root of git project14:04
`git rev-parse --show-cdup`14:04
doesnt work14:04
so as `git rev-parse --show-toplevel`14:04
https://stackoverflow.com/questions/957928/is-there-a-way-to-get-the-git-root-directory-in-one-command14:04
`git rev-parse --show-toplevel` just prints current dir14:04
ikke nikivi: it should show the root of the project14:06
are you sure there is no .git in the current dir?14:06
← OnkelBlade left14:07
→ init joined14:08
nikivi not in current dir14:10
if im in git-repo/src/mutations14:10
and run git rev-parse --show-toplevel14:10
I expect to get path to git-repo14:10
~/src/git-repo as example14:10
ikke that's what it's supposed to do14:10
what does ls -ld .git return?14:11
← darkbit left14:12
← tiin57 left14:12
nikivi `ls: .git: No such file or directory`14:13
because I run it not in the git root14:13
I want to go to git root14:13
ikke yes, was just verifying14:13
and what does git rev-parse --show-toplevel actually return?14:13
nedbat nikivi: what are the full absolute paths of your current directory, and the directory you want it to show?14:14
nikivi https://hastebin.com/hugefunugo.sql14:14
.git is inside `/Users/nikivi/src/orgs/learn-anything/release`14:15
nedbat nikivi: what about: ls -ld /Users/nikivi/src/orgs/learn-anything/release/web/.git14:17
→ tiin57 joined14:17
nikivi oh there is another .git there indeed, my bad14:17
it was generated folder, I didnt know14:17
thx14:17
← igemnace left14:28
→ gast0n joined14:31
→ mat001 joined14:35
← mat001_ left14:36
→ Muimi joined14:38
→ Aki-lucky joined14:40
← Aki-lucky left14:40
→ Aki-lucky joined14:41
→ Bluuu joined14:42
← tiin57 left14:42
→ tiin57 joined14:46
→ lss joined14:49
← aliss left14:50
← sunyibo left14:51
→ irc_user joined14:52
→ Thorn joined14:56
← raymond left14:56
→ clara97 joined14:59
← Aquazi left15:00
→ Celelibi joined15:02
← benfelin left15:03
→ cd joined15:03
← EvanCarroll left15:03
← dionysus69 left15:04
← tiin57 left15:13
→ chandoo joined15:14
← Bluuu left15:14
→ p-core joined15:16
→ tiin57 joined15:16
← KnoP left15:22
← diogenese left15:24
→ diogenese joined15:25
→ justanotheruser joined15:27
← p-core left15:28
→ p-core joined15:30
← Kaisyu7 left15:30
← mat001 left15:32
→ mat001 joined15:33
← p-core left15:35
→ p-core joined15:36
→ benfelin joined15:36
← p-core left15:41
→ Newami joined15:41
→ p-core joined15:42
← tiin57 left15:42
→ tiin57 joined15:46
← Muimi left15:50
← Newami left15:59
← lss left16:03
← cbreak left16:04
→ cbreak joined16:05
→ oatmealraisin joined16:07
← mirrorbird left16:08
← tiin57 left16:13
→ tiin57 joined16:16
← sgn left16:18
← cbreak left16:20
→ sgn joined16:21
→ snowkidimd joined16:21
→ cuppajoeman joined16:25
→ shtrb joined16:27
shtrb Is there a way other then forcing gpg signature on each commit to force users to have proper e-mail in thier commits ?16:27
Marmotte even with gpg signature, users could put what they want as email16:29
shtrb Shouldn't the signature correspond to the commit e-mail ?16:31
but at least with signature I could see who had signed it.16:31
ikke only if you have verified their public key16:32
shtrb Any other suggestions how I can force proper user e-mails (domain based) in commits ? I have dozens of submodules , and I expect people to have some kind of miss configuration and I wish to avoid having commits like user@user being pushed.16:33
Marmotte check that in a server-side hook ?16:34
ikke shtrb: a pre-receive hook that verifies what people push16:34
← cuppajoeman left16:35
shtrb Marmotte, I'm with github, and for what I got I can't have custom server-side hooks16:35
ikke Then there is little you can do16:35
shtrb *unless I missread their docs16:35
← thebope left16:35
ikke No, they do not allow you to implement hooks16:38
which means, unless it's a built-in feature (which I don't think github provides), anyone can put in any e-mail address16:39
shtrb maybe I can somehow have global pre-push (not per repo) to check that ? is there even a thing of a global hooks ?16:39
ikke You can either set a hooks dir16:40
shtrb ikke, Isn't hooks dir per repository thing ?16:40
ikke or you can add the hook to template dir16:40
You can set that in the global config16:41
shtrb Oh nice , it could do the trick , thanks , will see how can I implement such a thing16:41
← m0viefreak left16:41
← tiin57 left16:43
→ AnAverageHuman joined16:44
→ tiin57 joined16:47
→ cbreak joined16:47
← benfelin left16:47
← oatmealraisin left16:48
→ theoceaniscool joined16:49
→ mirrorbird joined16:52
→ kerframil joined16:54
← tpaper left16:55
→ Goplat joined16:55
→ rafasc joined16:57
→ tpaper joined16:57
← vdamewood left16:58
→ calcul0n_ joined17:00
→ cuppajoeman joined17:01
→ Betal joined17:03
← calcul0n left17:03
→ PJBoy joined17:04
→ KnoP joined17:05
→ impermanence joined17:07
← clara97 left17:09
← cuppajoeman left17:09
← tiin57 left17:13
→ tiin57 joined17:16
← mirrorbird left17:18
→ mirrorbird joined17:19
← Phylock left17:20
→ buffal0 joined17:21
→ matelot joined17:32
← chandoo left17:34
← pinpox left17:38
→ OnkelBlade joined17:39
→ pinpox joined17:39
→ chandoo joined17:41
← tiin57 left17:43
← realtime left17:43
→ mindCrime_ joined17:45
→ tiin57 joined17:46
→ cdown_ joined17:47
← cosimone left17:48
← cdown left17:50
cdown_ → cdown17:50
← j7k6 left17:52
→ j7k6 joined17:52
→ yonder joined17:57
oprypin i see a command being used: `git archive --format=tar --prefix= "$ref" | tar -x -f - -C "$path"`. is there any equivalent to it without using `tar`?17:59
← wootehfoot left17:59
← h3ck__ left18:00
rafasc oprypin: there's a zip backend as well.18:01
oprypin rafasc, ok also without using `zip`18:01
rafasc then using what?18:02
oprypin using just `git` ideally to achieve the same result18:02
as i understand, this might be similar to `git checkout` but not sure about caveats18:02
rafasc you could try: git --work-tree=/home/rafasc/github/repo/ checkout HEAD -- :/ ;18:04
→ oatmealraisin joined18:05
rafasc there also ways to do it using 'git checkout-index'18:05
you can see an example here: https://github.com/git/git/blob/master/Documentation/install-doc-quick.sh#L2518:06
← tilpner left18:06
rafasc but this may be more contrived than you need.18:06
mackerman What's the problem with the pipe using tar?18:06
oprypin mackerman, it's Windows18:06
→ tilpner joined18:07
shtrb oprypin, pipe work on windows , you can have tar and other tools installed using gnu tools (or even from git-bash )18:07
oprypin rafasc, i am indeed getting the same results from this command. thanks. `git --work-tree="$path" checkout "$ref" -- .`18:09
wondering about caveats18:09
← OnkelBlade left18:10
← tiin57 left18:12
→ tiin57 joined18:16
rafasc oprypin: !deployy18:17
!deploy18:17
gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html18:17
← fflam left18:18
mackerman Huh. My Windows 10 box has %WINDIR%\system32\tar installed, and I don't remember where from.18:19
→ fflam joined18:19
← vicfred left18:19
→ vicfred joined18:21
mackerman Oh that's right it ships with Windows now. https://devblogs.microsoft.com/commandline/tar-and-curl-come-to-windows/18:21
→ Khisanth joined18:21
rafasc oprypin: you also affect the index with the command, but there's git switch now, so you could probably use that instead to avoid that if necessary.18:22
← chandoo left18:29
← shtrb left18:30
oprypin rafasc, wait how does that affect index, and how does `git switch` *not* affect the index?18:31
ikke because one command is hardcoded to update the index, while for the other, it's optional18:32
rafasc because checkout -- file affects both the worktree and the index. And there's no way to separate the operations.18:32
That's one of the reasons why they introduced git switch, to allow more granular operations.18:32
ikke They could've added an option to checkout to achieve that18:34
rafasc I saw a patch that was going to port switch --worktree back to checkout.18:35
← p-core left18:35
ikke But they also wanted to split the file operations of git checkout from the switching commits part18:35
→ p-core joined18:35
rafasc oprypin: I said switch, but I meant restore.18:35
it shows how in my brain the switch and restore operations are still melded together due to how checkout works :D18:37
→ arcatech joined18:38
→ chandoo joined18:39
← chandoo left18:40
→ sozuba joined18:40
← tiin57 left18:42
→ dfee joined18:45
→ tiin57 joined18:46
← irc_user left18:52
← PJBoy left18:55
← dfee left18:57
→ thomasross joined19:03
→ dfee joined19:04
← Xenguy left19:04
← theoceaniscool left19:05
→ Xenguy joined19:06
← shored left19:07
→ jstein joined19:07
→ shored joined19:08
← wagle left19:10
← stats4647 left19:10
→ wagle joined19:11
← tiin57 left19:12
→ irc_user joined19:14
→ tiin57 joined19:16
← st-gourichon-fid left19:20
→ chouhoulis joined19:23
← mirrorbird left19:25
→ clara97 joined19:31
→ wootehfoot joined19:33
→ rustyshackleford joined19:34
← DiffieHellman left19:35
→ DiffieHellman joined19:36
→ st-gourichon-fid joined19:40
← tiin57 left19:42
→ Phylock joined19:46
→ tiin57 joined19:46
← p-core left19:48
→ p-core joined19:49
→ feriman joined19:51
← wootehfoot left19:55
← snowkidimd left20:01
← tarkus left20:02
← kleisli_ left20:03
← batrick left20:04
→ mat001_ joined20:04
→ braj joined20:06
← mat001 left20:06
← AnAverageHuman left20:08
← barteks2x__ left20:11
→ barteks2x__ joined20:11
← tiin57 left20:12
← Xenguy left20:13
→ Xenguy joined20:14
→ AnAverageHuman joined20:14
← st-gourichon-fid left20:14
→ st-gourichon-fid joined20:15
→ tiin57 joined20:16
← dfee left20:16
→ Xenguy_ joined20:18
← Xenguy left20:19
← hexnewbie left20:22
→ jaziz joined20:24
← Bilge left20:28
← p-core left20:28
→ p-core joined20:28
Xenguy_ → Xenguy20:31
→ dfee joined20:32
→ mat001 joined20:36
← feriman left20:38
← mat001_ left20:39
← tiin57 left20:43
→ tiin57 joined20:46
← RandomGuy90 left20:47
→ batrick joined20:51
← batrick left20:51
→ Lucas_Gray joined20:56
→ batrick joined20:56
→ ferdna joined20:58
← nsh left20:59
← Lucas_Gray left21:06
→ crose joined21:06
→ theoceaniscool joined21:07
DNS777 → DNS21:09
→ Lucas_Gray joined21:12
← tiin57 left21:13
→ tiin57 joined21:16
← dfee left21:19
← jstein left21:23
← luke-jr left21:24
→ kdlv joined21:25
→ luke-jr joined21:25
→ dfee joined21:27
→ PJBoy joined21:28
← dfee left21:28
→ dfee joined21:31
← dfee left21:32
→ nsh joined21:34
→ emmanuelux joined21:35
→ cosimone joined21:36
← gschanuel left21:38
→ gschanuel joined21:40
← clara97 left21:40
← init left21:42
← tiin57 left21:42
← j7k6 left21:44
→ dfee joined21:44
← dfee left21:46
→ tiin57 joined21:46
→ mowcat joined21:47
← mowcat left21:53
→ j7k6 joined21:54
→ dfee joined22:02
← dfee left22:03
→ dfee joined22:07
← dfee left22:08
← leah2 left22:08
→ Kaedenn joined22:12
← tiin57 left22:12
Kaedenn I have 311 Github repositories that all have the branches "master", "seed", "dev", "qa", "prod". I'd like to remove the "master" branch and use "prod" instead. Is there a way to do this using the Github Python API?22:13
In the majority of the repos, the "master" branch is empty.22:13
It's an artifact of how the repos were created, I believe.22:13
Jookia Kaedenn: see #github22:14
Kaedenn Thank you.22:14
nedbat Kaedenn: you can definitely use the api to delete branches. You might have to change the default branch of the repo first.22:14
→ tiin57 joined22:16
← leeN left22:19
← Phylock left22:19
← rafasc left22:23
→ dfee joined22:24
→ rafasc joined22:24
← meropyri left22:25
← dfee left22:25
→ meropyri joined22:25
→ leah2 joined22:26
← sozuba left22:35
← diogenese left22:36
← matelot left22:37
← arcatech left22:38
← tiin57 left22:42
→ fstd_ joined22:42
← gast0n left22:44
← Atlenohen left22:45
→ tiin57 joined22:46
← fstd left22:47
fstd_ → fstd22:47
→ EvanCarroll joined22:52
→ gast0n joined22:53
← Betal left22:53
← theoceaniscool left22:53
→ dfee joined22:58
← BUSY left22:59
← cosimone left23:00
← dfee left23:00
← justanotheruser left23:09
← calcul0n_ left23:09
← mindCrime_ left23:10
→ mindCrime_ joined23:10
→ va5c0 joined23:11
← tiin57 left23:12
→ dfee joined23:14
← dfee left23:15
→ tiin57 joined23:16
← ferdna left23:21
← va5c0 left23:33
→ va5c0 joined23:33
→ dfee joined23:34
← dfee left23:35
→ Betal joined23:37
← buffal0 left23:42
← tiin57 left23:43
→ dedowsdi joined23:44
→ bearclaw joined23:45
→ tiin57 joined23:46
→ Case_Of_ joined23:46
← Case_Of left23:46
← va5c0 left23:47
→ va5c0 joined23:47
Case_Of_ → Case_Of23:48
← va5c0 left23:49
→ va5c0 joined23:50
→ cuppajoeman joined23:50
→ dfee joined23:50
← dfee left23:51
← lankanmon left23:52
← dedowsdi left23:52
→ justanotheruser joined23:53
← va5c0 left23:54
→ va5c0 joined23:55
← Case_Of left23:57
→ Case_Of joined23:58
← va5c0 left23:58

Logs Search ←Prev date Next date→ Channels Documentation