IRCloggy #git 2019-03-30

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.

2019-03-30

→ AfroThundr|main joined00:04
→ Bobdude joined00:04
← finalbeta1 left00:04
→ fatalhalt joined00:04
← boombatower left00:05
← Ignacy left00:06
← AfroThundr|main left00:08
rafasc pie_: git log -g --pretty=$'%h\t%gD' | grep a54f73e6b3 | cut -f100:09
→ AfroThundr|main joined00:09
rafasc you can do it with a bit of bash scripting.00:09
← renich left00:10
pie_ yeah ok i thoguth of that but it seemed a bit sketchy00:10
thanks00:10
i know technically it doesnt matter but damn i have a commit i cant figure out how to GC again00:11
as far as i can tell its not in the reflog, its just a merge00:11
← nevodka left00:12
← AfroThundr|main left00:13
pie_ ok its in the reflog FILE but not in the reflog --all output00:13
→ AfroThundr|main joined00:13
← hg_hel left00:16
← n3wborn left00:19
pie_ reflog is just weird00:23
← hussam left00:25
→ sozuba joined00:25
→ mat001 joined00:25
pie_ rafasc, ok i think those hashes are commits but dont actually uniquely identify the reflog entry00:25
unless you formatted that specifically to deal with my thing and now im looking at something that needs the other hash field00:26
→ hg_hel joined00:28
← mat001 left00:30
← duderonomy left00:31
← Sasazuka left00:37
← eblip left00:39
Squarism pie_, thanks man00:40
rafasc pie_: the hashes are the commits yes. Being pointed by reflog entries.00:41
→ eblip joined00:41
→ def_jam joined00:41
← kyan left00:42
← eb0t left00:42
← Dirak left00:43
rafasc pie_: git log -g --pretty=$'%h\t%gD' --all00:43
← sozuba left00:44
→ mikecmpbll joined00:47
→ sozuba joined00:58
← sgen left00:59
← de-facto left01:01
→ de-facto joined01:01
← tarkus left01:03
→ kerframil joined01:05
→ Dirak joined01:13
← xcm left01:15
→ xcm joined01:15
← sozuba left01:19
→ zalt_ joined01:20
← igemnace left01:20
← zalt left01:23
zalt_ → zalt01:23
← mikecmpbll left01:23
← lankanmon left01:29
← m0viefreak left01:30
→ horia_g1 joined01:40
→ sgen joined01:42
← hg_hel left01:42
← nic-hartley left01:43
→ nic-hartley joined01:45
← nic-hartley left01:45
→ nic-hartley joined01:46
← Achylles left01:47
← horia_g1 left01:52
→ dre_ joined02:06
→ ricekrispie joined02:07
→ mat001 joined02:11
← hofmann3900 left02:15
→ bambanx joined02:16
← sgen left02:16
← pie_ left02:17
→ finalbeta joined02:22
→ nagyf joined02:25
← hugh-adolph left02:27
← rosco_y left02:29
← mat001 left02:29
← nagyf left02:30
← Regon left02:33
← kreyren left02:37
← F0rTex left02:37
← AtumT left02:38
→ F0rTex joined02:39
→ kreyren joined02:41
← freeman42x left02:41
← Dirak left02:42
← topdownjimmy left02:43
→ topdownjimmy joined02:44
← kreyren left02:56
→ duderonomy joined03:03
timezonebug After sleeping on it I actually know what was going on and it's a silly thing.03:04
It's not a timezone bug. It's the fact Git can be used offline, and it depends on the local time being set correctly.03:04
So it is possible to make commits against time that is hours ahead of what it should be, and then commit it to a server that has a correct time.03:05
← Essadon left03:06
← agg left03:14
→ nagyf joined03:19
→ kreyren joined03:20
→ pd09041999 joined03:23
← lagothrix left03:24
→ lagothrix joined03:24
← nagyf left03:24
→ Goplat joined03:33
← ave_milia left03:34
← hellauer left03:35
← kermit left03:36
← Tohtekcop left03:37
← kjartan left03:37
→ kjartan joined03:42
→ djapo joined03:48
← joaj left03:48
djapo i accidently merged a branch into master .. still haven't pushed to origin ..03:48
how can i make my local master point to the origin master?03:48
git reset --hard origin/master ?03:49
← kreyren left03:50
→ kreyren joined03:51
→ qu4ku joined03:51
djapo git co -B master origin/master03:54
did it wooo03:54
→ ricekrispie2 joined03:55
← xcm left03:56
→ xcm joined03:56
← ricekrispie left03:57
→ lankanmon joined03:59
→ bmintz joined03:59
→ griddle joined04:00
← Copenhagen_Bram left04:00
← diogenese left04:02
→ diogenese joined04:02
→ Copenhagen_Bram joined04:03
→ mat001 joined04:05
← mat001 left04:09
→ Tohtekcop joined04:11
→ nagyf joined04:13
← navidr left04:14
← Tohtekcop left04:16
bmintz https://0x0.st/zPKO.py i encountered this while resolving some merge conflicts. Please help me understand, how is this a merge conflict? It seems to just *add* lines, but if I'm reading it it right, i didn't modify those same lines?04:16
← nagyf left04:17
← orbyt_ left04:18
→ Tohtekcop joined04:19
← qu4ku left04:20
← bambanx left04:21
← fassl left04:27
→ rsrx joined04:31
rsrx let's say I work on `saturday-bugfix` branch with one urgent bugfix04:34
and then I want to create new branch to work on new features04:34
how do I do this properly, so that later both branches can get merged to master successfully?04:35
← anna-g left04:35
rsrx should I just git checkout -b feature-branch ?04:40
off the current bugfix branch?04:40
bmintz rsrx: if you create a feature branch off of the bugfix branch, then merging the feature branch will also merge the commits from the bugfix branch04:41
if that's not what you want, just check out the feature branch off of master, and don't make conflicting commits :P04:42
rsrx i want bugfix to be active in my new branch04:42
what happens if bugfix branch gets merged first?04:42
and then we try to merge feature branch04:42
(that I branched off bugfix branch)04:43
bmintz that'll work04:44
rsrx thank04:44
← skered left04:44
rsrx thanks04:44
→ sauvin_ joined04:45
← sauvin left04:45
← sauvin_ left04:45
→ sauvin joined04:46
← nurdie_ left04:48
→ kapil____ joined04:49
→ skered joined04:57
→ pks_ joined05:02
bmintz turns out the answer to my question was that i deleted those lines05:03
← bmintz left05:03
← pks left05:04
pks_ → pks05:04
→ olegafonin_ joined05:05
← dpyro left05:05
← fatalhalt left05:05
olegafonin_ hi everyone05:05
gitinfo olegafonin_: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.05:05
→ nagyf joined05:07
← ZachGibbens left05:08
olegafonin_ i had one problem when i used git05:10
maybe is feature?05:10
i use git for windows 2.2105:10
when i launch c:\program files\git\git-bash.exe05:11
git init /c/test05:11
git flow init05:12
← nagyf left05:12
olegafonin_ all as default05:12
git flow hotfix start ht105:12
change some files05:12
git commit -a -m 'tttt'05:12
git flow hotfix finish ht105:13
git shows vim for me three times for two commits and one tags05:13
but if i launch c:\program files\git\bin\bash.exe and do the same git shows me vim only one time for tags05:14
→ Raging_Hog joined05:16
olegafonin_ this file - c:\program files\git\bin\bash.exe - use phpstorm for example05:16
← inkbottle left05:17
olegafonin_ and i get incorrect behavior in phpstorm05:17
← GreenJello left05:20
← sauvin left05:22
→ sauvin joined05:23
→ InvisibleUp joined05:24
← timezonebug left05:26
→ mat001 joined05:33
→ hussam joined05:36
→ RoriconKnight joined05:41
→ Mattiaslndstrm joined05:43
→ inkbottle joined05:45
← mowcat left05:45
→ Dirak joined05:46
← cbreak left05:46
→ cbreak joined05:47
→ SkarmoutsosV joined05:51
← rsrx left06:01
→ nagyf joined06:01
← nagyf left06:06
→ dviola joined06:13
← Tohtekcop left06:14
→ Envil joined06:15
← Envil left06:18
→ Envil joined06:21
← inkbottle left06:27
→ horia_g1 joined06:31
→ nowhere_man joined06:35
→ rsrx joined06:37
→ thiago joined06:37
→ nagyf joined06:40
← nagyf left06:45
→ Lucas_Gray joined06:45
← Lucas_Gray left06:47
← djapo left06:47
← Goplat left06:47
← stux|RC-only left07:01
← xcm left07:09
← irqq left07:10
→ xcm joined07:10
← SkarmoutsosV left07:12
← nic-hartley left07:19
← dx_ob left07:26
→ Lucas_Gray joined07:27
← horia_g1 left07:31
→ nagyf joined07:34
→ YuGiOhJCJ joined07:35
← thiago left07:38
← nagyf left07:39
→ supernov1h joined07:44
→ cybrNaut joined07:53
→ pd_09041999 joined07:57
← pd09041999 left07:58
← Lucas_Gray left08:01
→ horia_g1 joined08:02
← kreyren left08:04
← olegafonin_ left08:05
→ kreyren__ joined08:07
← kreyren__ left08:07
→ kreyren__ joined08:08
← duderonomy left08:09
← dviola left08:10
← yonder left08:10
← kreyren__ left08:10
→ kreyren__ joined08:11
← hussam left08:13
→ Tohtekcop joined08:15
← Tohtekcop left08:19
→ irqq joined08:20
→ renich joined08:24
← nowhere_man left08:26
→ nagyf joined08:28
← kapil____ left08:29
← nagyf left08:32
← kreyren__ left08:34
← zalt left08:37
→ zalt joined08:37
← pd_09041999 left08:40
← dre_ left08:40
← irqq left08:41
→ nagyf joined08:46
→ stitched_unicorn joined08:49
← stitched_unicorn left08:55
→ pd_09041999 joined08:56
← pd_09041999 left08:57
→ hungrywolf joined08:58
hungrywolf I've just mistakenly added another repository's remote as my remote and it said fatal: refusing to merge unrelated histories08:59
then I changed it to the right repo and then hit git pull08:59
but it still says the same thign08:59
→ stitched_unicorn joined08:59
← xcm left08:59
→ n3wborn joined09:00
→ xcm joined09:00
→ dhollin3 joined09:01
← dhollinger left09:01
← rafasc left09:03
→ plexigras joined09:04
→ kreyren joined09:04
→ nowhere_man joined09:05
← stitched_unicorn left09:06
← friendofafriend left09:06
← crem left09:12
← renich left09:13
hungrywolf is there anyway that I can recover from this09:13
→ blackmesa joined09:16
hungrywolf pardon me everyone, it was my mistake, I was trying to pull from a different remote even the second time too09:17
fixed it09:17
← hungrywolf left09:17
→ Regon joined09:18
← catsup left09:18
→ catsup joined09:19
← catsup left09:19
→ catsup joined09:19
← shabius left09:24
← tombusby left09:31
→ tombusby joined09:32
← rsrx left09:33
→ hellauer joined09:42
→ stux|RC-only joined09:44
← zalt left09:48
→ pd09041999 joined09:53
→ mikecmpbll joined09:54
← kreyren left09:56
← stux|RC-only left09:56
← horia_g1 left09:57
→ horia_g1 joined09:58
→ tarkus joined09:59
← lankanmon left10:01
← horia_g1 left10:01
→ hg_hel joined10:01
← Mattiaslndstrm left10:02
← pd09041999 left10:04
← nowhere_man left10:05
→ kreyren joined10:06
→ nowhere_man joined10:06
← hellauer left10:09
→ hellauer joined10:11
→ Mattiaslndstrm joined10:11
→ gloomy joined10:12
→ Fernando-Basso joined10:13
← nowhere_man left10:15
← Raging_Hog left10:15
← supernov1h left10:16
→ supernov1h joined10:16
→ pd09041999 joined10:18
→ crst joined10:21
→ wateriswet joined10:21
← pd09041999 left10:22
→ pd09041999 joined10:23
crst Hi, I have a playground branch with several commits and I'd like to create a new branch from master with all changes of playground on top of it but without any commits. All files need to be red.10:24
← cbreak left10:24
→ cbreak joined10:25
← tarkus left10:25
crst * All changes files need to be red10:25
→ shabius joined10:30
→ OtakuSenpai joined10:31
→ hoijui joined10:31
hoijui I would like to do a performance comparison of the git workflow with and without a certain git clean/smudge filter10:32
I have a sample repo with enough commits10:33
does anyone know of some framework/code to test this?10:33
I could write it myself, but would rather use something already existing10:35
→ mase-tech joined10:36
→ theoceaniscool joined10:39
→ zalt joined10:41
→ stux|RC-only joined10:42
← Dirak left10:42
def_jam → eb0t10:46
→ m0viefreak joined10:46
→ zulutango joined10:49
→ Dirak joined10:50
← zulutango left10:50
← Inline left10:51
← Mattiaslndstrm left10:51
→ zulutango joined10:51
← finalbeta left10:53
→ finalbeta joined10:53
→ Inline joined10:54
← zulutango left10:54
→ zulutango joined10:55
→ threenuc joined11:02
← Bobdude left11:03
→ iskander joined11:04
← warthog9 left11:06
→ warthog9 joined11:07
→ lankanmon joined11:07
← xcm left11:08
→ xcm joined11:09
← Envil left11:11
← gloomy left11:12
→ Envil joined11:12
← wateriswet left11:13
→ venmx joined11:15
← diogenese left11:16
← AfroThundr|main left11:16
← gordonfish left11:16
← ndim left11:16
← thomasross left11:16
← b7219264 left11:16
← brethil left11:16
← johnny56 left11:16
← R2robot left11:16
← RichiH left11:16
← oojacoboo left11:16
← haasn left11:16
← v0lksman left11:16
← lembron left11:16
← Peng_ left11:16
← dbe left11:16
← forrestv left11:16
← VladGh left11:16
← brezanac left11:16
← Ram-Z left11:16
← hvxgr left11:16
← cfjk left11:16
← j416 left11:16
← supernovah left11:16
← Mo left11:16
← j7k6 left11:16
← wgrant left11:16
← polyrob left11:16
← GeraldW left11:16
← Davey left11:16
← thevisitor_ left11:16
← zrhoffman_ left11:16
← yourfate left11:16
← segnior_ left11:16
← sunrunner20 left11:16
← akdev left11:16
← rmaw left11:16
← apragmatist_ left11:16
← FabTG left11:16
← evil-god left11:16
← APic left11:16
← Derega left11:16
← Jonno_FTW left11:16
← arand left11:16
← sud0 left11:16
← ashnur left11:16
← murr4y left11:16
← dsnow left11:16
← bcc left11:16
← amygara left11:16
← Kuukunen left11:16
← bmoriarty left11:16
← iokill left11:16
→ hvxgr joined11:16
→ evil-god joined11:16
→ segnior joined11:16
→ Peng_ joined11:16
→ sud0 joined11:17
→ j7k6 joined11:17
→ j416 joined11:17
→ murr4y joined11:17
→ thomasross joined11:17
→ wgrant joined11:17
→ sunrunner20 joined11:17
→ Ram-Z joined11:17
→ brethil joined11:17
→ yourfate joined11:17
→ Mo joined11:18
→ zrhoffman joined11:18
→ brezanac joined11:18
→ diogenese joined11:18
→ polyrob joined11:18
→ forrestv joined11:18
← artgoeshere left11:19
→ thevisitor joined11:19
→ AfroThundr|main joined11:19
← hexagoxel left11:19
→ ashnur joined11:19
→ apragmatist joined11:19
→ haasn joined11:19
← volestorm left11:19
→ oojacoboo joined11:19
→ amygara joined11:19
← serialoverflow left11:19
← haritz left11:19
← d^sh left11:20
→ akdev joined11:20
→ ndim joined11:20
→ rogerroger2019 joined11:20
→ hexagoxel joined11:21
→ VladGh joined11:21
→ d^sh joined11:21
→ FabTG joined11:22
→ Achylles joined11:22
→ APic joined11:22
→ dsnow joined11:22
→ haritz joined11:22
→ Davey joined11:22
→ artgoeshere joined11:23
→ GeraldW joined11:23
→ serialoverflow joined11:23
← Copenhagen_Bram left11:23
← iNs left11:23
→ Jonno_FTW joined11:24
→ iNs joined11:24
← nagyf left11:25
→ Copenhagen_Bram joined11:25
→ gloomy joined11:26
← cd left11:27
→ Butterfly^ joined11:29
OtakuSenpai → Neel11:31
→ shabius_ joined11:32
← shabius left11:35
→ kapil____ joined11:42
→ yyy joined11:46
← zulutango left11:48
← kerframil left11:49
← stux|RC-only left11:51
→ nagyf joined11:54
← xcm left11:58
→ xcm joined11:59
← n3wborn left11:59
← Dirak left12:02
← Butterfly^ left12:03
→ ph88 joined12:03
ph88 how can i find the last commit in which a file was deleted ?12:04
i tried this but i just get a blank history https://stackoverflow.com/questions/6839398/find-when-a-file-was-deleted-in-git12:04
in the root of the project i typed git log --full-history -- frameworks/Haskell/wai/bench/stack.yaml12:04
project/commit: https://github.com/TechEmpower/FrameworkBenchmarks/pull/3149/files12:05
oh i already found it through some other commit message :/12:06
← shabius_ left12:06
→ greatgatsby joined12:07
→ shabius joined12:08
→ saidi joined12:13
→ serdar joined12:13
← mase-tech left12:16
← serdar left12:41
← yyy left12:42
← hoijui left12:45
→ R2robot joined12:49
→ altgray joined12:51
← ph88 left12:53
→ ph88 joined12:53
→ serdar joined12:55
← venmx left12:58
→ GreenJello joined13:00
← serdar left13:01
← threenuc left13:03
← kjartan left13:03
→ stux|RC-only joined13:03
→ Noti joined13:04
← supernov1h left13:05
→ venmx joined13:06
→ kjartan joined13:08
→ ZachGibbens joined13:08
→ hussam joined13:09
→ supernov1h joined13:10
→ howell joined13:12
→ Essadon joined13:12
← xcm left13:16
→ xcm joined13:16
← Noti left13:21
→ def_jam joined13:37
→ eb0t_ joined13:38
← eblip left13:38
← eb0t left13:38
← altgray left13:41
→ altgray joined13:42
→ olegafonin_ joined13:46
← rogerroger2019 left13:47
← olegafonin_ left13:47
→ fassl joined13:54
← YuGiOhJCJ left13:55
→ igemnace joined14:00
← Xeago left14:00
→ Xeago joined14:01
→ Lucas_Gray joined14:02
→ ferdna joined14:05
→ eb0t joined14:05
← eb0t_ left14:06
← def_jam left14:07
→ eblip joined14:07
→ Mattiaslndstrm joined14:11
→ Mike111 joined14:24
← Lucas_Gray left14:24
→ ave_milia joined14:24
→ hofmann3900 joined14:26
→ egovirus joined14:31
→ stitched_unicorn joined14:34
→ j9__ joined14:37
← pd09041999 left14:38
→ yyy joined14:38
← nuc left14:38
→ kneeki joined14:39
→ nuc joined14:40
← stitched_unicorn left14:40
→ inkbottle joined14:43
→ ZoeB joined14:44
→ thiago joined14:48
ZoeB Hi! I'm trying a git rebase, and it's not working like it usually does, so I think I'm doing something wrong...14:50
First, I'm using git merge-base to work out which commit the current branch was branched from; then I find the next commit along in the main branch, by checking the log; then git rebase onto that.14:51
I get a conflict and resolve it. Then I add and commit. Then I end up detached from the branch. I try git rebase --continue, but it says there's no rebase in progress.14:51
I'm sure I'm missing something fairly obvious, but I can't work out what. Any ideas?14:51
→ kp__ joined14:52
→ Tohtekcop joined14:53
← Fernando-Basso left14:53
→ irqq joined14:53
← irqq left14:54
→ irqq joined14:55
→ pd09041999 joined14:58
← sandlotasn left14:59
← xcm left15:00
→ xcm joined15:00
← gloomy left15:07
← chachasmooth_ left15:08
→ Phylock joined15:08
→ chachasmooth joined15:08
→ gloomy joined15:08
← gloomy left15:09
← greatgatsby left15:13
← Tohtekcop left15:20
← jelmer left15:21
→ jelmer joined15:22
← blackmesa left15:23
← howell left15:23
→ threenuc joined15:25
← VladGh left15:25
→ VladGh joined15:25
→ relipse2 joined15:27
← kp__ left15:29
← Khisanth left15:29
→ Jitta joined15:33
← theoceaniscool left15:34
→ dpyro joined15:41
→ Khisanth joined15:42
← threenuc left15:45
→ nowhere_man joined15:45
← yyy left15:50
← de-facto left15:53
→ de-facto joined16:01
→ kermit joined16:05
→ zalt_ joined16:06
← zalt left16:09
→ sgen joined16:14
← j9__ left16:15
→ blackmesa joined16:22
→ wateriswet joined16:23
→ sanchexm joined16:24
← Zohnuqu3pah5iej- left16:27
← pd09041999 left16:28
→ pd09041999 joined16:29
→ mase-tech joined16:30
← Revan- left16:31
← kapil____ left16:32
→ Zohnuqu3pah5iejo joined16:33
→ Revan- joined16:34
→ Fernando-Basso joined16:43
→ duderonomy joined16:44
← blackmesa left16:46
→ blackmesa joined16:46
← Fernando-Basso left16:47
→ Fernando-Basso joined16:48
← inkbottle left16:51
→ Goplat joined16:52
← relipse2 left16:54
← wateriswet left16:56
← blackmesa left16:57
← pd09041999 left16:57
→ djapo joined16:58
← xcm left17:04
→ xcm joined17:05
→ sanxm joined17:08
→ pd09041999 joined17:10
→ wootehfoot joined17:10
j416 ZoeB: check what errors our other output you got.17:13
you probably missed something.17:13
← Anthaas left17:15
→ Anthaas joined17:16
← djapo left17:17
→ Lucas_Gray joined17:18
← xcm left17:19
→ orbyt_ joined17:20
← Mike111 left17:20
→ xcm joined17:20
→ Tohtekcop joined17:25
← sanxm left17:26
→ sanxm joined17:27
← sanxm left17:29
← Tohtekcop left17:30
→ kmal joined17:31
← Goplat left17:34
→ pini joined17:36
pini Hi17:37
gitinfo pini: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.17:37
pini I've a question about 'git archive --remote=...', when remote is a bare repo with a info/attributes file containing '* export-subst'17:38
I can't find a way to prevent placeholders substitution when using 'git archive --remote=...' on such a repo17:39
→ v01d4lph4 joined17:39
← RoriconKnight left17:39
pini I've tried adding .gitattributes files setting '<randon-file> -export-subst', with no success at all17:40
is there a way to prevent placeholders subsitution for this use case?17:40
← orbyt_ left17:41
→ plongshot joined17:42
→ lucasb joined17:43
← de-facto left17:46
← venmx left17:46
→ de-facto joined17:46
← waveclaw left17:48
→ djapo joined17:50
→ Wryhder joined17:50
← Lucas_Gray left17:51
Wryhder → Lucas_Gray17:51
→ BPL joined17:51
BPL Hi guys, what are the conditions to be able to assign tickets in a github project?17:52
← kneeki left17:52
BPL asking cos I'm trying to figure out but no clue... i only see my name when i try to do so, ie: https://github.com/brupelo/pyblime/issues/23#issuecomment-47826991017:52
is it need the people you want to assign to become a "collaborator" (people that has push permissions)17:53
bremner !github17:53
gitinfo GitHub is a !3rdparty commercial service offering freemium !hosting services for repositories & projects. https://github.com/features17:53
bremner so helpful.17:53
anyway, there is also #github17:53
BPL bremner: sure, i'd already asked at #github... but i thought here there would be people familiar with it :P17:54
→ blackmesa joined17:54
bremner not I.17:54
BPL ok, it seems it was needed to become a collaborator, solved :P17:57
→ kyan joined18:00
→ AtumT joined18:03
← djapo left18:04
→ SkarmoutsosV joined18:04
→ clime joined18:05
← kyan left18:06
→ impermanence joined18:07
impermanence I have a very simple patch that is failing and I've no idea why; it is extremely short18:07
← wootehfoot left18:07
← plongshot left18:07
← Achylles left18:08
← xcm left18:08
→ xcm joined18:09
→ orbyt_ joined18:10
← orbyt_ left18:11
← egovirus left18:11
→ mowcat joined18:11
→ gordonfish joined18:12
→ yyy joined18:12
→ rafasc joined18:12
← altgray left18:13
→ orbyt_ joined18:13
← kmal left18:15
→ altgray joined18:17
→ yonder joined18:22
→ orcainbox joined18:22
→ serdar joined18:29
← serdar left18:29
→ Ignacy joined18:29
→ Achylles joined18:33
← Fernando-Basso left18:35
→ nic-hartley joined18:36
← InvisibleUp left18:36
→ cfoch joined18:38
← skered left18:38
← v01d4lph4 left18:45
→ v01d4lph4 joined18:46
→ skered joined18:47
← zalt_ left18:49
← v01d4lph4 left18:50
→ sbeyer joined18:54
→ cdown joined18:58
← griddle left18:58
← altgray left19:02
→ relipse2 joined19:03
→ Dirak joined19:04
← Lucas_Gray left19:08
← traumschule left19:09
→ traumschule joined19:13
→ Phoebus joined19:13
→ dege joined19:14
→ gareppa joined19:17
← pd09041999 left19:19
→ j9_ joined19:20
→ v01d4lph4 joined19:21
j9_ is there an easy way to transfer files from the remote to the master and vice versa?19:25
rafasc j9_: what do you mean?19:26
→ tanuki_ joined19:27
tanuki_ Is it still a bad idea to put git repositories on NTFS partitions?19:27
→ tm007 joined19:27
j9_ rafacs I think I answered my own question - fetch/push19:27
thanks for the response19:27
ZoeB Pull and push, if you also want to merge in the changes19:27
Fetch if you want the files but don't want to actually merge the commits in yet19:28
j9_ zoeB thanks also19:28
clime is there a way to find out if all anotated tags has been pushed to remote without ls-remote?19:28
j9_ gotcha thanks19:28
rafasc tanuki_: are you confusing NTFS with NFS?19:28
clime *have been19:28
tanuki_ rafasc: Nope19:28
clime ...in similar fashion as for commits when i can check if commit has been pushed by checking its presence in remote branch19:30
rafasc You may have issues with permissions, depending how you set it up, but afaik the problematic filesystems are the network based ones.19:30
clime: is this for scripting or just for visual information?19:32
clime rafasc: for scripting19:32
tanuki_ How about FAT32/VFAT/wev?19:32
← v01d4lph4 left19:32
rafasc tanuki_: are you setting up something like a portable repository in a pen drive or similar?19:33
tanuki_ → tanuki19:36
tanuki rafasc: Yeah, basically19:36
rafasc tanuki: git bundle; is great for that.19:37
especially if you don't want to carry the entire history with you.19:38
→ sanxm joined19:39
rafasc clime: is there a way to find out if all anotated tags has been pushed to remote without ls-remote? Without prior setup, No.19:40
clime rafasc: what do you mean by prior setup?19:40
rafasc when git fetches tags, it fetches them all in a shared namespace: refs/tags/*19:40
← gareppa left19:41
rafasc So once you fetch them, you lose the information from where they came.19:41
you can set up your own fetch refspec to fetch tags elsewhere, like refs/tags/*:refs/remotes/remotename/tags/*19:42
clime would git work well with those tags that are fetched somewhere else?19:43
rafasc but if you do that, git doesn't treat those tags differently. e.g. They will not be pushed if you use push --tags. Because for git tags are references in refs/tags19:43
← thiago left19:43
clime so e.g. git for-each-ref wouldn't list them?19:44
rafasc for-each-ref would, because they're still refs.19:45
→ gareppa joined19:45
rafasc e.g. $git for-each-ref refs/remotes/remotename/tags19:46
clime ye what about just git for-each-ref?19:46
→ freeman42x joined19:46
clime also i guess19:46
rafasc it would show them as refs/remotes/remotename/tags/tagname19:46
clime anyway, you said "git doesn't treat them differently". Did you mean "git does treat them differently"?19:47
← SuperLag left19:47
clime i.e. could there be some problems that they are stored on non-standard location?19:48
→ SuperLag joined19:48
clime also i don't see an option to change the refspec just for tags19:49
rafasc what I meant with that, is that some commands tat operate on tags will not operate on tags stored there.19:49
clime ok, cool19:49
← watabou left19:50
rafasc clime: https://public-inbox.org/git/20190228081103.GA22075@dektop/19:50
clime rafasc: i don't really get why they are overwriting the fetch refspec expression normally used for branches19:53
← SuperLag left19:53
← ph88 left19:53
rafasc clime: fetchspec are not for branches, they are for refs in general.19:54
clime sure, but that would mean branches are not fetched then right?19:54
rafasc you can have multiple ones.19:54
clime ok19:54
rafasc you can keep the ones for branches, and add those two lines of configuration.19:54
clime cool19:55
rafasc clime: if you really want to mimic how git handle tags, be sure you do not use the +prefix.19:55
because that makes git overwrite tags, and by default git doesn't overwrite tags.19:56
clime ok19:57
ye, i guess i'll go the ls-remote way for this as i need something that works when you just do git clone19:57
← pini left19:58
← impermanence left19:58
clime it would be nice if it worked so that i don't need network...19:58
rafasc what are you doing?19:58
clime rafasc: checking that i don't have unpushed tags19:58
rafasc: it's an optional check into the program i am working on19:59
rafasc git push origin --tags --dry-run; but not ideal for parsing.20:00
← Dirak left20:01
rafasc but would be ok if you are just showing that information to the user.20:01
ZoeB Thanks j416, I'll keep looking!20:01
← ZoeB left20:01
clime rafasc: an that doesn't need network oO?20:01
← ilmostro left20:02
rafasc no, it does need network. You need to know what's in the remote to know which ones are not there.20:02
clime rafasc: ye, i was looking for something that doesn't need network20:03
rafasc not possible.20:03
clime cause if i want to check if a commit has been pushed, it's possible then20:03
git branch -r <hash>20:03
sry git branch -r --contains <hash>20:04
rafasc that compares against refs/remotes/remotename/branch, so if you want to mimic that, you'll need that fetch spec.20:04
→ SuperLag joined20:05
← gareppa left20:05
clime rafasc: you mean the one for tags?20:05
rafasc otherwise it is not possible without contacting the server one way or the other.20:05
Some people have requested that git stored tags similar how it stores remote tracking branches. But as of right now, it just dumps all tags inside refs/tags.20:06
So if you clone and make a tag, your tag also goes in the refs/tags bucket. And there's no way to determine which ones the remote doesn't have without contacting it.20:08
clime rafasc: okay!20:08
rafasc It's even somewhat true for branches as well.20:08
clime rafasc: thanks a lot20:08
rafasc you can have state branches showing on -r. If they get removed from the remote.20:08
see what $git remote prune; does.20:09
or fetch --prune.20:09
clime ye, but i just basically need to know if a user called git push or not20:10
rafasc that's now enough.20:11
I can make a tag, user A can fetch my tag and push it to the repo. So when I push, my tag is already there.20:12
not*20:12
clime sry, let's just talk about branches20:13
it's probably the same thing20:13
the problem for me is that you can't find out if the commit is in remote by ls-remote unless it's tip of a branch20:15
→ altgray joined20:15
clime and i guess i just need a simple check that a user hasn't forgotten to push before doing something else like reporting that a bug has been fixed by that commit.20:16
→ ilmostro joined20:17
rafasc In that case I think it would be more reliable to do the check server side.20:17
similar how github can close issues if you include Fixes #123 in the commit message.20:18
clime right, but this is a client tool that im doing.20:18
so i can't just go server-side20:18
well, i can but i would like if that worked "client-side" as well20:19
rafasc doing that is complicated because git is distributed. Even if you parse ls-remote, and do some things based on that information.20:20
There's no guarantee that information will be still valid when you act on it.20:21
clime rafasc: well it should unless people are doing forced pushes20:22
ok, you could probably also delete a branch on remote that contains some changes that i act upon20:24
← j9_ left20:24
clime but that would be a problem even if i did the "bug-closing" server-side20:25
rafasc if you control the server, you could enable something like uploadpack.allowReachableSHA1InWant... and do something with it, not sure what.20:25
clime hmm, that's interestign20:25
rafasc be sure to read the security concerns.20:26
clime ok20:26
rafasc clime: so lets, backtrack. What exactly your client-side tool wants to do?20:26
It wants to prevent an action until some other action is taken elsewhere.20:27
clime rafasc: well, not elsewhere20:28
rafasc where then?20:28
clime it wants to prevent action until you do git push --tags and have tags and commits synced with remote20:28
rafasc what action?20:28
clime like reporting that you fixed a bug into bugzilla20:29
rafasc so, elsewhere?20:29
clime or sending automatic email about it20:29
it should prevent an action until you do "git push --tags"20:30
rafasc but why? I can have my own tags, that I don't intend to submit.20:30
clime it should be just a simple check that you didn't forget to push your changes20:30
rafasc but that doesn't prevent that. I am super confused.20:31
clime rafasc: prevent what? for your changes to occurr on remote by somebody else fetching them and pushing?20:32
i understand that you have some local annotated tags that are not present in remote20:32
i mean i understand that could be a problem20:33
and that you don't want to push20:33
i think it should be pretty rare scenario that you create annotated tags that you don't want to ever push, idk20:33
→ esotericnonsense joined20:34
rafasc I do it, to mark interesting commits with comments.20:34
for example, in git development, many people tag the commit they generated the patch they submitted to the mailing list.20:35
clime rafasc: why not using git notes?20:35
rafasc Some people share those tags, others do not.20:35
→ gloomy joined20:35
rafasc clime: tags are simpler to manage, but good observation20:36
→ zalt joined20:37
clime the tool i am making basically assumes that created an annotated tag means making a new release20:37
*creating20:37
probably it won't work for everyone20:38
rafasc for the comment part, notes can be handy, (especially because you can set it up to be rewritten on rebases). But for the git development part, it's nice to keep those old commits referenced so that you have a direct reference to them.20:39
but alas, I am derailing..20:40
← shabius left20:44
clime rafasc: thank you for the comments20:45
→ shabius joined20:46
rafasc clime: grep -Fxvf <(git ls-remote --tags) <(git for-each-ref refs/tags --format=$'%(objectname)\t%(refname)')20:49
→ Biopandemic joined20:49
rafasc but needs network. The only way around that, is changing ls-remote with another for-each-ref, with tags fetched there as reference.20:50
clime rafasc: ok, tx20:51
rafasc maybe ask again when other people is active.. I may be missing an obvious solution20:52
← orbyt_ left20:53
← ferdna left20:53
→ fstd_ joined20:55
← fstd_ left20:57
→ fstd_ joined20:57
← fstd left20:59
fstd_ → fstd20:59
→ quebec-hartley joined21:03
← lucasb left21:03
→ gloomy_ joined21:03
→ n3wborn joined21:03
→ watabou joined21:04
→ plongshot joined21:04
← gloomy left21:06
→ venmx joined21:06
← relipse2 left21:07
← Ignacy left21:07
← nic-hartley left21:07
→ theoceaniscool joined21:09
← quebec-hartley left21:10
← sanchexm left21:19
← gloomy_ left21:25
→ djapo joined21:27
← sleepingforest left21:27
← sharkboy left21:28
→ v01d4lph4 joined21:29
← SkarmoutsosV left21:30
→ inkbottle joined21:31
← crst left21:32
← shicks_ left21:36
→ shicks_ joined21:37
← diogenese left21:39
← plongshot left21:39
← de-facto left21:41
→ sleepingforest joined21:44
→ impermanence94 joined21:45
GeneralDiscourse → ephemer0l21:45
← ChrisLane left21:45
→ ChrisLane joined21:46
cybrNaut notabug.org does not seem to have a "keep my email address private" feature. So apparently the email address in my profile will be exposed on commits that i do. Question is, can the .git/config "[user] email = " be something like "Unusable Address [email@hidden.address] ?21:49
← altgray left21:49
cybrNaut or must it be a raw email address?21:49
→ de-facto joined21:50
BtbN user.name and user.email are separate21:51
And it's very good practice to have a working E-Mail address in there.21:52
→ ztychr joined21:55
cybrNaut github's privacy feature generates an addres like [email@hidden.address] and that address forwards to my (undisclosed) profile address (I think - not entirely sure). Notabug is missing that feature21:55
but the "noreply" probably discourages users from using that address21:55
← topdownjimmy left21:56
→ topdownjimmy joined21:57
→ tarkus joined22:01
→ diogenese joined22:03
cybrNaut i'm thinking the email is only useful for collaborators, and only if a collaborator does not have a notabug.org account. If it's a one-person project, i don't suppose it matters22:04
rafasc cybrNaut: you can use user.name and user.email with fake info.. git itself does no verification.22:04
→ cd joined22:04
rafasc besides that email needs to be something like [email@hidden.address]22:04
cybrNaut ok, thanks22:06
← Envil left22:07
dhollin3 → dhollinger22:07
← ztychr left22:09
← cdown left22:11
→ ztychr joined22:11
→ cdown_ joined22:11
→ cgi joined22:11
cdown_ → cdown22:11
cgi what is a good tool to extract statistics for various repos and see them in a website/localhost? I tried hercules but it seems pretty slow.22:12
← ztychr left22:12
→ ztychr joined22:14
→ Goplat joined22:14
← ztychr left22:16
→ ztychr joined22:17
← impermanence94 left22:17
j416 git-quick-stats is quite nice22:19
← v01d4lph4 left22:24
→ orbyt_ joined22:24
j416 (but I never use it; git shortstat is enough for me most of the time)22:24
and by that I mean git shortlog22:25
← nagyf left22:27
→ khisanth_ joined22:29
→ jubal joined22:30
→ hqdruxn08_ joined22:30
← Khisanth left22:30
← Jitta left22:33
← Biopandemic left22:33
← dege left22:36
← yyy left22:40
→ blackmesa1 joined22:40
← blackmesa left22:41
← khisanth_ left22:42
→ khisanth_ joined22:43
→ relipse2 joined22:48
← blackmesa1 left22:51
← shicks_ left22:52
→ shicks_ joined22:53
→ fatalhalt joined22:55
→ pd09041999 joined23:00
← oojacoboo left23:02
← plexigras left23:05
← theoceaniscool left23:11
← Achylles left23:14
← cfoch left23:17
← n3wborn left23:19
← ztychr left23:22
← machinehum left23:23
→ Achylles joined23:24
← relipse2 left23:26
← mooasaurus left23:28
→ mooasaurus joined23:28
→ yyy joined23:31
← sbeyer left23:33
→ ferdna joined23:38
→ greatgatsby joined23:38
← saidi left23:47
→ violentE joined23:47
→ libertyprime joined23:47
← greatgatsby left23:47
← hussam left23:48
← mase-tech left23:49
← BPL left23:58

Logs Search ←Prev date Next date→ Channels Documentation