IRCloggy #git 2020-10-26

Logs Search ←Prev date Next date→ Channels Documentation

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

2020-10-26

← Tawonga left00:02
← tiin57 left00:02
← finalbeta left00:05
← yohnnyjo1 left00:06
→ tiin57 joined00:06
← edsan left00:09
← royal_screwup21 left00:13
→ bambanx joined00:13
→ royal_screwup21 joined00:13
→ gschanuel7 joined00:16
← gschanuel left00:20
gschanuel7 → gschanuel00:20
← calcul0n left00:23
→ santagauss joined00:26
→ impermanence joined00:26
← tiin57 left00:33
← vdamewood left00:35
← cd left00:36
→ tiin57 joined00:36
→ sgn1 joined00:38
→ yohnnyjo1 joined00:38
← sgn left00:39
→ Technodrome joined00:39
← royal_screwup21 left00:42
→ royal_screwup21 joined00:42
→ marslander joined00:43
← m0viefreak left00:43
sgn1 → sgn00:44
← yohnnyjo1 left00:45
← bambanx left00:45
← marslander left00:46
← royal_screwup21 left00:47
→ sgn1 joined00:50
← sgn left00:52
→ heyitsrama joined00:52
→ justsomeguy joined00:55
← heyitsrama left01:02
← tiin57 left01:02
→ tiin57 joined01:06
→ royal_screwup21 joined01:14
→ yohnnyjo1 joined01:15
← royal_screwup21 left01:20
← tiin57 left01:32
→ tiin57 joined01:36
BlessJah_ → BlessJah01:40
apetresc → apetresc[m]01:41
apetresc[m] → apetresc01:42
→ royal_screwup21 joined01:44
← astronavt left01:46
→ astronavt joined01:46
← royal_screwup21 left01:48
← yoh left01:49
← AnAverageHuman left01:50
← duderonomy left01:56
→ AnAverageHuman joined01:56
→ duderonomy joined01:57
← impermanence left02:00
→ vicfred joined02:01
← tiin57 left02:02
← nomadicmathmo left02:03
→ nomadicmathmo joined02:03
← nomadicmathmo left02:06
→ tiin57 joined02:06
→ nomadicmathmo joined02:06
→ mimi_tom joined02:09
mimi_tom hi, I accidently did `git reset HEAD~3 .` from my branch. Can someone please tell me how I can able to undo that command?02:09
→ drbean joined02:11
BtbN reset again to where you were before02:12
mimi_tom but when I reset to my latest commit, All my files are unstaged02:14
← Gurkenglas left02:15
→ Shentino joined02:16
BtbN If you have unstaged changes, you'll have to add them again02:16
if you don't have any changes, just do a hard reset.02:16
mimi_tom you mean like `git reset --hard LATEST_COMMIT_HASH` this?02:18
← yohnnyjo1 left02:19
← F0rTex left02:24
→ F0rTex joined02:25
← cbreak left02:25
→ cbreak joined02:28
← tiin57 left02:33
← bin_bashtober left02:34
→ bin_bash joined02:34
→ kalbasit_ joined02:35
→ impermanence joined02:35
→ tiin57 joined02:36
→ heyitsrama joined02:37
→ blahboybaz joined02:40
← Technodrome left02:43
← santagauss left02:46
→ fikran[m] joined02:47
fikran[m] Hi all. I accidently committed a binary file. Is there a way to uncommit it? I am the sole owner/maintainer/user of this repo?02:48
← blahboybaz left02:49
← crose left02:53
← Shentino left03:02
← irc_user left03:02
← tiin57 left03:03
← heyitsrama left03:04
→ tiin57 joined03:06
lagothrix → Guest1276203:14
← Guest12762 left03:14
→ lagothrix joined03:14
→ Shentino joined03:14
← sudoforge left03:25
← tiin57 left03:33
→ tiin57 joined03:36
← nomadicmathmo left03:38
→ nomadicmathmo joined03:38
← stenno1 left03:43
→ notnatebtw joined03:44
→ stenno1 joined03:44
→ zebrag joined03:46
← inkbottle left03:46
Hello71 !undo03:47
gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at https://sukima.github.io/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!03:47
← notnatebtw left03:51
→ ferdna joined03:54
→ yohnnyjo1 joined03:59
← Hello71 left04:02
← nomadicmathmo left04:02
← tiin57 left04:02
→ Hello71 joined04:03
→ nomadicmathmo joined04:03
← maxwilliamson left04:05
→ maxwilliamson joined04:06
→ tiin57 joined04:06
← Lyqyd left04:16
→ powerh0use joined04:17
→ pwerhouse joined04:17
← powerh0use left04:18
← pwerhouse left04:18
→ powerh0use joined04:18
← donofrio left04:19
← geosmile left04:22
→ sudoforge joined04:24
← AnAverageHuman left04:30
→ cd joined04:31
← tiin57 left04:32
→ heyitsrama joined04:34
→ tiin57 joined04:36
← heyitsrama left04:38
← sgn1 left04:40
← ojdo left04:44
← madewokherd left04:49
→ sybariten joined04:50
sybariten Hey y'all04:50
→ ojdo joined04:51
sybariten here's a question that i would guess gets asked now and then: how does git handle (soft)links? I have a dir in one place, and i would like to have those files appear in a repo in another place.... transparently04:51
→ Guest20 joined04:52
→ Kaisyu joined04:52
→ sgn joined04:53
← tiin57 left05:02
→ tiin57 joined05:05
→ nephyrin_ joined05:08
← nephyrin left05:09
→ heyitsrama joined05:12
← heyitsrama left05:17
← nephyrin_ left05:21
→ nephyrin joined05:22
← kupi left05:25
→ OnkelBlade joined05:30
← tiin57 left05:32
→ tiin57 joined05:35
→ heyitsrama joined05:44
→ mightyjens joined05:45
← heyitsrama left05:49
→ Hounddog joined05:50
← tiin57 left06:02
← Aelius left06:05
→ tiin57 joined06:06
← sudoforge left06:06
→ Aelius joined06:07
← powerh0use left06:11
→ powerh0use joined06:12
← thiago left06:18
← Shentino left06:27
→ Shentino joined06:27
← gordonfish left06:32
← tiin57 left06:32
← orbyt_ left06:33
← powerh0use left06:34
→ tiin57 joined06:36
← Guest20 left06:36
← BSaboia left06:37
← dodobrain left06:39
← mat001__ left06:39
← gast0n left06:42
← lankanmon_ left06:44
→ finalbeta joined06:44
← stenno1 left06:47
→ stenno2 joined06:47
← arcatech left06:50
← nomadicmathmo left06:51
→ chele joined06:54
← tiin57 left07:03
← unluckyshrubbery left07:03
← smallville7123 left07:04
→ tiin57 joined07:06
← nemesit|znc left07:07
→ nemesit|znc joined07:08
← vicfred left07:31
→ teclator joined07:31
← tiin57 left07:33
← cd left07:33
→ LetoThe2nd joined07:36
→ tiin57 joined07:36
osse sybariten: git handles the links themselves07:40
← txtsd left07:41
osse another clone will contain a link07:41
→ KnoP joined07:41
→ rfuentess joined07:45
→ Haohmaru joined07:45
→ Mattiaslndstrm joined07:47
← Betal left07:54
← hussam left07:54
→ Technodrome joined08:01
← tiin57 left08:03
→ tiin57 joined08:05
→ nomadicmathmo joined08:06
→ p-core joined08:07
← sgn left08:08
nitrix-or-treat → nitrix08:10
← blowry left08:10
→ blowry joined08:10
← Goplat left08:12
→ jnavila joined08:14
→ santagauss joined08:17
← nomadicmathmo left08:26
← Mattiaslndstrm left08:31
→ venmx joined08:32
← tiin57 left08:32
→ nomadicmathmo joined08:33
→ oxymoron93 joined08:34
← hnOsmium0001 left08:35
→ tiin57 joined08:36
← nomadicmathmo left08:37
→ unluckyshrubbery joined08:38
← theoceaniscool left08:38
← bket left08:38
→ lankanmon joined08:39
← blowry left08:44
→ blowry joined08:45
→ PJBoy joined08:48
→ rcoote joined08:48
← mightyjens left08:49
→ mightyjens joined08:50
← drbean left08:54
← blowry left08:55
→ blowry joined08:56
← OnkelBlade left08:57
← tiin57 left09:03
→ tiin57 joined09:06
← webmariner left09:07
→ bket joined09:13
→ dodobrain joined09:16
→ fstd_ joined09:21
← fstd left09:25
fstd_ → fstd09:25
← blowry left09:25
→ blowry joined09:25
→ vdamewood joined09:26
← tc424 left09:31
→ txtsd joined09:32
← tiin57 left09:32
→ sgn joined09:34
→ tiin57 joined09:36
→ smallville7123 joined09:46
→ hussam joined09:50
→ Guest20 joined09:51
→ rsx joined09:51
← ferdna left09:51
→ feriman joined09:54
← p-core left09:56
← umask077 left09:56
← smallville7123 left09:57
→ shtrb joined09:58
shtrb can someone exaplain in simple words what is a "stale checkout" in the warning "a stale submodule checkout will remain in the old location, removing the old directory is only safe when it uses a git file"09:59
→ umask077 joined09:59
← umask077 left09:59
→ umask077 joined10:00
← umask077 left10:00
→ umask077 joined10:01
→ smallville7123 joined10:01
← tiin57 left10:02
→ tiin57 joined10:06
→ Mattiaslndstrm joined10:14
→ aliss joined10:29
→ calcul0n joined10:29
← tiin57 left10:32
← tilpner left10:33
→ tilpner joined10:33
← justsomeguy left10:35
→ jlevon joined10:36
→ tiin57 joined10:36
jlevon is it possible to get git fetch to fetch refs other than the default for submodules?10:36
--recurse-submodules with a supplied refspec does *not* do so10:37
→ OnkelBlade joined10:42
← feriman left10:45
→ shivam_ joined10:45
→ andreas303 joined10:46
← Guest20 left10:48
→ spiri joined10:52
→ jeso joined10:56
← g00s left11:00
← jeso left11:01
← tiin57 left11:02
→ kerframil joined11:03
→ Guest20 joined11:03
← Technodrome left11:04
→ SerialSmile joined11:05
→ tiin57 joined11:06
→ dodobrain_ joined11:08
→ Laxator2 joined11:09
→ feriman joined11:11
← dodobrain left11:11
→ Guest1430 joined11:13
← smallville7123 left11:14
gitinfo set mode: +v11:14
Laxator2 Need to learn about subtrees in git. I am using git version 2.9.5 (can't upgrade, no sysadmin rights). Is there a separate channel for this ? I already looked through the docs I could find on the web.11:15
← Guest1430 left11:15
shtrb jlevon, I found using git submodule update --remote --recursive --merge get most of what I need11:15
→ astrofog joined11:15
shtrb that's not what you asked for ,but maybe it will help you11:15
Laxator2 Thanks, something to look at11:16
jlevon thanks, but this is in jenkins git plugin context so it has to be a fetch argument11:16
stenno2 → stenno11:17
Laxator2 It covers submodules. Need to look at that too, but the subtrees specifically are what I am looking for11:17
← jaziz left11:18
→ royal_screwup21 joined11:18
→ wrobinson joined11:20
← Skeleswant left11:21
→ lainon joined11:21
→ mat001 joined11:22
shtrb Laxator2, I was answering to jlevon , sorry for the confusion.11:22
← Tobbi_ left11:22
← wrobinso1 left11:22
→ Swant joined11:23
Laxator2 No problem11:23
→ Tobbi_ joined11:23
jlevon shtrb: I also found it that even if remote.origin.fetch is set in .git/config, the submodule update --init doesn't fetch those11:23
→ donofrio joined11:24
Swant → Skeleswant11:28
← lainon left11:29
→ Anticom joined11:32
← tiin57 left11:33
→ thblt joined11:34
thblt Can git update a submodule's remote config after a change of SUBMODULE.path in .gitmodules?11:35
→ tiin57 joined11:36
thblt ok `git submodule sync`11:39
→ drbean joined11:41
→ dka joined11:46
dka I am following this tutorial to duplicate a repository: https://docs.github.com/en/free-pro-team@latest/github/creating-cloning-and-archiving-repositories/duplicating-a-repository , after duplicating it, I am cloning my new repo and when I do git status, I have : "On branch 1.4" why ??11:48
thblt dka: This is a github issue, not git. But I guess that's just the default branch of the origin repo.11:49
Which is relatively uncommon, but not unheard of.11:50
ikke dka: What does `git ls-remote --symref origin HEAD `11:51
return?11:51
replace origin with the apropriate remote name11:51
dka https://termbin.com/j55f11:54
ikke One test to be sure: git ls-remote origin | grep 35e69b87ebec3d23df045fb9193caa30491da5e911:54
← astrofog left11:54
→ amahl_ joined11:57
← spiri left11:59
← hussam left12:00
← thblt left12:01
← tiin57 left12:02
→ tiin57 joined12:06
→ clime joined12:08
→ jeroum joined12:09
jeroum hi12:09
gitinfo jeroum: 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.12:09
jeroum i'm actually new to git (version tracking stuff in general)12:10
what i want is, a way to sync files im working on on different machines12:10
← rustyshackleford left12:11
jeroum let's say im working on a project from two different computers, how can i manage them both in sync..12:11
ikke git is not really a file synchronization tool12:11
jeroum but there sure must be a way to achieve that right?12:12
osse Dropbox?12:14
jeroum so i clone one of my repositories to my local machine 112:15
and i do the same with local machine 212:16
then i work some files on lm1..12:16
→ bolovanos_ joined12:16
jeroum and i commit...12:17
now when i log into my lm2.. which command do i use to get the updates?12:17
ikke yes, constly commit, push, pull --rebase, commit, push, pull --rebase12:17
jeroum i see.. thank you ikke12:18
← shivam_ left12:19
← jeroum left12:20
→ mobidrop joined12:20
← bolovanos_ left12:23
→ yoh joined12:25
→ sdwrage joined12:31
← tiin57 left12:32
← royal_screwup21 left12:33
← syd left12:33
→ royal_screwup21 joined12:33
→ JTWLUK joined12:34
→ cdown_ joined12:34
→ tiin57 joined12:36
← cdown left12:37
cdown_ → cdown12:37
← royal_screwup21 left12:39
→ sysh joined12:40
→ ssiyad joined12:44
← dionysus69 left12:45
→ muhaha joined12:45
← freephile left12:48
→ BSaboia joined12:49
→ royal_screwup21 joined12:49
→ Gurkenglas joined12:57
← blowry left12:58
→ blowry joined13:01
← tiin57 left13:03
→ tiin57 joined13:06
→ darkbit joined13:06
→ pabs3 joined13:07
← amahl_ left13:07
→ gordonfish joined13:07
← sgn left13:08
← pabs3 left13:09
← blowry left13:09
← Guest20 left13:10
→ spiri joined13:12
→ saluri joined13:12
→ blowry joined13:13
← clime left13:15
← saluri left13:17
→ amahl_ joined13:20
← blowry left13:23
→ blowry joined13:23
← HumanG33k left13:24
→ pabs3 joined13:29
→ CodeSlingerPaul joined13:29
→ dodobrain__ joined13:29
← hexnewbie left13:29
pabs3 one of the objects in one of my packs is corrupt. how can I find out what that object is and what objects reference it?13:29
and if it turns out that I don't need the object, how can I remove it from the pack?13:30
← dodobrain_ left13:30
← sdwrage left13:30
→ randomguy090 joined13:30
← RandomGuy90 left13:30
← muhaha left13:31
ikke pabs3: did you run git fsck?13:32
← Kaisyu left13:32
← tiin57 left13:32
→ Amanas joined13:33
→ sdwrage joined13:33
← blowry left13:33
→ hexnewbie joined13:34
← dodobrain__ left13:34
pabs3 I hadn't, just did it now. looks like the pack is very corrupt :(13:34
→ blowry joined13:36
→ tiin57 joined13:36
← darkbit left13:38
→ crose joined13:39
← is_null left13:40
shtrb How do I see in reflog when a branch was erased , I got when it was created , but i still didn't see when it was dropped.13:40
→ nurdie joined13:40
osse when a branch is deleted the reflog is too13:41
In other words, you can't13:42
← drbean left13:43
← sweatsuit left13:48
→ sgn joined13:52
→ cd joined13:53
← blowry left13:55
← impermanence left13:55
→ blowry joined13:56
→ [twisti] joined13:56
[twisti] instead of doing git branch -b bla ; git add -p ; git commit ; git push, i instead did git add -p ; git commit ; git branch -b bla13:57
→ lucasb joined13:57
[twisti] i tried to cherry-pick the commit from my master, but of course it was empty13:57
any hint on how to recover ?13:57
→ sweatsuit joined13:58
nedbat [twisti]: what is "branch -b"? What did you want to do, and what is wrong now?14:01
← tiin57 left14:02
[twisti] nedbat: it creates a new branch and switches to it, its identical to git branch bla ; git switch bla14:05
err, sorry, not branch, checkout14:05
→ HumanG33k joined14:06
→ tiin57 joined14:06
← HumanG33k left14:07
→ HumanG33k joined14:07
nedbat [twisti]: ok, and why do you say of course the commit was empty? Did you make a commit on master?14:08
osse [twisti]: you only need to reset master back to before the commit14:08
https://github.com/Osse/git-stuff/blob/master/git-reset-explanation.txt14:08
[twisti] oh duh, thanks osse14:08
nedbat: yes, that was my problem14:09
→ Maxattax joined14:11
← tejr left14:14
← yohnnyjo1 left14:14
→ ghost43_ joined14:14
← ghost43 left14:15
← irrgit left14:16
→ tejr joined14:16
← SerialSmile left14:19
→ mat001_ joined14:20
← royal_screwup21 left14:21
→ royal_screwup21 joined14:21
← calcul0n left14:22
→ calcul0n joined14:23
← mat001 left14:23
← archpc left14:25
← royal_screwup21 left14:26
← epony left14:28
→ yohnnyjo1 joined14:30
← yohnnyjo1 left14:31
→ yohnnyjoe joined14:31
← tiin57 left14:32
→ thiago joined14:32
→ Technodrome joined14:35
→ independent_ joined14:35
→ tiin57 joined14:36
→ archpc joined14:38
← independent__ left14:38
← amahl_ left14:38
→ Betal joined14:44
→ mat001 joined14:45
→ nvmd joined14:46
← mat001_ left14:49
→ hnOsmium0001 joined14:53
→ roadie joined14:54
→ royal_screwup21 joined14:55
← k3yp left14:56
← hurfdurf left14:57
→ k3yp joined14:57
→ epony joined14:59
← royal_screwup21 left15:00
→ hurfdurf joined15:00
→ db_guy joined15:00
→ gast0n joined15:01
← db_guy left15:01
→ mat001___ joined15:01
→ Geminizer joined15:02
← tiin57 left15:02
Geminizer Does git have a way to generate an inverse commit, passing in a sha such that "whatever was added in that commit is now removed and what was removed is now re-added" ?15:02
← mat001 left15:03
Habbie Geminizer, git revert15:03
Geminizer, git revert <sha>15:03
Geminizer Habbie, thank you15:06
← Jackneill left15:06
→ tiin57 joined15:06
→ amahl_ joined15:08
→ clara97 joined15:10
→ royal_screwup21 joined15:11
→ sudoforge joined15:12
→ mat001 joined15:13
← mat001___ left15:16
← royal_screwup21 left15:16
→ Jackneill joined15:18
→ ferdna joined15:19
Geminizer is there a way to propagate that reversion to a new branch ?15:21
ikke git show -R <hash> if you just want the diff15:24
Geminizer: checkout the branch, and then do the revert15:24
→ durham joined15:25
Geminizer cool, thank you15:26
→ royal_screwup21 joined15:27
← luke-jr left15:28
→ durham_ joined15:28
→ mat001_ joined15:28
→ luke-jr joined15:29
← durham left15:30
← mat001 left15:31
shtrb thanks osse15:32
← royal_screwup21 left15:32
← tiin57 left15:32
→ arcatech joined15:33
→ mat001 joined15:34
← mat001_ left15:35
← austin987 left15:36
→ tiin57 joined15:36
→ nomadicmathmo joined15:37
→ dimi1947 joined15:38
← OnkelBlade left15:40
← KnoP left15:43
← arcatech left15:44
→ PyR3X joined15:44
PyR3X what is the best way to create a template repository and base other projects off it and being able to get updates from it? It seems submodules aren't able to be made at the root level of another project?15:45
ikke correct15:45
Git does not really support something like that15:45
→ uniminin joined15:46
PyR3X what is the best option for something like this?15:47
← uniminin left15:47
→ uniminin joined15:48
← uniminin left15:49
→ austin987 joined15:49
→ uniminin joined15:49
← uniminin left15:50
→ unihernandez22 joined15:51
ikke Good question15:51
→ uniminin joined15:51
→ durham joined15:51
dimi1947 I suppose..if I understand it corretly...when I change branch and stash changes(in master branch for example)..the changes will still be there when I swith to master again at a future time...correct?15:51
← oxymoron93 left15:51
ikke What you could do is to add the template repo as a remote, fetch from it, and squash any updates in (and keep track of what commit was last squashed in)15:51
← uniminin left15:52
ikke If you stash changes, the changes are stored as a stash, and remain there, until you pop the stash again15:52
→ mat001_ joined15:52
ikke and that could be done on any branch15:52
→ orbyt_ joined15:53
← durham_ left15:53
← unihernandez22 left15:54
→ sgn1 joined15:54
PyR3X I've done a lot of work to create a project template (gradle plugins preconfigured, buildSrc, READMEs, etc) that all exist in the project root. For new projects I basically want to clone this project and start making changes. But if I update the original repo, I want to be able to pull those changes in from the second project. My original idea was to make the first repo a submodule of the second15:54
project, but that would require me to add it to the root directory which I can't.15:54
ikke Correct15:55
submodules are separate projectsd, and the files are managed separately15:55
→ mat001__ joined15:55
ikke One solution (but kind of limited to unix) is to use symlinks back to the submoduel15:56
submodule*15:56
→ mat001___ joined15:56
← mat001 left15:56
PyR3X hmmm15:57
← sgn left15:57
→ heyitsrama joined15:57
→ arcatech joined15:57
PyR3X I guess it's kind of like a forked repo on GitHub. Forking on GitLab though requires a different group or namespace which is a problem15:57
https://medium.com/@smrgrace/having-a-git-repo-that-is-a-template-for-new-projects-148079b7f17815:58
I guess this kind of works?15:58
ikke A fork is basically just a clone in that regards15:58
← mat001_ left15:59
ikke One time forking / cloning is easy, but getting updates afterwards while having your own changes on top of that is more difficult15:59
← dimi1947 left15:59
← mat001__ left16:00
← Amanas left16:00
shtrb osse, other then reflog , is there a way for me to know when a branch had been erased (and to undelete maybe ) ?16:02
← tiin57 left16:02
sgn1 → sgn16:03
→ esc joined16:04
← esc left16:04
→ esc joined16:04
← gast0n left16:06
→ tiin57 joined16:06
← Anticom left16:08
← imMute left16:11
→ imMute joined16:11
← imMute left16:11
→ imMute joined16:11
ikke If you have recently checked out that branch, you should be able to restore it from the HEAD reflog16:13
but otherwise, no16:13
shtrb feels like an idiot16:14
shtrb thanks16:14
← imMute left16:14
→ imMute joined16:14
← imMute left16:14
→ imMute joined16:14
→ howdoi joined16:15
← chele left16:16
→ mat001 joined16:16
← nomadicmathmo left16:17
→ nomadicmathmo joined16:18
← mat001___ left16:19
← Jackneill left16:20
→ Jackneill joined16:23
→ gast0n joined16:29
→ mat001_ joined16:29
← nomadicmathmo left16:32
← mat001 left16:32
← tiin57 left16:32
→ nomadicmathmo joined16:32
→ orbyt_v7 joined16:33
← mat001_ left16:34
→ backthen31 joined16:35
→ tiin57 joined16:36
← mobidrop left16:41
ikke ter16:41
→ mat001 joined16:43
← orbyt_v7 left16:48
← Hounddog left16:48
← epony left16:49
→ madewokherd joined16:49
← Haohmaru left16:50
→ mat001_ joined16:52
← mat001 left16:53
→ Amanas joined16:54
← mat001_ left16:57
→ Fissure joined16:57
← rfuentess left16:58
→ mat001 joined16:58
← Amanas left16:59
→ dodobrain__ joined17:01
← tiin57 left17:02
← gast0n left17:05
→ tiin57 joined17:06
→ clime joined17:06
→ gast0n joined17:06
← rsx left17:12
→ Newami joined17:13
→ dyeplexer joined17:13
← Newami left17:13
dyeplexer is there a way to make git treat a symbolic link to a folder as a normal folder?17:14
ikke no17:14
dyeplexer ok17:15
← arcatech left17:19
← roadie left17:19
→ roadie joined17:19
← HumanG33k left17:19
← gast0n left17:21
→ orbyt_v7 joined17:22
→ theoceaniscool joined17:22
→ gast0n joined17:22
← ferdna left17:24
→ HumanG33k joined17:25
→ Amanas joined17:29
← Nokurn left17:31
← tiin57 left17:32
→ Guest20 joined17:33
← kerframil left17:35
→ tiin57 joined17:36
→ Nokurn joined17:37
→ dqx joined17:37
← HumanG33k left17:39
← Grems left17:39
← clara97 left17:39
→ Grems joined17:40
→ mat001_ joined17:40
← mightyjens left17:40
→ rustyshackleford joined17:42
← mat001 left17:42
← theorangeone left17:46
← HourGate left17:46
→ HourGate joined17:46
→ theorangeone joined17:47
→ jstein joined17:49
← dodobrain__ left17:50
← sysh left17:50
← spiri left17:51
← nasamuffin left17:51
→ nasamuffin joined17:55
← wolfshappen left17:57
→ bambanx joined17:57
→ clara97 joined17:58
← Geminizer left17:59
← mekhami left17:59
→ wolfshappen joined18:01
← clime left18:02
← tiin57 left18:02
→ epony joined18:03
→ theorangeone_ joined18:03
← theorangeone left18:03
← heyitsrama left18:04
→ heyitsrama joined18:05
→ kaartic joined18:05
→ tiin57 joined18:06
→ HumanG33k joined18:06
→ randallb_ joined18:07
→ webmariner joined18:08
← HumanG33k left18:09
→ HumanG33k joined18:10
← Guest20 left18:12
← dyeplexer left18:12
← Aquazi left18:13
← yohnnyjoe left18:17
← bocaneri left18:22
→ vicfred joined18:22
← tiin57 left18:32
← vdamewood left18:32
→ pac1 joined18:33
→ pac1_ joined18:33
← pac1_ left18:34
← Amanas left18:34
→ calcul0n_ joined18:35
→ tiin57 joined18:35
→ s2013 joined18:36
← calcul0n left18:38
→ hineios joined18:40
→ wootehfoot joined18:41
→ irc_user joined18:41
→ mat001 joined18:42
← mat001_ left18:46
← LetoThe2nd left18:55
→ arcatech joined18:56
← infl00p left18:59
→ infl00p joined18:59
→ yohnnyjoe joined19:00
→ mat001_ joined19:01
← tiin57 left19:02
→ thblt joined19:03
← mat001 left19:04
← voker57 left19:04
thblt Can git automatically add a branch to submodules and assign it a remote branch? I have horrible elisp scripts for that right now, I wonder if there's a better way.19:05
ikke thblt: probably something git submodule foreach?19:05
→ voker57 joined19:06
→ tiin57 joined19:06
→ mat001 joined19:07
thblt ikke: that's roughly what I do now.19:07
ikke I don't think git has anything better19:08
thblt (just noticed: you can't get --help on a subcommand if you're not in a repo)19:08
er no just wrong syntax19:08
← mat001_ left19:09
thblt there's set-branch but I don't understand what it's supposed to do.19:10
It seems to just update the field $module.path in .gitmodules, but the rest of git ignores this field altogether.19:12
← heyitsrama left19:14
→ mat001_ joined19:15
← mat001 left19:17
→ heyitsrama joined19:17
→ ferdna joined19:18
→ p-core joined19:19
kaartic thblt: you could get an idea of what $module.path means by taking a look at https://git-scm.com/docs/git-submodule/en#Documentation/git-submodule.txt---remote19:21
← heyitsrama left19:21
← p-core left19:23
→ p-core joined19:23
thblt kaartic: thanks!19:25
→ mat001 joined19:26
← shtrb left19:28
← mat001_ left19:28
→ heyitsrama joined19:30
← kaartic left19:31
→ mat001_ joined19:31
← Technodrome left19:32
← tiin57 left19:32
← justHaunted left19:32
← mat001 left19:34
← justanotheruser left19:35
→ tiin57 joined19:35
→ mat001 joined19:37
→ linux_dr__ joined19:38
← linux_dr__ left19:39
← mat001_ left19:40
→ linux_dr joined19:41
→ mat001_ joined19:44
← mat001 left19:46
← orbyt_v7 left19:47
→ vdamewood joined19:48
linux_dr Are there many git devs in here? I think I have a feature request that many people would find very helpful/powerful: Any ideas how to enhance the “unified diff” to make code that moved within or between files more obvious *AND* to make changes *TO* the moved code obvious also. (I know this is a non-trivial problem, but I think a solution would have long-term benefits for many projects.)19:48
← bambanx left19:49
→ bambanx joined19:51
→ justHaunted joined19:51
→ mat001 joined19:52
linux_dr Opinions?19:52
← yohnnyjoe left19:52
← mat001_ left19:52
→ mat001_ joined19:55
← nvmd left19:56
← mat001 left19:56
← heyitsrama left19:57
→ cdown_ joined19:58
thblt linux_dr: Out of my head: git doing diffing is a courtesy, not a fundamental feature. This could be implemented outside of git.19:58
osse linux_dr: are you looking for git diff --color-moved ?19:59
→ mat001 joined20:00
← yoh left20:00
← cdown left20:01
cdown_ → cdown20:01
← mat001_ left20:01
← tiin57 left20:02
→ gigasu_shida joined20:03
→ inkbottle joined20:04
← zebrag left20:04
← nomadicmathmo left20:04
→ nomadicmathmo joined20:04
gigasu_shida do i need to add the venv directory name to gitignore if i'm doing a django project?20:04
ikke Yes20:05
Committing a venv does not make a lot of sense20:05
→ tiin57 joined20:05
thblt I don't do much python but I think it's the kind of stuff that could even be globablly ignored20:07
gigasu_shida so if my venv dir is named "/home/username/tut" (the result of doing 'pwd'), is that what i add to my .gitignore file?20:07
thblt You usually add patterns, not paths.20:09
linux_dr thblt: true... I considered it a “UI feature” if anything... but if it’s gonna see any wide adoption, it will likely be in git.20:09
thblt If your venv is outside your repo you don't need to care at all.20:09
linux_dr osse: I’ll have to check it out.20:09
gigasu_shida how does git work?20:10
like if i don't put anything in the gitignore, will every single file in the whole computer get backed up?20:10
linux_dr gigasu_shida: very well. ;-)20:10
thblt gigasu_shida: no. But I think you need to read at least a few chapters of the book.20:10
gigasu_shida ok20:11
thblt gigasu_shida: git isn't a backup system, it allows to track revisions over specific directories.20:11
gigasu_shida right, i mean to put "backed up" in parens20:11
i mean quotes20:11
linux_dr I’ve heard of some git-based backup systems, but they tend to not be very robust.20:11
gigasu_shida i get it, it doesn't store the entirety of the file20:12
thblt git directories (repositories) are independant from each other. And git doesn't do much automatically, yo have to tell it what you want to make your new version of and give it a description.20:12
linux_dr: I do abuse git this way, but it's Bad.20:12
linux_dr thblt: especially with binary files, I imagine20:13
thblt I'm not *that* bad.20:13
gigasu_shida: Read this https://git-scm.com/book/en/v2 it will help.20:13
→ yoh joined20:15
← rcoote left20:15
gigasu_shida i will read it but right now i wanna make sure i don't destroy my computer20:15
thblt linux_dr: in all fairness though, git is perfectly happy with binary files. The UI isn't too nice but it works just as well.20:15
← nomadicmathmo left20:16
linux_dr thblt: I was referring to *git* being bad (read inefficient) with binary files.20:16
→ nomadicmathmo joined20:16
gigasu_shida what will happen if i don't have anything in .gitignore?20:16
will it version control every single file in my whole PC?20:16
thblt gigasu_shida: nothing.20:16
it won't do what you don't ask. It's not an Apple product.20:17
gigasu_shida will it version control every file?20:17
if i do a 'git add .' will it version control every single file?20:17
← misuto left20:18
thblt gigasu_shida: yes, in the repository.20:19
linux_dr I believe git will never version control files inside a `.git` directory... and it does have a global gitignore default.20:20
← Maxattax left20:21
gigasu_shida so why do i need to mention my venv folder in the .gitignore?20:21
← arcatech left20:21
gigasu_shida shouldn't it ignore it by default?20:21
linux_dr You also, generally won’t have a git repo in the root of a file system...20:22
gigasu_shida: if you put your venv in your global git ignores, it will.20:23
← justHaunted left20:23
gigasu_shida "I believe git will never version control files inside a `.git` directory" -- I don't understand this statement20:23
it won't version control files in a directory with .git in it?20:24
← indy left20:28
← Eldin left20:28
gigasu_shida guys, you've only made me more confused20:30
i'm just being honest20:30
← tiin57 left20:32
→ jaziz joined20:34
→ arcatech joined20:35
← epony left20:35
→ tiin57 joined20:36
→ g00s joined20:37
← ferdna left20:39
← roadie left20:40
→ arcatech_ joined20:40
← DiffieHellman left20:41
→ DiffieHellman joined20:41
→ lilbabygrlrp joined20:43
gigasu_shida i'm gonna read the book you gave me but i suspect i'll still have the same questions20:43
and btw i've already read a basic tutorial20:43
← Kaivo left20:43
← arcatech left20:43
← jlevon left20:44
← loadout[m] left20:45
← Guest46327 left20:45
← cerna left20:45
← lambda left20:45
← batrick left20:45
← CustosLimen left20:45
← Nothing4You left20:45
→ mp3 joined20:45
→ __ad joined20:45
→ Goop_ joined20:45
→ CustosLimen joined20:45
→ chusem4n joined20:45
→ epony joined20:45
→ batrick joined20:45
mp3 → Guest3774820:45
→ Ram-Z joined20:46
→ justanotheruser joined20:46
→ SegFaultAX joined20:46
→ routingsparks joined20:46
→ Kaivo joined20:46
→ misuto joined20:47
→ justHaunted joined20:47
→ lambda joined20:47
→ AnAverageHuman joined20:47
← Mattiaslndstrm left20:48
← Voxel left20:48
→ Guest46327 joined20:49
→ loadout[m] joined20:49
→ m0viefreak joined20:50
→ Mattiaslndstrm joined20:50
→ cerna joined20:52
thblt gigasu_shida: git is complicated, and you need to read more than a basic tutorial to get started. The book is really good, I think.20:52
gigasu_shida well i've always found that if i can get basic questions answered ahead of time, i absorb technical documents better20:53
i'm sure a lot of people are like this20:53
linux_dr gigasu_shida: a VCS and a back up system are really not that similar... al least not in use cases.20:54
gigasu_shida i mis-spoke earlier20:54
thblt I'm sorry, really, but you don't seem to understand basic answers. At the very least read the first two chapters (or even just 2) or the Git Book to get started.20:55
linux_dr And I’ve been half listening. So we’re both guilty... lol20:55
gigasu_shida if i say "git init" and it turns that directory into a repo, does that mean git only looks at files in that directory and its subdirectories?20:55
thblt yes20:56
gigasu_shida then it's very confusing why i needed to add the 'pattern' that points to my venv directory to my .gitignore20:56
i'm just confused i guess maybe due to faulty info i got20:56
thblt <thblt> If your venv is outside your repo you don't need to care at all.20:56
linux_dr gigasu_shida: yep... a VCS is for managing files within a project, and that project, as it exists on your computer, is a directory20:56
thblt gigasu_shida: ^20:56
gigasu_shida yeah, i'm still not sure what a 'repo' is20:57
← backthen31 left20:57
gigasu_shida i guess it's a directory where you call 'git init', plus its subdirectories20:57
thblt it's a directory managed by git.20:57
Yes.20:57
gigasu_shida right, i get that20:57
but which folders/directories does it cover/entail20:57
linux_dr gigasu_shida: do you have a specific use case you’re trying to fill? Or are you just wanting to add git to your tool belt?20:58
gigasu_shida the tutorials i've read don't come out and say exactly which directories are paid attention to when you run a 'git init'20:58
← amahl_ left20:58
gigasu_shida my specific use case is django/python20:58
← justHaunted left20:58
gigasu_shida which often involves using venv20:58
← HourGate left20:59
osse gigasu_shida: the git repo covers the files you tell it to cover with git add21:00
imMute gigasu_shida: the folder you're in when you 'git init' is the one that becomes the root of the repo.21:00
gigasu_shida right, i know that. you can say 'git add <specific file path>' , but most people just do "git add ."21:00
and i was wondering what, by default, "git add ." covers21:01
imMute gigasu_shida: '.' is the directory you're currently in.21:01
that's a shell convention, not git.21:01
← mud left21:01
gigasu_shida does '.' also cover subdirectories?21:01
imMute yes.21:01
(well not shell, more like filesystem thing? either way, it's not specific to git)21:01
gigasu_shida ok so a .gitignore is basically blocking out things that are inside that repo directory and its subdirectories21:02
← feriman left21:02
← tiin57 left21:02
imMute gigasu_shida: more like makes them not show up as untracked in 'git status'. if you have a file that git already tracks, gitignore isn't gonna change anything.21:02
gigasu_shida: .gitignore is for hiding files from 'git status' that you don't want to add to the repo21:03
→ Nothing4You joined21:03
linux_dr gigasu_shida: the general rule of thumb for VCS, is any file that can be automatically generated from your source files ( like vendor directories) should be excluded from VCS21:03
Also, and files that are developer-specific should be excluded as well.21:04
And while I’m at it. Also exclude any files containing “secrets” like encryption keys, etc... that means care must be taken to keep the secrets out of your code, and to distribute the secrets to those that need them.21:05
→ tiin57 joined21:06
→ justHaunted joined21:06
linux_dr But, like all such rules, part of the value of experience is knowing when to violate these rules.21:07
gigasu_shida thanks immute that's helpful and worth writing down21:07
→ notnatebtw joined21:11
← vdamewood left21:11
→ Amanas joined21:13
linux_dr gigasu_shida: i will say, you may have an easier time than some that came from centralize VCSs as there is some stuff you don’t need to un-learn.21:14
→ relipse joined21:16
gigasu_shida i now know what the 'VCS' menu in pycharm means =P21:16
← p-core left21:19
← arcatech_ left21:20
← Hello71 left21:21
→ Hello71 joined21:21
← justHaunted left21:23
→ justHaunted joined21:24
← thblt left21:27
→ thblt joined21:27
← thblt left21:27
← milkt left21:28
→ milkt joined21:30
gigasu_shida oh i get what's going on. a lot of people put their venv inside their django project directory. so then it needs to be excluded21:31
← tiin57 left21:32
← AnAverageHuman left21:33
← wootehfoot left21:33
→ tiin57 joined21:35
← Amanas left21:39
→ Soliton joined21:40
← lacrymology left21:42
← Soliton left21:42
← lilbabygrlrp left21:42
← routingsparks left21:43
→ Soliton joined21:43
← randallb_ left21:46
← clara97 left21:49
← irc_user left21:51
→ Mike60 joined21:54
← m0viefreak left21:56
sybariten osse: aha , i was hoping to magically have some other behaviour (regarding git and links). I basically wanted git to be unaware that it was looking at a link21:57
← tiin57 left22:03
→ routingsparks joined22:04
→ indy joined22:04
→ arcatech joined22:05
→ tiin57 joined22:06
→ dpflick_ joined22:07
← dpflick left22:09
osse sybariten: maybe you can keep the actual content in git and have a symlink the other way22:10
sybariten osse: i did something like that finally22:11
I can maybe take the opportunity to explain my case, maybe someone has an idea or suggestion. I have one dir called ~/courses , where i get stuff from school courses. These files are handled with a sort of a proprietary vcersioning system. It acts a bit like git so i think its running that under the hood. But somehow i also like to keep a repo on bitbucket, with parts of this code i'm doing in the courses. So22:14
this is under ~/programming or something.22:14
→ NeilG joined22:14
← Mike60 left22:15
→ Atlenohen_ joined22:15
sybariten I mean, since ~/courses is already handled by git somehow i didnt wanna mess it up by trying to version that dir explicitly, to bitbucket. So my repo is separate. But if i have something like ~/courses/assignment1 , i was hoping i would be able to just create a link ~/programming/assignment1 cause i'm doing the real work in ~/courses . Now i'm manually copying stuff from courses to programming, as they get22:16
finished.....22:16
← fling left22:17
← Atlenohen_ left22:17
← Atlenohen left22:17
→ roganjoshina joined22:22
← JanC left22:25
→ JanC joined22:25
→ Amanas joined22:29
← roganjoshina left22:30
← tiin57 left22:32
→ tiin57 joined22:35
→ servo joined22:50
← jnavila left22:51
← jstein left22:54
← servo left22:54
→ dodobrain joined22:55
→ ferdna joined22:56
→ AnAverageHuman joined22:57
← tiin57 left23:02
NeilG how do I make a branch on origin equal to my local branch?23:05
→ tiin57 joined23:05
NeilG without deleting it and recreating it23:06
← justanotheruser left23:06
→ dflick__ joined23:07
cbreak NeilG: you can force push23:09
← dpflick_ left23:09
← calcul0n_ left23:09
← s2013 left23:10
NeilG cbreak how do I do that? It seems like the branches aren't tracking each other23:11
cbreak git push -fu origin localname:remotename23:11
NeilG can I make my branch track the remote first?23:11
← aliss left23:11
NeilG or should I?23:11
cbreak after this, the local branch will track the remote one, and the remote one will be in the state the local one was during the push23:11
NeilG oh nice23:11
NICE23:12
thank you23:12
cbreak for example git push -fu origin HEAD23:12
NeilG what does that example do?23:13
I thought you needed a : ?23:13
Timvde If you don't specify a localname: it will take the current branch23:13
NeilG oh lol ok23:13
Timvde HEAD as remotename will match the local branch name23:13
NeilG wait23:13
what23:13
if I don't specify localname, it uses the branch that I'm in, right?23:14
Timvde If you're on mybranch and you push to HEAD, it will push to mybranch remotely23:14
← HumanG33k left23:14
NeilG you just said I was pushing to HEAD23:14
you mean push from mybranch?23:14
→ zebrag joined23:14
Timvde Yes23:14
← ariedro left23:14
NeilG ok that makes sense23:15
← AnAverageHuman left23:16
NeilG I tend to go to the branch I'm working from anyway, so I'll probably just use that form23:16
Timvde If you have mybranch checked out, `git push origin HEAD` is equivalent to `git push origin mybranch`23:16
If that's a clearer explanation23:16
NeilG I thought HEAD on master was a separate branch?23:17
than mybranch23:17
← inkbottle left23:17
NeilG origin/HEAD is different than origin/mybranch23:17
Timvde Yes, but check the git push man page23:17
NeilG so why wouldn't git push origin mybranch push from whatever I have checked out to origin/mybranch?23:18
Timvde It explains `git push origin HEAD` as: A handy way to push the current branch to the same name on the remote.23:18
NeilG the git man page is opaque lol23:18
ahahah23:18
aha23:18
got it23:18
Timvde NeilG: it does23:18
NeilG okay23:18
Timvde but our branch names are PROJ-123/doing_some_stuff23:18
NeilG that is a confusing overloaded meaning of HEAD23:18
Timvde So HEAD is a nice shorthand :)23:18
NeilG makes sense23:19
I use some kind of autocomplete thing, so i can just tab23:19
← random_yanek left23:19
NeilG not sure how it works, but I think it's part of zsh23:19
thanks for the explanation23:19
mackerman HEAD is a pointer to what you are working on how23:19
* now23:19
← g00s left23:19
Timvde Yea, I also have autocomplete, but I'd still have to type the ticket number, while I have an alias set to git push -u origin HEAD :)23:19
NeilG mackerman yes, I knew that, but I didn't realize that origin/HEAD had a special meaning when pushing23:20
I thought origin/HEAD was always origin/master23:20
→ Technodrome joined23:20
NeilG (I was just corrected)23:21
← PJBoy left23:21
→ AnAverageHuman joined23:21
NeilG timvde thanks, yes that makes sense23:21
Timvde Yes, but `origin HEAD` != `origin/HEAD`23:21
`origin/HEAD` points to the branch that will be checked out on clone23:22
so it is usually origin/master, as you noticed23:22
← CodeSlingerPaul left23:22
→ yohnnyjoe joined23:27
← pabs3 left23:27
cbreak the HEAD in git push origin HEAD is not origin/HEAD23:28
it's your local HEAD23:28
→ random_yanek joined23:29
← tiin57 left23:32
← hineios left23:33
→ tiin57 joined23:36
→ hineios joined23:37
→ ariedro joined23:38
ariedro → Guest6689923:39
→ Hey joined23:39
Hey how do I recommit all files and folders so I can push them all and overwrite23:40
cbreak ?23:41
← Amanas left23:41
cbreak if you didn't change anything, you can make an empty commit with --allow-empty23:41
but really... what you ask for makes no sense23:42
Hey yeah23:42
Let me check something first23:42
dodobrain i use `git log --oneline --decorate --graph --all` quite a lot. recently i've had to add in a lot of remotes due to an increase of new developers on the projects i work on23:51
is there a way i can limit the output of my cmdline to cimply my local repo and my origin remote ? i dont want to see decorations or branches or commits from other remotes23:52
previously the amount of remotes i had was quite low, so there was no issue in having them show up in my --all cmdline output. but now things are getting out of hand and im not able to visually parse the output given the amount of other remotes and their branches showing up23:53
→ shush joined23:57
← theoceaniscool left23:58

Logs Search ←Prev date Next date→ Channels Documentation