IRCloggy #git 2022-10-27

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.

2022-10-27

oriba left00:03
gsi_ joined00:03
audiobirb joined00:03
LuKaRo left00:04
LuKaRo joined00:05
gsi left00:05
audioburn left00:06
TheCatBehemoth left00:06
redbool left00:08
redbool joined00:09
alexhandy joined00:13
nate2 joined00:14
odoood joined00:14
awmv left00:16
awmv joined00:17
nate2 left00:18
alexhandy left00:18
adlternative left00:19
adlternative joined00:19
awmv left00:22
bin_slasherjavascript00:22
javascriptjquery00:22
jquerybin_slasher00:23
bin_slasherjava00:23
javabin_slasher00:23
Sasazuka left00:24
gvg joined00:24
hiroot joined00:27
awmv joined00:30
alexhandy joined00:31
alexhandy left00:31
dnh left00:32
clime left00:33
odoood left00:34
ThorMojito left00:36
ZacSharp left00:36
rama left00:36
rama joined00:37
madewokherd left00:39
ferdna left00:39
rama left00:39
rama joined00:40
avar left00:42
Murr left00:44
Murr joined00:44
NSOL left00:44
NSOL joined00:45
NSOL left00:45
polo_ joined00:45
avar joined00:47
Sasazuka joined00:48
stewie925 left00:48
polo left00:49
alexhandy joined00:49
mncheck left00:51
alexhandy left00:51
polo_ left00:52
polo joined00:53
epony joined00:53
reset left00:54
rama left00:55
rama joined00:55
rama left00:56
polo left00:58
xx left01:05
awmv left01:07
alexhandy joined01:09
fweht left01:12
Cromulent joined01:13
ThorMojito joined01:14
alexhandy left01:14
LuKaRo left01:16
Lord_of_Life left01:16
Filip2 left01:16
Lord_of_Life joined01:17
LuKaRo joined01:19
Sasazuka left01:22
avar left01:30
avar joined01:30
arescorpio left01:31
forgotmynick joined01:44
codebam joined01:53
pulse left01:55
nate2 joined02:01
inversed joined02:02
madewokherd joined02:04
Yruama left02:04
runlevels joined02:09
alexhandy joined02:09
Kangie_ joined02:14
alexhandy left02:16
nate3 joined02:17
nate2 left02:17
Kangie_Kangie02:18
LuKaRo left02:20
dionysus69 left02:20
ntz left02:20
gast0n left02:20
piwu left02:20
regedit left02:20
jazz-o-lantern left02:20
dermoth left02:20
m5zs7k left02:20
dirtydan left02:20
jed left02:20
Quietus left02:20
whatsupdoc left02:20
ectospasm left02:20
Soliton left02:20
ryjen left02:20
selckin left02:20
ndorf joined02:20
ntz joined02:20
MrMagic joined02:20
iokill joined02:20
cweiss076532124 joined02:20
jinsl joined02:20
lagash joined02:20
Learath2 joined02:20
dirtydan joined02:20
MaverickFischer joined02:20
Jenna16bit joined02:20
mingdao joined02:20
piwu joined02:20
dmvrtx joined02:20
preisi joined02:20
stutz joined02:20
sco1 joined02:20
Nixx joined02:20
redrambles joined02:20
regedit joined02:20
lechner joined02:20
whatsupdoc joined02:20
frojnd joined02:20
teddyc joined02:20
glik22 joined02:20
terminaldweller joined02:20
Illya joined02:20
cozycactus joined02:20
ectospasm joined02:21
Jenna16bit left02:21
Jenna16bit joined02:21
lechner left02:21
lechner joined02:21
Illya left02:21
Illya joined02:21
terminaldweller left02:21
terminaldweller joined02:21
stutz left02:21
stutz joined02:21
dionysus69 joined02:21
FFY00 joined02:21
Noisytoot joined02:22
hexology joined02:22
ectospasmGuest439802:22
riposte joined02:22
jgn joined02:22
m5zs7k joined02:22
johncs joined02:22
skered joined02:22
skered left02:22
selckin joined02:22
Quietus joined02:22
Kamilion joined02:22
robink joined02:22
jim joined02:22
ueberall joined02:22
arash joined02:22
ripdog joined02:22
barlas joined02:22
magic_ninja joined02:22
jed joined02:22
sebastorama joined02:22
ProperNoun joined02:22
michele joined02:22
tcurdt joined02:22
Erawan joined02:22
ryjen joined02:22
bremner joined02:22
mcfrdy joined02:22
Tuor joined02:23
nyuszika7h joined02:23
skered joined02:23
skered left02:23
LuKaRo joined02:23
magga joined02:24
Disconsented joined02:24
skered joined02:24
skered left02:24
ecs joined02:24
jazzy joined02:24
charly joined02:25
Soliton joined02:25
mooz joined02:25
gast0n joined02:25
skered joined02:25
polo joined02:27
Aleksejs joined02:29
polo left02:37
FinnElija left02:47
finn_elija joined02:47
finn_elijaFinnElija02:47
TheCatBehemoth joined02:55
epony left02:57
epony joined02:58
Murr- joined02:59
shokohsc4 joined03:00
shokohsc4shokohsc03:01
Murr left03:02
Murr-Murr03:02
nate3 left03:04
jb1277976_ joined03:07
lucasta joined03:09
guardianx joined03:11
guardianx left03:13
cdown left03:17
HumanG33k joined03:26
skapata left03:34
sahilister joined03:35
Kangie_ joined03:36
TheCatBehemoth left03:37
Kangie left03:37
Kangie joined03:41
Kangie_ left03:42
dviola joined03:43
forgotmynick left04:00
zebrag left04:02
hbautista joined04:03
vdamewood joined04:06
LuKaRo left04:08
LuKaRo_ joined04:09
alexhandy joined04:10
alexhandy left04:10
coot joined04:12
Cleverness left04:13
forgotmynick joined04:14
lucasta left04:14
lucasta joined04:16
caveman joined04:19
gast0n left04:20
lucasta left04:25
Kangie left04:26
lucasta joined04:26
Murr- joined04:27
Murr left04:29
Murr-Murr04:29
dob1 joined04:33
wallabra joined04:34
lucasta left04:35
lucasta joined04:36
c0dehu1k left04:38
c0dehu1k joined04:39
roadie joined04:43
Murr left04:43
jed left04:44
Murr joined04:44
Kangie joined04:45
jed joined04:46
atrigent_ left04:47
hbautista left04:48
hbautista joined04:50
atrigent joined04:52
RiFo joined04:55
lucasta left04:58
lucasta joined04:59
epony left05:01
epony joined05:02
bgs joined05:03
LuKaRo_ left05:05
madewokherd` joined05:05
lucasta left05:05
lucasta joined05:06
LuKaRo joined05:07
madewokherd left05:08
foul_owl left05:09
lucasta left05:11
lucasta joined05:11
SirRippovMaple joined05:16
bgs left05:22
foul_owl joined05:25
lucasta left05:26
lucasta joined05:26
pyeveryt_ left05:32
warthog9 joined05:33
pyeverything joined05:33
gsi_ left05:33
gsi joined05:34
jiffe left05:35
pyeverything left05:38
jiffe joined05:38
roadie left05:39
recyclehero joined05:39
caveman left05:42
jiffe left05:43
lucasta left05:43
jazzyjazz-o-lantern05:43
lucasta joined05:45
jiffe joined05:45
vdamewoodvdameboo05:46
alexhandy joined05:48
lucasta left05:51
alexhandy left05:51
lucasta joined05:51
hiroot left05:54
lucasta left05:56
lucasta joined05:56
igemnace joined05:59
alexhandy joined06:00
alexhandy left06:00
hbautista left06:00
alexhandy joined06:01
audiobirb left06:01
agarr left06:01
BrianBlaze joined06:02
alexhandy left06:04
pyeverything joined06:04
blahboybaz left06:07
LuKaRo left06:07
fweht joined06:11
LuKaRo joined06:14
alexhandy joined06:14
KimK_ left06:15
alexhandy left06:16
gtristan joined06:19
Scien left06:20
forgotmynick left06:20
Betal left06:21
Scien joined06:21
srinidhi joined06:22
rfuentess joined06:22
Murr- joined06:22
sa0 joined06:24
gtristan Hi, it seems we've got ourselves in a bit of a bind doing a complicated merge, and as I've had good luck asking here in the past, perhaps someone here could tell me the best merge strategy for this situation06:25
Murr left06:25
Murr-Murr06:25
gtristan It's probably *fairly* typical06:25
So we've got a situation which can be described like this: https://bpa.st/7KYQ (simple ascii art)06:26
Essentially, a downstream vendor has modifications against an upstream stable branch06:26
And we want to move to the next stable branch, and unfortunately in the past, these folks have been doing a `git merge <new-upstream-branch>` into their downstream06:27
They are interested in properly isolating their downstream patches again so that a rebase strategy will work better, but for now they've gone a couple cycles of merging upstream into their downstream06:28
So they'd prefer to take the quickest approach for right now, and then refactor their things so that a rebase is more possible in the future06:28
pyeverything left06:29
gtristan The result of this however, is that when we do the `git merge` command, we get a big mix of conflicts - including conflicts between the two upstream stable branches, sometimes mixed into the same file where we have downstream vendor changes06:29
nate3 joined06:30
nivag joined06:30
c0dehu1k left06:30
c0dehu1k joined06:31
gtristan So ultimately, I'm curious if it would be possible to say: Merge the next stable into our downstream messy branch, and automatically prefer changes from the upstream while merging... *except* for changes which can be found in the delta between last-upstream-stable...this-messy-branch06:31
KimK joined06:32
gtristan This way, even though the strategy is messy for now, we still should only be dealing with resolving conflicts between downstream vendor changes and the new upstream06:32
Cromulent left06:33
alexhandy joined06:34
nate3 left06:34
lucasta left06:35
lucasta joined06:36
alexhandy left06:36
Murr left06:44
Murr joined06:44
IFTquestion2 joined06:44
alexhandy joined06:46
alexhandy left06:46
alexhandy joined06:47
agarr joined06:49
mncheck joined06:50
alexhandy left06:52
agarr left06:54
zeenk joined06:56
alexhandy joined06:58
hamburgler left07:00
adlternative hi, how can I know a local repo is "synced" with repo on github or other git server?07:00
Leonarbro joined07:00
alexhandy left07:04
agarr joined07:05
clime joined07:05
epony left07:05
otisolsen70 joined07:05
epony joined07:07
agarr left07:09
alexhandy joined07:10
shyjun joined07:11
alexhandy left07:11
peirik_ joined07:12
transhumanist left07:13
xx joined07:13
transhumanist joined07:14
shyjun left07:18
feriman joined07:18
Guest55 joined07:18
Guest55 Hi I have a doubt/question07:18
can some1 help ?07:19
LuKaRo left07:20
rkta Don't ask to ask.07:21
_sa0sin_ joined07:22
Guest55 In a git repo, there is a folder "a", inside that there is "b" . like that a->b->c->d->e->f ... if i give "git status" on folder "f" it show git status. Is there any option to specify how many levels to go up to look for repository ?07:22
ajfriesen left07:23
jazz-o-lantern left07:24
ajfriesen joined07:24
m5zs7k left07:24
sa0 left07:25
alexhandy joined07:25
LuKaRo joined07:25
m5zs7k joined07:25
gtristan left07:26
alexhandy left07:28
osse Guest55: not directly. You can set GIT_CEILING_DIRECTORIES, but that's a list of paths it won't cd into.07:31
But you cannot control how many levels to cd up before it gives up07:31
IF you want to "disable" git for some reason you can set GIT_DIR to a bs directory07:32
alexhandy joined07:34
thebombzen_ joined07:37
alexhandy left07:40
Le_Ris joined07:42
Leris left07:45
theoceaniscool_ joined07:46
theoceaniscool joined07:46
farzat joined07:49
epony left07:50
iomari891 joined07:52
gtristan joined07:53
Masklin_GurderMasklin__Gurder08:00
Masklin__GurderMasklin08:00
agarr joined08:01
epony joined08:03
agarr left08:05
sa0 joined08:09
Guest55 My prob is like this. I have a "tools" repo checked out at /home/uesr directory. and there is another repo(an SDK) which is at /home/user/a/. This "a" can be a repository, or it will be built by some script.(if its a repo, then it will have .git folder, if its built/packaged by a script, then .git folder wont be there.). If "a" is a repo, then08:09
if i give "git status" on /home/user/a/b/c/d it shows the git version of repo "a"... If "a" is generated through script, and i give "git status" on /home/user/a/b/c/d it shows the git version of repo "tools" ...08:09
mobidrop joined08:11
_sa0sin_ left08:11
Guest55 My makefile fetches git version from /home/user/a and gives it as a macro to a C file. The prob is if /home/user/a is a repo, then it works fine, but if its built/packaged through script, it gets version of "/home/user/tools/"08:13
alexhandy joined08:16
alexhandy left08:16
gtristan left08:17
gtristan joined08:17
Guest55 left08:17
Guest55 joined08:17
fling left08:22
pyeverything joined08:22
fling joined08:22
dante-as joined08:26
osse Guest55: then I suggest you export GIT_DIR=/home/user/a/.git (or use git --git-dir=...) in your script/Makefile to force git to consider /home/user/a as a repo. It might fail of course if there is no repo there, but at least you don't get false positives from the outer repo08:27
Guest55 left08:27
pyeverything left08:27
farzat left08:31
cart_ joined08:31
codebam1 joined08:32
farzat joined08:33
codebam left08:34
jonascj joined08:36
jonascj Hi all. If I have two branches feature and master. Since the branching both branches have had commits. I think I want some changes from the master branch incorporated into my feature branch but not all (maybe just the changes to one file).08:39
Guest55 joined08:39
trace1918 joined08:40
jonascj What action would do this, is it a merge?08:40
alexhandy joined08:40
grawity a merge is mostly all-or-nothing – you can merge "all commits up to X" but not split them up08:41
if all you need is a single commit or two, `git cherry-pick` it08:41
agarr joined08:43
alexhandy left08:45
agarr left08:47
Guest55 left08:47
atrigent left08:50
atrigent joined08:51
jonascj grawity thanks08:52
leon_ joined08:54
realies6 joined08:55
realies6realies08:57
daoudr joined09:09
epony left09:10
jonascj grawity Apart from a note in the log, will cherry-picking more or less be equivalent to manually taking the changes from two working trees and incorporating them?09:10
epony joined09:11
grawity the result is just a regular commit, equivalent to applying a patch09:11
jonascj okay, so the graph will not afterwards reflect that something from one branch was incorporated into another branch?09:12
grawity no09:13
trace1918 left09:14
grawity the graph can only represent merges of whole commit history -- not single commits, but their parents included09:14
_sa0sin_ joined09:17
sa0 left09:20
gtristan left09:20
agarr joined09:21
jonascj alright, thanks you09:22
*thank09:22
agarr left09:25
trace1918 joined09:34
coot left09:34
R2robot left09:35
Guest55 joined09:38
pyeverything joined09:41
wgrant joined09:41
dante-as left09:42
Murr- joined09:44
pyeverything left09:45
alexhandy joined09:45
jonascj left09:45
Guest55 left09:45
R2robot joined09:46
Murr left09:46
Murr-Murr09:46
nuala joined09:48
m4r35n357 joined09:49
coot joined09:51
malmalmal joined09:57
codebam1codebam09:58
LuKaRo left09:59
Masklin left09:59
Murr- joined10:00
f3n1x joined10:01
reset joined10:02
Murr left10:03
Murr-Murr10:03
dnh joined10:04
LuKaRo joined10:04
alexhandy left10:06
edgars left10:11
coot left10:12
elastic_1 joined10:18
elastic_1elastic_dog10:18
tristan_ joined10:23
Murr- joined10:31
nate3 joined10:31
Murr left10:32
Murr-Murr10:32
vishal left10:35
nate3 left10:36
Murr- joined10:37
vishal joined10:37
edgars joined10:37
Murr left10:39
Murr-Murr10:39
feriman left10:45
Filip2 joined10:51
leon_leon10:51
csm310599 joined10:57
clime1 joined10:57
vitali64 joined10:57
csm310599 left10:59
csm310599 joined10:59
tuskkk____ joined11:01
csm310599 left11:01
csm310599 joined11:01
csm310599 left11:04
csm310599 joined11:04
Masklin joined11:04
Visne left11:04
awmv joined11:05
vladoski joined11:05
fandre1986 joined11:07
fandre1986 Hi all11:07
fweht left11:08
fandre1986 I would like to ignore all files with pattern *.csv and *.xlsx;11:08
I can add both lines to .gitignore but is it possible to do it in one line?11:09
ikke no11:09
one pattern per line11:09
fandre1986 i.e: *.[csv-xlsx]11:09
ikke no11:09
that's not possible11:09
fandre1986 Ok11:09
thanks11:10
agarr joined11:11
agarr left11:12
Visne joined11:13
dante-as joined11:13
epony left11:14
epony joined11:15
mobidrop left11:15
alexhandy joined11:16
cdown joined11:18
fandre1986 left11:19
alexhandy left11:19
lacrymology joined11:20
detuneattune joined11:23
thuna` joined11:24
LuKaRo left11:25
alexhandy joined11:27
alexhandy left11:27
cdown_ joined11:28
ThorMojito left11:28
ThorMojito1 joined11:28
LuKaRo joined11:28
dante-as left11:30
cdown left11:30
cdown_cdown11:30
malmalmal left11:30
ThorMojito joined11:31
ThorMojito1 left11:31
yuiyukihira joined11:32
coot joined11:32
mingdao left11:33
mingdao joined11:34
adanwan left11:35
detuneattune How would I deal with things if I made 5 atomic, incremental commits to one file, made a PR and the maintainer didn't approve of the 3rd commit but the other commits were fine? Would that mean that everything from commit 4 and onwards is also unusable since they also contain the incorrect changes from commit 3?11:40
adanwan joined11:41
bremner you can try rebase -i, remove the commit, and resolve any conflicts11:41
selckin git rebase -i <one before it>, delete 4th commit, exit, and resolve conflicts if any, and bremner types faster then me11:41
cdown left11:41
pyeveryt_ joined11:41
bremner yay, I win11:41
give bad advice fast, thank you coffee11:42
detuneattune Thank you! I was wondering what the best practice was in this case. I considered doing a separate branch and PR for each commit if it was in the same file but that sounded odd/incorrect11:42
I'll look up rebasing :)11:42
selckin you can do it in many ways11:43
sjoshi joined11:45
alexhandy joined11:45
c0dehu1k left11:45
sjoshi left11:46
pulse joined11:50
alexhandy left11:50
sjoshi joined11:51
lacrymology left11:52
enimaloc joined11:52
cdown joined11:55
IRChatter detuneattune, it all comes down to cohesion. Is each commit a completely different thing (a new feature, a bug fix, etc)? Or does their sum result in only one of those? The former would be a different PR for each, and the latter a single one12:01
alexhandy joined12:03
TomyWork joined12:03
detuneattune I think I'd say it'd fall under the latter as one PR. I wanted to make a README easier to understand. One commit would have been changing the examples given, and the other one would have been adding a paragraph to expand upon a point12:04
Thanks for the clarification though, was a bit confused on this since I haven't really had to do anything other than git add, commit and push up until now :P12:05
LuKaRo left12:07
eroux left12:08
LuKaRo joined12:09
alexhandy left12:09
mexen joined12:13
ajshell1 joined12:14
eroux joined12:18
codebam left12:19
alexhandy joined12:21
apteryx joined12:23
apteryx hi! I have a script that outputs extra arguments such as --add-header= ... to be tacked to the git send-email command line, but its invocation through command substitution causes quoting issues... perhaps there's a native git mechanism to extend its command line?12:25
selckin how does it pass the args, should be fixable so it works12:26
alexhandy left12:27
john_johnk joined12:27
apteryx after discussing that in #bash, our conclusion is that the design is fragile and should be reviewed; currently it's to be invoked as: git send-email --to [email@hidden.address] $(./etc/teams.scm cc mentors) *.patch, where etc/teams.scm is a Guile script in the tree12:28
the problem is that the command substitution of said script generates output like: --add-header="X-Debbugs-Cc: some@email" ..., and when using command substitution these quotes are not interpreted so the words are split on white space and it breaks12:29
(and the quotes appear as literals in the arguments)12:30
clime1 left12:31
selckin can't change it to like ./etc/teams.scm cc mentors -- git send-email --to [email@hidden.address] *.atch12:32
then teams can call the cmd after -- with the proper args12:32
ferdna joined12:32
Matt|home joined12:36
theoceaniscool_ left12:36
theoceaniscool left12:36
Matt|home hello. Is there a way to pull all github branches with git? for example, I have two branches in a repo: main and other. If i simply do git pull 'github.com/mystuff' , it only pulls in main and excludes other like it doesn't exist12:38
Do i need to manually pull in each branch?12:38
derpydoo joined12:38
apteryx selckin: interesting idea!12:38
alexhandy joined12:39
molt joined12:40
osse Matt|home: pull = fetch + merge. usually it will fetch all branches (so that origin/foo and origin/bar) are updated, but only merge one branch (e.g. for master it will memrge origin/master and so on)12:41
Matt|home ah12:41
how do i get the repo back from githut without doing merges/changes12:41
with all branches12:41
alexhandy left12:42
pyeveryt_ left12:42
RiFo left12:42
john_johnk left12:42
osse depends on what you mean exactly12:43
Murr left12:43
Murr joined12:44
Matt|home I created a directory on my local machine. I have a github repo with 2 branches. main and other. I'd like to get both branches from the same repo, and move them into the directory i created. I don't want the branches merged yet because I am stil working on other12:44
RiFo joined12:44
osse Matt|home: in your local repo, what is the output of git branch -r ?12:44
Matt|home one moment12:45
no output, empty12:45
git branch only shows master12:45
osse you should add your github repo as a remote and then fetch. try this:12:47
durko03 joined12:47
loulou joined12:47
loulou left12:47
loulou joined12:47
osse git remote add origin github.com/mystuff && git fetch origin12:47
what does git branch -r say after that12:47
Matt|home after running those commands, git branch without any arguments shows main, but git branch -r shows both branches in red12:48
matt@rfranklin:~/Programming/SantasWorkshop$ git branch12:48
* master12:48
matt@rfranklin:~/Programming/SantasWorkshop$ git branch -r12:48
origin/header-dump12:48
origin/main12:48
matt@rfranklin:~/Programming/SantasWorkshop$12:48
osse good, that's the way it's supposed to be12:49
the way git works is that for each branch X in github you will have something locally called origin/X12:49
but the branch(es) you have locally exist in a different namespace, so to speak12:49
lacrymology joined12:50
Matt|home okay cool. i can switch between them, update and push no problems right?12:50
thanks osse12:51
osse to update and push you should make a new local branch by the same name. usually 'git checkout header-dump' (without origin/ in front) will automatically do that for you12:51
Matt|home yep12:51
it seems to have worked12:51
loulou left12:51
Matt|home thank you12:51
osse ncie12:52
printed something like "switch to a new branch" and "set up tracking" and bla bla right?12:53
theoceaniscool joined12:53
theoceaniscool_ joined12:53
csm310599 left12:54
Matt|home yep12:54
one of these days i'll read the git docs in full and actually understand how to use it12:55
durko03 left12:55
Matt|home one day12:55
dermoth joined12:57
awmv left12:58
osse well13:01
one day13:01
or another13:01
git'll gonna find ya13:02
gonna get ya get ya get ya13:02
csm310599 joined13:02
LuKaRo left13:02
malmalmal joined13:02
f3n1x left13:05
LuKaRo joined13:08
feriman joined13:08
gryffus joined13:08
skfax joined13:09
vladoski left13:10
edgars left13:10
BlessJah joined13:11
lacrymology left13:12
Xenguy left13:13
belsirk joined13:15
coot left13:16
coot joined13:17
rfuentess left13:17
pyeverything joined13:18
pyeverything left13:18
epony left13:18
pyeveryt_ joined13:18
epony joined13:19
RiFo left13:20
feriman left13:23
mw_ joined13:24
feriman joined13:25
Raito_Bezarius joined13:29
Raito_Bezarius left13:32
cyberpear joined13:35
GrapeSlush joined13:38
peirik_ left13:41
malmalmal left13:43
alexhandy joined13:46
hamburgler joined13:52
peirik_ joined13:52
ccapndave joined13:53
otisolsen70 left13:55
molt left13:56
peirik_ left13:58
theoceaniscool left14:00
theoceaniscool_ left14:00
alexhandy left14:03
colemickens joined14:03
atrigent left14:04
causasui joined14:05
colemickens hi folks. What is the state of the art for fast `git status`? I'd been using [rs-git-fsmonitor](https://github.com/jgavris/rs-git-fsmonitor), but it hasn't seen many updates and I see the GitHub blog just uses plain watchman and hooks14:05
audiobirb joined14:06
colemickens I use gitstatusd with zsh and frankly it makes it very hard to change shells, because nothing comes anywhere near it for speed. (unless using something like jj [jujube] where it can do smarter things)14:06
lucasta left14:06
atrigent joined14:07
tux12 left14:07
lucasta joined14:08
selckin an SSD14:11
ccapndave left14:11
selckin what kind of crazy repo you got that status is slow14:11
skfax left14:13
colemickens nixpkgs14:13
SSD + zfs with a huge arc and it's still easy to tell a difference :D14:14
though, I just enabled untrackedCache, so that might considerably help.14:14
austin987 joined14:14
sd5 joined14:15
powftw joined14:16
gryffus left14:16
lpapp joined14:16
lpapp hi, git bisect log does not contain the number of commits and steps left14:16
can I somehow explicitly request it?14:16
gh34 joined14:16
lpapp when I am in the middle of a bisecting session14:17
lucasta left14:17
supay joined14:19
pyeveryt_ left14:20
ccapndave joined14:22
sjoshi left14:26
thiago joined14:27
peirik_ joined14:27
tristan_ left14:29
tristan_ joined14:30
peirik_ left14:32
nate3 joined14:33
moon93 joined14:34
c0dehu1k joined14:34
tristan_ left14:35
jonosterman joined14:37
nate3 left14:37
gryffus joined14:38
LuKaRo left14:39
thiago left14:39
memoryleak joined14:40
thiago joined14:41
alexhandy joined14:42
LuKaRo joined14:44
alexhandy left14:45
ccapndave left14:48
audioburn joined14:49
csm310599 left14:49
peirik_ joined14:50
audiobirb left14:52
peirik_ left14:55
medusa joined14:56
feriman left14:56
medusa left14:56
softirq joined14:56
bookworm joined14:56
berkay joined14:57
pyeverything joined14:58
ThorMojito1 joined14:58
ThorMojito left14:58
pyeverything left14:59
pyeverything joined14:59
jazz-o-lantern joined15:04
soman joined15:05
alexhandy joined15:06
travisghansen left15:06
thiago left15:06
edgars joined15:08
haps joined15:09
thiago joined15:11
trace1918 left15:11
peirik_ joined15:12
LuKaRo left15:13
LuKaRo joined15:15
alexhandy left15:16
blaklistd left15:16
blaklistd joined15:16
Lunatrius joined15:17
blaklistd left15:17
ntz left15:18
blaklistd joined15:18
ntz joined15:19
m0viefreak joined15:20
leeand00 joined15:20
Kulrak joined15:20
edgars left15:20
alexhandy joined15:22
epony left15:22
alexhandy left15:24
belsirk left15:27
epony joined15:27
lacrymology joined15:28
Kobaz little bit of a gittastrophy here15:28
https://dpaste.com/29B7BP5ZM15:28
ikke Kobaz: !situation15:30
gitinfo Kobaz: Please post the url returned by ' git log -n 20 --all --graph --format="%h %p %d %s" | curl -F text=@- https://upaste.de ' to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)15:30
rama joined15:30
ferdna left15:30
selckin !undo_merge15:30
Kobaz fatal: ambiguous argument '%p': unknown revision or path not in the working tree.15:31
anddam how do I force checking out on "error: The following untracked working tree files would be overwritten by checkout:"?15:31
selckin !revert_merge15:31
gitinfo [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you can use 'git revert' but there are gotchas to be aware of. Please read: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt15:31
ikke Kobaz: seems like you omitted the quotes?15:31
anddam oh, checkout --help has --force15:31
Kobaz nope, the quotes are in there15:31
dionysus69 left15:31
Kobaz # git log -n 20 --all --graph --format="%h %p %d %s"15:31
option doesn't exist maybe?15:33
ikke it works for me15:33
And it's not a recent option15:33
Kobaz git version 2.30.215:33
anddam worksforme as well15:34
ikke Kobaz: what shell?15:34
sd5 left15:35
anddam "What the shell!"15:35
sd5 joined15:35
anddam Kobaz: try single quotes maybe15:36
Kobaz single quotes.. nope.... and man git-log does show %p as a valid option15:36
gitinfo the git-log manpage is available at https://gitirc.eu/git-log.html15:36
alexhandy joined15:37
GrapeSlush left15:37
audioburn left15:38
gsgx joined15:38
anddam Kobaz: yea I figure parent is a pretty old concept in git logging15:38
Kobaz maybe a bug in this version15:39
GrapeSlush joined15:39
alexhandy left15:39
ThorMojito1 left15:41
anddam Kobaz: what if you throw an actual revision there?15:41
also you didn't answer what shell is this15:42
Kobaz oh, sorry... bash15:43
anddam that sounds very odd then15:43
peirik_ left15:43
ferdna joined15:45
dionysus69 joined15:45
alexhandy joined15:45
alexhandy left15:45
apteryx left15:46
clime1 joined15:48
crabbedhaloablut left15:52
crabbedhaloablut joined15:52
madewokherd joined15:53
ThorMojito joined15:55
feriman joined15:57
madewokherd` left15:58
leeand00 left15:59
dionysus69 left16:00
alexhandy joined16:00
pyeverything left16:00
pyeverything joined16:00
Murr- joined16:03
alexhandy left16:03
Murr left16:06
Murr-Murr16:06
lpapp left16:07
leeand00 joined16:08
ThorMojito left16:12
cdown left16:14
ferdna left16:15
IFTquestion2 left16:18
sd5 left16:19
sd5 joined16:21
ferdna joined16:21
sd5 left16:24
sd5 joined16:25
powftw left16:25
leeand00 left16:27
alexhandy joined16:27
alexhandy left16:27
___nick___ joined16:28
sd5 left16:28
___nick___ left16:28
sd5 joined16:29
clime1 left16:29
___nick___ joined16:30
jonosterman left16:30
cdown joined16:31
feriman left16:32
feriman joined16:32
NorrinRadd left16:32
haps left16:33
leeand00 joined16:37
moon93 left16:39
supay left16:41
adlternative left16:41
adlternative joined16:42
loulou joined16:43
loulou left16:43
loulou joined16:43
junebug joined16:43
cdown left16:44
cdown joined16:45
alexhandy joined16:46
ThorMojito joined16:46
lucasta joined16:48
skapata joined16:49
LuKaRo left16:49
cdown left16:50
alexhandy left16:51
LuKaRo joined16:53
adlternative left16:59
soman left16:59
pyeverything left17:01
alexhandy joined17:01
lucasta left17:02
rama left17:02
rama joined17:03
lucasta joined17:03
alexhandy left17:03
LuKaRo left17:08
IFTquestion2 joined17:10
lpapp joined17:10
softirq left17:10
lpapp is this deliberate that git bisect good/bad keeps the local changes, e.g. a build fix for htat revision?17:11
i.e. I have to throw that away explicitly for the next step?17:11
LuKaRo joined17:11
lpapp I actually do not even know how it does it, it rebases the local changes on top of the next commit in the bisecting session?17:11
ikke it would just checkout the commit it wants to check17:12
softirq joined17:12
lpapp but for that, we typically need to drop local changes, right17:12
or commit them17:12
ikke git checkout will succeed if there are no conflicting changes17:13
lpapp ok, maybe I confused it with pull then, thanks17:13
so, if there was conflict, git bisect good/bad would also be in trouble.17:13
ikke rebase wants a clean working tree17:13
adlternative joined17:15
Sasazuka joined17:19
lpapp thanks17:20
edgars joined17:21
alexhandy joined17:22
leeand00 left17:24
lucasta left17:24
alexhandy left17:24
leeand00 joined17:25
lucasta joined17:25
edgars left17:29
LuKaRo left17:30
TheCatBehemoth joined17:30
derpydoo left17:31
epony left17:31
epony joined17:32
wpcarro would `git reflog` be the place to go to find the previous values for HEAD for branch=main17:32
ikke wpcarro: the default reflog tracks HEAD, which can be any branch17:33
if you want to know the history of main, use `git reflog main`17:33
wpcarro ty anyway to query a remote's reflog?17:34
ikke no17:34
wpcarro i'd like to see `git reflog main` for my origin remote17:34
:(17:34
ikke reflog is local only, not shared17:34
or exposed17:34
wpcarro okay must find new implementation idea then17:35
i have a ci job that adds refs to tag commits with "revision numbers" (e.g. r/123 is the 123rd commit in the mainline branch)17:35
lpapp left17:35
LuKaRo joined17:36
pyeveryt_ joined17:36
wpcarro and it's working mostly okay except i forgot that github PRs allow multiple commits per PR, so i'm tag only the HEAD of main and skipping previous commits17:36
junebug left17:36
wpcarro was hoping to find the commit range from the PR using `git reflog main` on the remote17:36
i'd prefer to not query github if i can avoid it17:36
pure git much nicer imo17:36
ikke github does expose several refs for each PR17:37
wpcarro oh right!17:37
so maybe i can find the pr ref from a commit SHA...17:37
rama_ joined17:38
rama_ left17:39
rama left17:41
ferdna left17:42
blahboybaz joined17:44
hoochmonger joined17:44
wpcarro hard to find that ref bc i guess the commit SHAs will differ after the merge... could look it up by tree SHA lol17:45
this is starting to feel a bit much17:46
Murr- joined17:47
leeand00 left17:47
wpcarro i'll just find a way to backfill from HEAD to which commit in main doesn't have a r/* ref17:48
Murr left17:49
Murr-Murr17:49
softirq left17:52
NorrinRadd joined17:52
wpcarro is `git for-each-ref --contains=HEAD` the fastest way to list all refs attached to HEAD?17:53
lucasta left17:53
lucasta joined17:54
ThorMojito1 joined18:02
ThorMojito left18:02
ThorMojito joined18:03
ThorMojito1 left18:03
wpcarro `git log -1 --format=%D HEAD` maybe more direct18:06
leeand00 joined18:07
cart_ left18:09
dionysus69 joined18:22
peepsalot left18:24
dkeohane joined18:27
alexhandy joined18:29
c0dehu1k left18:29
adanwan left18:30
iomari891 left18:31
adanwan joined18:32
NorrinRadd left18:34
nate3 joined18:34
anddam Kobaz: no more updates?18:35
I am curious about that misinterpreted %p18:35
ThorMojito left18:35
ThorMojito joined18:35
pyeveryt_ left18:37
IFTquestion2 left18:38
TomyWork left18:39
nate3 left18:39
sudoforge joined18:40
peirik_ joined18:41
Murr left18:43
alexhandy left18:43
Murr joined18:43
NorrinRadd joined18:45
lucasta left18:52
lucasta joined18:52
ThorMojito left19:03
blahboybaz left19:04
blahboybaz joined19:06
gryffus left19:06
LuKaRo left19:06
fweht joined19:08
LuKaRo joined19:11
pyeveryt_ joined19:12
gsgx left19:12
lucasta left19:13
lucasta joined19:13
pyeveryt_ left19:14
pyeverything joined19:14
peirik_ left19:16
adlternative left19:18
adlternative joined19:18
ThorMojito joined19:25
edgars joined19:25
ThorMojito left19:25
audioburn joined19:27
dionysus69 left19:28
IFTquestion2 joined19:31
edgars left19:31
LuKaRo left19:31
jaume joined19:33
jaumemalmalmal19:33
malmalmal left19:34
jaume joined19:35
LuKaRo joined19:35
epony left19:36
jaume left19:36
epony joined19:37
malmalmal joined19:37
fling left19:37
malmalmal left19:44
malmalmal joined19:45
malmalmalmal joined19:45
malmalmal left19:47
malmalmalmal left19:47
malmalmal joined19:47
ThorMojito joined19:49
tuskkk____ left19:50
ThorMojito1 joined19:56
ThorMojito left19:56
irrgit_ left20:01
fling joined20:01
malmalmal left20:01
fling left20:02
lucasta left20:02
irrgit_ joined20:02
lucasta joined20:04
___nick___ left20:04
fling joined20:05
wpcarro anyone know how to list the commits added in a gh pr using vanilla git? i know there's the refs/pull/#/head...20:10
if refs/pull/n/head has been rebased with latest origin/main, then origin/main..pull/n/head works as expected20:11
but i think things might get strange when pull/n/head hasn't been rebased with the latest origin/main20:11
am i better off just using the gh api?20:13
peirik_ joined20:14
pyeverything left20:16
pyeveryt_ joined20:16
NorrinRadd left20:16
peirik_ left20:18
Coop left20:20
ThorMojito1 left20:20
pyeveryt_ left20:21
ferdna joined20:23
IFTquestion2 left20:25
user joined20:26
user hi20:26
lgc joined20:27
user i found the file and and a hash via 'git grep keyword $(git rev-list --all)' but how can i find the exact commit hash?20:27
sudoforge left20:28
lgc left20:29
alexhandy joined20:29
Coop joined20:37
alexhandy left20:42
baffodoro joined20:42
peirik_ joined20:42
keypushe- joined20:45
igemnace left20:45
keypusher left20:46
coot left20:48
keypushe-keypusher20:48
LuxuryMode left20:51
YuGiOhJCJ joined20:51
alexhandy joined20:52
awmv joined20:52
lucasta left20:54
lucasta joined20:54
pyeveryt_ joined20:56
Le_Ris left20:57
iomari891 joined20:59
fling left21:00
LuKaRo left21:03
cdown joined21:04
hexadecagram left21:04
molt joined21:07
LuKaRo joined21:15
iomari891 left21:15
fling joined21:19
robo- joined21:21
hexadecagram joined21:24
robo- left21:26
LuKaRo left21:26
robo- joined21:27
gvg left21:27
dviola left21:27
analpaper__ joined21:28
m0viefreak2 joined21:28
m0viefreak left21:28
m0viefreak2m0viefreak21:28
LuKaRo_ joined21:30
edgars joined21:30
user left21:31
travisghansen joined21:32
alexhandy left21:33
dnh left21:33
peirik_ left21:34
gvg joined21:34
sd5 left21:35
edgars left21:36
jim left21:37
ThorMojito joined21:37
alexhandy joined21:37
ThorMojito left21:38
fweht left21:38
lucasta left21:39
lucasta joined21:40
sedzcat joined21:40
dviola joined21:41
pikapika joined21:41
sedzcat left21:42
jim joined21:42
ThorMojito joined21:42
adanwan left21:43
adanwan joined21:46
causasui left21:48
gh34 left21:48
geosmile left21:49
crabbedhaloablut left21:49
crabbedhaloablut joined21:50
peirik_ joined21:51
alexhandy left21:51
feriman left21:52
peirik_ left21:55
pyeveryt_ left21:56
jim left21:57
adanwan left21:57
adanwan joined21:58
trace1918 joined21:58
ThorMojito1 joined21:59
ThorMojito left21:59
cbreak joined21:59
peirik_ joined22:00
Shentino joined22:01
ThorMojito1 left22:03
alexhandy joined22:03
gildasio left22:04
m0viefreak left22:07
alexhandy left22:08
peirik_ left22:08
Lord_of_Life left22:10
gildasio joined22:10
Lord_of_Life joined22:11
Xenguy joined22:14
vitali64 left22:18
ThorMojito joined22:19
lucasta left22:20
alexhandy joined22:21
lucasta joined22:22
mncheck left22:24
alexhandy left22:25
lucasta left22:27
cyberpear left22:35
nate3 joined22:36
ThorMojito left22:38
alexhandy joined22:39
pyeveryt_ joined22:40
dkeohane left22:40
alexhandy left22:40
nate3 left22:41
ThorMojito joined22:41
ThorMojito1 joined22:42
ThorMojito left22:42
srinidhi left22:43
madewokherd left22:44
trace1918 left22:47
TheCatBehemoth left22:50
FinnElija left22:51
FinnElija joined22:55
pyeveryt_ left22:57
YuGiOhJCJ left23:04
rama joined23:05
barometz joined23:06
gildasio left23:08
ThorMojito1 left23:08
ThorMojito joined23:09
gildasio joined23:10
YuGiOhJCJ joined23:12
Kangie left23:12
barometz left23:16
barometz joined23:17
sa joined23:17
polo joined23:19
_sa0sin_ left23:26
darkstardevx joined23:31
adlternative left23:32
rama left23:33
edgars joined23:33
rama joined23:34
barometz left23:35
rama left23:35
rama joined23:35
darkstardevx left23:35
ThorMojito left23:37
edgars left23:38
barometz joined23:39
madewokherd joined23:39
YuGiOhJCJ left23:40
zeenk left23:43
epony left23:44
epony joined23:45
YuGiOhJCJ joined23:46
darkstardevx joined23:50
alexhandy joined23:50
darkstardevx left23:52
darkstardevx joined23:53
specing joined23:56
jacobk joined23:56
specing Hello, I have an issue: $(git branch -r) shows no branches at all23:57
alexhandy left23:57
specing git remote -v lists fetch and push origin https://github.com/vegastrike/Vega-Strike-Engine-Source.git (fetch)23:57
thiago fetch that remotes23:58
specing thiago: I did git fetch, git fetch --all, git fetch origin all to no avail23:59

Logs Search ←Prev date Next date→ Channels Documentation