IRCloggy #git 2021-06-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.

2021-06-26

Sasazuka left00:05
skapata left00:06
Torr left00:07
FFY00 left00:27
FFY00 joined00:28
chexum left00:32
chexum joined00:33
orbyt left00:39
pulse left00:40
apauli joined00:42
Nalt joined00:44
alzgh left00:45
PaMeDa left00:45
ano left00:46
ano joined00:47
thiago left00:56
nate1 joined01:00
FFY00 left01:02
FFY00 joined01:02
nate1 left01:04
hegstal left01:16
pete443_ joined01:31
pete443 left01:33
hnOsmium0001 left01:38
aquijoule_ joined01:51
richbridger left01:54
hnOsmium0001 joined02:03
pretty_dumm_guy left02:21
Guest53 joined02:22
Guest53 left02:23
zebrag_ left02:28
finn_elija joined02:32
FinnElija left02:32
finn_elijaFinnElija02:32
rewrit3 joined02:34
cdown left02:35
twinsignal joined02:37
twinsignal left02:41
Codaraxis_ joined02:45
structoha joined02:48
structoha hey, i wonder if it is a good practice to use cloud drives for git-repos sync02:49
Codaraxis left02:49
Soni how do you get the accidental commit on main out of main?03:04
(not pushed)03:04
git checkout -b feature/whatever and then what?03:04
hmm, switch back to main and git reset --hard HEAD~1?03:06
yay, it worked!03:06
jsrnop left03:20
Wuzzy left03:30
mackerman structoha: No, putting a .git on a file sync service is a bad idea.03:30
!dropbox_why03:30
gitinfo git uses a lot of frequently-changed small files, which dropbox's synchronization algorithms barf on. Use of multiple dropbox clients compounds this, with hilarious results03:30
structoha alright thx, i guess i will add the files and exclude the .git03:31
mackerman An archived repo in one file is a different matter. man git bundle03:31
gitinfo the git-bundle manpage is available at https://gitirc.eu/git-bundle.html03:31
mackerman Work tree file sync seems like a bad idea too. The sync will introduce changes that are not in the history.03:32
structoha i will give git bundle a try, i dont see another solution for now03:34
thank you03:34
mackerman Multiple file sync clients, one of which checks out a different work tree, that gets synced, then the other copy has changes, but for the wrong branch (!)03:35
structoha ya i guess i shouldnt mix the two solutions at all probably03:36
Lord_of_Life left03:39
Lord_of_Life joined03:40
mackerman git hosting is bettter at providing a real git remote. Actual cold backups are better backups than leaving an online copy in a file share.03:40
dimi1947 joined03:41
structoha And you recommend to use git-bundle for the referred cold backups?03:41
dimi1947 left03:43
mackerman git bundle generantes an archive file with history. Good for any kind of file transfer you like, the usual network protocol not required.03:43
Backup software should be able to handle a .git directory with work tree.03:44
But many frequently changed small files is not good for most file sync solutions.03:45
jsrnop joined03:45
structoha I just tested on mega cloud, looks horrible :O03:45
anton left03:50
anton joined03:51
mackerman Backblaze backups appear to be excluding .git on my Windows box.04:00
structoha hmmmmm04:00
mackerman I push my work to a remote, but that might be less backed up than I thought.04:00
structoha exactly same here04:01
mackerman Maybe later I'll ask support why.04:01
structoha am deploying my backup on mega cloud currently04:03
backblaze sounds very promising but i am not sure why i would switch04:03
apauli left04:08
AbleBacon left04:10
nate1 joined04:13
Vonter joined04:15
Crassus joined04:21
nate1 left04:23
Crassus left04:28
Scotty_Trees left04:32
madewokherd` joined04:40
madewokherd left04:43
structoha left04:48
AnAverageHuman joined04:52
reset left04:52
PuercoPop left05:03
Codaraxis__ joined05:08
UsrLocalLibera joined05:08
UsrLocalLibera Hi, what does "business logic" mean to you guys?05:10
Codaraxis_ left05:12
vicfred left05:22
jkl joined05:27
Guest9 joined05:28
arcatech left05:32
forgotmynick joined05:40
onizu joined05:41
onizu hi05:42
when I do 'git fetch' I am getting a new branch there, which I want to merge. But it's not yet available in 'git branch'05:42
Do I need to 'git pull' for that?05:42
gast0n left05:42
onizu Hope it will not merge with 'master'05:42
I did 'git checkout remoteBranch'05:46
then 'git checkout master' and then 'git merge --no-ff remoteBranch'. Is this the right way? Or should there had been a 'git pull' somewhere in the process?05:47
Vonter left05:52
lgc left05:54
Vonter joined05:54
ikke onizu: no, git pull is not what you want in this case05:54
onizu hi ikke , ok05:55
when is 'git pull' used then?05:55
thunfisch left05:55
hmmmas joined05:55
ikke git pull is fetch + merge05:56
(merge by default, it can also be rebase)05:56
onizu I see05:57
so no, I don't want to merge right away05:57
YuGiOhJCJ joined05:57
ikke note that you do not necesarily have to checkout that branch (which causes git to automatically create a 'local' branch)05:58
FH_thecat joined05:58
ikke you could just do: git fetch, git merge origin/<branchname>05:58
onizu I see05:58
ikke but your approach is fine05:59
onizu so in that case I need to specify the origin05:59
ikke when you fetch branches from origin, git creates so called remote tracking branches06:00
onizu it would make sense to avoid checkout, as that remote branch was created by me on another computer, so I know what's there06:00
ikke they all have the remote name prefixed06:00
onizu I see06:00
ikke: to be safe, I only pushed the new branch to remote and didn't merge with master on the other computer. But if I were sure of merging those changes, I get an option on GitHub to 'create pull request' from my new branch after I push, should I go for it?06:02
ikke if you just want to merge it, you could've already merged it locally06:03
creating a merge request just to directly merge it seems a bit excessive06:04
ThorMojito left06:04
ikke (it's different if you have some kind of CI process attached to the pull request)06:04
onizu ok06:06
AnAverageHuman left06:25
Guest9 left06:26
furrymcgee joined06:30
raindrop joined06:41
sudoforge left06:43
Crassus joined06:51
ndim left06:52
ndim joined06:54
ndim left06:58
ferdna left07:00
unluckyshrubbery left07:04
ndim joined07:04
structoha joined07:14
hbautista left07:15
structoha left07:19
ubique joined07:33
Crassus left07:35
SirRippovMaple6 joined07:35
SirRippovMaple6 left07:36
SirRippovMaple6 joined07:38
SirRippovMaple6 left07:38
Guest9 joined07:41
SirRippovMaple6 joined07:50
SirRippovMaple6 left07:51
dmang left08:01
dmang joined08:02
dmang left08:07
lionkor joined08:09
dmang joined08:15
af left08:29
dviola joined08:31
Adoi joined08:33
ndim left08:34
ndim joined08:34
Guest9 left08:36
tsujp left08:38
FH_thecat left08:50
af joined08:51
arash joined08:54
alzgh joined08:57
lionkor left08:57
SirRippovMaple6 joined08:58
ubique_ joined08:58
SirRippovMaple6 left08:59
forgotmynick left09:00
SirRippovMaple6 joined09:00
SirRippovMaple6 left09:00
Crassus joined09:01
ubique left09:01
SirRippovMaple6 joined09:02
ubique joined09:04
ubique_ left09:04
jazzy left09:05
SirRippovMaple6 left09:06
milosz left09:06
unluckyshrubbery joined09:07
SirRippovMaple6 joined09:08
SirRippovMaple6 left09:08
SirRippovMaple6 joined09:13
hnOsmium0001 left09:18
arash left09:18
xayto_ left09:26
xayto joined09:27
Betal left09:31
Scotty_Trees joined09:32
Lunatrius` joined09:34
Lunatrius left09:35
UsrLocalLibera left09:37
thunfisch joined09:41
Adoi left09:53
Codaraxis_ joined09:54
Codaraxis__ left09:58
Codaraxis__ joined10:05
Codaraxis_ left10:08
apauli joined10:16
arash joined10:20
dshikoh joined10:22
dshikoh left10:23
Lunatrius` left10:26
Lunatrius joined10:26
Adoi joined10:26
Vonter left10:33
pulse joined10:36
raindrop22 joined10:37
raindrop left10:41
chexum left10:45
pretty_dumm_guy joined10:45
jimklimov joined10:47
jimklimov1 left10:50
Vonter joined10:50
Vonter left10:58
Vonter joined11:01
kenanmarasli joined11:15
Strom left11:16
Strom joined11:17
raindrop22 left11:19
hmmmas left11:27
cdown joined11:30
arash left11:54
arash joined11:57
skapata joined11:57
adlternative left12:11
jinsun left12:11
Cleverness joined12:12
jinsun joined12:12
Cleverness left12:14
Taro42 I have a question about --verify-signatures: Do I really need to set the trust level of every public key to 5 / ultimate? I tried anything less than 5 and git complained about it being untrustworthy. This is weird because ultimate trust usually implies that I'm the owner, but there may be other keys that I trust, but I wouldn't want to set it to set that trust level regardless.12:19
e.g. git pull --verify-signatures12:19
unixbhaskar joined12:20
cehteh Taro42: no you should not12:29
that would totally break its purpose12:29
Taro42 cehteh: then how could I do git pull --verify-signatures for other people's keys?12:30
Adoi left12:31
cehteh when you dont have a trust chain (which is safely established, not by setting things brainless to trusted) then it is expected that validation fails12:31
you just cant establish trust then, forcing it to do so would be pointless12:32
UsrLocalLibera joined12:33
Taro42 cehteh: I mainly need it to verify commits on a server12:36
there are multiple people contributing12:36
cehteh then you have to validate their keys .. possibly in a personal meeting, and sign their keys12:36
jimklimov left12:37
lispmacs joined12:37
lispmacs hi, can I use some git command to help me merge two files that are not in a git repository?12:38
jimklimov joined12:41
Taro42 cehteh: ah, just gpg --sign-key is enough? I only know them over the Internet.12:41
cehteh no its not enough12:41
thats malpractice12:41
when you cant establish a trust then then you cant12:41
you need some secret channel where you negotiate the key, private meeting, telephone call, carrier pidgeon .. whatever12:42
in theory you can just sign anyone elses key, but you never really verified their identity, thus a man in the middle could sneak in and coerce you into trusting the wrong key12:44
Taro42 cehteh: the only purpose of this is not to trust the gitlab server12:44
nothing else12:44
I agree, there are better ways to do this12:44
cehteh and by that the whole thing becomes compromised, people who rely on you to do this carefully are in danger too12:44
when you cant establsih trust then just start without it12:44
when you have some private reson to trust some key then you can do a local/private signature, but be very careful with that12:45
lispmacs: you can git diff between any 2 files ... as much or less that helps, there are better tools for the job12:47
Taro42: for sure you do not want ultimate trust12:48
hoochmonger joined12:49
Taro42 ok, I'll create private keys for each server instead12:49
cehteh not private keys but private signatures12:50
cdown_ joined12:51
cehteh man gpg see lsign12:51
tejr left12:54
tejr joined12:56
vdamewood joined12:58
Taro42 ah okay, thank you cehteh. this is delving into #gnupg territory, so I'll stop here ;)12:58
dviola left13:00
Torr joined13:15
xkr47 left13:17
Scotty_Trees left13:19
pretty_dumm_guy left13:22
pretty_dumm_guy joined13:23
Torr left13:24
Torr joined13:25
Taro42 left13:25
adlternative joined13:31
reset joined13:34
qunzhong_luxian joined13:37
qunzhong_luxian left13:41
unixbhaskar left13:44
hegstal joined13:49
hegstal_ joined13:50
madewokherd joined13:50
hegstal left13:51
hegstal_hegstal13:53
BaD_CrC joined13:54
madewokherd` left13:55
AnAverageHuman joined14:10
dms489 joined14:12
Deneb joined14:13
Deneb left14:15
cdown_ left14:17
dms489 Since upgrading to Ubuntu 20.04, I have been locked out of github. Error is "remote: invalid user name or password." Github shows my user name and project correctly. Any ideas?14:18
ikke dms489: what does git config credential.helper return?14:19
dms489 nothing!14:20
git config --list seems OK14:24
gas51627 joined14:25
dms489 although if has 4 odd lines about remote. [stuff]14:26
zebrag joined14:27
tionij joined14:28
YuGiOhJCJ left14:30
ubique left14:31
AbleBacon joined14:31
dms489 Was my post above seen by @ikke as a reply14:33
?14:33
Crassus left14:34
ikke yes14:34
Just thinking what it can be14:34
Something must be providing a username and password14:34
dms489 Sorry to bug you. I'm new here.14:34
FinnElija left14:34
dms489 I thought that was cthe config stuff.14:35
I'm quite happy to rip everything out and start over. I have the project backed up, and a dead tree copy of the Chacon / Straub book.14:37
ebeip90 joined14:38
FinnElija joined14:38
ebeip90 left14:38
ebeip90 joined14:38
dms489 Should I give you the whole dialog?14:40
ebeip90 Hello all! I love git diff's --function-context / -W feature, but there are certain file extensions where Git just decides to show the whole file. I would like to disable the --function-context for specific extensions. I know Git has some sort of support for this, as using --function-context to diff a .txt file behaves as if the flag was not specified. How can I add more extensions to ignore / bypass this feature?14:41
nedbat ebeip90: you want a gitattributes file: https://git-scm.com/docs/gitattributes14:43
Kill-Anirnals joined14:44
ebeip90 @nedbat: I have a ~/.gitattributes file, but there's no documented way to disable Git's attempt to interpret the contents of the file with -W/--function-context. The file format in question just HAPPENS to look like C, e.g. has nested {{}}. The file format starts with a C-style comment, and the first non-comment character is a '{', and the file ends with '}' -- so the "git diff --function-context" shows the whole file. I tried setting "*.ext14:45
diff=text" (and txt) but this didn't resolve the issue.14:45
I also tried setting "git config --global diff.ext.command '!git diff -C5'" to try to force Git to use a different diff driver (to circumvent -W) but this didn't work either.14:47
Guest42 joined14:47
ikke dms489: do you get a dialog?14:49
dms489 I said the wrong thing. I meant to show you all the steps from 'git init' to the disaster.14:51
ikke dms489: Is your remote http or ssh?14:54
dms489 git fetch https://github.com/dms489/Portal14:55
Xenguy joined14:56
dms489 I did set up SSH also.14:56
gas51627 Hi. Sorry another question about git rev-list. Why is P included in "--full-history without parent rewriting" mode? P is treesame to O, so it should be excluded. http://imgur.com/a/GHUPeuU14:57
nate1 joined15:00
SirRippovMaple6 left15:00
GeorgeK joined15:04
herbas joined15:04
nate1 left15:05
herbas left15:05
dms489 left15:06
xkr47 joined15:10
Adoi joined15:10
dms489 joined15:11
Guest42 left15:12
Guest42 joined15:12
dms489 (Sigh!) finger trouble. Is ikke still here?15:14
oriba joined15:16
Adoi left15:18
cliluw joined15:18
Adoi joined15:19
vicfred joined15:20
Adoi left15:20
rewrit3 left15:21
Adoi joined15:21
BaD_CrC left15:23
Adois joined15:27
EvilDMP joined15:28
Guest42 left15:29
Adoi left15:31
ebeip90 @nedbat: Managed to resolve it with a custom diff command. It wasn't working originally because I was unaware that "git log" needs "--ext-diff" in order to use the diff.ext.command from ~/.gitconfig.15:31
If anybody is curious, I also made it so that the diff output looks like the normal "git diff" output by moving the temporary files around and re-creating the directory path. For the curious: https://gist.github.com/zachriggle/ed4eb9a6e5880eaf78dd7d29817e131315:35
EvilDMP I've never found a very good workflow for this... I'm working on a local branch; I push to my fork, and make a PR to upstream. Before I continue working locally, I want to synchronise my local branch with upstream/main. What is a clean way to overwrite everything in my local branch with upstream/main?15:35
ebeip90 @EvilDMP: "overwrite everything"? git fetch upstream; git reset --hard upstream/main;15:36
EvilDMP does the trick perfectly thank you ebeip90 .15:38
Adoi joined15:38
Adois left15:42
marink joined15:43
fef joined15:45
m0viefreak left15:45
Adoi left15:48
zebrag left15:49
Wuzzy joined15:49
kenanmarasli_ joined15:51
kenanmarasli left15:53
arash left15:54
structoha joined15:54
anton left15:54
ano left15:55
arash joined15:55
ano joined15:55
anton joined15:55
schmillin left15:57
ebeip90 left15:58
schmillin joined16:00
structoha left16:00
pycurious joined16:00
pycurious I'm looking for a software to generate statistics from a repo for number of lines committed per month per developer16:00
jstein joined16:01
fef any guidelines on git commit messages16:05
ikke !clean16:05
gitinfo [!clean_message] It helps to write clean commit messages. http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html explains how.16:05
pycurious git-quick-stats seems to be good for me.16:05
hnOsmium0001 joined16:05
tionij left16:06
Guest53 joined16:12
cliluw left16:15
cliluw joined16:16
stkrdknmibalz joined16:16
arcatech joined16:20
Guest53 left16:20
cliluw left16:20
kenanmarasli_kenanmarasli16:23
nate1 joined16:25
lgc joined16:27
gas51627 Finally managed to construct a git log command that shows really all changes to the path16:29
nate1 left16:30
structoha joined16:33
structoha left16:33
structoha joined16:33
lgc left16:39
iamtheranger left16:42
iamtheranger joined16:42
iamtheranger left16:43
iamtheranger joined16:44
gast0n joined16:48
Guest42 joined16:50
ferdna joined16:53
Guest42 left16:54
pretty_dumm_guy left17:03
natechan Is there a way to leave the repo in its current state and generate a diff/patch file that includes (1) staged (2) unstaged and (3) untracked files which can be applied? I'm fine with losing the distinction between staged and unstaged when applying the patch.17:05
ikke To get a diff of untracked filed, you need to at least add them with --intent-to-add17:06
Codaraxis joined17:06
xall joined17:06
natechan Thanks @ikke! I was hoping there was a way that would leave the repo untouched. That said, I guess the new files still aren't staged with that done, so it's almost like not changing the state.17:08
dms489 left17:09
Codaraxis__ left17:09
ikke it would only affect the index in a minor way17:09
AnAverageHuman left17:13
RedNifre joined17:29
RedNifre Hey, git people.17:35
structoha left17:36
RedNifre I have a funny idea: See, I have some ancient code from 20 years ago and wanted to put it on Github. I think it would be funny if the code was actually commited 22.7.2001 23:30, 4 years before the release of git. Is that possible?17:39
Same for repository creation etc., if those events even have different dates.17:39
I was thinking about using a VM with a wrong system date for that, but maybe git allows for date overrides?17:40
fef left17:41
chexum joined17:44
marink RedNifre, look into git commit --date, and/or GIT_AUTHOR_DATE/GIT_COMMITTER_DATE environment variables17:45
EvilDMP left17:49
ThorMojito joined17:52
madewokherd` joined17:52
arash left17:56
madewokherd left17:56
EvilDMP joined17:58
jazzy joined17:59
cliluw joined18:01
EvilDMP left18:02
bket left18:05
arash joined18:05
lgc joined18:09
AnAverageHuman joined18:10
Betal joined18:10
arash left18:10
bongobrown joined18:12
arcatech left18:12
gothicserpent left18:12
bket joined18:12
CommunistWolfCapitalistWolf18:15
CapitalistWolfCommunistWolf18:15
Guest9 joined18:20
SirRippovMaple left18:23
SirRippovMaple joined18:25
EvilDMP joined18:29
SirRippovMaple6 joined18:31
SirRippovMaple6 left18:33
SirRippovMaple6 joined18:34
marink left18:40
Adoi joined18:43
Kill-Anirnals left18:44
gas51627 left18:44
natrys joined18:49
SirRippovMaple6 left18:50
anton left18:51
SirRippovMaple6 joined18:51
bongobrown left18:52
SirRippovMaple6 left18:53
bongobrown joined18:54
SirRippovMaple6 joined18:54
UsrLocalLibera left18:54
jkljkl133718:58
sudoforge joined19:00
jkl1337jkl19:00
jkl left19:01
jkl joined19:01
vdamewood left19:02
SirRippovMaple left19:03
dunderprotos joined19:05
SirRippovMaple joined19:05
BUSY joined19:08
dunderprotos left19:09
SirRippovMaple6 left19:10
dunderprotos joined19:10
dunderprotos left19:12
SirRippovMaple6 joined19:13
anton joined19:13
SirRippovMaple6 left19:14
pulse left19:14
SirRippovMaple left19:16
SirRippovMaple joined19:19
daemon joined19:33
Strom left19:34
daemon hey all if I am on a previous commit, in this example: git checkout 920db7e1fe156002d8e3933c7feb7256f08ff837 - how do I make this the most up to date master (remove all commits that followed) - this has no remote/origin its local only19:34
I am also not on a branch this is all on master19:34
Strom joined19:36
daemon left19:37
thiago joined19:41
vdamewood joined19:46
rewt if you want to force master to that hash, and you've already checked it out, `git branch -D master; git checkout -b master; git push -fu;` ... delete local master; create local master at current commit; force push and create tracking19:46
welovfree joined19:47
SirRippovMaple left19:50
yuljk left19:50
yuljk joined19:51
SirRippovMaple joined19:53
Vonter left19:53
xkuru joined19:58
Vonter joined19:59
welovfree left20:01
SirRippovMaple left20:04
pycurious left20:04
SirRippovMaple joined20:08
pycurious joined20:08
GNUcifer joined20:11
arcatech joined20:13
cehteh left20:15
GNUcifercehteh20:15
Guest9 left20:16
Adoi left20:18
Crassus joined20:27
furrymcgee left20:28
Vonter left20:32
frk joined20:46
frk left21:00
structoha joined21:02
Scotty_Trees joined21:03
seand left21:18
bongobrown left21:19
vdamewood left21:28
natrys left21:41
Vonter joined21:47
FinnElija left21:58
seand joined21:58
a6a45081-2b83 joined21:59
Vonter left22:00
FinnElija joined22:02
structoha left22:08
inkbottle[m] `git diff HEAD~1 HEAD~2`, is there a shortcut for that?22:16
canton7 git show HEAD~22:17
Murr left22:17
Murr joined22:17
rewrit3 joined22:19
Nalt left22:20
schmillin_ joined22:20
ferdna left22:23
schmillin left22:24
unixbhaskar joined22:24
a6a45081-2b83 left22:25
Crassus left22:27
pycurious left22:30
debsan joined22:47
Gustavo6046Gustavo6046|bloo22:54
Gustavo6046|blooGustavo6046|oops22:54
Gustavo6046|oopsGustavo604622:54
alzgh left22:56
Adoi joined22:56
AnAverageHuman left22:56
Nalt joined23:03
tsdh left23:03
onizu left23:06
Kaedenn joined23:07
Kaedenn What does Github use to format markdown into HTML, and how can I obtain that for offline use?23:07
bremner buy github?23:09
dunno really. You'd think that kind of tool would be available. Look for github flavoured markdown23:10
there are several third party formatters that claim to understand it23:10
seand left23:12
tsdh joined23:12
jlombera joined23:12
jlombera left23:14
Kaedenn I'm using pandoc but either github keeps changing their CSS or there's something wrong with their spec23:15
alzgh joined23:15
Kaedenn ...wait, the number of hyphens in the alignment row of a table specifies the column's width?!23:16
LSDacidsys23:18
jlombera joined23:19
Betal Kaedenn: you might not get answers here because #git != ##github23:21
Kaedenn ah ok, thanks23:21
gothicserpent joined23:22
AnAverageHuman joined23:24
rewrit3 left23:28
jstein left23:29
unixbhaskar left23:32
inkbottle[m] `git rebase -i HEAD~2` to change the commit message of `HEAD~1`. What "command" do I have to chose to do that? (I've done two commits with dummy messages, and I want to make a single commit of them, and I want to use a sensible message, and I want to use rebase.)23:36
kenanmarasli left23:38
Crassus joined23:39
Nalt left23:40
rewt inkbottle[m], `git rebase -i --keep-base HEAD~2` will let you keep the original base (so not really a rebase) and let you do anything you can do during a regular interactive rebase, including `reword`23:40
Nalt joined23:40
inkbottle[m] okay, keep-base, thanks.23:42
venmx joined23:50
alzgh left23:50
inkbottle[m] Hum, I forgot ordering was reversed. Never mind I made only dummy changes.23:55

Logs Search ←Prev date Next date→ Channels Documentation