IRCloggy #git 2018-01-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.

2018-01-19

← igemnace left00:00
→ igemnace joined00:01
← barduck left00:02
← NightStrike left00:03
← sanscoeur left00:03
→ yohnnyjoe joined00:03
← sanscoeu_ left00:04
← finalbeta left00:04
← db8093246 left00:05
← Masterphi left00:05
→ zumba_addict joined00:07
→ Kaisyu joined00:09
→ Masterphi joined00:11
← xaxxon left00:12
← orbyt_ left00:14
← Masterphi left00:15
← abba left00:17
← [Brain] left00:18
→ Masterphi joined00:18
← anli left00:18
→ salamanderrake joined00:18
→ Anthaas joined00:19
← Dougie187 left00:20
← bkxd left00:20
← dsdeiz_ left00:20
← zumba_addict left00:21
→ mostlybadfly joined00:21
→ dsdeiz joined00:21
← dsdeiz left00:21
→ dsdeiz joined00:21
← Noldorin left00:24
← Masterphi left00:25
→ SimpleName joined00:25
→ tunekey joined00:26
→ LeBlaaanc joined00:26
← Mattiasl_ left00:27
← v4ult left00:28
← gugah left00:29
→ jimmyrcom joined00:29
← sourcream left00:30
← coumbole left00:31
← xcm left00:33
→ xcm joined00:33
→ zumba_addict joined00:34
← QualityAddict left00:35
→ bkxd joined00:35
← zumba_addict left00:35
← King_Hual left00:38
← Walex left00:39
→ chorkpop joined00:39
entropypendulum arahael: it is not so much dependence that is the problem but the nature of the projects I am trying to track ... it is anything from coding like C#, python to excel,ssrs,powerbi reporting type of files where text comparison isnt important but just version control is enough .. also ... aloooot of SQL from functions and stored procedures to ad hoc scripts etc ... this is why I am afraid that I will have way too many projects to track00:40
arahael entropypendulum: Git isn't a substitute for project management.00:41
entropypendulum arahael: are you suggesting something like JIRA or ServiceNow for this?00:42
← fission6 left00:43
entropypendulum arahael: I like the idea of being able to fork and keep versions of files .. at the same time there are pure text files that will need to be merged etc..00:43
arahael entropypendulum: Sure, those are useful tools. But you still need to do *project management*.00:43
→ zumba_addict joined00:44
entropypendulum arahael: its just htat we have 100s maybe even in the 1000 of sql scripts .. I am not sure how to organize this unless I go down the route of nested folders00:44
arahael entropypendulum: Then sure... Use nested folders.00:44
entropypendulum sure the CI actually may not be a bad idea at all for the pure code projects00:45
← robattila256 left00:45
arahael entropypendulum: A good idea for those SQL scripts, too.00:45
entropypendulum arahael: but I need to permission each nested folder individually and it seems that this is not possible in git00:45
arahael: I am not sure about SQL ... some scripts should not be ran at will as they model/insert data etc .. not pure selects .. also would clog up the server everytime some1 pushes sql code00:46
→ ecuanaso joined00:46
← Anticom left00:46
→ r3c0d3x joined00:46
← r3c0d3x left00:47
→ learningc joined00:47
← afuentes left00:48
→ orbyt_ joined00:48
← Tobbi left00:49
arahael entropypendulum: I'm not sure you appreciate what a CI server does.00:49
→ r3c0d3x joined00:51
← r3c0d3x left00:51
→ r3c0d3x joined00:51
→ Mattiaslndstrm joined00:51
← salamanderrake left00:51
← Forlorn left00:52
→ salamanderrake joined00:52
← GoBear left00:52
← chorkpop left00:53
← r3c0d3x left00:53
→ perrier-jouet joined00:54
→ chorkpop joined00:54
← Sonarpulse left00:54
entropypendulum arahael: sorry, maybe I need to do more research on how it is actually used for sql files I just assume that it runs unit tests to make sure that none break from a code push00:55
← SimpleName left00:55
arahael entropypendulum: Temporary databases could be a thing, perhaps. But teh point is to validate and ensure that eachc ommmit is correct.00:57
entropypendulum: And in particular: That any dependencies still work.00:57
→ r3c0d3x joined00:57
← salamanderrake left00:57
← Murr left00:57
→ Murr joined00:58
→ salamanderrake joined00:58
→ tarkus joined00:59
→ ZexaronS joined00:59
tarkus Hey guys! Do you know, if I remove a file from Git history using "filter-branch" + "push origin --force".. will it change the existing commit IDs? Will I be able to merge updates from an upstream repo back into my project form there on?01:00
→ tmsmith joined01:01
arahael tarkus: That's a matter of perspective. It won't change the commit ID's so much as create an entirely new set of commits. (So yes, effectively, "changing" them.)01:03
→ Bobdude joined01:04
arahael tarkus: And no, you wont be able to merge updates from an upstream repo without re-merging every. single. commit.01:04
← bkxd left01:06
← zumba_addict left01:07
← plujon left01:08
→ Nicmavr joined01:09
Nicmavr → Guest5970401:09
→ nimomo joined01:09
→ bkxd joined01:11
→ QualityAddict joined01:13
← Guest59704 left01:13
← nimomo left01:14
← TomyLobo left01:14
← xs2 left01:14
← john_doe_jr left01:14
→ qaz joined01:15
gitinfo set mode: +v01:17
→ fission6 joined01:19
→ cdown_ joined01:23
← tarkus left01:24
← Zamerick left01:25
→ nimomo joined01:25
← cdown left01:25
cdown_ → cdown01:25
→ thiago joined01:26
← tmsmith left01:27
← VoradorPT left01:27
→ lenswipe joined01:27
lenswipe hey folks01:27
Can I take featureB off featureA and then rebase featureB on to master when featureA is merged?01:28
← cdown left01:28
imMute if by "take" you mean "branch". then yes.01:29
→ cdown joined01:29
← nimomo left01:30
← thiago left01:30
← cdown left01:30
→ cdown joined01:31
← ChrisADR left01:33
→ ChrisADR joined01:33
← xaa left01:33
← fission6 left01:34
→ tmsmith joined01:35
← orbyt_ left01:35
← igemnace left01:36
← ChrisADR left01:36
→ ChrisADR joined01:36
→ igemnace joined01:37
← durham_ left01:37
→ thiago joined01:38
→ xs2 joined01:42
← rafasc left01:43
← xs2 left01:43
← tmsmith left01:44
→ bronson joined01:46
→ xs2 joined01:47
→ cfoch joined01:47
lenswipe ah yeah - sorry01:48
← Amanas left01:49
← xs2 left01:49
→ xs2 joined01:50
← bkxd left01:51
← bronson left01:51
← sunri5e left01:56
→ fission6 joined01:56
→ sleepingdeforest joined02:02
→ durham joined02:02
← Pacra left02:05
→ bkxd joined02:05
→ doug16k joined02:07
← belmoussaoui left02:07
→ cqi joined02:07
→ redj joined02:08
← cbreak left02:10
← dsdeiz left02:11
→ dsdeiz joined02:12
→ cbreak joined02:12
← durham left02:13
→ finalbeta joined02:14
→ fnodeuser joined02:15
← marian1235813 left02:16
← xs2 left02:16
→ rchavik joined02:18
→ xs2 joined02:19
← craftyguy left02:22
→ durham joined02:22
→ craftyguy joined02:23
→ vore joined02:25
← Sasazuka left02:27
← igemnace left02:28
→ salamanderrake_ joined02:29
← salamanderrake left02:29
← Bobdude left02:31
← learningc left02:31
← vore left02:32
→ nd joined02:34
← nd_ left02:35
← bsanford_ left02:38
→ wpgadmin joined02:38
→ gugah joined02:40
← fission6 left02:42
← durham left02:42
← wpgadmin left02:43
← Praxi left02:43
← ilbot3 left02:44
→ bkxd_ joined02:46
→ bronson joined02:47
← YuGiOhJCJ left02:48
← bkxd left02:50
→ Nicmavr joined02:50
Nicmavr → Guest2570802:50
← bronson left02:52
→ SimpleName joined02:53
← ecuanaso left02:55
→ dreiss joined02:56
→ Bobdude joined02:58
→ ilbot3 joined02:58
→ cdg joined02:59
→ Bobguy joined03:00
→ bkxd joined03:01
← dexterfoo left03:03
← cdg left03:03
← Bobdude left03:03
← bkxd_ left03:04
← rchavik left03:05
← hussam left03:09
← yates left03:09
→ dwmw2_gone joined03:11
← Gurkenglas left03:13
→ canton7 joined03:14
← demize left03:18
← cqi left03:24
→ ok91 joined03:29
→ ahf joined03:30
→ demize joined03:30
← ok91 left03:33
← yohnnyjoe left03:34
→ fmcgeough joined03:40
→ banisterfiend joined03:43
← babyflakes left03:44
→ tarkus joined03:46
→ bkxd_ joined03:46
← bkxd left03:47
→ bronson joined03:48
→ meadmoon joined03:48
← lenswipe left03:49
→ wxg joined03:50
← fmcgeough left03:50
→ ecuanaso joined03:51
← dwmw2_gone left03:51
← bronson left03:53
→ dwmw2_gone joined03:57
→ justan0theruser joined03:57
← justanotheruser left03:58
← PaulCapestany left03:59
→ chachasmooth_ joined04:00
← ecuanaso left04:00
← chachasmooth left04:01
→ PaulCapestany joined04:03
← chorkpop left04:05
← banisterfiend left04:08
← wxg left04:09
← tarkus left04:10
→ banisterfiend joined04:10
← EvilPenguin left04:14
← gildarts left04:16
→ orbyt_ joined04:17
→ BlackBeard joined04:18
← BlackBeard left04:19
→ BlackBeard joined04:19
← banisterfiend left04:20
← CheckDavid left04:21
← ZexaronS left04:23
→ InsigkneeUh joined04:31
← bkxd_ left04:32
→ Graypup_ joined04:32
← Cabanossi left04:35
→ Orbitrix joined04:35
→ Cabanossi joined04:35
→ EvilPenguin joined04:36
→ banisterfiend joined04:36
← meadmoon left04:36
← SimpleName left04:37
← einnjo left04:37
→ einnjo joined04:38
← einnjo left04:38
← EvilPenguin left04:40
→ gildarts joined04:41
→ cqi joined04:42
→ bkxd joined04:45
→ bronson joined04:49
→ jungsubk joined04:50
← bronson left04:54
→ dermoth joined04:54
← banisterfiend left04:59
← jungsubk left05:00
→ Darcidride joined05:00
→ banisterfiend joined05:00
→ SimpleName joined05:00
← Darcidride__ left05:00
← SimpleName left05:01
← pks left05:03
→ pks joined05:05
← dreiss left05:08
→ sim590 joined05:10
→ dre_ joined05:11
← jimmyrcom left05:12
→ SimpleName joined05:13
← orbyt_ left05:14
← energizer left05:14
→ energizer joined05:14
→ babyflakes joined05:15
← SimpleName left05:21
← Mattiaslndstrm left05:21
→ SimpleName joined05:21
→ FoxRocks joined05:21
← DropItLikeItsHot left05:23
→ nimomo joined05:26
→ AfroThundr joined05:27
← Wetmelon left05:28
← dviola left05:30
→ bkxd_ joined05:30
→ zumba_addict joined05:30
← nimomo left05:30
← dermoth left05:30
→ dermoth joined05:32
← bkxd left05:33
← LeBlaaanc left05:33
← zzz left05:34
→ re1 joined05:34
← novae left05:35
← SimpleName left05:37
← gugah left05:37
→ dreiss joined05:40
→ vagrantin joined05:40
→ bulletmark joined05:45
← dreiss left05:45
← JoshuaD left05:47
← comptroller left05:48
← vagrantin left05:48
→ grawity joined05:49
→ freimatz joined05:50
→ aw1 joined05:50
→ bronson joined05:50
→ comptroller joined05:50
→ vagrantin joined05:51
→ naiveai joined05:51
← boombatower left05:54
← bronson left05:55
→ jimmyrcom joined05:59
← InsigkneeUh left06:00
→ Mattiaslndstrm joined06:00
← Mattiaslndstrm left06:05
← vagrantin left06:06
→ zulutango joined06:07
→ jimi_ joined06:08
← jimi_ left06:08
← g00s left06:09
← zumba_addict left06:10
→ vagrantin joined06:10
→ abba joined06:10
→ dege joined06:11
→ LocaMocha joined06:12
← bkxd_ left06:15
→ bkxd joined06:15
→ Pacra joined06:16
← zulutango left06:16
← cfoch left06:17
← BlackBeard left06:18
← FoxRocks left06:19
→ dimi1947 joined06:20
← banisterfiend left06:23
→ masuberu joined06:24
→ g00s joined06:26
← PioneerAxon left06:26
→ PioneerAxon_ joined06:27
→ zumba_addict joined06:27
→ zulutango joined06:28
→ rscata joined06:29
← bulletmark left06:31
→ shaowei joined06:35
→ xaxxon joined06:40
← vagrantin left06:41
← re1 left06:43
← abba left06:43
→ vagrantin joined06:43
→ cur8or joined06:45
← vagrantin left06:49
→ vagrantin joined06:49
→ bronson joined06:51
← vagrantin left06:52
← rkta left06:53
→ shoutuser501 joined06:53
→ jcrben joined06:54
jcrben the #git-devel channel seems to be a bit dead - I'm messing around with the git src - is there a recommended, streamlined developer workflow out there? right now I'm just changing stuff and then rerunning make06:55
→ jimi_ joined06:56
jcrben for example, I'd like to watch and recompile the changed file on save - don't usually work in C...06:56
← bronson left06:56
← disi left06:57
← ti2 left06:57
→ disi joined06:58
→ dreiss joined06:58
← bkxd left07:00
→ vagrantin joined07:01
→ Repox joined07:01
← Forkk left07:01
→ wandering_vagran joined07:02
→ bkxd joined07:02
← arooni left07:02
→ KeyJoo joined07:02
← freimatz left07:02
← computerquip left07:03
→ re1 joined07:05
jcrben https://facebook.github.io/watchman/ is probably as good as anything...07:06
→ dec0n joined07:07
→ chele joined07:07
← dre_ left07:07
→ goksinen joined07:08
→ bkxd_ joined07:08
← dreiss left07:10
_ikke_ I just run make when I want to test things, no advanced workflow07:11
← bkxd left07:11
→ JeroenT joined07:12
→ Forkk joined07:13
→ tarkus joined07:16
→ jamellebeats joined07:20
→ arooni joined07:20
→ schleppel joined07:20
→ computerquip joined07:20
→ devbaka joined07:22
← dimi1947 left07:24
← jimi_ left07:24
→ dreiss joined07:29
→ imack joined07:30
→ abba joined07:31
→ theoceaniscool joined07:33
→ dimi1947 joined07:34
cbreak jcrben: recompiling on save is unusual07:34
IDEs can give you compiler-like feedback though07:34
but since git's build system sucks, integrating it into one is probably tricky07:34
osse Doesn't 'make foo.o' work somewhat reasonably if you want to compile foo.c?07:38
← alyptik left07:38
← vagrantin left07:38
← ghost43 left07:39
→ alyptik joined07:39
→ ghost43 joined07:39
← alyptik left07:40
cbreak osse: sure... but that won't link it07:40
and it'll not work if the naming rules of the project are weird07:40
← Pacra left07:41
→ vagrantin joined07:41
→ alyptik joined07:41
jcrben cbreak: watchman-make -p '**/*.c' '**/*.h' 'Makefile*' -t '' ended up working ok07:44
← theoceaniscool left07:44
jcrben ultimately07:45
← masuberu left07:45
← sleepingdeforest left07:45
← dreiss left07:45
jcrben might hook it up to a keyboard shortcut instead tho07:45
cbreak save on recompile is much more useful than recompile on save :)07:46
after all, often you change a header and a source file in tandem in languages like C or C++07:46
or even multiple source files07:46
→ nasd4 joined07:46
jcrben hmm, save what on recompile?07:47
cbreak every file that belongs to the project that's opened and has unsaved changes in the IDE07:47
← nasd4 left07:47
← abba left07:48
osse cbreak: I assumed that wasn't wanted since that requires compiling all the other files too07:48
cbreak no... only files that changed07:48
→ abba joined07:48
← izabera left07:48
→ venmx joined07:49
cbreak that's the workflow in all the IDEs I've worked with.07:49
→ bkxd joined07:49
← thiago left07:49
← vagrantin left07:50
_ikke_ the files that changes and what depends on those files07:50
cbreak while editing you get IDE feedback, for example using libclang in xcode, so you get compiler errors right there if they are independent enough07:50
and then you recompile to actually test it, that obviously needs all participating files to be up to date07:50
→ phormat joined07:51
→ Tobbi joined07:51
jcrben interesting - might these types of recommendations for a workflow be written down somewhere?07:51
← rominronin left07:51
_ikke_ these are very generic workflows07:52
cbreak this isn't really a recommendation, just a description of how it usually is07:52
→ bronson joined07:52
→ vagrantin joined07:52
jcrben "save on recompile is much more useful than recompile on save" and in this workflow, how are you triggering the recompile?07:53
← bkxd_ left07:53
jcrben if you manually switch focus back to the CLI from the IDE, it slows you down considerably07:53
→ bkxd_ joined07:53
cbreak I press the button in xcode or use a keyboard shortcut.07:54
if I'd use vim more, I'd have a shortcut there too07:54
→ belmoussaoui joined07:54
cbreak but usually when I work on vim using projects I have several terminals open07:54
a few with vims, and an other with a shell where I make07:55
← kadoban left07:55
← vagrantin left07:55
← bronson left07:56
← bkxd left07:57
→ xaa joined07:59
← xs2 left07:59
jcrben cool, that's helpful, just switched to using a keyboard shortcut instead07:59
→ seschwar joined08:01
← wandering_vagran left08:01
→ JoshuaD joined08:01
← finalbeta left08:05
→ finalbeta joined08:05
→ TomyWork joined08:08
→ robotroll joined08:08
← theskillwithin left08:09
← robotroll left08:10
← phormat left08:10
← venmx left08:13
→ JeroenT_ joined08:16
→ wandering_vagran joined08:18
→ f2k joined08:19
→ rideh joined08:19
← JeroenT left08:20
→ flaviodesousa joined08:21
← habbasi left08:22
osse Ok, I agree with that workflow. I was just trying to answer the question :p08:24
← PtxDK left08:24
osse Unless I use mingw make on windows, in which case I make it my mission to compile as seldom as possible08:24
← swords left08:26
→ habbasi joined08:26
← dmarr left08:27
← lamont left08:27
← SegFaultAX left08:27
← Eugene left08:27
← SleePy left08:27
← Neo left08:27
← Klumben left08:27
← dysfigured left08:28
← awygle left08:28
← ajd left08:28
← murph left08:28
← landau[m] left08:28
→ dysfigured joined08:29
→ ok91 joined08:29
→ awygle joined08:31
jast .trigger_edit gitlink Linking examples: git::master:Documentation/ (tree), git::master (shortlog), git::master^{commit} (commit), git::master/tree.h (file) -- also: git[notabug jast/gitinfo] master:http.pm (currently supported providers: github gitlab bitbucket kernel repo notabug)08:32
gitinfo jast: Okay.08:32
→ Eugene joined08:33
→ SleePy joined08:33
← devbaka left08:33
→ ZyX-I joined08:33
→ ShalokShalom2 joined08:35
← tarkus left08:35
ShalokShalom2 Parallel development. Let’s say you follow the development of an open-source project, and you have some controversial patches that aren’t accepted by the official maintainers. No problem – make your changes and publish your own repository. It’s a fork, of sorts, but it’s still connected to the mainline. Whenever the official project makes changes, you can do a darcs pull to get them, and resolve any conflicts. This08:36
way, your fork is kept up to date.08:36
Is this possible in Git?08:36
→ oxymoron93 joined08:36
jast sure08:36
in git you can add multiple remotes to a local repository, so you can sync with several remotes08:37
→ dmone joined08:37
→ Mike11 joined08:38
← dsdeiz left08:38
→ lamont joined08:38
← bkxd_ left08:38
→ dsdeiz joined08:39
← dsdeiz left08:39
→ dsdeiz joined08:39
→ MoziM joined08:39
→ floppydh joined08:39
→ theoceaniscool joined08:40
→ bkxd joined08:40
← JeroenT_ left08:41
→ JeroenT joined08:41
→ landau[m] joined08:41
→ rfuentess joined08:42
→ CedaEI[m] joined08:42
→ pvn[m] joined08:42
→ aspiers[m] joined08:42
← deltam left08:43
cbreak ShalokShalom2: in git, every repository is a fork08:43
→ dmarr joined08:43
← xaxxon left08:43
davve don't yo u mean every fork is a repository08:44
cbreak davve: both08:44
davve because a git init is not a fork of anything08:44
cbreak it's a root fork :)08:44
davve or am i wrong?08:44
→ deltam joined08:44
cbreak kind of a degenerate case I guess08:45
davve :p08:45
jast well, if I track something only locally, you couldn't really call it a fork, and that's not a degenerate case at all08:45
← rvgate left08:46
← dimi1947 left08:46
→ rvgate joined08:47
→ fstd_ joined08:48
→ aard joined08:49
→ PtxDK joined08:49
← fstd left08:52
fstd_ → fstd08:52
→ King_Hual joined08:52
→ nimomo joined08:53
← PtxDK left08:54
→ YuGiOhJCJ joined08:55
→ grayjoc joined08:55
← rscata left08:56
← SleePy left08:57
→ absence joined08:57
← cqi left08:57
← grayjoc left08:57
← nimomo left08:58
absence can i revert only a deleted file from an old commit, but to a new path?08:58
→ DaGoaty joined09:01
← DaGoaty left09:01
→ DaGoaty joined09:02
→ diaot joined09:02
grawity git show commit:old/path.c > new/path.c09:03
→ cstratak joined09:03
davve neat09:04
→ dimi1947 joined09:04
→ SteffanW joined09:05
→ kurkale6ka joined09:06
→ hussam joined09:07
→ nakkht joined09:08
absence grawity: very nice. is that safe for binary files too?09:08
grawity yes09:08
absence great, thanks!09:08
grawity if in doubt you can use `git cat-file blob commit:old/path.c`09:08
→ kes joined09:08
grawity but as far as I know `git show` does the job fine09:09
← YuGiOhJCJ left09:09
absence grawity: minor note, need commit~109:09
grawity you said "from an old commit" so I assumed you already had a commit ID which contained the file09:10
← nakkht left09:10
grawity commit~1 is only useful if you're giving it the commit which *deleted* the file09:10
→ PtxDK joined09:10
absence ah right. semantics :D i dug the id out by searching for deleted files, so technically i had the wrong id09:11
→ MD87 joined09:12
← sitaram_ left09:13
→ sitaram joined09:13
→ SleePy joined09:13
← sitaram left09:13
→ sitaram joined09:13
→ fierz joined09:14
→ masuberu joined09:15
→ robattila256 joined09:15
→ leeN joined09:16
gitinfo set mode: +v09:17
fierz Hello ! how can I update my local repo with changes made on remote repository? Thank you in advance09:17
← dimi1947 left09:17
oxymoron93 git fetch fierz09:19
→ mosab joined09:19
→ bkxd_ joined09:20
← PioneerAxon_ left09:21
→ PioneerAxon joined09:21
fierz oxymoron93: so 'git fetch remote_repo' ?09:23
will this update my local repository ?09:23
→ Cadii joined09:24
→ bkxd__ joined09:24
← bkxd left09:24
fierz please forgive my ignorance09:24
oxymoron93 what does git remote -v says to you fierz09:25
→ pbandark joined09:27
oxymoron93 if you cloned recently, then just git fetch should be fine09:27
← bkxd_ left09:28
fierz oxymoron93: I did clone recently09:28
but I cloned a specific branch not the whole repo09:28
then I updated that remote branch from another computer , and want these changes to be updated here on my local repo09:29
→ murii joined09:30
fierz origin https://remote_repo.git (fetch)09:31
origin https://remote_repo.git (push)09:31
→ Articate joined09:33
→ ajd joined09:35
gitinfo set mode: +v09:35
Articate Hello!09:35
gitinfo Articate: 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.09:35
oxymoron93 well running "git fetch" should be just fine, after that you can inspect changed created on remote and incorporate them using standard git commands, like git checkout, git merge, git rebase etc fierz09:35
→ SegFaultAX joined09:35
oxymoron93 changes* created on remote09:35
it depends of your flow, and I am not the best one for that talk09:36
→ GoBear joined09:36
← GoBear left09:36
fierz oxymoron93: thank you ! appreciated09:37
→ GoBear joined09:37
Articate I wish to have a permanent "release" branch. The idea is to develop functionality in feature branches, merge them to master, and get the product owner to sign off. After signoff, I imagine doing a merge to Release, to have a cut-off of functionality that's currently "releasable".09:39
The challenge here is to be completely certain that it's an exact copy of master at the point I want to merge to release. It would be best to make a new release branch everytime, but I can set up rules for the release-branch in TFS and have better control of what happens to that branch that way09:40
is there a way to sort of ensure that at a given point, this release branch becomes a perfect copy of whatever is on Master?09:41
← _ADN_ left09:41
← murii left09:41
→ novae joined09:42
← novae left09:42
→ novae joined09:42
osse Articate: git reset --hard master09:43
but at this point it's worth pondering what's the point with a release branch if it's supposed to be equal to master09:44
→ murii joined09:44
Articate because more functionality can be added to master, but not yet have been signed off for release09:44
← SteffanW left09:44
osse and can any development take place on release that won't be in master?09:45
Articate I first figured I would say that should never happen09:45
however, I could imagine a hotfix being done on release branch, with a hotfix branch from release.09:46
← novae left09:46
osse Then I would scrap the idea of the release branch and rather create tags to point to what you want to mark as for release09:46
→ cstratak_ joined09:48
→ nimomo joined09:48
Articate I may have overlooked the possibility to use tags in TFS, so that's a great idea I'll look into right away!09:49
→ novae joined09:49
← novae left09:49
→ novae joined09:49
Articate Yup, I can use tags! Thanks, osse.09:50
← cstratak left09:50
qaz Is it possible to allow empty commit messages on particular repo?09:52
→ Amadiro joined09:52
→ bronson joined09:53
← bkxd__ left09:54
→ bkxd joined09:55
→ goweol joined09:56
_ikke_ qaz: there is no setting to allow it, you have to specify --allow-empty every time09:56
← goweol left09:57
← bronson left09:57
← goweol2 left09:58
← dcpc007 left09:58
→ goweol joined10:00
→ fmgt joined10:00
→ Chaosruler joined10:02
→ bkxd_ joined10:06
← bkxd left10:09
→ dcpc007 joined10:09
← Kaisyu left10:09
→ uxboy joined10:09
→ bkxd joined10:09
← raynold left10:11
← bkxd_ left10:13
→ belmoussaoui_ joined10:14
← belmoussaoui left10:15
→ nerder joined10:15
nerder hello guys10:15
i had a very strange behaviour with git today, and i don't understand how is this happen or if is related with some local configuration10:16
← cbreak left10:16
belmoussaoui_ → belmoussaoui10:16
← bkxd left10:18
→ coumbole joined10:18
← dcpc007 left10:18
nerder basically i have a branch that had conflict with master, once i try to rebase my branch with the new master i got conflict in 2 files, one was pretty "normal", but the other once that i expect to be an "add or delete" conflict, since the file has beeing delete in master was instead issued with another file that have nothing to do with it10:19
→ _ADN_ joined10:19
→ cbreak joined10:20
→ Tuju joined10:20
nerder the 2 files have no relation at all, they are in different language as well, basically git is trying to merge a php file with some js code taken from the old deleted file that had instead addition in the branch10:20
anybody can help me understand why this?10:21
Tuju hi, what's the recommeded way to fork a project if you want to also follow old project's changes and include them to new one?10:21
_ikke_ Tuju: That's called a triangular work flow10:21
→ dcpc007 joined10:22
Tuju _ikke_: ack, is there any text that i could read more?10:22
_ikke_: google found something....10:22
_ikke_ You can just add 2 remotes to the same repo10:23
Tuju ack10:23
_ikke_ fin10:23
:P10:23
← bket left10:24
→ Cavallari joined10:25
→ LichtMacher joined10:25
← energizer left10:27
→ xfbs joined10:27
← dcpc007 left10:28
→ bket joined10:29
← King_Hual left10:31
← Impaloo left10:33
← PioneerAxon left10:33
→ PioneerAxon joined10:33
← nimomo left10:37
→ dcpc007 joined10:37
← robattila256 left10:38
→ gtristan joined10:42
→ manuelschneid3r joined10:43
→ barduck joined10:44
← nerder left10:44
← exotime left10:46
← dermoth left10:46
→ dermoth joined10:46
← goksinen left10:47
← aw1 left10:48
→ marlinc joined10:48
← luckman212 left10:49
→ sunri5e joined10:50
→ cur8or_ joined10:51
← sarri left10:51
→ luckman212 joined10:51
← cur8or left10:51
→ sarri joined10:52
← sarri left10:52
→ sarri joined10:52
← dcpc007 left10:55
← cdown left10:55
→ sammyg joined10:55
→ goksinen joined10:56
→ afuentes joined10:57
← ZyX-I left10:57
→ dcpc007 joined10:57
← mikemcowie left11:00
→ aw1 joined11:00
← goksinen left11:01
→ exotime joined11:04
→ cdown joined11:04
→ goksinen joined11:05
← LichtMacher left11:06
→ cdown_ joined11:06
← dcpc007 left11:08
← fierz left11:08
← cdown left11:09
cdown_ → cdown11:09
← goksinen left11:09
→ dcpc007 joined11:11
← uxboy left11:14
→ uxboy joined11:15
← kgz left11:16
← mosab left11:19
→ LichtMacher joined11:19
→ mosab joined11:19
mosab → mos3abof11:20
← shaowei left11:20
→ Patricius joined11:21
← uxboy left11:21
→ MarioBranco joined11:22
→ uxboy joined11:22
→ chaosruler2 joined11:24
← Chaosruler left11:27
← masuberu left11:31
→ plexigras joined11:31
← KeyJoo left11:32
← xeno left11:34
→ Forlorn joined11:35
→ xeno joined11:35
← Patricius left11:37
→ ti2 joined11:37
→ Achylles joined11:37
← coumbole left11:38
← ti2 left11:39
→ ti2 joined11:39
← doug16k left11:41
→ dpl joined11:44
← sammyg left11:46
→ JeroenT_ joined11:46
← JeroenT left11:50
← xeno left11:50
→ tijensse joined11:50
→ gotsrian joined11:51
→ bronson joined11:54
← salamanderrake_ left11:54
→ salamanderrake joined11:54
→ Raging_Hog joined11:56
← konsolebox_ left11:57
→ konsolebox joined11:58
← bronson left11:59
← jimmyrcom left11:59
← Forlorn left12:04
← xcm left12:04
← Chulbul left12:04
← Kulrak left12:04
→ xcm joined12:04
→ kragniz joined12:08
→ CheckDavid joined12:09
← gotsrian left12:14
← nahtnam left12:17
gurrkiin hmm this is probably something fairly stupid .. but I am able to clone manually via git bash, but get repo not found cloning from a script on the same repo12:17
→ coumbole joined12:21
→ doug16k joined12:21
← rewt left12:24
→ rewt`` joined12:24
rewt`` → rewt12:24
→ mgt joined12:24
→ cstratak__ joined12:25
kragniz → kgz12:25
→ tinanoo1 joined12:25
→ aielima joined12:26
← JoshL left12:26
← cpallares left12:26
← xtheosirian left12:26
← [Kid] left12:26
oxymoron93 gurrkiin: don't quite understand, but is it a problem that after you cloned, you didn't enter into repo directory, fairly stupid answer :D12:26
→ KeyJoo joined12:26
→ masuberu joined12:26
← dysfigured left12:26
← tinanoo left12:26
← oprypin left12:26
→ ghoti_ joined12:26
← Eugene left12:26
→ sword` joined12:26
→ [Kid] joined12:27
← randomstrangerb left12:27
← harv left12:27
← erhandsome left12:27
← sangy left12:27
← surfist left12:27
← ghoti left12:27
← midnightmagic left12:27
← jcrben left12:27
→ dysfigured joined12:27
← disi left12:27
→ oprypin joined12:27
← diaot left12:27
← ghost43 left12:27
← SleePy left12:27
← coumbole left12:27
← novae left12:27
← perrier-jouet left12:27
← Sleepy63 left12:27
← matoro_ left12:27
← aananev left12:27
← Gianormagantrous left12:27
← ohcibi left12:27
← cliluw left12:27
← foo left12:27
← ollien left12:27
← Xethron left12:27
← kriskropd left12:27
→ jcrben joined12:27
→ ohcibi joined12:28
→ cliluw joined12:28
→ Eugene joined12:28
→ novae joined12:28
→ ollien joined12:28
← fmgt left12:28
← cstratak_ left12:28
← hurricanehrndz left12:28
→ coumbole joined12:28
→ SleePy joined12:28
→ hurricanehrndz joined12:28
→ midnightmagic joined12:28
→ matoro_ joined12:28
← novae left12:28
→ novae joined12:28
→ foo joined12:28
→ erhandsome joined12:28
→ Sleepy63 joined12:28
→ \malex\ joined12:28
→ Gianormagantrous joined12:28
← Gianormagantrous left12:28
→ Gianormagantrous joined12:28
→ Peng joined12:28
→ devster31 joined12:28
→ shoogz joined12:28
→ xtheosirian joined12:29
→ Xethron joined12:29
→ cpallares joined12:29
→ sangy joined12:29
→ harv joined12:29
→ surfist joined12:29
→ perrier-jouet joined12:29
→ aananev joined12:30
→ ghost43 joined12:30
→ kriskropd joined12:31
gurrkiin oxymoron93: I have one command "git clone my.repo.url target". I'm cloning a bunch of repos in a script, problem is the command wont work in the script. But it clones the repo when i run the same command in a terminal12:31
→ goatish joined12:31
→ disi joined12:31
osse can we see the script? and the errors?12:31
also, if it's a shell script, add 'set -x' at the top to see what it's doing12:32
→ Neo joined12:32
→ Kronuz joined12:33
gurrkiin i'm just about to head for lunch, i'll check back in in 30 mins or so12:33
← Mike11 left12:34
→ Gurkenglas joined12:34
→ zarzar joined12:34
→ JoshL joined12:35
← luckman212 left12:37
← Tobbi left12:39
← disi left12:41
→ Impaloo joined12:41
→ luckman212 joined12:42
→ robattila256 joined12:42
→ disi joined12:42
← psprint_ left12:42
→ psprint_ joined12:43
→ swords joined12:44
→ fission6 joined12:45
← uxboy left12:49
→ murph joined12:50
murph → Guest3218212:50
→ NerdyPepper joined12:52
← xfbs left12:56
→ xfbs joined12:57
← xfbs left12:57
← Murr left12:57
→ Murr joined12:58
→ linuxmodder joined12:58
→ xfbs joined12:58
← linuxmodder left12:59
→ SteffanW joined13:00
→ linuxmodder joined13:00
→ sammyg joined13:00
→ Klumben joined13:02
← Raging_Hog left13:02
→ peacememories joined13:03
→ joe776 joined13:06
← fission6 left13:06
← DaGoaty left13:07
→ dave0x6d joined13:09
gitinfo set mode: +v13:09
→ uxboy joined13:10
← uxboy left13:10
→ uxboy joined13:10
joe776 hi! i have a question concerning the git-completion in bash. I sourced the latest git-completion.bash, and it works for some commands, but for example "git sym<tab>" does not resolve anything (expecting at least symbolic-ref). I quickly searched for symbolic-ref in the completion file and it is there. Any ideas on why it is not working in that case?13:10
← NerdyPepper left13:11
← xfbs left13:14
jast joe776: symbolic-ref is an interrogator command, I believe the bash completion lists only porcelain (high-level) commands on the top level13:17
← linuxmodder left13:18
← destiny left13:19
canton7 (mine doesn't auto-complete it either, fwiw13:22
→ gotsrian joined13:22
canton7 but if I type 'git symbolic-ref <tab><tab>', then it will suggest things, which is probably why it appears in git-completion.bash13:22
joe776 jast: there is a function in there to list the porcelain commands which also contains symbolic-ref: https://github.com/git/git/blob/master/contrib/completion/git-completion.bash#L89613:22
jast joe776: yes, and it's tagged "plumbing". all the commands listed there are the ones that *don't* get shown. :)13:22
look at the last line in the 'case' block: that's where commands actually get included in the list :)13:23
← surfist left13:23
joe776 ah I see! :)13:23
→ shinnya joined13:24
→ surfist joined13:24
← Cadii left13:25
← gotsrian left13:25
→ gotsrian joined13:25
← andrybak left13:27
joe776 well, i'm not using symbolic-ref that often, I think can live without completing it :D Thanks for looking into it!13:28
→ mmlb joined13:28
→ andrybak joined13:28
→ goksinen joined13:28
→ linuxmodder joined13:30
← linuxmodder left13:32
← theoceaniscool left13:32
→ linuxmodder joined13:32
→ uxboy_ joined13:32
← linuxmodder left13:33
→ linuxmodder joined13:34
← linuxmodder left13:35
→ linuxmodder joined13:35
← uxboy left13:36
← linuxmodder left13:36
→ linuxmodder joined13:37
← LiftLeft left13:38
← linuxmodder left13:38
← kurkale6ka left13:38
→ linuxmodder joined13:38
← uxboy_ left13:38
→ kurkale6ka joined13:38
← gotsrian left13:38
← joe776 left13:39
← robattila256 left13:39
← linuxmodder left13:39
→ linuxmodder joined13:40
→ uxboy joined13:40
→ fission6 joined13:40
← uxboy left13:40
→ uxboy joined13:40
← linuxmodder left13:41
→ linuxmodder joined13:41
← uxboy left13:41
→ mborgard joined13:42
→ uxboy joined13:42
← uxboy left13:42
→ uxboy joined13:42
← linuxmodder left13:42
→ Tobbi joined13:42
→ linuxmodder joined13:43
← linuxmodder left13:44
→ linuxmodder joined13:44
→ LiftLeft joined13:44
← linuxmodder left13:45
→ linuxmodder joined13:46
← linuxmodder left13:47
→ linuxmodder joined13:47
← gtristan left13:48
← linuxmodder left13:48
← zumba_addict left13:48
→ linuxmodder joined13:49
← linuxmodder left13:50
→ linuxmodder joined13:50
→ zumba_addict joined13:51
← linuxmodder left13:51
→ linuxmodder joined13:52
→ pankaj joined13:52
← craftyguy left13:52
pankaj Why did Linux community left VCS?13:53
← linuxmodder left13:53
→ theoceaniscool joined13:53
→ linuxmodder joined13:53
pankaj Sorry, I mean that why did linux community leaft Bitkeeper Version Control System?13:53
canton7 pankaj, the BitKeeper wiki page explains it fairly well: https://en.wikipedia.org/wiki/BitKeeper13:54
← linuxmodder left13:54
→ bronson joined13:54
→ linuxmodder joined13:55
→ craftyguy joined13:55
← linuxmodder left13:56
→ linuxmodder joined13:56
→ rokups joined13:57
← linuxmodder left13:57
→ linuxmodder joined13:58
← linuxmodder left13:59
→ linuxmodder joined13:59
← bronson left13:59
← linuxmodder left14:00
← Cavallari left14:00
→ linuxmodder joined14:01
← linuxmodder left14:02
← coumbole left14:02
→ linuxmodder joined14:02
← zarzar left14:03
← linuxmodder left14:03
← cur8or_ left14:03
→ linuxmodder joined14:04
→ coumbole joined14:04
← remedan left14:04
→ DaGoaty joined14:04
← linuxmodder left14:05
→ linuxmodder joined14:05
← Puffball left14:05
← cdown left14:06
→ xs2 joined14:06
← linuxmodder left14:06
→ cdown joined14:06
→ linuxmodder joined14:07
→ kzh joined14:07
← linuxmodder left14:08
→ linuxmodder joined14:08
→ robattila256 joined14:08
← gildarts left14:08
← linuxmodder left14:09
→ YuGiOhJCJ joined14:10
→ linuxmodder joined14:10
← peacememories left14:10
→ gildarts joined14:11
← linuxmodder left14:11
← cdown left14:11
→ linuxmodder joined14:11
→ IrishPrime joined14:12
← linuxmodder left14:12
→ hvxgr joined14:12
→ linuxmodder joined14:13
→ cdown joined14:13
→ remedan joined14:13
← linuxmodder left14:14
→ linuxmodder joined14:14
← linuxmodder left14:15
→ linuxmodder joined14:16
← Repox left14:16
→ sleepingdeforest joined14:16
← sleepingdeforest left14:16
← linuxmodder left14:17
→ sleepingdeforest joined14:17
→ linuxmodder joined14:17
← linuxmodder left14:18
→ linuxmodder joined14:19
← linuxmodder left14:20
→ Master__ joined14:20
→ linuxmodder joined14:20
← remedan left14:20
← oxymoron93 left14:20
← linuxmodder left14:21
→ linuxmodder joined14:22
→ czart joined14:22
← linuxmodder left14:23
→ linuxmodder joined14:23
← MarioBranco left14:24
← linuxmodder left14:24
← czart_ left14:24
→ linuxmodder joined14:25
← linuxmodder left14:26
→ linuxmodder joined14:26
← linuxmodder left14:27
→ MarioBranco joined14:28
→ Amanas joined14:29
← barduck left14:29
→ pirocks joined14:30
← JeroenT_ left14:30
→ barduck joined14:30
→ JeroenT joined14:30
→ dendazen joined14:30
← barduck left14:32
← Master__ left14:32
→ barduck joined14:33
← zumba_addict left14:34
← aw1 left14:35
← barduck left14:35
→ Pacra joined14:36
→ barduck joined14:36
→ remedan joined14:37
← giraffe left14:39
→ raynold joined14:40
pankaj canton7: Sorry for replying very late. I got your answer.14:41
→ boombatower joined14:41
→ relipse joined14:42
relipse what is the difference between doing git fetch origin and git fetch?14:42
→ alphawarrior joined14:43
_ikke_ relipse: git fetch origin explicitly fetches from origin14:43
→ linuxmodder joined14:44
_ikke_ git fetch depends on the remote tracking information of the current branch14:44
→ dfas` joined14:44
← linuxmodder left14:45
→ cfoch joined14:45
→ linuxmodder joined14:45
→ nast joined14:46
→ jungsubk joined14:46
← linuxmodder left14:46
← nast left14:46
→ linuxmodder joined14:47
→ nast joined14:47
← dfas left14:47
→ Dougie187 joined14:47
→ Raging_Hog joined14:47
← linuxmodder left14:47
← imack left14:48
← Achylles left14:52
skalpin I just recently learned "git checkout -" will checkout the previous branch you were on. It makes me wonder what other tricks I don't know. Does anyone know of a blog or has a list of "git tricks" I can look at?14:54
→ frederfred joined14:55
← nast left14:55
Dougie187 skalpin: Every once in a while, I just google `git tips and tricks` and see if I can learn something new.14:56
skalpin: I don't know that there is any one single resource to teach you new things, aside from maybe lurking in here and reading everything anyone writes.14:57
_ikke_ skalpin: man gitrevisions and man gitglossary perhaps14:57
gitinfo skalpin: the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html14:57
skalpin: the gitglossary manpage is available at https://gitirc.eu/gitglossary.html14:57
← masuberu left14:58
→ Grange joined14:58
← Grange left14:58
← flaviodesousa left15:01
skalpin awesome. thank I'll take a look15:02
→ Grange joined15:02
→ nimomo joined15:02
← Grange left15:02
← doug16k left15:03
_ikke_ also man gitcli15:04
gitinfo the gitcli manpage is available at https://gitirc.eu/gitcli.html15:04
→ tcorneli joined15:06
← jungsubk left15:06
pankaj How to understand the structure of '.git' directory. What its important files are and what do they do?15:07
osse pankaj: man gitrepository-layout15:08
gitinfo pankaj: the gitrepository-layout manpage is available at https://gitirc.eu/gitrepository-layout.html15:08
→ doug16k joined15:08
→ chaosruler joined15:09
→ zarzar joined15:09
→ phluks joined15:12
→ zaherdirkey joined15:12
← murii left15:12
← chaosruler2 left15:12
→ giraffe joined15:12
zaherdirkey i git repo there is a huge bin file, i already have it, how can i bypass downloading it when fetch/pulling it?15:13
← doug16k left15:13
→ zumba_addict joined15:13
_ikke_ you cannot15:15
→ orbyt_ joined15:16
zaherdirkey it stuck at "remote: Compressing objects: 100% (6/6), done.15:16
Unpacking objects: 15% (6/39)" is that normal? i can wait but i dont see any progress15:16
← Graypup_ left15:16
→ bsanford joined15:17
← plexigras left15:17
← dave0x6d left15:18
← Tobbi left15:18
→ Graypup_ joined15:19
← tcorneli left15:20
← xcm left15:21
→ xcm joined15:21
← JeroenT left15:22
← barduck left15:22
← sammyg left15:22
→ Sonarpulse joined15:23
→ AaronMT joined15:24
→ tlaxkit joined15:24
→ barduck joined15:24
← skered left15:24
← kurkale6ka left15:25
→ einnjo joined15:26
→ kurkale6ka joined15:26
← barduck left15:26
→ barduck joined15:27
← orbyt_ left15:27
→ karstensrage joined15:27
← karstensrage left15:27
← einnjo left15:28
→ rpi[work] joined15:28
→ skered joined15:28
→ doug16k joined15:29
← shinnya left15:29
← barduck left15:29
→ Guest22295 joined15:29
← xcm left15:30
← sarri left15:30
→ xcm joined15:30
→ texasmynsted joined15:31
texasmynsted this might be reaching a bit . . .15:31
→ jready joined15:31
→ sarri joined15:31
← sarri left15:31
→ sarri joined15:31
texasmynsted I have git-prompt working fine on one machine, but I added it to a new machine and when my working directory is not a git repo I get "-bash: __git_ps1: command not found"15:31
anybody see this before?15:31
→ barduck joined15:32
→ peacememories joined15:33
← abba left15:34
← barduck left15:34
← konsolebox left15:35
→ barduck joined15:36
← goksinen left15:36
← uxboy left15:37
black_13 how do keep my working tree updated with the upstream changes?15:38
just "pull" and deal with any possible conflicts ...15:38
← barduck left15:38
→ barduck joined15:40
→ freimatz joined15:40
→ konsolebox joined15:41
← fission6 left15:41
← barduck left15:42
→ orbyt_ joined15:43
→ Raed|Laptop joined15:44
→ dimi1947 joined15:44
← czart left15:45
→ fission6 joined15:45
→ nimomo_ joined15:46
← bathtub_shark left15:46
← Zarthus left15:46
→ plexigras joined15:46
→ Zarthus joined15:47
← nimomo left15:47
ghoti_ → ghoti15:48
← dec0n left15:48
← dilijev left15:48
→ gugah joined15:50
← msonntag left15:51
← xcm left15:51
→ msonntag joined15:52
→ xcm joined15:52
← upperdeck left15:52
→ barduck joined15:52
← Raging_Hog left15:54
→ upperdeck joined15:54
← manuelschneid3r left15:54
→ rkta joined15:54
→ dviola joined15:56
← f2k left15:56
→ bronson joined15:56
← konsolebox left15:56
← mgt left15:57
→ banisterfiend joined15:57
← seschwar left15:57
← upperdeck left15:58
← bronson left16:00
→ tarkus joined16:01
→ Green_Crystal joined16:02
texasmynsted black_13: fetch16:02
fetch will update without merging16:03
→ konsolebox joined16:03
texasmynsted iirc pull first fetches, then merges16:03
black_13 ok16:03
using git is playing chess ... svn/tfs ... checkers16:03
texasmynsted: in texas?16:04
→ ZexaronS joined16:04
texasmynsted well up until a couple of years ago. Moved to TN16:04
→ kadoban joined16:04
← Zarthus left16:04
← chele left16:05
black_13 i was thinking about gather some of the soil from the texas side of the red river and carrying it with me16:05
texasmynsted heh16:06
you OK?16:06
→ manuelschneid3r joined16:06
→ eivarv joined16:06
black_13 I'm Okay but OK isn't16:06
→ aphorismenoi joined16:06
→ griffindy joined16:06
black_13 tulsa16:06
→ g0z joined16:06
black_13 after i ran git fetch several patch names were listed16:07
← griffindy left16:08
← Guest22295 left16:08
← phluks left16:08
black_13 i would paste them but this is a company git and the info is proprietary16:08
which makes sense i guess16:08
→ LeBlaaanc joined16:09
→ karstensrage joined16:10
→ Zarthus joined16:11
← ertes-w left16:11
← SteffanW left16:12
← mos3abof left16:13
← dpl left16:13
← coumbole left16:13
← duckydan left16:14
texasmynsted proprietary patch names?16:15
wow16:15
→ xeno joined16:15
→ davide joined16:16
→ kpease joined16:18
← ok91 left16:19
→ duckydan joined16:21
← davide left16:21
→ davide joined16:22
→ bathtub_shark joined16:22
← duckydan left16:23
→ sjoshi joined16:23
← davide left16:23
→ dreiss joined16:24
→ meadmoon joined16:25
← mostlybadfly left16:25
← meadmoon left16:25
→ thiago joined16:26
→ Masterphi joined16:28
→ h12o joined16:28
black_13 texasmynsted: i was working on branch then went a way16:30
→ sammyg joined16:30
← nimomo_ left16:30
→ nimomo joined16:30
black_13 texasmynsted: i mean is i work for a company and the branch is the name of a future product16:30
← zumba_addict left16:31
black_13 and if i said the name of an up coming product that would be bad16:31
texasmynsted oh right16:31
→ nimomo_ joined16:31
→ nimomo__ joined16:31
← nimomo left16:35
← nimomo_ left16:36
black_13 fetch just updates correct16:36
→ davide joined16:36
→ djb-irc joined16:36
← rokups left16:36
← orbyt_ left16:36
black_13 pull might cause the need to merge sources ?16:36
Dougie187 black_13: Fetch just updates remote tracking branches.16:37
black_13: pull updates remote tracking branches, and merges them (potentially)16:37
→ jesst_ joined16:37
black_13 so lets say there is a foo.cpp i was working on bar function and another developer was working on the bar function then its possible a merge might need to occur correct?16:38
→ LionsMane joined16:39
← davide left16:39
kadoban black_13: Yes, there might be a conflict that you have to resolve16:40
→ ecuanaso joined16:40
→ theskillwithin joined16:40
→ anli joined16:41
← ericnoan left16:43
← bathtub_shark left16:44
black_13 ok when I do a git pull it says I have unstaged changes which I do16:45
kadoban It gives you a couple of options as I recall. Did any of them sound likely?16:46
← Zarthus left16:46
black_13 and that I am 186 commits behind16:47
→ gchristensen joined16:48
← g0z left16:48
black_13 how do I get caught up?16:49
cjohnson It tells you16:49
Commit or stash your changes and re-pull though and you should be good to go16:49
→ davide joined16:49
← davide left16:50
← LeBlaaanc left16:50
← konsolebox left16:50
← steven left16:50
→ Cavallari joined16:50
← floppydh left16:51
→ db8093246 joined16:51
← zaherdirkey left16:52
← jesst_ left16:52
→ zaherdirkey joined16:52
→ zumba_addict joined16:52
→ Impaloo55 joined16:52
← naiveai left16:52
← Impaloo left16:53
← Raed|Laptop left16:53
← Impaloo55 left16:53
→ Impaloo55 joined16:53
→ LeBlaaanc joined16:53
→ steven joined16:53
← Impaloo55 left16:54
→ Impaloo joined16:54
← xs2 left16:54
← Cavallari left16:54
← cfoch left16:54
→ xs2 joined16:55
gchristensen hi, I'm writing a program which automatically calls git commands and I want to write some automatic tests for it. is there a way to check a git repo in to a second repo, without git thinking it is a submodule?16:55
← peacememories left16:56
→ davix3f joined16:56
← Impaloo left16:56
→ Impaloo joined16:57
davix3f i have a repo in gitlab; i copied it into github. now can i set my local repo folder so that when i push commits, they are pushed both in gitlab and github at the same time?16:57
← xs2 left16:57
→ konsolebox joined16:57
← Murr left16:57
← rfuentess left16:57
→ Murr joined16:58
→ peacememories joined16:59
→ abba joined16:59
← davix3f left17:00
→ EvilPenguin joined17:01
→ JeffH joined17:02
→ sanscoeur joined17:03
← banisterfiend left17:04
← kzh left17:05
← ChrisADR left17:06
→ muelleme_ joined17:09
→ duckydan joined17:11
← nimomo__ left17:13
← peacememories left17:13
→ Zarthus joined17:13
→ grokking joined17:13
← cstratak__ left17:14
→ patarr joined17:14
← dimi1947 left17:15
← foo left17:15
→ foo joined17:15
patarr So as part of a commit, I've removed some lines from a particular file. Is there a way I can restore those lines with the original author's attribution without having to resort to rewriting history?17:15
→ kzh joined17:15
→ batrick joined17:15
osse patarr: You can make a new commit in the original author's name17:16
← batrick left17:16
← kzh left17:16
patarr osse: that sound a tad scary17:16
_ikke_ scary why?17:16
osse Git stores both author and committer separately, so the paper work will be tidy17:16
patarr Oh. wasn't aware there was a difference17:17
← disi left17:18
→ ericnoan joined17:18
→ disi joined17:19
→ Darcidride_ joined17:19
→ nimomo joined17:19
← ecuanaso left17:20
← thiago left17:21
→ ecuanaso joined17:21
→ moei joined17:21
osse patarr: But I suppose letting him or her know would be the sensible thing to do17:21
→ peacememories joined17:22
← tarkus left17:22
osse patarr: Yeah the functionality is seldom used when you push changes yourself or use pull requests, but it's ubiquitous when you send patches to a mailing list.17:22
← grokking left17:23
→ dimi1947 joined17:23
osse patarr: Almost all commits in git's own repo have Junio Hamano as committer, but there's are hundreds of different authors17:23
← JeffH left17:23
← nimomo left17:24
→ aeo1ack joined17:25
← zumba_addict left17:25
← fission6 left17:26
→ zumba_addict joined17:27
← psprint_ left17:27
← aeo1ack left17:27
→ aLeSD joined17:27
aLeSD hi all17:27
I just rebased my local branch17:28
→ aeo1ack joined17:28
aLeSD how could I push it remotely ? cause the local branch now diverged17:29
because of the rebase17:29
_ikke_ Did anyone else already fetch the old branch?17:29
aLeSD _ikke_, it's a pull request in github17:29
← barduck left17:29
→ zumba_a__ joined17:30
aLeSD so yes17:30
or I imagine yes17:30
→ fission6 joined17:31
→ batrick joined17:31
← h12o left17:31
→ tarkus joined17:31
← kurkale6ka left17:32
← zumba_addict left17:32
← zumba_a__ left17:34
← dendazen left17:34
aLeSD no prob.. resolved17:35
← zaherdirkey left17:35
← pirocks left17:35
→ zaherdirkey joined17:35
← dreiss left17:36
→ kzh joined17:37
← gugah left17:38
← dmone left17:38
← pbandark left17:40
→ Noldorin joined17:40
→ SteffanW joined17:40
→ h12o joined17:41
← tarkus left17:41
← peacememories left17:42
← kzh left17:43
← _ADN_ left17:44
→ Murr- joined17:46
← anli left17:46
← pankaj left17:46
→ orbyt_ joined17:48
← Murr left17:49
_ikke_ aLeSD: alright17:50
→ dion joined17:51
→ phormat joined17:51
← h12o left17:54
← fission6 left17:54
→ h12o joined17:54
→ pankaj joined17:54
→ zaherdirkey_ joined17:54
← serialoverflow left17:55
← plexigras left17:56
→ bronson joined17:57
→ Raed|Mobile joined17:57
→ durham joined17:58
← zaherdirkey left17:58
→ plexigras joined17:59
← pankaj left18:01
← zaherdirkey_ left18:01
← bronson left18:01
← goatish left18:04
← TomyWork left18:05
← tunekey left18:07
→ diego4 joined18:08
→ tarkus joined18:09
→ m0viefreak joined18:11
→ Praxi joined18:11
← dviola left18:11
→ thiago joined18:11
→ xfbs joined18:13
← diego4 left18:14
→ diego4 joined18:14
diego4 → dviola18:14
← emg left18:15
→ emg joined18:16
← wandering_vagran left18:17
→ pankaj joined18:17
← sim590 left18:18
← dion left18:20
← KeyJoo left18:20
→ KeyJoo joined18:21
← sleepingdeforest left18:21
← pankaj left18:22
→ fission6 joined18:22
→ serialoverflow joined18:23
→ pankaj joined18:23
→ TomyLobo joined18:24
→ Master__ joined18:24
← MarioBranco left18:26
← sjoshi left18:26
→ dave0x6d joined18:27
→ MarioBranco joined18:30
← MarioBranco left18:31
← Bobguy left18:32
← __main__ left18:32
← justan0theruser left18:32
→ justanotheruser joined18:32
← Noldorin left18:32
→ MarioBranco joined18:33
→ banisterfiend joined18:33
← Master__ left18:33
← pankaj left18:34
→ __main__ joined18:36
→ staafl__ joined18:39
→ pankaj joined18:40
← staafl left18:41
← staafl_ left18:41
→ staafl joined18:42
← aLeSD left18:44
→ Master__ joined18:44
→ Bishop_Bautista joined18:44
← pankaj left18:46
→ rosco_y joined18:46
→ grokking joined18:46
→ pankaj joined18:46
→ Ellusionist joined18:47
→ xeno_ joined18:47
→ bronson joined18:47
← MarioBranco left18:47
← tkore\ left18:48
← kadoban left18:49
← orbyt_ left18:49
← xeno left18:49
xeno_ → xeno18:50
← black_13 left18:50
→ MarioBranco joined18:51
→ cdown_ joined18:51
← patarr left18:53
→ orbyt_ joined18:53
→ Bobdude joined18:53
← Master__ left18:54
← cdown left18:54
cdown_ → cdown18:54
→ Master__ joined18:54
← grokking left18:56
→ grokking joined18:57
→ Mattiaslndstrm joined18:57
→ energizer joined18:57
→ rwb joined18:57
← MarioBranco left18:58
← xfbs left19:02
← Ellusionist left19:03
← phormat left19:03
→ bathtub_shark joined19:04
← cdown left19:04
→ cdown joined19:04
← __main__ left19:08
→ patarr joined19:09
← DaGoaty left19:12
← dimi1947 left19:12
← tlaxkit left19:13
→ davix3f joined19:14
← davix3f left19:14
← GoBear left19:14
← grokking left19:15
→ grokking joined19:15
→ davide joined19:15
← davide left19:15
→ DaGoaty joined19:15
→ tkore joined19:15
grokking hello!19:16
gitinfo grokking: 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.19:16
grokking → grokkingStuff19:16
→ Sasazuka joined19:17
grokkingStuff beep boop19:17
so i'm trying to write a script that redirects a static url to a dynamically allocated url on github pages19:17
got the script working, but i need to make a git commit each time i need to change it.19:17
how do i do that without polluting git log?19:17
_ikke_ amend + force push?19:17
← sammyg left19:17
→ sammyg joined19:18
grokkingStuff true but i don't want to amend a previous commit19:19
want to put it in a branch and merge without affecting previous commits19:20
the script is running on a poor pi - don't want it to download a large git repo19:20
← DaGoaty left19:20
→ Plouescat joined19:20
→ DaGoaty joined19:21
→ __main__ joined19:22
← belmoussaoui left19:23
← bronson left19:23
← cdown left19:24
→ barduck joined19:25
← Raed|Mobile left19:25
→ pbandark joined19:25
← rosco_y left19:26
← DaGoaty left19:26
← barduck left19:26
→ barduck joined19:27
← energizer left19:27
← grokkingStuff left19:27
→ energizer joined19:28
→ jamiejackson joined19:28
→ DaGoaty joined19:28
→ xeno_ joined19:28
→ grokking joined19:29
← grokking left19:29
← barduck left19:29
→ grokkingStuff joined19:29
← tarkus left19:29
→ GoBear joined19:29
→ barduck joined19:30
← minionofgozer left19:30
← GoBear left19:30
→ sim590 joined19:31
→ anli joined19:31
→ GoBear joined19:31
← xeno left19:31
← anli left19:32
← barduck left19:32
← LocaMocha left19:33
→ barduck joined19:33
← banisterfiend left19:33
← Case_Of left19:33
← DaGoaty left19:33
→ DaGoaty joined19:34
→ Case_Of joined19:34
← barduck left19:35
→ barduck joined19:36
→ Raed|Mobile joined19:36
→ rosco_y joined19:36
→ goatish joined19:36
→ Achylles joined19:37
→ mostlybadfly joined19:37
← rosco_y left19:37
← DaGoaty left19:37
← barduck left19:38
→ DaGoaty joined19:38
→ cdown joined19:40
→ _ADN_ joined19:40
← Gurkenglas left19:41
→ barduck joined19:42
→ gugah joined19:43
← bsanford left19:43
→ bsanford joined19:44
← Raed|Mobile left19:44
← barduck left19:44
← Anthaas left19:45
→ barduck joined19:45
→ banisterfiend joined19:46
→ kzh joined19:46
→ Anthaas joined19:46
← barduck left19:47
← netj left19:48
→ netj joined19:49
→ aeyxa joined19:49
← theoceaniscool left19:49
→ bronson joined19:50
→ barduck joined19:51
← kpease left19:52
← DaGoaty left19:53
→ minionofgozer joined19:53
← barduck left19:53
← mborgard left19:54
aeyxa Trying to understand why something happened which I fixed with "git resert --hard @{u}"19:54
s/resert/reset19:55
← bronson left19:55
→ barduck joined19:55
aeyxa I added to a branch and tried to push to gitlab on master which was a protected branch but the local commit worked, and I couldn't revert it with git reset --hard, why did I need the @{u}?19:55
← barduck left19:57
← SteffanW left19:57
_ikke_ did you rewrite history (commit --amend, rebase, ..)?19:58
← rvgate left19:59
→ Raed|Mobile joined19:59
← Neo left20:00
← \malex\ left20:00
→ kpease joined20:01
← Raed|Mobile left20:01
← __main__ left20:02
→ __main__ joined20:03
← netj left20:03
→ barduck joined20:03
← xcm left20:04
← diogenese left20:04
→ netj joined20:04
← orbyt_ left20:04
→ xcm joined20:04
→ MarioBranco joined20:04
← Green_Crystal left20:06
← Master__ left20:07
→ jramsay joined20:09
← jramsay left20:09
→ sleepingforest joined20:09
→ jramsay joined20:09
← YuGiOhJCJ left20:10
→ jimmyrcom joined20:11
aeyxa I didn't do that _ikke_20:11
→ diogenese joined20:12
→ Mattiasl_ joined20:12
→ pirocks joined20:13
← relipse left20:14
→ relipse__ joined20:14
→ sleepingdeforest joined20:14
→ ZexaronS-2 joined20:15
→ DaGoaty joined20:15
← dfas` left20:16
← Mattiaslndstrm left20:16
← energizer left20:16
→ Sna4x8 joined20:16
← sleepingforest left20:17
← ZexaronS left20:17
→ ShalokShalom joined20:17
→ Bobguy joined20:18
Sna4x8 My team uses the gitflow workflow. We have some features that are ready for release, so we've merged them into develop and created a release candidate branch. That branch is undergoing UAT, but it's taking a long time to QA. Meanwhile we have other features that are complete, and we want to get those moved out.20:18
The problem is, we can't merge those features into develop without picking up the previous features. develop's kind of blocking us from going to production with new, smaller type enhancements. Any suggestions?20:19
← barduck left20:19
_ikke_ create a new branch based on master, merge in there20:20
→ _main_ joined20:20
Sna4x8 Like a new develop (develop1 or something)?20:20
_ikke_ Whatever you call it20:20
← ShalokShalom2 left20:20
_ikke_ perhaps just another release branch20:20
Sna4x8 Yeah, we were leaning that way. We were thinking of just nuking the current develop branch and creating a new one off of master.20:21
Then when the long-lived RC is ready to go to prod, we merge that into the new develop and up to master.20:21
← fnodeuser left20:21
← Bobdude left20:22
→ belmoussaoui joined20:22
_ikke_ Sna4x8: in the end, it doesn't really matter how you call the branch20:22
← _main_ left20:22
_ikke_ what matters is where it's started and what's merged into it20:22
Sna4x8 Right.20:22
← Masterphi left20:22
Sna4x8 Okay, thanks, __ikke_. Just wanted to run that by someone else and make sure I'm not doing something stupid.20:23
← __main__ left20:23
← kes left20:24
← ZexaronS-2 left20:24
→ __main__ joined20:25
← LionsMane left20:25
← hahuang65 left20:25
← __main__ left20:25
qpdb there once was a list of funny git related quotes in the topic, where is it?20:26
→ barduck joined20:27
→ __main__ joined20:27
→ bsanford_ joined20:27
← pnorman left20:28
← barduck left20:29
→ barduck joined20:30
zarzar how do i set git to use a specific ssh key, i have a few keys, need to specify which one to use20:30
→ bkxd joined20:30
← bkxd left20:30
← bsanford left20:30
← __main__ left20:30
→ throstur joined20:30
_ikke_ zarzar: ssh config20:31
→ Neo joined20:31
← throstur left20:31
_ikke_ qpdb: https://github.com/EugeneKay/git-jokes20:31
← Sleepy63 left20:32
qpdb thank you _ikke_20:32
← barduck left20:32
→ \malex\ joined20:32
→ barduck joined20:33
→ hahuang65 joined20:34
← DaGoaty left20:34
→ __main__ joined20:36
→ StuartMI joined20:36
← __main__ left20:37
← aeyxa left20:37
← banisterfiend left20:38
← barduck left20:38
→ DaGoaty joined20:39
→ __main__ joined20:40
← __main__ left20:42
→ banisterfiend joined20:42
→ VoradorPT joined20:43
→ __main__ joined20:44
zarzar _ikke_: not sure why but that isn;t working20:44
_ikke_ zarzar: what did you try?20:44
zarzar https://pastebin.com/Czdnfwiu20:45
← m0viefreak left20:45
zarzar What is User? Git user? Site user?20:45
→ m0viefreak joined20:45
→ Mattiaslndstrm joined20:46
← h12o left20:47
_ikke_ ssh user20:47
zarzar what the hell is an ssh user?20:47
← sleepingdeforest left20:47
preaction a user that has access to log in via ssh20:47
so, likely a user account on the machine20:48
→ barduck joined20:48
_ikke_ Most git hosting systems use 'git' as the user20:48
← Mattiasl_ left20:49
← barduck left20:50
→ bronson joined20:51
→ barduck joined20:51
→ h12o joined20:51
← MarioBranco left20:51
← __main__ left20:52
← zarzar left20:52
← ericmathison left20:52
→ dre_ joined20:53
→ __main__ joined20:53
← barduck left20:53
← __main__ left20:53
→ barduck joined20:54
← LeBlaaanc left20:54
→ __main__ joined20:55
→ ericmathison joined20:55
← pirocks left20:55
← bronson left20:55
← __main__ left20:55
→ Green_Crystal joined20:56
→ tarkus joined20:56
← barduck left20:56
→ __main__ joined20:57
← tarkus left20:57
→ zzz joined20:58
← Pacra left20:58
← __main__ left21:02
← dermoth left21:03
→ jnavila joined21:03
→ __main__ joined21:04
→ ZexaronS joined21:04
← madewokherd left21:05
→ jcarpenter2 joined21:05
← __main__ left21:05
→ barduck joined21:06
→ __main__ joined21:07
→ madewokherd joined21:07
← barduck left21:08
← __main__ left21:08
→ Masterphi joined21:09
→ barduck joined21:09
→ __main__ joined21:10
← Masterphi left21:10
← fission6 left21:11
← __main__ left21:12
← barduck left21:12
→ ZyX-I joined21:13
→ __main__ joined21:15
← __main__ left21:15
→ orbyt_ joined21:15
→ mpeter joined21:15
← mpeter left21:15
→ __main__ joined21:17
→ salek__ joined21:17
← __main__ left21:18
→ gtristan joined21:19
← salek_ left21:19
← cdown left21:19
← dvl left21:20
→ __main__ joined21:21
→ cdown joined21:21
→ fission6 joined21:22
→ Masterphi joined21:24
← rwb left21:26
→ Gurkenglas joined21:26
← Green_Crystal left21:27
→ Mike11 joined21:27
← cdown left21:28
← banisterfiend left21:29
← IrishPrime left21:30
→ Tobbi joined21:30
← salamanderrake left21:31
→ salamanderrake joined21:32
← muelleme_ left21:32
→ cdown joined21:33
→ nahtnam joined21:34
→ LionsMane joined21:35
→ nimomo joined21:38
→ wootehfoot joined21:39
← Bobguy left21:39
← zulutango left21:40
← belmoussaoui left21:40
→ belmoussaoui joined21:41
← cdown left21:42
← h12o left21:42
→ belmoussaoui_ joined21:42
← fission6 left21:43
← belmoussaoui left21:45
belmoussaoui_ → belmoussaoui21:45
← dre_ left21:47
→ dre_ joined21:47
→ misosoup joined21:49
← misosoup left21:49
→ gho5t joined21:49
→ fission6 joined21:50
gho5t On my branch I have created 6 commits. I want to reset --soft and instead make it just one final commit. The problem is I've already pushed to my remote. Is this possible?21:50
← fission6 left21:51
→ bronson joined21:51
_ikke_ It's possible, it might just anoy anyone who already fetched it21:53
← schleppel left21:54
← Masterphi left21:55
← bronson left21:56
gho5t no one has fetched it21:56
→ cdown joined21:57
gho5t so..how?21:57
_ikke_ same operation21:58
and then push --force-with-lease21:59
← dre_ left21:59
← nimomo left21:59
→ h12o joined22:00
← cdown left22:00
← Gurkenglas left22:01
← Achylles left22:02
→ Pacra joined22:02
gho5t very nice22:03
thanks22:03
← gho5t left22:04
← dviola left22:05
→ snax39 joined22:05
→ masuberu joined22:06
← masuberu left22:08
→ masuberu joined22:08
→ energizer joined22:10
← kzh left22:11
← belmoussaoui left22:13
← xcm left22:13
→ xcm joined22:13
→ belmoussaoui joined22:14
→ cagomez joined22:14
→ kzh joined22:15
→ Anticom joined22:15
← GivenToCode left22:15
→ sleepingforest joined22:16
← frederfred left22:17
← belmoussaoui left22:17
→ belmoussaoui joined22:18
← Mike11 left22:18
→ Mike11 joined22:20
← freimatz left22:21
→ tigers joined22:21
← robattila256 left22:21
← kzh left22:21
← Mike11 left22:22
← sleepingforest left22:22
→ Mike11 joined22:23
gchristensen → the22:23
→ sourcream joined22:23
← Mike11 left22:23
→ bronson joined22:24
← shabius left22:25
← sourcream left22:25
← pankaj left22:26
→ pbandark1 joined22:27
→ sourcream joined22:27
← sourcream left22:28
← pbandark left22:28
pbandark1 → pbandark22:28
→ rwb joined22:28
← bronson left22:29
→ muelleme_ joined22:30
← finalbeta left22:30
→ finalbeta joined22:30
→ sourcream joined22:30
← h12o left22:33
the → gchristensen22:33
← afuentes left22:33
← muelleme_ left22:34
→ sleepingforest joined22:37
← sleepingforest left22:37
← plexigras left22:37
→ sleepingforest joined22:38
← aard left22:40
← sourcream left22:40
→ sourcream joined22:40
← jnavila left22:40
← MoziM left22:41
→ shabius joined22:41
← bsanford_ left22:45
→ fission6 joined22:45
← jready left22:49
→ barduck joined22:49
→ h12o joined22:50
→ daeng joined22:51
→ MontyCarleau joined22:52
← Guest25708 left22:52
→ Guest25708 joined22:52
Guest25708 → Nicmavr22:52
MontyCarleau if I pull from a remote master and start making edits without checking out a new branch, is there a good way to have all of those edits applied to a new branch (as if I had immediately checked out a new branch after git-pull)?22:54
→ James0r joined22:54
← h12o left22:54
voker57 did you commit all these edits?22:55
if not, just check out, then commit22:55
← dege left22:55
→ zulutango joined22:56
MontyCarleau Isn't git going to make me stash changes before checking out a new branch?22:56
James0r after I've ignored a file, i'm still getting that it will be overwritten on a merge, what do I need to do to get git to respect the line in .gitignore?22:56
voker57 no.22:56
(to MontyCarleau)22:56
← disi left22:57
MontyCarleau voker57: Got it, thank you22:57
← Murr- left22:57
→ cdg joined22:57
→ Murr joined22:57
→ disi joined22:58
← Anticom left22:59
preaction James0r: gitignore doesn't work on files that are already in the repo22:59
James0r so I need to rm it then?23:00
← Amanas left23:00
preaction yes23:00
→ pirocks joined23:01
James0r preaction hrmm but then it's auto generated by my gulp task23:02
→ pionen joined23:02
← aphorismenoi left23:04
← xcm left23:05
→ xcm joined23:05
→ L8 joined23:06
L8 hey guys, an internal question: is there a way to get to the object files of a specific commit hash?23:06
← gchristensen left23:06
_ikke_ git ls-tree -r <commit>23:07
→ nimomo joined23:07
_ikke_ that would show all the blobs belonging to a commit23:07
→ iota_pi joined23:07
← Plouescat left23:07
← tigers left23:08
← Dougie187 left23:08
L8 I'm trying to fetch an object data from a remote git, that is being served via basic http server without ability to actually clone that repo23:09
I can only query .git/* files without ability to browse them actually23:09
so I'm trying to map the logs/HEAD (/index) file to an actual object file23:09
← re1 left23:10
_ikke_ can you run at least once git update-server-info?23:10
L8 nope :(23:10
_ikke_ and note that objects may be packed after gc23:10
→ h12o joined23:10
← nimomo left23:11
← revdns left23:12
← Darcidride_ left23:12
_ikke_ You need to look at refs/*23:12
← abba left23:13
← Sonarpulse left23:14
← fission6 left23:14
← h12o left23:15
← belmoussaoui left23:15
← aielima left23:16
→ aielima joined23:16
← Nicmavr left23:16
→ fission6 joined23:17
← manuelschneid3r left23:17
→ belmoussaoui joined23:17
→ revdns joined23:18
← jamiejackson left23:19
← KeyJoo left23:19
→ cdown joined23:19
→ Amanas joined23:20
→ h12o joined23:21
→ Forlorn joined23:22
← DaGoaty left23:22
→ DaGoaty joined23:22
← DaGoaty left23:22
→ DaGoaty joined23:23
← LionsMane left23:23
← DaGoaty left23:23
preaction James0r: generated files shouldn't be committed, so you `git rm` and add it to gitignore so it doesn't get committed again23:23
→ Masterphi joined23:23
← AaronMT left23:23
← shabius left23:24
← Masterphi left23:24
→ Masterphi joined23:25
← sammyg left23:25
→ bronson joined23:25
→ robattila256 joined23:26
→ dre_ joined23:27
← cdg left23:27
← fission6 left23:27
← cdown left23:28
← grokkingStuff left23:29
← bronson left23:30
→ muelleme_ joined23:31
← kpease left23:31
← goatish left23:33
→ cfoch joined23:33
← xcm left23:34
← Amanas left23:35
→ xcm joined23:35
← muelleme_ left23:35
← luckman212 left23:36
→ sentinal8473 joined23:38
← dsdeiz left23:38
← rpi[work] left23:39
→ dsdeiz joined23:39
← thiago left23:40
→ luckman212 joined23:40
→ kvik joined23:41
→ Atemu joined23:42
→ Raed|Mobile joined23:42
→ fission6 joined23:43
→ Amanas joined23:45
← kvik left23:45
→ cdg joined23:48
→ kvik joined23:48
← Bishop_Bautista left23:48
→ Nicmavr joined23:51
Nicmavr → Guest4496023:51
← Guest44960 left23:51
→ Guest44960 joined23:51
Guest44960 → Kestrel-02923:52
← cdg left23:52
← h12o left23:53
← ZexaronS left23:54
← Forlorn left23:54
← kvik left23:58
← neunon left23:58
← dave0x6d left23:58
→ v4ult joined23:58
← fission6 left23:59
→ h12o joined23:59
← ecuanaso left23:59
→ neunon joined23:59

Logs Search ←Prev date Next date→ Channels Documentation