IRCloggy #git 2023-10-25

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.

2023-10-25

→ utkojhamela joined00:00
→ wonko-the-sane joined00:01
← henry40408 left00:04
→ henry40408 joined00:05
← SuperLag left00:06
→ SuperLag joined00:07
← SuperLag left00:07
→ SuperLag joined00:07
→ jklfds joined00:08
→ JayBeeFOSS joined00:12
← jklfds left00:14
→ jklfds joined00:15
← hanneso left00:19
← JayBeeFOSS left00:19
← jklfds left00:20
← gsi left00:22
→ gsi joined00:23
→ ThorMojito joined00:33
→ ThorMojito1 joined00:33
← jacobk left00:34
← qqq left00:35
→ jklfds joined00:35
→ qqq joined00:35
← defjam left00:36
→ hanneso joined00:36
← bn_work left00:36
→ ThorMojito2 joined00:36
→ JayBeeFOSS joined00:36
← ThorMojito left00:37
← ThorMojito1 left00:38
← jklfds left00:41
← henry40408 left00:44
→ henry40408 joined00:44
← nyah left00:46
→ jklfds joined00:46
→ defjam joined00:49
→ cliluw joined00:52
← defjam left00:53
cliluw Is it usual for merge commit messages to have a "# Conflicts" section? I noticed Git autoadded those. Am I supposed to remove those commented-out lines with my text editor before saving the commit message?00:53
nedbat cliluw: i believe git will ignore lines starting with #. they won't appear in your commit message.00:54
cliluw Interesting. I noticed Git kept those lines if I do `git commit --no-edit` on the merge commit. I could see keeping those lines as they are somewhat helpful to track an possibly-evil merge.00:55
← jklfds left00:57
← opal left00:58
→ opal joined00:58
← ThorMojito2 left00:59
→ ThorMojito joined00:59
← Lord_of_Life left01:00
← JayBeeFOSS left01:00
→ Lord_of_Life joined01:01
← mataga left01:03
← BUSY left01:04
→ defjam joined01:06
→ jklfds joined01:09
→ mataga joined01:10
← mataga left01:10
→ mataga joined01:10
← vanessa left01:11
← defjam left01:12
→ oblivskep joined01:13
← oblivskep left01:15
← jas-maelstrom left01:16
→ nate2 joined01:17
→ JayBeeFOSS joined01:18
→ bywaterloo_ joined01:18
← jklfds left01:20
← bywaterloo left01:21
→ Betal joined01:22
← nate2 left01:22
→ defjam joined01:23
← ThorMojito left01:27
← defjam left01:29
→ jas-maelstrom joined01:33
→ jklfds joined01:34
→ NeatNit joined01:34
← jklfds left01:40
→ defjam joined01:40
← Dotz0cat left01:41
→ ThorMojito joined01:42
← leah2 left01:44
← defjam left01:47
← cousteau left01:47
→ jklfds joined01:47
← opal left01:48
← Vonter left01:49
← jklfds left01:53
→ jklfds joined01:53
← ThorMojito left01:55
→ Vonter joined01:56
→ defjam joined01:58
← jklfds left01:59
→ dev4449 joined02:02
← defjam left02:03
→ opal joined02:06
← FinnElija left02:09
→ finn_elija joined02:09
finn_elija → FinnElija02:09
→ jklfds joined02:12
→ Dotz0cat joined02:12
← jb1277976 left02:13
← keypusher left02:15
→ defjam joined02:16
→ keypusher joined02:17
← jklfds left02:17
→ danse-nr3 joined02:19
← cliluw left02:20
← danse-nr3 left02:22
→ danse-nr3 joined02:22
← defjam left02:22
← stagas left02:25
← utkojhamela left02:26
→ stagas joined02:26
← raffaele left02:28
→ raffaele joined02:28
→ defjam joined02:29
→ jklfds joined02:30
→ jacobk joined02:35
← defjam left02:35
← jklfds left02:35
← jacobk left02:42
← criswell left02:42
← bloody left02:44
→ criswell joined02:44
→ jklfds joined02:48
→ defjam joined02:48
← jklfds left02:53
← defjam left02:54
← tirnanog left02:54
→ defjam joined02:54
→ jklfds joined02:58
← defjam left03:00
← jklfds left03:03
→ jklfds joined03:10
→ defjam joined03:14
→ jacobk joined03:15
Ali_nz Hi Guys03:15
Anyone herlp me with this please?03:16
https://stackoverflow.com/questions/77355818/git-in-vscode-extra-repository03:16
nektro what does the files tab look like03:19
← defjam left03:20
Ali_nz Doesnt look to have any git options03:21
Could share a pic if you wnat?03:21
← dnb^ left03:24
← Dotz0cat left03:25
→ Dotz0cat joined03:25
nektro does it have multiple folders?03:27
eg my first guess is u have a workspace03:28
← jklfds left03:29
Ali_nz bird-app is root folder03:30
bird-project is actually created as a subfolder03:30
→ defjam joined03:30
→ jklfds joined03:35
← wonko-the-sane left03:36
← GNUmoon left03:36
← defjam left03:36
→ GNUmoon joined03:37
← mven left03:38
← gast0n left03:40
← jklfds left03:40
→ mven joined03:40
← Vonter left03:41
→ Vonter joined03:43
← bywaterloo_ left03:43
nektro is there a .git folder in bird-project?03:43
→ leah2 joined03:44
← GNUmoon left03:46
→ GNUmoon joined03:46
← danse-nr3 left03:46
→ m5zs7k joined03:47
→ danse-nr3 joined03:47
→ jklfds joined03:49
→ defjam joined03:49
← mven left03:51
← jklfds left03:54
← defjam left03:55
← jacobk left03:58
→ utkojhamela joined04:00
← FinnElija left04:00
→ FinnElija joined04:01
Ali_nz doesnt look to be04:04
→ jklfds joined04:05
Ali_nz a gitignore but thats it04:05
→ defjam joined04:07
← jklfds left04:10
→ jklfds joined04:10
→ genesis1523 joined04:11
Ali_nz Sorry it does04:12
it was hidden04:12
(Windows)04:12
← defjam left04:14
← jklfds left04:15
→ jklfds joined04:16
→ wonko-the-sane joined04:23
← genesis1523 left04:25
← jklfds left04:27
→ defjam joined04:28
← danse-nr3 left04:33
← defjam left04:34
→ jklfds joined04:39
← bket left04:42
← theobjectivedad left04:43
← jklfds left04:44
← opal left04:45
→ bket joined04:45
→ defjam joined04:46
→ fdan joined04:48
→ otisolsen70 joined04:48
→ jklfds joined04:50
← cpackham left04:55
← jklfds left04:55
→ danse-nr3 joined04:55
← otisolsen70 left04:58
← defjam left04:58
→ otisolsen70 joined04:59
→ jacobk joined05:00
→ R2robot joined05:00
← ZMarkGC left05:01
← fdan left05:02
← itaipu left05:05
→ jklfds joined05:05
→ defjam joined05:10
← jklfds left05:11
← defjam left05:16
→ derfflinger_ joined05:16
→ jklfds joined05:17
→ itaipu joined05:18
→ nate2 joined05:19
→ derfflinger__ joined05:21
← nate2 left05:23
← derfflinger_ left05:25
← jklfds left05:27
← derfflinger__ left05:28
→ defjam joined05:28
→ jmd joined05:32
← dsrt^ left05:33
→ ZMarkGC joined05:33
← defjam left05:33
→ dsrt^ joined05:36
alephnull So I am trying to replicate git fetch --depth 1 ... && git checkout using go-git. The go-git version cannot checkout and complains that the reference cannot be found.05:38
→ jklfds joined05:39
alephnull I can see that .git/refs/heads/ are present and have the correct contents. In fact, running git checkout works correctly. What I'm trying to understand is where git-checkout looks for references in a shallow clone.05:43
← jklfds left05:44
→ abubakarsadiq joined05:44
→ defjam joined05:45
← jmd left05:47
← GNUmoon left05:48
→ GNUmoon joined05:50
→ jklfds joined05:51
← defjam left05:51
← thiago left05:54
← jklfds left05:56
→ carl-- joined05:56
← carl-- left05:57
→ carl-- joined05:58
→ Jaxef joined06:00
→ defjam joined06:03
→ jklfds joined06:06
← defjam left06:09
← Furai left06:09
← jklfds left06:11
← wonko-the-sane left06:13
→ stats4647 joined06:13
→ masoudd joined06:13
→ Furai joined06:13
← stats4647 left06:18
→ jklfds joined06:21
→ defjam joined06:22
← ferdna_ left06:24
→ YuGiOhJCJ joined06:25
← jklfds left06:26
→ TheCaptain3 joined06:26
← defjam left06:28
← rama_ left06:28
← TheCaptain left06:28
TheCaptain3 → TheCaptain06:28
→ defjam joined06:30
→ rama_ joined06:30
→ schne1der joined06:34
← rama_ left06:35
→ jklfds joined06:36
→ CO2 joined06:45
← Gary_Sinise left06:45
→ igemnace joined06:46
→ coot joined06:49
← Celelibi left06:50
→ Celelibi joined06:51
→ rama joined06:58
→ rfuentess joined06:59
← rama left07:04
→ rama joined07:06
→ jb1277976 joined07:07
← rfuentess left07:08
→ rfuentess joined07:09
← GNUmoon left07:09
→ iomari891 joined07:10
→ GNUmoon joined07:10
← jacobk left07:11
← rama left07:12
→ crabbedhaloablut joined07:13
← deltab left07:13
→ feriman joined07:15
← skapate left07:16
→ rama joined07:17
→ jklfds_ joined07:18
→ cpackham joined07:20
← jklfds left07:21
→ cart_ joined07:22
← Guddu left07:22
→ deltab joined07:23
→ jacobk joined07:29
← cart_ left07:34
→ cart_ joined07:34
→ mobidrop joined07:35
← danse-nr3 left07:35
→ danse-nr3 joined07:35
← colona left07:36
→ opal joined07:38
adgtl Which log flag do you use regularly?07:39
← vdamewood left07:45
→ vdamewood joined07:45
→ danse-nr3_ joined07:47
← danse-nr3 left07:47
← Albright left07:47
→ Albright joined07:50
← cart_ left07:50
← cpackham left07:51
→ cart_ joined07:51
→ chris_99 joined07:53
← cart_ left07:56
chris_99 Hi, afaik when i do git rebase upstream/master, the hashes for my own commits will have changed, if i do 'git checkout <OLD HASH>' i can still checkout one of my commits, with history prior to rebasing, i'm just wondering that old hash, wont stay valid forever, or will it?07:57
← warmana left07:57
← opal left07:58
osse chris_99: Git will "garbage collect" it eventually07:59
→ warmana joined07:59
→ TomyWork joined07:59
osse depends a bit on settings, but without any manual intervention it'll be valid for at least 14 days07:59
by default it will be valid for at least 90 I think08:00
chris_99 ah interesting, thanks, so can you alter the # of days?08:00
osse yes08:00
chris_99 cool, do you happen to know if you can tweak that on services like github too?08:01
selckin you can't08:01
chris_99 ah08:02
osse Github likely uses vastly different settings for this stuff than what a regular repo on a normal PC does.08:02
It doesn't use reflogs (I assume) so then we're back to 14 days, not 90. But I guess they garbage collect way more often than what just Git does locally08:02
Imo. on servers just assume it's no longer valid immediately. Don't rely on it.08:03
chris_99 sure, that's a good point, thanks08:03
osse If you *want* it to become invalid quicker than what it actually does I think you have to contact github support . (eg. you committed a password or something)08:04
selckin you can reach other peoples forks through your own repo on github08:04
← gryffus left08:05
→ theoceaniscool joined08:08
→ pretty_dumm_guy joined08:09
chris_99 selckin: what do you mean by that out of interest, not quite sure what you mean08:14
selckin they are backed by the same "git repo", if you commit something in a fork, you can access it from the original repo with commit hash, so always assume there is garbage08:17
chris_99 oh, interesting, didn't know that08:18
← rama left08:18
→ gryffus joined08:19
← pretty_dumm_guy left08:26
← mitrokov left08:27
→ navi joined08:28
→ colona joined08:33
← sukieyy left08:34
→ rosco joined08:34
→ sukieyy joined08:35
→ rama joined08:37
→ Guest13 joined08:37
← Guest13 left08:38
← danse-nr3_ left08:40
← rama left08:42
→ opal joined08:47
→ danse-nr3 joined08:51
→ rama joined08:52
← LuKaRo left08:52
nektro --oneline is my most common log flag adgtl08:55
selckin alias lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative08:56
osse pro-tip. configure that format with a name in gitconfig. that way you can use it outside of that alias as well08:57
(and the alias becomes a bit shorter)08:58
← rosco left09:00
→ cart_ joined09:02
→ pretty_dumm_guy joined09:04
→ kek_ joined09:06
→ genesis1523 joined09:06
→ stats4647 joined09:11
← warmana left09:13
← Betal left09:13
← utkojhamela left09:16
← stats4647 left09:18
→ z3bra joined09:19
z3bra Hello, I have a question about git-shell: Does it reset the environment when you run a command with -c ?09:20
selckin reset?09:20
→ nate2 joined09:20
selckin env is inherited from to child, when it exists, its gone09:21
← Jaxef left09:22
← Vonter left09:22
→ Vonter joined09:23
z3bra I have a git-shell-command which basically does: export FOO=BAR; git-shell -c "$SSH_ORIGINAL_COMMAND"09:23
and it seems that my FOO=BAR is not in the env09:23
so I wonder if that's expected or if it's my setup which doesn't work09:24
selckin its made to be restricted shell for security, keeping env vars would be dangerous09:25
← nate2 left09:26
→ TheCaptain2 joined09:26
→ Jaxef joined09:26
← rfuentess left09:27
← TheCaptain left09:28
TheCaptain2 → TheCaptain09:28
→ nyah joined09:32
z3bra idk, it seems to work when I run it from a shell prompt09:33
→ rfuentess joined09:33
← kek_ left09:36
z3bra I think it's sshd which clears the environment in my case09:45
selckin it does09:48
→ Ophielle joined09:51
← Dotz0cat left09:52
← JayBeeFOSS left09:53
→ Dotz0cat_ joined09:53
→ bf_ joined09:53
← Noisytoot left09:54
Ophielle Ok im new to this and have a question, i have a git repo we can call it A and inside A i created a submodule B, ive done work on both of these repos and when pulling the git on another computer A pulls file but submodule init and submodule update pulls B down in the state it was in when i added it missing many changes it also dosent seem to have an upstream branch meaning i have to go into it and do git pull origin branch to update09:54
it. am i doing this wrong? i just want B to be always pulled at the latest version09:55
Dotz0cat_ → Dotz0cat09:55
→ Noisytoot joined09:55
OnkelTem_ → OnkelTem09:55
← rama left09:58
→ utkojhamela joined09:59
→ rama joined10:04
→ theobjectivedad joined10:07
← rama left10:10
→ JayBeeFOSS joined10:10
→ arahael joined10:11
→ squealingcode joined10:14
→ stenno joined10:14
→ rama joined10:16
← rama left10:21
→ rama joined10:22
← defjam left10:27
→ mane joined10:37
→ defjam joined10:41
← coot left10:47
→ cousteau joined10:47
osse Ophielle: a submodule is always at a specific commit. Changing the commit of the submodule is considered a change that must be committed in the outer repo10:50
That's just how it is. Maybe a submodule is not what you want10:51
nedbat Ophielle: can you say more about why you are using a submodule? There might be a better solution.10:53
→ dnh joined10:53
cousteau osse: I think that's how it should be... a commit that is working cannot suddenly stop working without doing any changes; having your repo do different things in different days because some external component changed would be confusing10:56
osse cousteau: I agree.10:56
Submodules make more sense for external deps, like a library at version 1.2.310:56
cousteau "this worked yesterday, why doesn't it work today?" and "I reverted all the changes and that still didn't fix the problem" are two of the most frustrating things that can happen10:56
(as a fun side note, a friend of mine had that happen with a program that didn't work on Wednesdays)10:57
osse cousteau: wow, how did that happen?11:06
Sounds more like a logic error than an actual code change every Wednesdays :O11:07
cousteau Well, at the beginning we started saying that as a joke, because one day the program would start terminating abruptly (even without having touched anything on the source code, or having reverted all the changes), and the next day it'd work just normally. That had to be frustrating.11:08
At some point, the guy using the code got tired and started trying to diagnose the issue11:08
and found that the problem was when one of the components wrote the system date as a comment on a file11:09
← utkojhamela left11:09
cousteau "Wednesday" in Spanish is "miércoles"11:09
→ chao joined11:10
cousteau *encoding error*11:10
← stenno left11:10
chao → stenno11:10
← YuGiOhJCJ left11:14
← dsimic left11:18
osse :D11:19
→ dsimic joined11:19
osse do u even utf8 everywhere11:19
→ warmana joined11:22
← rama left11:26
→ mitrokov joined11:28
→ cation joined11:31
← danse-nr3 left11:36
→ epicout joined11:41
← epicout left11:41
→ epicout joined11:41
← defjam left11:43
→ defjam joined11:45
→ rama joined11:46
→ epicout_ joined11:46
← epicout left11:50
← rama left11:51
← igemnace left11:52
→ igemnace joined11:53
→ humanface joined11:55
← cousteau left11:57
→ rosco joined11:58
→ rama joined11:59
← xandris left12:01
← epicout_ left12:02
← defjam left12:02
← Traneptora left12:04
← pretty_dumm_guy left12:04
→ xandris joined12:04
→ naruto69 joined12:05
→ Xaldafax joined12:06
← opal left12:13
→ opal joined12:13
→ defjam joined12:14
← humanface left12:15
← defjam left12:19
→ defjam joined12:20
← squealingcode left12:23
→ squealingcode joined12:24
→ pretty_dumm_guy joined12:25
→ danse-nr3 joined12:28
→ apathor joined12:28
← genesis1523 left12:33
→ genesis1523 joined12:38
→ bloody joined12:39
← dnh left12:40
← naruto69 left12:47
→ humanface joined12:53
← defjam left12:57
→ dnh joined12:57
→ defjam joined13:00
← jacobk left13:04
→ Xaros joined13:06
← feriman left13:12
→ Rashad joined13:15
→ jacobk joined13:15
→ rsx joined13:16
→ feriman joined13:19
← squealingcode left13:22
→ nate2 joined13:22
← mkwrz left13:27
← nate2 left13:27
→ mkwrz joined13:27
← danse-nr3 left13:30
→ danse-nr3 joined13:30
← arahael left13:32
← defjam left13:35
→ ursa joined13:36
← henry40408 left13:47
→ henry40408 joined13:48
← dav1d left13:49
→ dav1d joined13:50
← mcfrdy left13:50
→ mcfrdy joined13:50
← Ophielle left13:52
← qqq left13:53
→ qqq joined13:53
← GNUmoon left13:56
→ GNUmoon joined13:57
← CO2 left14:00
← gryffus left14:00
→ defjam joined14:00
← rama left14:04
← Jaxef left14:04
→ GNUmoon2 joined14:04
← Xaros left14:07
← schne1der left14:07
← jacobk left14:08
← geirha left14:08
← GNUmoon left14:09
← GNUmoon2 left14:11
← deepy left14:12
→ GNUmoon2 joined14:12
→ deepy joined14:13
→ jacobk joined14:15
→ evccyr joined14:19
→ ThorMojito joined14:23
→ thiago joined14:25
→ CO2 joined14:25
evccyr When I amend to my local git repo and then push those changes to the remote origin branch, I get this error:14:26
```sh14:26
❯ git push origin main14:26
To https://github.com/evccyr/dotfiles.git14:26
! [rejected] main -> main (non-fast-forward)14:26
error: failed to push some refs to 'https://github.com/evccyr/dotfiles.git'14:26
hint: Updates were rejected because the tip of your current branch is behind14:26
hint: its remote counterpart. If you want to integrate the remote changes,14:26
hint: use 'git pull' before pushing again.14:26
hint: See the 'Note about fast-forwards' in 'git push --help' for details.14:26
```14:26
but when I run push with the --force flag I have no problems. So what's exactly happening here? I also don't feel that the error was helpful.14:26
→ Jaxef joined14:26
selckin it tries to prevent you from rewriting history, since that makes it difficult for other users, and well rewrites history14:27
evccyr oh14:27
← jacobk left14:28
evccyr then why does the error say that the tip of your branch is behind14:28
→ utkojhamela joined14:28
evccyr shouldn't the error say what you said instead14:28
→ mven joined14:28
evccyr also is there a way to open the scm docs on a specific topic using the `git` command itself?14:29
If not then what would be an easy way to search the git book for a specific topic?14:30
progit book*14:30
instead of having to google search and find the specific chapter14:31
also the progit book website doesn't have a fast search option14:31
Bombe The error message above tells you where to get more information. It also provides a possible solution.14:31
← utkojhamela left14:32
evccyr btw my bad just found out that the git website does have a fast search tool14:32
selckin evccyr: that error could also mean the remote has newer commits that you don't have locally, so you never eally want to force push, but pull --rebase, but since oyu said amend it was probably rewrite14:32
→ utkojhamela joined14:33
evccyr selckin If I make a pr and I wanted to make some changes before it's merged, what would be the correct way to do that? Just making more commits for all the littlest changes?14:34
selckin if its your own branch you for it14:35
+go for it14:35
otherwise people might not like that they can't see what changed since last time they reviewed it for example14:36
othertimes it's perfectly fine to do it14:36
← masoudd left14:36
→ ferdna_ joined14:37
evccyr okay thanks!14:37
← Rashad left14:37
→ cyberpear joined14:42
→ rama joined14:43
← vdamewood left14:45
→ vdamewood joined14:46
← raffaele left14:48
← evccyr left14:50
← chris_99 left14:54
← GNUmoon2 left14:57
← aljazmc left14:57
→ GNUmoon2 joined14:58
← ThorMojito left15:00
→ ThorMojito joined15:02
← rfuentess left15:08
→ rfuentess joined15:10
→ epicout joined15:14
← epicout left15:14
→ epicout joined15:14
← danse-nr3 left15:20
← mobidrop left15:27
→ admiral_frost joined15:29
← harv left15:31
→ harv joined15:32
← rfuentess left15:35
→ countach202020 joined15:35
← cart_ left15:36
→ danse-nr3 joined15:36
→ jmd joined15:37
→ hbautista joined15:37
← countach202020 left15:38
→ countach202020 joined15:39
← rama left15:43
→ Guest23 joined15:45
Guest23 Hello15:46
→ masoudd joined15:46
← hrberg left15:46
→ hrberg joined15:46
← Guest23 left15:46
→ danse-nr3_ joined15:47
← danse-nr3 left15:49
→ ConfusedGit joined15:50
→ rama joined15:51
← epicout left15:59
→ darkAffinity0 joined16:07
← lojik left16:07
→ lojik joined16:08
← darkAffinity left16:09
darkAffinity0 → darkAffinity16:09
→ aljazmc joined16:10
← CodeAgain left16:11
← ConfusedGit left16:14
← ThorMojito left16:14
→ ThorMojito joined16:15
← rama left16:15
← danse-nr3_ left16:16
→ danse-nr3_ joined16:17
← randm left16:19
→ randm joined16:19
← warmana left16:19
← qqq left16:22
← fossdd left16:25
→ IceMichael joined16:26
← Vonter left16:26
← lojik left16:27
← darkAffinity left16:27
→ lojik joined16:29
→ Vonter joined16:30
→ darkAffinity joined16:30
→ wo0f joined16:32
← stagas left16:35
→ fossdd joined16:36
→ jacekowski joined16:36
→ bywaterloo joined16:36
→ stagas joined16:37
jacekowski what is the correct way of rolling back changes that were pushed to master16:37
selckin git-revert16:37
nitrix Reverting the commit and pushing that additional commit.16:37
jacekowski i'm using tortoise git and i've done a chekout of previous commit which created a branch16:38
and when i tried to merge it with master it seems to have merged16:38
but git diff branch..master is showing differences16:38
nitrix Yes because that point in time has already happened and part of master.16:38
jacekowski but merge is saying everything is up to date16:38
→ cart_ joined16:38
nitrix Going back to it is useful for exploring the past locally but doesn't change that it's been merged already.16:39
jacekowski ok, so now that things are in my current state, how do i make my branch_X the new master?16:41
rebase?16:41
nitrix You can't unless you do it forcefully and that'll screw up everyone that has master checked out.16:42
→ justaguy_ joined16:44
← Jaxef left16:46
← danse-nr3_ left16:46
→ rama joined16:49
→ Jaxef joined16:50
nitrix Suppose you ignore branches temporarily and you only have a master branch. It's a sequence of commits chained up. As you append new commits and lengthen the chain, people pull the additional commits to synchronize with you and lengthen theirs. The chain acts as a ledger of everything that transpired to get you from point A to point C in time. If you remove commits from it and push to origin, other people pushing to origin will just put them back because they're16:54
ahead.16:54
Changing any of the ulterior commits forcefully will conflict and if you still forcibly push to the origin, then now everyone's timeline wont match with the origin and they will conflict too.16:54
← masoudd left16:55
→ danse-nr3_ joined16:56
→ danse-nr3 joined16:57
← cart_ left16:57
← countach202020 left16:58
nitrix You can do pretty nasty things to other branches because you can always just create more branches from others branches and continue your work elsewhere, but everyone's work eventually converges on master and so it should be treated with an "append-only" mindset.16:58
← rsx left17:00
← danse-nr3_ left17:01
← ThorMojito left17:03
← dnh left17:06
← humanface left17:10
→ ThorMojito joined17:11
← ThorMojito left17:12
→ flom84 joined17:13
← flom84 left17:16
← carl-- left17:22
→ nate2 joined17:23
← defjam left17:25
← Vonter left17:26
→ defjam joined17:28
← nate2 left17:28
→ Vonter joined17:28
← genesis1523 left17:28
← rosco left17:31
→ flom84 joined17:36
← agd851201010 left17:42
← rustyshackleford left17:43
→ agd851201010 joined17:46
→ ___nick___ joined17:51
→ cart_ joined17:54
→ wurstwasser joined17:56
← ___nick___ left17:56
→ ___nick___ joined17:58
← ___nick___ left17:59
→ ___nick___ joined18:01
→ stats4647 joined18:05
← danse-nr3 left18:06
← ghost43 left18:10
→ ghost43 joined18:12
→ tirnanog joined18:17
← ghost43 left18:19
→ ghost43 joined18:19
← wurstwasser left18:22
← GNUmoon2 left18:24
→ GNUmoon2 joined18:25
← admiral_frost left18:26
→ mven5 joined18:28
← rama left18:28
→ rama joined18:30
→ LuKaRo joined18:30
← mven left18:31
mven5 → mven18:31
← flom84 left18:31
← iomari891 left18:34
← rama left18:35
← defjam left18:36
→ rama joined18:36
← stats4647 left18:37
→ stats4647 joined18:37
→ dnh joined18:38
← rama left18:41
→ realies joined18:42
→ chris_99 joined18:42
→ rama joined18:43
→ Guest4 joined18:44
← mane left18:46
Guest4 Hi there, I'm trying to do a `git commit --author="Author Name [email@hidden.address] --message="Move file"` and I'm getting this error: https://stackoverflow.com/q/29685337/253468, how can I check if there's a tracking issue and it's a known problem that `git config` execution is necessary before I can use `--author`?18:46
→ mane joined18:47
← rama left18:47
→ defjam joined18:49
← mane left18:52
thiago Guest4: my guess is that the *committer* is missing, not the author18:53
← defjam left18:53
→ m0viefreak joined18:53
thiago this doesn't look like a bug in Git, so nothing to track18:54
you can set GIT_COMMITTER_NAME and GIT_COMMITTER_EMAIL in the environment18:55
← realies left18:55
Guest4 :facepalm: you're right, the error message changed. Any idea why there's no `git commit --committer` arg?18:57
to complete the `--author`, `--date` trio18:57
→ realies joined18:59
→ ConfusedGit joined19:00
← feriman left19:01
← jmd left19:01
gsish the difference would be that it's perfectly normal to "need to" adjust authorship or author date details when picking up external contributions19:02
while there's hardly any doubt that the committer would be the one who's committing, at this very moment where the commit happens, and that rarely changes during work on a local clone19:02
→ wootehfoot joined19:03
gsish so "the trio" is not as equal as one would assume at first glance19:03
→ feriman joined19:03
Guest4 "during work on a local clone" is a key part of that, I'm on a CI server :)19:03
→ jacobk joined19:03
← chris_99 left19:03
Guest4 anyway, thank you, it still makes sense, I'll just use the config, it seems simpler than the 4 ENV vars19:04
→ Gary_Sinise joined19:04
→ rama joined19:04
→ defjam joined19:05
→ wurstwasser joined19:09
→ CaCode joined19:09
← jacobk left19:09
← defjam left19:10
jacekowski hi again, i had to disappear for a moment19:13
so how do i create a commit that makes my master identical to the branch19:14
dodo squash all commits from there? or is this a trick question?19:15
jacekowski no19:16
dodo or actually, reset hard19:16
but that's not a commit19:16
jacekowski i'm continuing from few hours ago19:16
ive created a commit that broke few things and pushed19:16
dodo revert it?19:16
jacekowski then i've done a checkout to a new branch with working version19:16
commited to this branch19:17
dodo yup, revert the bad branch and rebase on that19:17
jacekowski and now i want to make make master identical to this working branch with modifications19:17
master is bad, branch is ok19:17
dodo how did you fix your branch?19:18
anyway, doesn't matter. revert in master and rebase should still work19:18
jacekowski tortise git switch/checkout to previous commit with create new branch ticked19:19
dodo anyway, doesn't matter. revert in master and rebase should still work19:19
jacekowski so i need to switch to master first19:19
and then rebase?19:19
dodo switch to master, revert the bad commit, switch to your branch, rebase on master19:20
← Jaxef left19:20
→ defjam joined19:21
→ falafel joined19:23
← defjam left19:27
← T_X left19:29
← Guest4 left19:29
nedbat github has .patch urls, like https://patch-diff.githubusercontent.com/raw/openedx/edx-cookiecutters/pull/79.patch what is the git command that can apply a patch like this?19:29
ikke nedbat: git am19:30
(a)pply (m)ailbox19:30
nedbat ikke: i thought so, but it tells me "error: corrupt patch at line 33"19:30
ikke: oh, it might be that the previous sha in the patch doesn't exist in my repo19:31
ikke that should not result in a corrupt patch message19:31
and would require --3-way to matter19:32
← wurstwasser left19:35
→ defjam joined19:36
← TomyWork left19:37
→ h-erectus joined19:39
← realies left19:45
→ darkAffinity2 joined19:45
← darkAffinity left19:45
darkAffinity2 → darkAffinity19:45
→ mane joined19:45
← rama left19:47
→ rama joined19:47
→ realies joined19:48
← igemnace left19:49
← defjam left19:52
← ChmEarl left19:53
→ wurstwasser joined19:54
← whatsupdoc left19:58
← wootehfoot left19:59
→ defjam joined19:59
← ___nick___ left20:04
→ igemnace joined20:07
← lostlazy left20:08
← cart_ left20:09
← crabbedhaloablut left20:09
← feriman left20:12
← ConfusedGit left20:12
← dviola left20:13
→ geirha joined20:14
← falafel left20:15
→ Rashad joined20:20
← sm1999__ left20:20
→ sm1999__ joined20:21
← otisolsen70 left20:25
← m0viefreak left20:25
← realies left20:25
← GNUmoon2 left20:26
→ GNUmoon2 joined20:27
← stats4647 left20:30
→ stats4647 joined20:31
→ skapata joined20:32
← utkojhamela left20:33
← mane left20:33
← stats4647 left20:35
← CaCode left20:42
→ CaCode joined20:51
← igemnace left20:52
→ sympt joined20:54
← Notgnoshi left20:55
→ cdown joined20:55
→ Notgnoshi joined20:56
→ Gaboradon joined21:03
← dnh left21:03
→ stats4647 joined21:04
← wurstwasser left21:06
← stats4647 left21:09
→ gcarlos8 joined21:14
← gcarlos8 left21:15
→ dnh joined21:15
← h-erectus left21:17
→ gcarlos8 joined21:18
← gcarlos8 left21:18
→ gcarlos8 joined21:19
← gcarlos8 left21:20
→ liefer396 joined21:20
→ realies joined21:21
→ utkojhamela joined21:21
→ stats4647 joined21:22
→ gcarlos8 joined21:23
→ nate2 joined21:25
← stats4647 left21:27
← de-facto left21:28
← nate2 left21:30
→ de-facto joined21:30
← dnh left21:31
← yoyofreeman left21:36
← realies left21:36
→ yoyofreeman joined21:36
← gcarlos8 left21:40
→ wurstwasser joined21:42
→ lostlazy joined21:45
→ jokoon joined21:45
jokoon I have a directory created, but git status doesn't list its content21:45
how can I see files inside it, I don't want to add them all21:46
--untracked-files21:47
← jokoon left21:48
→ gcarlos8 joined21:48
→ larryv joined21:49
← utkojhamela left21:55
→ gcarlos87 joined21:59
← gcarlos8 left22:02
gcarlos87 → gcarlos822:02
← aljazmc left22:04
← ferdna_ left22:05
→ Gaboradon_ joined22:08
← gildasio left22:08
→ realies joined22:09
→ gildasio joined22:09
← Gaboradon left22:11
→ Yruama joined22:15
← Gaboradon_ left22:15
← project10 left22:16
→ project10 joined22:17
← jklfds_ left22:21
→ Gaboradon joined22:21
→ jklfds joined22:21
← gildasio left22:23
→ gildasio1 joined22:23
← gildasio1 left22:24
→ gildasio joined22:24
← jklfds left22:25
→ Traneptora joined22:27
← Rashad left22:29
→ jklfds joined22:31
← jklfds left22:32
→ jklfds joined22:33
→ stats4647 joined22:33
→ jacobk joined22:36
← stats4647 left22:38
← jklfds left22:38
→ jklfds joined22:39
← welder left22:40
→ welder joined22:41
← jklfds left22:42
→ jklfds joined22:43
→ rustyshackleford joined22:44
← jklfds left22:52
→ Rashad joined22:52
← rama left22:54
→ diego joined22:57
diego → Guest612822:57
← CaCode left23:02
→ dnh joined23:04
← wurstwasser left23:06
← cyberpear left23:11
← pretty_dumm_guy left23:17
← Rashad left23:18
← defjam left23:19
← dev4449 left23:20
→ nate2 joined23:27
→ defjam joined23:31
← nate2 left23:31
→ de-facto_ joined23:34
← defjam left23:35
→ jklfds joined23:37
← de-facto left23:37
de-facto_ → de-facto23:38
← jklfds left23:41
← Yruama left23:42
← omero left23:47
→ evccyr joined23:50
→ omero joined23:50
← navi left23:50
evccyr I'm unable to create this alias `gh alias set h 'help'`23:50
BtbN gh is not git23:51
evccyr Yes, I'm sorry for that. The github channel is invite only.23:52
BtbN I was more thinking that you are trying to use a git command with gh23:52
But git aliases are done differently, now that I look into it23:52
But yeah, try asking in the github channel.23:53
← farzat left23:53
BtbN It's ##github23:53
← nyah left23:54
← tirnanog left23:56

Logs Search ←Prev date Next date→ Channels Documentation