IRCloggy #git 2020-09-24

Logs Search ←Prev date Next date→ Channels Documentation

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

2020-09-24

igemnace joined00:02
SwiftMatt joined00:05
deltab left00:09
tiin57 left00:11
tiin57 joined00:14
kerframil left00:14
Xenguy joined00:14
maxzor left00:15
cim209 joined00:16
init joined00:17
EvanCarroll left00:17
deltab joined00:19
arcatech left00:21
init left00:22
cdown_ joined00:26
Thorn joined00:27
tilpner_ joined00:27
zebrag left00:27
cdown left00:29
cdown_cdown00:29
tilpner left00:30
tilpner_tilpner00:30
zebrag joined00:30
tafa2 left00:34
jsatk joined00:40
yamashitatan left00:41
Muimi joined00:41
impermanence left00:41
tiin57 left00:41
jsatk Hello. I'm suddenly having a hell of a time pushing a new remote to git. When I'm on `master` I run `git checkout -b foo` and then `git push --set-upstream origin foo` but when I run `git branch -vv` it shows that `foo` is pointed at `master` still. And the aformentioned push fails because git thinks I'm trying to push on top of `master` which is a protected branch.00:41
Any ideas what weird settings or config could be causing this? I've been using git for a decade... this is... strange.00:42
Aki-lucky left00:43
Gurkenglas left00:43
alesan joined00:44
alesan hello00:44
relipse left00:45
tiin57 joined00:45
alesan I am using git in a scenario that I think is pretty common these dys, I have a remote called "origin" that has a MASTER branc, I clone it on my local machine, I create a different branch, I push it bach with push origin <branchname>00:45
nedbat sounds pretty standard00:46
alesan what I am asking is: why do I need to specify a branchname? Cannot just take the current branch name, UNLESS I want to push to a different branch?00:46
(and what would be the semantics to push to a different branch I am not sure)00:46
nedbat alesan: a great question. i don't know the answer00:46
jsatk nedbat: https://stackoverflow.com/questions/37770467/why-do-i-have-to-git-push-set-upstream-origin-branch00:47
alesan OK thanks anyway :)00:47
jsatk i am over here stumped trying to figure out why the hell `git checkout -b foo && git push -u origin foo` is still causing `foo` to track against `master`.00:48
Wetmelon joined00:51
kupi left00:52
jsatk Okay it's either something about branch.autosetupmerge=true or rebase.autosquash=true.00:57
Wetmelon left01:00
Irish left01:01
Xenguy left01:02
Xenguy joined01:02
SwiftMatt left01:02
POQDavid joined01:04
vngx left01:04
Jookia left01:06
yonder joined01:10
arcatech joined01:10
tiin57 left01:11
Xenguy left01:11
Tk55 joined01:12
stats4647 left01:13
stats4647 joined01:13
tiin57 joined01:14
acetakwas joined01:18
stats4647 left01:18
F0rTex left01:19
gschanuel left01:20
F0rTex joined01:20
gschanuel joined01:21
Jookia joined01:22
mud joined01:24
leprechau left01:27
javashin joined01:28
davispuhh joined01:28
davispuh left01:30
Xenguy joined01:33
fstd_ joined01:34
AnAverageHuman left01:35
leprechau joined01:36
fstd left01:38
fstd_fstd01:38
tiin57 left01:41
tiin57 joined01:44
acetakwas left01:48
POQDavid left01:49
acetakwas joined01:49
drbean joined01:50
POQDavid joined01:50
stats4647 joined01:50
POQDavid left01:50
POQDavid joined01:51
binTrl joined01:51
binTrl left01:54
acetakwas left01:55
POQDavid left01:55
arcatech left01:55
POQDavid joined01:56
acetakwas joined01:56
javashin_ joined02:05
AnAverageHuman joined02:06
arcatech joined02:07
javashin left02:08
init joined02:09
dfee left02:09
arcatech left02:10
tiin57 left02:11
POQDavid left02:11
acetakwas left02:11
dfee joined02:11
POQDavid joined02:12
acetakwas joined02:12
arcatech joined02:12
init left02:14
tiin57 joined02:15
arcatech left02:17
SwiftMatt joined02:19
Goplat joined02:22
s2013 left02:23
marslander joined02:25
init joined02:25
lagothrixGuest4238102:29
Guest42381 left02:29
lagothrix joined02:29
init left02:30
arcatech joined02:30
gast0n left02:32
gast0n joined02:34
POQDavid left02:37
yousef9 left02:37
POQDavid joined02:37
gast0n left02:38
acetakwas left02:38
acetakwas joined02:40
tiin57 left02:41
tiin57 joined02:44
init joined02:44
Cabanoss- joined02:49
init left02:49
Cabanossi left02:49
Cabanoss-Cabanossi02:49
SwiftMatt left02:53
Jookia left02:57
chachasmooth left02:57
kent\n joined02:58
chachasmooth joined02:59
tgunr joined03:01
Jookia joined03:04
stats4647 left03:06
wagle left03:09
wagle joined03:10
tiin57 left03:11
sudoforge joined03:14
mowcat left03:14
tiin57 joined03:15
marslander left03:15
init joined03:20
cuppajoeman left03:24
oatmealraisin left03:25
init left03:25
wagle left03:29
wagle joined03:29
Xiti left03:30
Xiti joined03:32
davispuhh left03:33
tiin57 left03:41
tiin57 joined03:45
Guest20 joined03:48
powerhouse left03:53
javashin_ left03:55
AnAverageHuman left04:02
acetakwas left04:02
POQDavid left04:02
acetakwas joined04:03
POQDavid joined04:04
n-st left04:06
thomasross left04:10
tiin57 left04:11
buckworst joined04:11
Thominus left04:12
buckworst left04:13
tiin57 joined04:14
mat001_ joined04:15
mat001 left04:17
pikapika joined04:17
n-st joined04:21
vicfred left04:22
vicfred joined04:24
a-l-e joined04:26
dermoth left04:28
dermoth joined04:30
s2013 joined04:36
crose joined04:36
powerhouse joined04:40
tiin57 left04:41
tiin57 joined04:44
drbean left04:48
init joined04:55
wgrant joined04:57
init left05:02
meropyri left05:03
meropyri joined05:03
zrhoffman left05:09
tiin57 left05:11
matelot joined05:14
tiin57 joined05:14
Abbott left05:26
Abbott joined05:26
mightyjens joined05:30
mirrorbird joined05:30
init joined05:32
SwiftMatt joined05:33
sudoforge left05:36
init left05:38
stats4647 joined05:39
kent\n left05:40
tiin57 left05:41
kent\n joined05:41
stats4647 left05:44
tiin57 joined05:44
theoceaniscool joined05:49
Xenguy left05:52
ekh joined05:53
Xenguy joined05:54
geosmile left05:55
jaziz left05:56
SwiftMatt left05:58
arcatech left06:05
macrover joined06:06
mir100 left06:07
karab44 joined06:11
SwiftMatt joined06:11
tiin57 left06:11
thiago left06:11
rfuentess joined06:13
tiin57 joined06:14
mat001 joined06:14
mirrorbird left06:15
fatalhalt joined06:15
SwiftMatt left06:16
mat001_ left06:16
stats4647 joined06:19
konrados joined06:23
stats4647 left06:24
VectorX left06:26
karab44 left06:31
OnkelBlade joined06:37
tiin57 left06:41
Muimi left06:44
tiin57 joined06:44
irc_user left06:45
txtsd left06:48
tarkus joined06:48
jsatk I figured it out. It's `autosetupmerge = always` that I'd added to my gitconfig. I thought I understand what it did but clearly not...06:50
chele joined06:50
osse alesan: if you add -u to the first push from the new branch, you can then just use 'git push' with no args thereafter06:52
R2robot joined06:55
causasui left06:56
KnoP joined06:58
VectorX joined06:58
theoceaniscool left07:00
unluckyshrubbery left07:02
FH_thecat left07:05
FH_thecat joined07:05
matelot left07:05
SerialSmile joined07:06
oxymoron93 joined07:08
tiin57 left07:11
Muimi joined07:11
hussam left07:13
Mattiaslndstrm joined07:14
tiin57 joined07:15
justanotheruser left07:16
Mattiaslndstrm left07:18
crose left07:21
txtsd joined07:22
crose joined07:22
Goplat left07:28
kegger joined07:29
nikivi joined07:31
PJBoy joined07:31
causasui joined07:31
a-l-e left07:32
Exagone313 joined07:34
Exagone313 left07:34
shtrb joined07:34
mirrorbird joined07:34
Exagone313 joined07:34
shtrb Is "Received disconnect from ip: 11: Bye Bye" message specific to a provider or general for git and can indicate some kind of user problem ?07:35
feriman joined07:36
kjartan left07:37
nee joined07:37
fatalhalt left07:37
nee left07:38
kjartan joined07:39
tiin57 left07:41
vicfred left07:43
vicfred joined07:43
tiin57 joined07:44
s2013 left07:48
a-l-e joined07:49
selckin google says, its ssh auth failure07:49
shtrb I doubt it as I got it mid clone (after getting over 200 mb)07:51
wrobinso1 joined07:51
shtrb Or is there several times an auth is being done during clone ?07:52
wrobinson left07:54
benfelin joined07:59
wrksx_ joined08:00
wrksx left08:00
selckin are you the user or provider08:01
mightyjens left08:05
FH_thecat left08:05
shtrb user08:06
selckin other ppl complaining on google, its either ppl trying to brute force login (doesn't apply here i would say), or maybe some incompatible ssh versions obscure bug, but i can't find references to the bye bye error message in openssh code08:06
shtrb that happend with github , I had disconnects in the past but not with "Bye Bye"message08:06
running the same command few seconds later seem to work just fine (which is odd ) .08:07
Could it be something related to the provider ?08:08
maxzor joined08:08
selckin on windows?08:08
shtrb yes08:08
selckin what does 'ssh -vT [email@hidden.address] say, give the error?08:09
stats4647 joined08:09
FH_thecat joined08:09
shtrb I do not get that error08:10
I have a passphrase if it have any implications08:10
konrados left08:11
tiin57 left08:11
shtrb and on win10 pro08:11
selckin then you need to update your ssh version probably08:11
shtrb thanks , will try08:11
tafa2 joined08:11
tiin57 joined08:14
stats4647 left08:16
a-l-e--- joined08:16
SerialSmile left08:17
zrhoffman joined08:17
a-l-e left08:19
chele left08:19
yonder left08:20
alesan osse, it has to be the very first push with -u, or it can be at any time?08:21
clara97 joined08:21
clara97 hi08:21
osse alesan: any time08:21
alesan: -u sets up tracking info08:22
after that git push alone will work08:22
clara97 if I want to read commitment in 2days08:22
what should I do?08:22
shtrb selckin, I had found the issue , if I enter a correct passphrase after 90 seconds it fails08:22
alesan I'll try but08:23
I am absolutely surprised - why a push isn't done by default to a branch of the same exact name UNLESS a different one is specified? Is it a technical limitation of GIT?08:24
or is it a design choice08:24
osse that too is configurable08:24
man git-config, see push.default08:25
gitinfo the git-config manpage is available at https://gitirc.eu/git-config.html08:25
mat001_ joined08:25
alesan there must be something I fail to understand because I cannot think of a use case where one wouldn't want that to be the default08:25
ok thanks08:25
out of curiosity - who is the git developer? Still Mr. L. Torvalds or now is somebody else?08:26
osse alesan: it sounds like you want to change push.default to current08:26
alesan osse, maybe, I'll need to make sure on the documentation08:26
:D thanks08:26
Gurkenglas joined08:26
osse alesan: it's not a single guy.08:26
mat001 left08:27
ikke Junio C. Hamano is the maintainer08:27
osse Torvalds wrote the initial implementation and became the maintainer. After a while a new guy took over as maintainer.08:27
alesan: actually, next time just run 'git push' without any args. either it does what you want immediately or it will tell you want to do08:28
unluckyshrubbery joined08:30
clara97 hello what should I do to read log in 2daysv08:32
?08:32
osse what do you mean?08:32
bvdw left08:33
clara97 I just want to read commits in 2 days08:33
bvdw joined08:33
osse then run 'git log' in 2 days08:33
clara97 git log would return all log?08:34
Jookia clara97: do you over the past two days or do you mean you will be reading two commits on friday08:34
clara97 the past 2 days08:35
osse git log --since='2 days ago'08:39
calcul0n joined08:40
tiin57 left08:41
clara97 thanks08:41
Jookia osse: is that the same as 'git log ..@{2 days ago}' and is that all the commits within 2 days, so inclusive, or does it miss one?08:42
cosimone joined08:44
kegger left08:44
tiin57 joined08:44
osse Jookia: it's not the same08:45
as for whehter it's inclusive, I'm not sure08:46
mozgalom joined08:48
meropyri left08:48
meropyri joined08:49
downunder left08:52
OnkelBlade left08:53
nelgin joined08:53
nelgin Hi all, this may be a stupid question but I don't use git much, only as an end user. When using git pull I find some filenames are truncted by prefixing with ... - Is there any way to force the whole path to be printed regardless of the number of columns? I use the result of the git pull to do certain things with certain files, but I need the full path. Thanks.08:54
pa hi, why git reset HEAD^ somefile produces both a staged and an unstaged change for that file?08:57
nkuttler nelgin: hm, i'd probably ask for an explicit list of files, not use a tool that does something else and dumps random info08:58
nelgin: like git fetch && git diff --name-only <remote>08:58
cd left08:58
nelgin Well, it wouldn't be random to me if it had the full path.08:58
osse nelgin: you can configure the width of a diffstat. maybe pull respects those settings08:59
try git config diff.statGraphWidth 99999908:59
downunder joined08:59
osse no that's the graph part, bleh09:00
init joined09:01
osse try git config diff.statGraphWidth 80,9999909:01
nelgin OK, I set that. I'll see wht happens next time I do a pull.09:02
osse the comma version doesn't work09:02
you can test it by doing git reset --hard @~5 and pulling again09:02
DerHorst left09:03
nelgin fatal: bad numeric config value '80,99999' for 'diff.statgraphwidth': invalid unit09:03
Ah my bad.09:03
Hang on09:04
Oh nope. I thought it was case issue but I entered as you gave me.09:04
osse the comma thing was a guess09:05
OnkelBlade joined09:05
init left09:06
nelgin It only checked out 5 items when I did a git pull and none of them over 80 chars. Oh well.09:06
osse after a pull git prints out something like "Updating 01146e6757..2460146bdb"09:07
you can then do git diff --stat=999 01146e6757..2460146bdb09:07
nelgin Yup, shows me the same thing pretty much.09:08
txtsd left09:08
pa nvm, gotcha09:08
nelgin I think it might be because the author added a new tag.09:09
Looks like these are just updates since the it changed.09:09
tiin57 left09:11
imp joined09:12
chele joined09:12
hineios left09:12
nelgin No, that didn't work, still get truncated files.09:12
osse what did not09:12
nelgin Using the width thing09:13
osse it diff --stat=999 ?09:13
the config won't work09:13
nelgin Ah yes, let me try that09:13
tiin57 joined09:14
karab44 joined09:14
nelgin Ah yes, that looks better.09:14
txtsd joined09:15
jaziz joined09:17
alesan osse, OK thanks09:19
Lucas_Gray joined09:20
OnkelBlade left09:22
cosimone left09:22
OnkelBlade joined09:24
wolfshappen joined09:24
tonyj left09:26
cosimone joined09:27
clime joined09:33
dionysus69 joined09:35
T_UNIX joined09:39
Betal left09:40
tiin57 left09:41
tiin57 joined09:44
NeoCron joined09:47
karab44 left09:49
RandomGuy90 left09:50
RandomGuy90 joined09:51
macrover left09:52
hussam joined09:54
Shentino left09:54
Lucas_Gray left09:56
alesan left09:59
Shentino joined10:00
tonyj joined10:03
maxzor left10:03
crose left10:09
tiin57 left10:11
sudoforge joined10:12
tafa2 left10:13
tiin57 joined10:14
sudoforge left10:20
walidvb joined10:21
walidvb hey all! After years of dev, i'm finally collaborating with someone!10:22
I'm wondering how to handle the flow, specifically around pull requests. When I review it, should i rebase it on master?10:23
if i do so, i'll need to push -f to github before merging the branch(or do it locally)10:23
vngx joined10:23
walidvb should the author of the PR do this himself? in which case, it sounds like an endless loop if master is committed to frequently 🤔10:23
and if i merge master, i'm adding an unnecessary commit10:24
DreadnaughtKulrak10:28
init joined10:28
va5c0 joined10:28
OnkelBlade left10:30
va5c0 left10:31
va5c0 joined10:33
Jookia walidvb: congrats! are you the project maintainer?10:33
walidvb i am :)10:33
va5c0 left10:34
va5c0 joined10:34
Jookia generally the easiest and least complicated way is to merge PRs in to your main branch. rebases are more for the PR makers to do if needed10:34
walidvb although it's a private repo10:35
va5c0 left10:35
Jookia rebases are good for patch sets, merges are good when you have git repos10:36
walidvb but then, when i check the work of that PR, it's not on par, no?10:36
Jookia what do you mean not on par? do you mean the work is bad, or it's not based on the latest code?10:38
merging will bring in all the changes in the PR on to the latest code10:38
walidvb i mean not based10:39
but i will bring code to master that hasn't been tested with master10:39
so either way it feels like master should be on the branch i'm checking (it could even be that merging the PR brings a regression)10:40
Jookia well, master is a moving target10:40
and a lot of changes don't affect other code10:40
walidvb in terms of conflicts, it sounds to me that i would want to merge master to the PR before testing and merging it10:40
Jookia the master branch is generally considered a development branch, where things may be broken10:41
tiin57 left10:41
walidvb in terms of history, i'd rebase, but that breaks the ability to merge etc10:41
Jookia rebasing PRs shouldn't break ability to merge10:42
txtsd left10:42
fossegrim joined10:43
Muimi_ joined10:43
Jookia never rebase a branch people are using (like master)10:43
walidvb that's what i meant10:43
Jookia your concerns are very real, but usually this is solved without git, but by CI10:44
where the bot will grab the branch, merge it, then test to see if it works10:44
walidvb fair10:44
tiin57 joined10:44
init left10:45
osse but master might move ahead while the CI is working.... It will never be perfect10:45
txtsd joined10:46
Trieste left10:46
Muimi left10:46
Muimi_Muimi10:46
walidvb i'm not sure i agree with the statement that master is considered dev10:46
stats4647 joined10:46
sQVe joined10:46
Jookia walidvb: well, you can create a develop/stable/etc branch. master is kind of a vague term10:47
walidvb fir10:47
fair*10:47
and true, the CI would not deploy if the test fails10:47
Jookia generally projects have layers of branches depending on how tested a feature is10:48
a-l-e--- left10:48
Jookia which the top layer being tagged release that gets shipped to users10:48
and the bottom being a feature in development10:48
Trieste joined10:48
osse One goal of the Git git repo is that master is at any point better than the latest release :p10:50
Muimi_ joined10:50
walidvb brb sry10:51
stats4647 left10:51
DiffieHellman left10:52
Muimi left10:52
Muimi_Muimi10:53
DiffieHellman joined10:53
DiffieHellman left10:56
walidvb we're 2 ppl, i'm trying to keep it to a minimum10:56
osse If this is new to you then I wouldn't overthink it10:57
if the PR looks good, merge it10:57
walidvb used to use git-flow, but was.a bit tricky to push rc to my team, especially because one feature could prevent another to make it to prod10:58
Fusl left10:58
walidvb so switched to feature br only, which seems more convenient10:58
Jookia walidvb: this is just a classic concurrency issue :D10:58
walidvb also, at first i had little to no automated testing on my frontend, so it was quite risky to push without manual testing10:59
Fusl joined10:59
walidvb that's changed now though, so indeed i'm more confident in the changes brought in10:59
Jookia my small team working is 'have your own branch with what you're working on so we can check out and try it', cherry-pick stuff you like from the branch, then make them PRs for review that get merged to unstable10:59
haymawk joined11:00
walidvb Jookia: thx11:00
osse: that sounds reasonable, too :)11:00
clara97 left11:00
walidvb still need to set up my cli. setup is a bit complex, as it's a rails rspec running against an expo frontnd (which is currently not served by rails, but standalone – hosted on firebase for ease)11:02
jomo_ joined11:02
walidvb i'm thinking a githubaction that pushes my front to test.reveel.id, and Capybara that loads that url(which in turns hits my localhost:7357 test api)11:03
but i had some issues, and had to move on. will take another look at some point soon i hope!11:04
bit of a bummer not to see the test state in the PR (for me, i run my tests before submitting a PR )11:04
opal left11:09
opal joined11:10
crose joined11:10
tiin57 left11:11
calcul0n_ joined11:13
calcul0n left11:13
ch left11:15
tiin57 joined11:15
mat001_ left11:15
mat001 joined11:15
init joined11:19
init left11:24
kdlv joined11:25
tarkus left11:27
OnkelBlade joined11:30
TomyWork joined11:36
DiffieHellman joined11:36
tafa2 joined11:40
cdown_ joined11:40
tiin57 left11:41
cdown left11:42
cdown_cdown11:43
Mattiaslndstrm joined11:43
tiin57 joined11:44
tafa2 left11:46
shabius left11:50
Muimi_ joined11:51
Muimi left11:53
Muimi_Muimi11:53
nikivi left11:54
vdamewood joined11:54
nikivi joined11:54
maxzor joined11:55
g00s left11:56
nikivi left11:57
acetakwas left11:57
mirrorbird left11:57
nikivi joined11:57
acetakwas joined11:57
stats4647 joined11:59
shabius joined12:00
Muimi_ joined12:02
Muimi left12:03
Muimi_Muimi12:03
stats4647 left12:04
canadev joined12:07
jaziz left12:09
tiin57 left12:11
Guest20 left12:12
tiin57 joined12:14
denel joined12:15
Trieste left12:17
Trieste joined12:21
feriman left12:21
CodeSlingerPaul joined12:32
macrover joined12:38
tiin57 left12:41
benfelin left12:41
mirrorbird joined12:43
tiin57 joined12:44
Jookia left12:47
ekh left12:48
Jookia joined12:48
fling left12:54
Xenguy left12:55
fling joined12:56
Maxattax joined12:56
dohzer joined13:00
Anticom joined13:00
stats4647 joined13:04
a-l-e joined13:06
stats4647 left13:09
tiin57 left13:11
tiin57 joined13:14
mirrorbird left13:17
Guest20 joined13:18
walidvb one other thing i'm not too sure how to handle, is the fact that i smtimes do work on a branch, PR it, and then switch to another feature, that potentially requires some changes from that previous branch(but don't necessarily rely on the feature itself. eg. a bugfix/refactor). I'm guessing the best answer is to either switch to master, bugfix, and commit, or to be careful to commit only the bugfix and cherry-pick it?13:19
Gurkenglas left13:19
howdoi left13:20
POQDavid left13:20
init joined13:20
pikapika left13:21
pikapika joined13:21
POQDavid joined13:21
init left13:25
benfelin joined13:27
gast0n joined13:29
denel left13:32
denel joined13:33
clara97 joined13:36
Guest20 left13:36
cdunklau walidvb: cherry picking is a slippery slope13:37
Jookia walidvb: yeah that's why i have a general branch then focus on making PRs once the work is done13:38
walidvb but the PR takes some time to be merged, right? what if you want to jump right in the next feature, but therefore can't take advantage of some new code that your wrote(a new module, some perf optim, a bugfix)?13:39
cdunklau walidvb: then you're screwed13:40
Jookia that's ideally why you have a personal integration branch13:41
cdunklau walidvb: or you branch from the PR13:41
tiin57 left13:41
leah2 i noticed a weird thing, maybe someone can explain. i use pull.ff=only and sometimes "git pull" says "fatal: Not possible to fast-forward, aborting." When I then run "git pull --rebase" it says "Successfully rebased and updated refs/heads/master."13:41
but the commit hash is exactly the remote hash, so what did it rebase, and why didnt ff work?13:41
cdunklau leah2: what's reflog say13:42
leah2 cbb02bde (HEAD -> master, origin/master, origin/HEAD) HEAD@{0}: pull --rebase (finish): returning to refs/heads/master13:44
tiin57 joined13:44
leah2 cbb02bde (HEAD -> master, origin/master, origin/HEAD) HEAD@{1}: pull --rebase (start): checkout cbb02bdec98f37e3f7f9863dab7f88ec3471714d13:44
so it didnt do anything, right?13:44
cdunklau leah2: huh13:45
leah2 hmm, maybe it did13:45
my previous HEAD was actually a patch i merged13:45
s maybe this was legit :p13:46
Xiti` joined13:46
Jookia maybe the rebase was a no-op if your HEAD was identical to the origin's HEAD but diferent hashes13:46
init joined13:47
Xiti left13:47
cdunklau leah2: what's rev-parse say for master and origin/master13:48
mirrorbird joined13:48
bamdad left13:48
bamdad joined13:49
bamdad left13:49
bamdad joined13:49
leah2 well after the rebase they are the same ofc?13:50
Aki-lucky joined13:51
Aki-lucky left13:51
Aki-lucky joined13:52
ch joined13:52
irc_user joined13:57
Kaivo left13:58
nikivi left13:58
nikivi joined13:59
POQDavid left13:59
POQDavid joined13:59
nikivi left14:00
nikivi joined14:00
Xiti` left14:00
Kaivo joined14:00
foul_owl left14:01
Muimi_ joined14:01
foul_owl joined14:02
Muimi left14:05
Muimi_Muimi14:05
rafasc joined14:07
howdoi joined14:10
tiin57 left14:11
Mattiaslndstrm left14:11
sgn left14:14
tiin57 joined14:14
malmalmal joined14:19
[twisti] joined14:21
[twisti] can i configure the diff used by git add -p ? or in any way have to tell me what whitespace changes its asking me to stage or not ?14:21
oatmealraisin joined14:22
reprazent left14:29
walidvb cdunklau: yeah... i'll see when/how that comes up. thanks!14:30
Xiti joined14:30
Jookia leah2: rebasing should apply your cahnges on top so the only thing i can think of is that for some reason rebasing was a no-op, leaving just the origin/master instead of adding a commit on top14:31
binarymutt joined14:31
stats4647 joined14:31
leah2 yes, it was14:32
rafasc [twisti]: not really, but there's a contrib script: https://github.com/git/git/tree/master/contrib/git-jump14:32
[twisti]: that allows you to jump to places where there are whitespace errors with: git jump ws14:33
Or you could run diff --check; and over it manually.14:33
reprazent joined14:36
tiin57 left14:41
Fusl left14:43
Lucas_Gray joined14:44
Fusl joined14:44
tiin57 joined14:44
stats4647 left14:45
stats4647 joined14:46
thiago joined14:46
relipse joined14:48
s2013 joined14:49
sQVe left14:52
sweatsuit left14:54
mozgalom left14:54
sweatsuit joined14:57
sgn joined14:59
cdown_ joined15:07
cdown left15:10
cdown_cdown15:10
tiin57 left15:11
Lucas_Gray left15:11
Lucas_Gray joined15:12
tiin57 joined15:14
theoceaniscool joined15:16
tarkus joined15:20
AnAverageHuman joined15:24
mowcat joined15:26
oxymoron93 left15:26
mowcat left15:27
kdlv left15:27
Papillon joined15:28
mir100 joined15:30
jmejias joined15:30
timvisher joined15:31
timvisher Is there a better way to check that a branch contains a commit from a script than `git branch <branch> --contains <sha>`? I'm seeing a warning that my terminal isn't fully functional when running from automation and I'm thinking that I'm smelling non-porcelain.15:32
KnoP left15:33
timvisher I can always `>/dev/null 2>&1` obviously but I usually don't have to when using the right tool.15:33
ikke timvisher: git merge-base --is-ancestor15:33
You are probably getting that message from the pager, although, that should not be invoked in non-interactive usage15:34
malmalmal left15:35
chele left15:36
maxzor left15:36
rfuentess left15:40
tiin57 left15:41
timvisher ikke: Thank you! Just so I'm clear if I'm reading the docs correctly it would be `git merge-base --is-ancestor <sha> <branch>` which would test that <sha> is an ancestor (or not) of <branch>. Rather than where I started which was `…or <branch> <sha>` which would assert that <branch> is an ancestor of <sha>.15:42
In my testing that looks correct.15:42
tiin57 joined15:44
clara97 left15:45
masber2 joined15:46
masber2 hi, I made the mistake of making changes in a branch different than master which should have been make into a different branch. Is there a way I can change my current branch to master, pull and then move to changes to this new branch?15:48
Jookia masber2: so you have 3 branches: A, B, and master, and you accidentally committed to A instead of B? and now you want to update master then bring changes from master in to A or B?15:50
timvisher left15:50
timvisher joined15:52
walidvb left15:53
timvisher ikke: Sorry I got kicked off if you said anything. If you did would you mind resending it? Otherwise sorry for the noise. :)15:54
ikke Didn't reply yet15:54
pa left15:55
timvisher No worries.15:55
ikke But what you said appears correct15:56
timvisher Thanks. :)15:56
pa joined15:58
tgunr left16:02
noonien left16:02
masber2 Jookia, I have 2 branches masber and A, I made changes in A but those changes should go to a new branch B from master. I am still in A with the changes and I have not commited yet16:03
hope that clarifies...16:04
Jookia masber2: Ah. They're not comitted yet? Stash, check out master, branch from it, then stash pop16:04
Betal joined16:04
masber2 thanks!16:05
shtrb left16:06
scoobertron joined16:07
arcatech joined16:07
tarkus left16:09
Wetmelon joined16:09
timvisher left16:09
AnAverageHuman left16:10
tiin57 left16:11
Muimi left16:13
mat001_ joined16:13
Lucas_Gray left16:14
tiin57 joined16:14
mat001 left16:16
sudoforge joined16:17
squirrel left16:18
justanotheruser joined16:20
Papillon left16:20
squirrel joined16:20
prominentpotato joined16:20
prominentpotato left16:21
yamashitatan joined16:21
dohzer left16:25
tiin57 left16:41
pikapika left16:41
acetakwas left16:41
cdown_ joined16:41
pikapika joined16:41
pikapika left16:42
pikapika joined16:42
acetakwas joined16:43
cdown left16:44
cdown_cdown16:44
tiin57 joined16:44
scoobertron left16:45
Lucas_Gray joined16:46
dermoth Is there a way to have current screen go up in the scrollback buffer when we either clear the terminal or16:48
raymond joined16:48
aliss joined16:48
dermoth ... or start an app using a screen (vim, less, etc...)16:49
thomasross joined16:50
arcatech left16:50
opal left16:51
Jookia dermoth: did you try the scroll wheel16:51
dermoth actually, it works here...not at work16:52
maybe diff version, or something different in the libraries (Debian vs RHEL7)16:52
mat001 joined16:53
mat001_ left16:54
Lucas_Gray left16:56
dermoth Ha nm, I had "URxvt.SecondaryScreen" instead of "URxvt.secondaryScreen" - and I thought that was case-insensitive anyway....16:59
clear still erases the screen but that is less of an issue, the secondary screen was really annoying though (I set it to false)17:00
mir100 left17:00
arcatech joined17:01
BackupBackupNick joined17:01
dermoth I have another odd problem but having a hard time isolating it.... sometimes using ipmiconsole long lines end up in netherland, they're truncated on edge with only the last char of them (resizing doesn't help). Reset fixes it but it also clears scroll, whhich is a bit annoying. I tried tset too but it doesn't fixes it17:03
Aki-lucky left17:03
canadev left17:04
arcatech left17:05
arcatech joined17:08
cosimone left17:09
tiin57 left17:11
PJBoy left17:13
Human_G33k joined17:14
tiin57 joined17:14
impermanence joined17:15
HumanGeek left17:17
masber2 left17:18
cdown left17:19
leeN joined17:20
sunova joined17:27
cosimone joined17:31
binarymutt left17:31
feriman joined17:32
tiin57 left17:41
tiin57 joined17:44
aliss left17:50
TomyWork left17:56
macrover left17:58
macrover joined18:05
snatcher joined18:05
snatcher is there a sort of unique id for master? at least need unique id for master on github, saw some unique id (checksum?) for some releases on gihub18:05
macrover left18:07
cd joined18:07
zumba_addict joined18:08
T_UNIX left18:08
Jookia left18:09
Jookia joined18:10
tiin57 left18:11
opal joined18:11
Lunatrius left18:14
mat001_ joined18:14
tiin57 joined18:14
Lunatrius joined18:15
nedbat snatcher: unique id in what sense? "master" is a unique id18:15
snatcher nedbat: in sens of repository/branch content18:16
mat001 left18:16
cuppajoeman joined18:16
jstein joined18:17
nedbat snatcher: do you want an id that always means "current master"? and where do you want to use this id? for what?18:17
snatcher: can you say more about the problem you are solving?18:18
j416 snatcher: are you referring to a commit hash?18:18
davispuh joined18:18
alesan joined18:18
Anticom left18:20
snatcher need to build binary pkg from master branch with version identifier represented state of branch18:22
osse snatcher: git rev-parse master18:23
bocaneri left18:23
osse if you want to build something and you know the hash: git checkout hash'18:24
cahoots joined18:29
cahoots hi, i'd like to use "--shallow-since=" to just clone with that commit. like i can do "--shallow-since='1 day'", but that might include more commits than just the very most recent one. any ideas?18:30
nelgin left18:31
opal left18:32
j416 cahoots: --depth18:33
cahoots j416, for various complicated reasons, i can only use shallow-since18:34
Mattiaslndstrm joined18:36
j416 then go through the necessary hoops to arrive at a date18:36
corelax left18:36
opal joined18:37
tiin57 left18:41
BackupBackupNick left18:42
Betal left18:43
a-l-e left18:44
pikapika left18:44
nikivi left18:44
acetakwas left18:44
tiin57 joined18:45
acetakwas joined18:45
pikapika joined18:45
nikivi joined18:45
nikivi left18:46
nikivi joined18:46
shailangsa does anybody know the command to git clone https://android.googlesource.com/platform/prebuilts/misc/+/refs/tags/android-7.1.2_r29/linux-x86/flex/ , im running this command https://pastebin.com/8xHgjvf4 why isnt it cloning it?18:47
stats4647 shailangsa: doesn't look like the repo exists?18:51
Mattiaslndstrm left18:51
j416 shailangsa: git clone https://android.googlesource.com/platform/prebuilts/misc18:52
shailangsa: your attempt fails because you're trying to clone something that isn't a repo18:52
shailangsa do i need to clone the whole repo if i just want this tree https://android.googlesource.com/platform/prebuilts/misc/+/refs/tags/android-7.1.2_r29/linux-x86/flex/ ?18:53
feriman left18:53
feriman joined18:56
j416 shailangsa: if the remote supports it, you can use git-archive18:59
shailangsa: there is also a handy link to download that, on the site you linked to.19:00
that remote does not appear to support archive.19:01
PJBoy joined19:01
ch1astrechiastre19:04
macrover joined19:06
zumba_addict left19:06
shailangsa im tried to git clone the mentioned repo with the branch https://pastebin.com/Lqq4kwcL but it clones the whole repo again (2GB) instead of just the android-7.1.2_r29 branch , why is that?19:07
pikapika left19:07
ekh joined19:07
acetakwas left19:08
pikapika joined19:08
acetakwas joined19:08
nikivi left19:08
nikivi joined19:09
pikapika left19:09
cdunklau shailangsa: because it's a clone19:10
pikapika joined19:10
j416 shailangsa: I don't think -b limits what gets cloned; you'll get a full clone still.19:10
cdunklau shailangsa: -b just changes what branch gets checked out19:10
you probably want --single-branch19:10
tiin57 left19:11
cdunklau shailangsa: or probably even `--depth 1`19:11
corelax joined19:11
j416 shailangsa: what are you trying to achieve?19:11
cdunklau shailangsa: note that this won't help you if you want to actually work on the code19:11
Narrat joined19:12
cdunklau a shallow clone is for all intents and purposes read-only19:12
at least, not-useful-for-contributing-upstream19:12
j416 shailangsa: curl -O https://android.googlesource.com/platform/prebuilts/misc/+archive/refs/tags/android-7.1.2_r29/linux-x86/flex.tar.gz19:12
tiin57 joined19:15
mat001 joined19:23
macrover left19:25
zumba_addict joined19:26
snatcher left19:26
mat001_ left19:27
Darcidride joined19:28
PJBoy left19:40
tiin57 left19:41
yamashitatan left19:41
nurdie joined19:44
tiin57 joined19:44
mud left19:45
irc_user left19:46
bamdad_ joined19:47
bamdad left19:47
theoceaniscool left19:48
pikapika left19:50
acetakwas left19:50
pikapika joined19:51
acetakwas joined19:52
jmejias left19:54
cahoots j416, got it, ty19:55
cdown joined19:56
shailangsa how did you find the https://android.googlesource.com/platform/prebuilts/misc/+archive/refs/tags/android-7.1.2_r29/linux-x86/flex.tar.gz link?19:57
irc_user joined19:57
cahoots j416, another q, forgetting the --shallow-since restriction, how can i shallow-clone to a specific commit (as opposed to a branch or tag)? i've run `git config --global uploadpack.allowReachableSHA1InWant true` but still not sure what to do19:58
j416 shailangsa: with my eyes19:59
Noldorin joined19:59
inkbottle joined20:00
matelot joined20:00
zebrag left20:00
Maxattax left20:02
zumba_addict left20:03
dermoth Jookia, wait, I was in #git all along? sorry for the spam!20:04
it was meant got the urxvt channel :/20:04
j416 dermoth: :D20:05
we try our best.20:06
ekh left20:10
Betal joined20:10
tiin57 left20:12
tiin57 joined20:16
Lucas_Gray joined20:24
sunova left20:26
alesan left20:27
F0rTex left20:27
cahoots left20:28
zumba_addict joined20:29
m0viefreak joined20:30
mir100 joined20:33
mirrorbird left20:36
mirrorbird joined20:36
cosimone left20:39
gxt left20:39
stormsz left20:40
cosimone joined20:41
smitop joined20:43
gxt joined20:46
Cb-Mc joined20:47
crose left20:47
crose joined20:49
arcatech left20:49
zumba_addict left20:49
Technodrome left20:51
Cb-Mc left20:53
crose left20:53
jim left20:54
feriman left20:55
tafa2 joined20:56
zumba_addict joined20:57
zumba_addict left21:03
jim joined21:05
dupondje left21:06
gpanders left21:12
alesan joined21:13
jaziz joined21:14
tiin57 left21:15
arcatech joined21:15
ninjin_ left21:17
mud joined21:17
ninjin_ joined21:17
g00s joined21:17
F0rTex joined21:18
jim left21:21
virmaha joined21:24
jim joined21:32
cdown left21:34
Kaivo left21:34
Kaivo joined21:37
Darcidride left21:39
imp left21:42
dupondje joined21:44
alesan left21:45
alesan joined21:45
mat001_ joined21:53
Narrat left21:56
zumba_addict joined21:57
rafasc left21:57
mat001 left21:57
tpaper left21:59
nikivi left21:59
tpaper joined22:00
nikivi joined22:00
Mattiaslndstrm joined22:00
zumba_addict left22:01
Mattiaslndstrm left22:03
CodeSlingerPaul left22:03
POQDavid left22:03
pikapika left22:04
POQDavid joined22:04
acetakwas left22:04
pikapika joined22:05
mud left22:05
jstein left22:05
acetakwas joined22:05
dionysus69 left22:06
sdwrage joined22:07
m0viefreak left22:08
nikivi left22:09
acetakwas left22:09
pikapika left22:09
nikivi joined22:10
pikapika joined22:10
acetakwas joined22:11
pikapika left22:12
acetakwas left22:12
nikivi left22:12
pikapika joined22:13
acetakwas joined22:13
nikivi joined22:13
Muimi joined22:16
Muimi left22:16
calcul0n_ left22:16
irc_user left22:16
alesan left22:17
zumba_addict joined22:17
ash_worksi joined22:18
ash_worksi I started a new project that looks a lot like an old project; I just want to commit it to the same repo; is there a way I can just get the .git folder for that repo and then just have it remove/add everything and call version2 ?22:20
it*22:20
or is that a bad idea?22:20
zumba_addict left22:22
austin987 joined22:25
gitinfo set mode: +v22:26
virmaha left22:27
meLon joined22:28
austin987 hi there; I'm on git-2.28.0; is there a way to use the -U feature of git diff (lines of unified diff to show) with git commit -p (partial commit)? I.e., I want to run `git commit -p`, but I need more diff context lines to see what I'm doing22:30
git commit doesn't accept -U, and I don't see anything similar in the help22:30
yonder joined22:31
leeN left22:32
mat001 joined22:32
sdwrage left22:33
mowcat joined22:34
mat001_ left22:36
zumba_addict joined22:38
mckendricks joined22:40
zumba_addict left22:43
budonyc joined22:52
zumba_addict joined22:54
justanotheruser left22:55
justanotheruser joined22:55
zumba_addict left22:59
Xenguy joined23:03
cosimone left23:04
vdamewood left23:06
Beta joined23:12
Betal left23:12
cosimone joined23:17
gast0n left23:22
maxzor joined23:23
opal left23:24
mackerman ash_worksi: If you are going to re-add everything, don't bother deleting. Edit the changelog and metadata to call it version 2, and git tag it as such.23:34
matelot left23:36
opal joined23:37
alesan joined23:38
vngx left23:42
AnAverageHuman joined23:45
mckendricks left23:45
acetakwas left23:46
acetakwas joined23:47
ash_worksi left23:47
nikivi left23:47
nikivi joined23:48
AnAverageHuman left23:53

Logs Search ←Prev date Next date→ Channels Documentation