| 2022-01-21 |
| ← spare left | 00:00 |
| ← DrowningElysium left | 00:07 |
| ← FinnElija left | 00:08 |
| ← zen_coder left | 00:14 |
| → FinnElija joined | 00:18 |
| ← great_taste left | 00:38 |
| → Xenguy joined | 00:41 |
| → avu joined | 00:45 |
| ← Yruama left | 00:46 |
| ← perrierjouet left | 00:48 |
| → jazzy joined | 00:51 |
| → kaiseisei joined | 00:52 |
| ← tehenderz left | 00:53 |
| → tehenderz joined | 00:53 |
| → perrierjouet joined | 00:53 |
| → lmat joined | 00:54 |
|
lmat
| j416: Are you a software developer? Freelance or w2? | 00:54 |
|
maryo
| There is a commit which got merged to our staging branch.. I wanted to know from which branch that commit got merged to my staging branch and via what merge method. How can we do this? | 01:02 |
| ← durham left | 01:04 |
| → durham joined | 01:05 |
| → BUSY joined | 01:06 |
|
rawtaz
| maryo: is there a merge commit? | 01:06 |
|
| if so that one should say | 01:06 |
| ← luke-jr left | 01:07 |
| → luke-jr joined | 01:09 |
| ← durham left | 01:09 |
| → dkp-01 joined | 01:13 |
|
lmat
| maryo: You can't necessarily. Branches are just pointers to commits. Once branches have moved through a merge, where the branch WAS is lost. That's why you need to make sure commits hold all the meta information you need. You might say tags can also hold this informaiton, but tags are much more transient and maleable than commits. | 01:15 |
|
| maryo: "...via what merge method." That's not really meaningful. There's only one merge method: git merge; In your question, it sounds like you're not using git by itself, but maybe Microsoft Github or some other git host? Those hosts often add information, as rawtaz said, to the merge commits. Maybe using `git show <merge-commit-hash>;`, you can see a merge request URL or pull request URL where you can get all | 01:17 |
|
| the information you want? | 01:17 |
|
| maryo: Good luck out there. | 01:17 |
| ← Betal left | 01:21 |
|
maryo
| thank you lmat | 01:21 |
| ← skapata left | 01:21 |
| → skapata joined | 01:24 |
| ← fikran left | 01:24 |
| → fikran joined | 01:26 |
| → gast0n joined | 01:28 |
| → vysn joined | 01:30 |
| → BtbN joined | 01:32 |
| → gco joined | 01:39 |
| ← gumbo left | 01:41 |
| → Xatenev joined | 01:42 |
| ← Xatenev left | 01:42 |
| → Xatenev joined | 01:42 |
| ← nyah left | 01:42 |
| → phylaz joined | 01:45 |
| → zmt01 joined | 01:46 |
| ← skapata left | 01:47 |
| ← zmt00 left | 01:49 |
| → adonis joined | 02:01 |
|
adonis
| So I checked out this source: https://chromium.googlesource.com/external/webrtc/+log/branch-heads/4664 | 02:03 |
|
| When doing git checkout refs/branch-heads/4664 it says: error: pathspec 'refs/branch-heads/4664' did not match any file(s) known to git | 02:04 |
|
| why? | 02:04 |
|
BtbN
| You probably nefer fetched that ref. | 02:05 |
| → skapata joined | 02:05 |
|
BtbN
| It's probably gerrit crazyness as well, and not intended for use with normal tools | 02:06 |
|
adonis
| shouldn't doing a clone of that repo bring that ref in? | 02:07 |
|
| whats even more odd is the commit at the tip of that branch is 809830f1b39f, yet I can't check it out via commit either | 02:08 |
|
| tip of that ref | 02:08 |
| → tmz joined | 02:11 |
| → tdeo joined | 02:14 |
|
BtbN
| You clearly didn't fetch it then | 02:17 |
| → ztrawhcse joined | 02:17 |
| → hannibal_ad_port joined | 02:17 |
| ← causa_sui left | 02:17 |
| ← pretty_dumm_guy left | 02:19 |
| → ndorf joined | 02:19 |
| → causa_sui joined | 02:20 |
|
adonis
| I cloned the repo so it should've brought it in. I doubt they do force pushes to that repo. | 02:24 |
|
BtbN
| Whatever force pushes got to do with that. | 02:25 |
|
| You just didn't fetch thar ref. It's gerrid shenanagans. | 02:25 |
|
| *gerrit | 02:25 |
| ← tejr left | 02:25 |
|
adonis
| I mentioned the force-push thing since maybe that was an overwritten ref but it shouldn't be, at least not due to force pushes. | 02:26 |
| → tejr joined | 02:27 |
| ← bluesm left | 02:32 |
| → mgedmin joined | 02:32 |
| → senoraraton joined | 02:36 |
| ← Xatenev left | 02:40 |
| ← skapata left | 02:41 |
| → causa-sui joined | 02:46 |
| → mihael joined | 02:49 |
| ← causa_sui left | 02:49 |
| ← xkuru left | 02:51 |
|
mihael
| When using --recursive how do I specify what port to connect? e.g. `git clone --recursive `git@github.com:34/..` , when it tries to clone the submodules, it reverts back to port 22. | 02:52 |
| → skapata joined | 02:53 |
| ← skapata left | 02:53 |
| → skapata joined | 02:53 |
| ← mihael left | 02:57 |
| → mihael joined | 02:58 |
| ← causa-sui left | 02:58 |
| ← skapata left | 03:00 |
| ← adonis left | 03:01 |
| → causasui joined | 03:05 |
| → gumbo joined | 03:08 |
| → forgotmynick joined | 03:09 |
| → skapata joined | 03:17 |
| ← skapata left | 03:17 |
| → skapata joined | 03:17 |
| ← mihael left | 03:19 |
| ← causasui left | 03:21 |
| ← skapata left | 03:25 |
| → great_taste joined | 03:25 |
| ← FinnElija left | 03:27 |
| → finn_elija joined | 03:27 |
| finn_elija → FinnElija | 03:27 |
| ← cdown left | 03:28 |
| ← cmbengue left | 03:28 |
| → causa-sui joined | 03:32 |
| ← dkp-01 left | 03:33 |
| ← fikran left | 03:33 |
| → fikran joined | 03:35 |
| ← causa-sui left | 03:36 |
| → OnkelTem joined | 03:37 |
| → chenqisu12 joined | 03:38 |
| ← toma left | 03:40 |
| ← chenqisu1 left | 03:41 |
| ← luke-jr left | 03:43 |
| → terrorjack joined | 03:44 |
| → causa-sui joined | 03:45 |
| ← vicfred left | 03:49 |
| ← causa-sui left | 03:50 |
| ← jazzy left | 03:53 |
| → lechner joined | 04:00 |
| → haasn joined | 04:01 |
| ← gco left | 04:04 |
| ← Swahili left | 04:07 |
| → luke-jr joined | 04:07 |
| → Swahili joined | 04:07 |
| → chenqisu1 joined | 04:09 |
| ← realtime-neil left | 04:11 |
| ← chenqisu12 left | 04:11 |
| → realtime-neil joined | 04:11 |
| ← zmt01 left | 04:16 |
| → zmt00 joined | 04:18 |
| → causa-sui joined | 04:29 |
| → cryptonector joined | 04:30 |
| ← chenqisu1 left | 04:32 |
| ← causa-sui left | 04:34 |
| → pilyn joined | 04:39 |
| ← zmt00 left | 04:44 |
| → queue joined | 04:45 |
| → zmt00 joined | 04:46 |
| ← ChmEarl left | 04:49 |
| → causa-sui joined | 04:54 |
| ← Thanatermesis left | 04:55 |
| ← causa-sui left | 04:59 |
| ← tyson2 left | 05:07 |
| ← gast0n left | 05:08 |
| → causa-sui joined | 05:08 |
| ← zebrag left | 05:09 |
| ← causa-sui left | 05:13 |
| → xx joined | 05:16 |
| ← bloody left | 05:21 |
| ← forgotmynick left | 05:28 |
| → dviola joined | 05:29 |
| → vimal joined | 05:36 |
| → fcser joined | 05:36 |
| ← pilyn left | 05:36 |
| → mackerman joined | 05:39 |
| ← lechner left | 05:39 |
| ← zmt00 left | 05:40 |
| → ecs joined | 05:40 |
| → structoha joined | 05:40 |
| → dzho joined | 05:41 |
| ← structoha left | 05:41 |
| → structoha joined | 05:42 |
| ← great_taste left | 05:42 |
| ← fikran left | 05:42 |
| → madewokherd` joined | 05:43 |
| ← thiago left | 05:43 |
| → fikran joined | 05:45 |
| ← madewokherd left | 05:45 |
| ← ecs left | 05:46 |
| ← maryo left | 05:46 |
| → Gurkenglas joined | 05:47 |
| → earthbreaker joined | 05:47 |
| → FluffyFoxeh joined | 05:48 |
| → ecs joined | 05:48 |
| → mfiano joined | 05:49 |
| FluffyFoxeh → Frogging101 | 05:49 |
|
hendry
| hi, i'm trying to push to a remote a particular commit. the remote name is "stg". When I run `git push $commit stg` it says "error: src refspec stg does not match any" | 05:57 |
| ← Xaldafax left | 05:58 |
| → llh joined | 06:02 |
| → mexen joined | 06:02 |
| ← sudoforge left | 06:04 |
|
hendry
| my aim is (forcefully) set _stg_ remote to a commit called "d7d3ea", when I run `git push stg main d7d3ea` I get fatal: d7d3e.. | 06:05 |
|
| cannot be resolved to branch"... sorry. Bit stuck how to set a remote to d7d. | 06:05 |
| ← structoha left | 06:05 |
| → structoha joined | 06:06 |
| ← senoraraton left | 06:08 |
|
hendry
| I think I finally found the answer on https://stackoverflow.com/a/40580976/4534 | 06:09 |
| → hbautista joined | 06:14 |
| ← madewokherd` left | 06:17 |
| ← mud left | 06:20 |
| → carl- joined | 06:22 |
| → carl-- joined | 06:25 |
| → causa-sui joined | 06:26 |
| → bkircher joined | 06:28 |
| ← carl- left | 06:28 |
| → xiongxin joined | 06:29 |
| → Xenguy_ joined | 06:31 |
| ← causa-sui left | 06:31 |
| ← crashrep left | 06:32 |
| ← Xenguy left | 06:33 |
| → Xenguy joined | 06:40 |
| ← ivanzep left | 06:41 |
| ← Xenguy_ left | 06:42 |
| → Xenguy_ joined | 06:43 |
| ← Xenguy left | 06:45 |
| ← GNUmoon left | 06:46 |
| ← maxzor left | 06:55 |
| → Xenguy__ joined | 06:59 |
| ← Xenguy_ left | 07:01 |
| → john_johnk joined | 07:02 |
| → Xenguy_ joined | 07:03 |
| → chenqisu1 joined | 07:04 |
| ← Xenguy__ left | 07:05 |
| ← john_johnk left | 07:06 |
| ← luke-jr left | 07:07 |
| → Xenguy__ joined | 07:07 |
| → luke-jr joined | 07:08 |
| ← Xenguy_ left | 07:09 |
| → Xenguy_ joined | 07:15 |
| ← rgrinberg left | 07:16 |
| → mud joined | 07:18 |
| ← Xenguy__ left | 07:18 |
| → BinarySavior_ joined | 07:20 |
| ← BinarySavior left | 07:20 |
| ← dzho left | 07:20 |
| → dzho joined | 07:21 |
| ← xiongxin left | 07:27 |
| → aniruddha joined | 07:28 |
| → Crispy joined | 07:29 |
| → otisolsen70 joined | 07:31 |
| → meator joined | 07:31 |
| ← otisolsen70 left | 07:32 |
| → otisolsen70 joined | 07:32 |
| → causa-sui joined | 07:32 |
| → moviuro joined | 07:33 |
| ← causa-sui left | 07:37 |
| → mehwork joined | 07:39 |
|
mehwork
| is `git fetch` ever useful if my git repo is completely local / offline online (has no remote attached)? | 07:39 |
|
osse
| no | 07:40 |
|
| you can use git fetch with a literal url instead of a remote name. but other than that, no. | 07:41 |
|
mehwork
| ok thanks | 07:41 |
|
| wondered because `git fetch` outputs nothing but `git pull` tells me there's no tracking info | 07:42 |
|
| seems like git fetch should do some kind of warning to say there's nothing to fetch from yet | 07:42 |
|
osse
| because pull = fetch + merge, and it's the merge part that needs that info | 07:42 |
|
| yeah, that would make sense | 07:42 |
|
mehwork
| otherwise it's just a nop and not very helpful to a noob like me | 07:43 |
| ← hbautista left | 07:46 |
| → xiongxin joined | 07:47 |
| → GNUmoon joined | 07:47 |
| ← fikran left | 07:52 |
| → spare joined | 07:52 |
| ← structoha left | 07:52 |
| → Xenguy__ joined | 07:53 |
| ← meator left | 07:53 |
| → fikran joined | 07:54 |
| → causa-sui joined | 07:55 |
| ← Xenguy_ left | 07:55 |
| → structoha joined | 07:56 |
|
mehwork
| when `git commit --ammend` changes the commit SHA, does that technically mean it created a new commit? It's still the same _amount_ of commits. So did it just rewrite the history? | 07:57 |
|
osse
| yes | 07:58 |
|
| you replace one commit with another | 07:59 |
|
mehwork
| i noticed i can still `git show <old commit it replaced>` though | 07:59 |
|
| but git log isn't showing it anymore | 07:59 |
|
| so it's a combination of creating a new commit and rewriting history? | 07:59 |
| ← causa-sui left | 08:00 |
|
osse
| the old commit data is still lying around because git is lazy about cleaning up after itself | 08:00 |
|
| so the data is still obtainable if you know the hash | 08:00 |
|
mehwork
| does it ever get cleaned up? | 08:00 |
|
osse
| but git log (without args) starts from the branch name, and goes from there. | 08:00 |
|
| yes, git periodically runs 'git gc --auto' which checks if there's too much garbage | 08:01 |
| → palasso joined | 08:01 |
|
mehwork
| i just manually ran git gc --auto and it didn't clean up that old commit | 08:02 |
|
osse
| there's not enough garbage I guess | 08:03 |
|
mehwork
| interesting | 08:03 |
|
osse
| to clean it up you'd have to do git gc --really-delete-everything --no-i-mean-it --just-do-what-i-say | 08:03 |
| → causa-sui joined | 08:03 |
|
osse
| (that was a joke. but git is a bit careful) | 08:03 |
|
mehwork
| i see | 08:04 |
|
osse
| in your case the old commit is still referenced by the reflog (reflog != log) so it'll be about 90 days before git starts to care | 08:05 |
|
| !reflog | 08:05 |
|
gitinfo
| The git reflog (`git log -g`) temporarily (90 days by default) snapshots your branch states at each operation that changes the branch, making it easy to undo e.g. merges and rebases. The usual warnings about !rewriting/undoing history apply. See https://sukima.github.io/GitFixUm/ for full details. | 08:05 |
|
osse
| but if you clear the reflog and say that git should remove all unreference objects then it should get deleted | 08:05 |
| → Xenguy joined | 08:06 |
| ← unluckyshrubbery left | 08:06 |
| ← Xenguy__ left | 08:06 |
| → Jong joined | 08:07 |
| ← causa-sui left | 08:08 |
| → rfuentess joined | 08:08 |
| → MajorBiscuit joined | 08:10 |
| → abu joined | 08:12 |
| → Major_Biscuit joined | 08:15 |
| → feriman joined | 08:17 |
| ← MajorBiscuit left | 08:18 |
| → iomari891 joined | 08:21 |
|
bleb
| I have local changes which conflict with the master repo | 08:22 |
|
| so git pull says error: Your local changes to the following files would be overwritten by merge: ... Please commit your changes or stash them before you merge. | 08:22 |
|
| just want to make sure I'm doing this the "right" way: do I run git stash, then git pull, then git stash apply to begin the merge? | 08:23 |
|
osse
| pull does the merge part | 08:24 |
|
| but yes, the order is correct | 08:24 |
| ← feriman left | 08:24 |
|
bleb
| I tried it and the auto-merge happened when I ran git stash apply | 08:25 |
|
| what would I have had to do for pull to do the merge? | 08:25 |
| ← vysn left | 08:25 |
|
osse
| miscommunication | 08:26 |
| → causa-sui joined | 08:26 |
|
osse
| there are two merges involved. git pull does one (as in it runs 'git merge') | 08:26 |
|
| stash applies the changes you have, which can be called a merge, I guess, but it's more like applying a patch | 08:26 |
|
bleb
| ok, but the first merge happens only if you have conflicting commits | 08:28 |
|
| I only had conflicting changes in my working directory | 08:28 |
|
| yes? | 08:28 |
|
osse
| yes | 08:28 |
|
bleb
| cool thanks | 08:28 |
| → dsrt^ joined | 08:30 |
| ← causa-sui left | 08:30 |
| ← earthbreaker left | 08:35 |
| → earthbreaker joined | 08:36 |
| ← dzho left | 08:37 |
| → nickel715 joined | 08:40 |
| → EvilDMP joined | 08:41 |
| → duxsco joined | 08:42 |
| → coot joined | 08:46 |
| ← cliluw left | 08:49 |
| → tureba joined | 08:49 |
| → cliluw joined | 08:50 |
| → kenanmarasli joined | 08:51 |
| → dzho joined | 08:52 |
| → causa-sui joined | 08:52 |
| → furrymcgee joined | 08:59 |
| → Sulky_ joined | 09:00 |
| → GreenAlpaca joined | 09:00 |
| ← causa-sui left | 09:00 |
| → jimklimov joined | 09:01 |
| → causa-sui joined | 09:01 |
| → Codaraxis joined | 09:03 |
| ← whatsupdoc left | 09:03 |
| ← jimklimov left | 09:05 |
| → jazzy joined | 09:06 |
| ← causa-sui left | 09:06 |
| ← Codaraxis_ left | 09:06 |
| → feriman joined | 09:13 |
| → AnapodoPsalidaki joined | 09:16 |
| ← AnapodoPsalidi left | 09:18 |
| → Disconsented joined | 09:19 |
| ← Murr left | 09:20 |
| → teut joined | 09:20 |
| → Murr joined | 09:20 |
| → murii joined | 09:23 |
| ← teut left | 09:25 |
| → nyah joined | 09:26 |
| ← mud left | 09:28 |
| → mud joined | 09:28 |
| ← carl-- left | 09:29 |
| → carl- joined | 09:29 |
| ← bkircher left | 09:31 |
| ← Disconsented left | 09:31 |
| → causa-sui joined | 09:31 |
| → Disconsented joined | 09:32 |
| ← Gurkenglas left | 09:32 |
| → dlam joined | 09:32 |
| ← causa-sui left | 09:35 |
| → TheCatBehemoth joined | 09:38 |
| ← tirnanog left | 09:38 |
| ← xiongxin left | 09:38 |
| → ___nick___ joined | 09:41 |
| ← irc_user left | 09:42 |
| ← BinarySavior_ left | 09:46 |
| → BinarySavior joined | 09:48 |
| → xiongxin joined | 09:48 |
| ← xiongxin left | 09:52 |
| → mannequin joined | 09:58 |
| ← dlam left | 09:58 |
| → causa-sui joined | 09:59 |
| ← Gustavo6046 left | 09:59 |
| → adonis joined | 10:00 |
| ← fikran left | 10:02 |
| ← causa-sui left | 10:03 |
| ← Disconsented left | 10:03 |
| → fikran joined | 10:04 |
| → unluckyshrubbery joined | 10:06 |
| ← feriman left | 10:06 |
| ← coot left | 10:10 |
| → coot joined | 10:13 |
| → hazmi35 joined | 10:16 |
| → chenqisu12 joined | 10:20 |
| ← chenqisu1 left | 10:23 |
| → causa-sui joined | 10:23 |
| ← Akiva left | 10:25 |
| → Disconsented joined | 10:26 |
| → dlam joined | 10:26 |
| ← causa-sui left | 10:29 |
| → maxzor joined | 10:34 |
| → vysn joined | 10:38 |
| → Lord_of_Life_ joined | 10:44 |
| → jlucas_ joined | 10:44 |
| ← Lord_of_Life left | 10:44 |
| ← jlucas left | 10:44 |
| → teut joined | 10:45 |
| Lord_of_Life_ → Lord_of_Life | 10:45 |
| ← kaiseisei left | 10:47 |
| ← spare left | 10:57 |
| ← Swahili left | 10:58 |
| → Swahili joined | 10:59 |
| → Codaraxis_ joined | 11:03 |
| ← Codaraxis left | 11:03 |
| ← Codaraxis_ left | 11:07 |
| → Codaraxis_ joined | 11:07 |
| → zen_coder joined | 11:08 |
| → jlucas joined | 11:10 |
| ← jlucas_ left | 11:11 |
| → madewokherd joined | 11:12 |
|
j416
| lmat: dev yes. not freelance. | 11:16 |
| → vishal joined | 11:16 |
| → Gurkenglas joined | 11:21 |
| → ch joined | 11:25 |
| → cdown joined | 11:25 |
| → causa-sui joined | 11:26 |
| → tulpa_ joined | 11:28 |
| ← perrierjouet left | 11:28 |
| ← causa-sui left | 11:30 |
| → causa-sui joined | 11:31 |
| ← ___nick___ left | 11:35 |
| ← causa-sui left | 11:36 |
| → ___nick___ joined | 11:36 |
| ← ___nick___ left | 11:36 |
| → causa-sui joined | 11:37 |
| → ___nick___ joined | 11:38 |
| ← causa-sui left | 11:41 |
| ← ___nick___ left | 11:42 |
| → ___nick___ joined | 11:43 |
| → pileatedx joined | 11:44 |
| → causa-sui joined | 11:45 |
| ← adonis left | 11:48 |
| ← causa-sui left | 11:49 |
| → causa-sui joined | 11:49 |
| → TomyWork joined | 11:50 |
| → YuGiOhJCJ joined | 11:51 |
| ← causa-sui left | 11:54 |
| → natrys joined | 11:55 |
| ← unluckyshrubbery left | 11:56 |
| → DrowningElysium joined | 11:57 |
| → causa-sui joined | 11:59 |
| ← causa-sui left | 12:03 |
| ← AbleBacon left | 12:04 |
| → causa-sui joined | 12:05 |
| ← TheCatBehemoth left | 12:06 |
| ← causa-sui left | 12:09 |
| → elkalamar_ joined | 12:10 |
| ← fikran left | 12:11 |
| ← elkalamar left | 12:12 |
| → fikran joined | 12:13 |
| → BSaboia joined | 12:13 |
| → causa-sui joined | 12:15 |
| ← causa-sui left | 12:19 |
| → lunix00 joined | 12:21 |
| ← BSaboia left | 12:24 |
| → tyson2 joined | 12:27 |
| → causa-sui joined | 12:28 |
| ← aniruddha left | 12:28 |
| ← jlucas left | 12:29 |
| → jlucas joined | 12:29 |
| dob1_ → dob1 | 12:31 |
| ← causa-sui left | 12:33 |
| → perrierjouet joined | 12:34 |
| ← elkalamar_ left | 12:36 |
| ← zen_coder left | 12:36 |
| → causa-sui joined | 12:38 |
| ← Codaraxis_ left | 12:40 |
| → unluckyshrubbery joined | 12:41 |
| ← causa-sui left | 12:42 |
| ← tehenderz left | 12:43 |
| → tehenderz joined | 12:43 |
| → causa-sui joined | 12:50 |
| ← duderonomy left | 12:56 |
| ← causa-sui left | 13:01 |
| ← hazmi35 left | 13:01 |
| ← emanuele6 left | 13:06 |
| → durham joined | 13:06 |
| → causa-sui joined | 13:07 |
| ← abu left | 13:08 |
| → cek joined | 13:09 |
| ← cek left | 13:09 |
|
kernelspace
| are tags branch-related ? | 13:10 |
| ← durham left | 13:10 |
| ← causa-sui left | 13:11 |
| ← chenqisu12 left | 13:12 |
|
bremner
| no | 13:14 |
| → emanuele6 joined | 13:15 |
| ← OnkelTem left | 13:18 |
| ← Murr left | 13:19 |
| → Murr joined | 13:20 |
| → teut93 joined | 13:22 |
| → causa-sui joined | 13:24 |
| ← teut left | 13:25 |
| ← causa-sui left | 13:29 |
| → xkuru joined | 13:29 |
| → causa-sui joined | 13:29 |
| → lgc joined | 13:30 |
| ← lgc left | 13:30 |
|
ikke
| Tags and branches are at the same level conceptually | 13:33 |
| ← realtime-neil left | 13:33 |
| ← causa-sui left | 13:33 |
| ← lunix00 left | 13:38 |
| → causa-sui joined | 13:40 |
| ← causa-sui left | 13:44 |
| → robertparkerx2 joined | 13:44 |
| ← robertparkerx2 left | 13:45 |
| → polyphem joined | 13:45 |
|
polyphem
| i recently stumbled over git-flow and find it quite reasonable , however after doing a bit of research i found that it is regarded obsolte/deprecated it favour of trunk based development which is more useful for ci/cd , but i think a lot od open source projects still do git flow, can someone experienced give me a clarification on the current best practices please ? | 13:49 |
| → ekathva joined | 13:50 |
| ← ekathva left | 13:50 |
| ← dman777 left | 13:52 |
| → cmbengue joined | 13:54 |
| → causa-sui joined | 13:54 |
| → fdan joined | 13:54 |
|
fdan
| how to rebase the PR on latest master | 13:54 |
|
| some context: I have forked a repo and then made changes and created a PR | 13:55 |
|
| now i would want to rebase the PR on latest master | 13:55 |
|
| how would i do that | 13:55 |
|
j416
| fdan: git fetch && git checkout yourbranch && git rebase origin/master | 13:55 |
|
fdan
| j416 how can i do a git clone of my forked repo? | 13:56 |
|
j416
| git clone <url> | 13:56 |
|
fdan
| sure | 13:56 |
|
| git fetch && git checkout yourbranch && git rebase origin/master | 13:57 |
|
| this command needs to be run from my forked repo? | 13:57 |
|
lericson
| never underestimate git clone <path_on_local_filesystem> | 13:57 |
| ← cmbengue left | 13:57 |
|
fdan
| j416: it says Your branch is up to date with 'origin/master'. | 13:58 |
|
j416
| fdan: then all good | 13:59 |
| ← causa-sui left | 14:00 |
|
polyphem
| ^?! | 14:01 |
| → causa-sui joined | 14:01 |
| ← causa-sui left | 14:05 |
| ← teut93 left | 14:06 |
| → bloody joined | 14:09 |
|
fdan
| git fetch is different from git fetch upstream? | 14:12 |
|
osse
| it can be | 14:13 |
| ← FinnElija left | 14:14 |
| → causa-sui joined | 14:16 |
| ← xkuru left | 14:17 |
| ← fikran left | 14:20 |
| ← causa-sui left | 14:20 |
| → xkuru joined | 14:20 |
| → FinnElija joined | 14:21 |
| → BSaboia joined | 14:22 |
| → fikran joined | 14:22 |
| ← BSaboia left | 14:26 |
| → causa-sui joined | 14:26 |
| ← Xenguy left | 14:27 |
| ← fdan left | 14:28 |
| ← causa-sui left | 14:31 |
| → wgrant joined | 14:32 |
| ← AnapodoPsalidaki left | 14:36 |
| → BSaboia joined | 14:38 |
| ← BSaboia left | 14:39 |
| → Xaldafax joined | 14:40 |
| → rapiz joined | 14:41 |
| → rsx joined | 14:44 |
| → BSaboia joined | 14:46 |
| ← BSaboia left | 14:47 |
| → elkalamar joined | 14:47 |
| → molt joined | 14:49 |
| → TheCatBehemoth joined | 14:51 |
| → BSaboia joined | 14:53 |
| → drogas joined | 14:53 |
| ← BSaboia left | 14:54 |
| → node1 joined | 14:54 |
| → skapata joined | 14:55 |
| ← skapata left | 14:55 |
| → skapata joined | 14:55 |
| → fdan joined | 14:57 |
|
fdan
| Hi there, i get this error You are in 'detached HEAD' state | 14:58 |
|
| https://bpa.st/M7CA | 14:58 |
|
| could someone help me how to fix this | 14:58 |
| → ChmEarl joined | 15:00 |
| ← texasmynsted left | 15:01 |
| ← node1 left | 15:02 |
|
fdan
| could someone help me | 15:03 |
|
canton7
| !detached | 15:05 |
|
gitinfo
| A detached HEAD (aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach | 15:05 |
|
mackerman
| fdan: You made a commit not on a named branch. That is called detached | 15:05 |
| → andi_ joined | 15:05 |
|
mackerman
| git gave some hints as to how to create a branch, if you wish to do so. | 15:05 |
|
fdan
| mackerman i get this message from the build tool | 15:05 |
|
| and its one of the docker image building steps | 15:06 |
|
| how do i resolve this | 15:06 |
| → causa-sui joined | 15:06 |
|
canton7
| It's cause by the fact that you said to checkout a commit hash directly: '&& git checkout ${COMMIT_SHA} \'. However, that's unrelated to the patch failing to apply | 15:06 |
|
mackerman
| Ask whomever wrote that patch to fix it, or fix it yourself. | 15:07 |
|
canton7
| It looks like your probably is just that the patch isn't applying: if this is a build system, it's probably fine and intended that you're detaching the HEAD, as you won't be making any commits | 15:07 |
|
| (git throws up that big warning because it's easy to accidentally lose work if you detach your HEAD and then make commits. You can silence it with 'git checkout --detach ${COMMIT_SHA}') | 15:08 |
|
| *It looks like your problem is just that | 15:08 |
| ← coot left | 15:10 |
| → BSaboia joined | 15:10 |
|
fdan
| canton7 if i try to to rebuild , i get the same error | 15:10 |
|
| how can i fix this? | 15:10 |
| ← BSaboia left | 15:10 |
|
bookworm
| by rewriting the patch so that it applies | 15:11 |
|
fdan
| can i do git stash; git checkout master; git stash pop; git push | 15:11 |
|
canton7
| fdan, presumably that patch is supposed to be applied to that commit? Otherwise why does the build step specifically check out that commit? | 15:12 |
|
| The first step to solving the problem is understanding why it's happening... | 15:12 |
|
fdan
| the commit hash belongs to the release https://github.com/decred/dcrd/commit/74a67dce24802169142990a6a9797653354b31cc | 15:13 |
| → thiago joined | 15:13 |
| ← GreenAlpaca left | 15:16 |
| → BSaboia joined | 15:17 |
| ← BSaboia left | 15:18 |
|
canton7
| So presumably you actually want to use that release in your build? | 15:19 |
| → Thanatermesis joined | 15:21 |
|
fdan
| yes | 15:21 |
|
| thats right | 15:21 |
| ← jazzy left | 15:22 |
| → lesshaste joined | 15:24 |
|
lesshaste
| how can I git clone https://github.com/dmlc/dgl/tree/0.7.x/docs ? | 15:24 |
| ← vimal left | 15:24 |
|
bookworm
| clone the repo, if necessary with a filter assuming you just want the doc subdir | 15:25 |
|
| https://stackoverflow.com/a/13738951 | 15:26 |
|
lesshaste
| thanks | 15:27 |
|
fdan
| could you guys help me | 15:27 |
| → j`ey joined | 15:28 |
|
j`ey
| how can I get --no-color, from .git/config? I tried [ui]\ncolor=false | 15:29 |
|
| ok [color] ui, not [ui] color | 15:32 |
|
fdan
| [20:28:38] <fdan> Hi there, i get this error You are in 'detached HEAD' state | 15:33 |
|
| [20:28:41] <fdan> https://bpa.st/M7CA | 15:33 |
|
| could someone help me please | 15:33 |
|
osse
| fdan: that's what happens when you checkout a sha1 directly | 15:35 |
|
| it's no big deal | 15:35 |
|
fdan
| but the error says failed | 15:36 |
|
| 1 out of 1 hunk FAILED | 15:36 |
|
bookworm
| that's because your patch doesn't apply cleanly | 15:36 |
|
fdan
| so how to fix this | 15:36 |
|
bookworm
| rewrite the patch so that it does | 15:36 |
|
fdan
| i saw the git commands in other repo, the commands look similair but this is the only repo where the build is failing | 15:36 |
|
| bookworm when you say rewrite the patch? how can i do that | 15:37 |
|
bookworm
| where did you get the patch from? | 15:37 |
|
| you are applying a patch from /app/whatever | 15:37 |
| ← vysn left | 15:37 |
|
fdan
| from here https://github.com/decred/dcrd/commit/74a67dce24802169142990a6a9797653354b31cc | 15:37 |
|
bookworm
| if it's in the same repo, why are you even doing that via patch? Just use git and tell it to cherry-pick that commit | 15:38 |
|
fdan
| bookworm what is this command `&& patch -N -p1 < /app/assets/0001-allow-any-notls.patch` | 15:39 |
|
bookworm
| patch is a cli tool that applies a patch file (a diff) | 15:39 |
| ← causa-sui left | 15:39 |
|
fdan
| can i remove the command | 15:39 |
| ← Xaldafax left | 15:39 |
|
fdan
| would that work? | 15:39 |
|
bookworm
| sure | 15:39 |
|
| then you wouldn't patch the source | 15:39 |
|
fdan
| this is not my repo but still touching | 15:39 |
|
| thats a standard process for us to checkout a new release | 15:40 |
|
bookworm
| to immediately patch it? | 15:40 |
|
| seems strange to me but godspeed | 15:41 |
|
| but considering the name of the patch file I seriously doubt that it is related to https://github.com/decred/dcrd/commit/74a67dce24802169142990a6a9797653354b31cc as you've said | 15:42 |
|
wyre
| hi guys, could I remove a specific commit? | 15:42 |
|
bookworm
| as that would be the worst patch file naming in history | 15:42 |
|
| wyre: define remove, you can with rebase but it modifies the history | 15:43 |
|
wyre
| I mean, like if it wouldn't be there ever | 15:43 |
|
bookworm
| better is to revert it | 15:43 |
|
| password or some such? | 15:43 |
|
wyre
| s/wouldn't be/wouldn't have been/ | 15:43 |
|
| bookworm, nope, just a change in docs that I have to revert | 15:43 |
|
bookworm
| then just revert it, no harm done | 15:44 |
|
| unless that thing wasn't public yet, then rebase is fine | 15:44 |
|
wyre
| bookworm, how? | 15:44 |
|
| I mean, is there git revert? | 15:44 |
|
bookworm
| literally, yey | 15:44 |
|
wyre
| oh, I see | 15:44 |
|
bookworm
| yes* | 15:44 |
|
wyre
| hehe | 15:44 |
| → madewokherd` joined | 15:53 |
| → funkytwig joined | 15:54 |
| ← madewokherd left | 15:56 |
| ← kenanmarasli left | 16:01 |
| → kenanmarasli joined | 16:02 |
| ← jlucas left | 16:11 |
| → jlucas joined | 16:12 |
| → reset joined | 16:14 |
|
clime
| i guess, with git, you can't you commit into a different branch than you are in? something like git commit -a --target-branch <something>? | 16:15 |
| → causasui joined | 16:15 |
|
ikke
| not with the porcelain | 16:16 |
|
| The problem is, unless you update the index to first match the target branch, the commit would most likely not look like you expect | 16:17 |
|
clime
| ok | 16:18 |
| → bluesm joined | 16:18 |
|
clime
| i sometimes want to test something dirty and quick but at the same time i need to track that state... | 16:19 |
|
Jong
| where is the git submodule commit id stored? | 16:19 |
|
| I remember it was in some file | 16:19 |
|
| Subproject commit aab3edawefawef | 16:19 |
|
| something like that | 16:19 |
|
imMute
| Jong: the "file" where the submodule is. | 16:19 |
|
| Jong: so if your repo has a submodule at foo/bar/baz then the parent project records a file at foo/bar/baz with the submodule commit SHA | 16:20 |
|
Jong
| what's the name of the file? | 16:20 |
|
imMute
| Jong: it's the path to the submodule | 16:20 |
|
| (when stored in the git DB) | 16:20 |
| ← pileatedx left | 16:20 |
|
Jong
| you mean under the hidden .git folder? | 16:21 |
|
imMute
| yes | 16:21 |
|
| and it's not necessarily stored as a file in there either (it might be part of a pack) | 16:22 |
|
Jong
| Is the file name called HEAD ? | 16:22 |
|
| I see the commit id stored there | 16:22 |
|
imMute
| no, that's something else | 16:22 |
|
Jong
| I'm looking in <myrepo>/.git/modules/<mysubmodule> | 16:24 |
|
| is it there? | 16:24 |
|
| you said it's in a file named the same name as the submodule? | 16:24 |
|
imMute
| the HEAD in there would be the currently checked out commit in the submodule. that may or may not be the commit that the parent project has recorded for the submodule | 16:24 |
|
| it's a "file" in the git DB. it's not a file on the filesystem though. | 16:24 |
|
| a better question is, why do you want access to this file? | 16:24 |
| → skapate joined | 16:25 |
| ← skapate left | 16:25 |
| → skapate joined | 16:25 |
|
clime
| i guess, i can just make some bash macro, that will stash, checkouts, unstash, commits, and checkouts back...shouldn't be that difficult... | 16:26 |
| ← skapata left | 16:27 |
| ← atrigent left | 16:28 |
| ← mar77i left | 16:29 |
| ← fikran left | 16:30 |
| → atrigent joined | 16:31 |
| → fikran joined | 16:32 |
| → DoofusCanadensis joined | 16:33 |
| → great_taste joined | 16:37 |
|
Jong
| imMute I want to update the submodule repo commit id to a newer commit, but not the very latest of the submodule repo. | 16:39 |
|
imMute
| git -C path/to/submodule checkout <sha you want> | 16:41 |
|
| or cd to the directory and do 'git checkout <sha>' like normal | 16:41 |
| → XV8 joined | 16:43 |
| → Akiva joined | 16:43 |
| → EvilDMP_ joined | 16:43 |
| ← EvilDMP left | 16:46 |
|
Jong
| imMute that's how to update the folder locally. I'm talking about updating the remote so next time anyone does git clone --recursive some_github_repo.git, it checks out the commit id I want it to. | 16:46 |
| → EvilDMP joined | 16:47 |
| → lunix00 joined | 16:47 |
|
imMute
| you have to commit the change to the parent repo too. you can't just "change a file" and have the submodule start pointing at a different version | 16:47 |
|
Jong
| to update remote, I need to commit something after checking out the new commit id | 16:47 |
|
imMute
| yeah, you have to do that no matter what | 16:47 |
|
Jong
| but to commit, I need to know which file to add so I can do git add | 16:47 |
|
imMute
| you add the path to the submodule. | 16:48 |
|
| just do the git checkout in the submodule and then do 'git status' in the parent and you'll see the path marked as modified | 16:48 |
| ← EvilDMP_ left | 16:49 |
|
polyphem
| git flow or trunk based development ? what is best practice ? | 16:50 |
| → Xaldafax joined | 16:50 |
| → EvilDMP_ joined | 16:50 |
| ← madewokherd` left | 16:50 |
|
imMute
| polyphem: there is no best, do what works for your team/project. | 16:51 |
|
| what works for one project might not work for another. | 16:51 |
|
| my personal preference is one that's like git flow but what flow calls "develop" I call "master" (or "main" now I guess). and what flow calls "master" i don't have at all. and hotfixes are done on the relevant release branches. | 16:52 |
| → durham joined | 16:52 |
| ← EvilDMP left | 16:53 |
|
polyphem
| i think open source projects prefer git flow , cause of untrusted contributors and PR with code review, whereas closed source project with trust between devs can easily use tbd , right ? | 16:53 |
|
imMute
| I think it's the opposite. the git flow model seems to be focused on things that have a production environment (like websites). most open source software is released by throwing a tarball up on the internet that others download and use | 16:54 |
|
bremner
| there are many ways to do code review | 16:54 |
|
imMute
| and even closed source project tend to use PRs when merging into the main development branch. | 16:55 |
| ← zer0bitz left | 16:56 |
| → EvilDMP joined | 16:56 |
| → Betal joined | 16:56 |
| → cvmn joined | 16:59 |
| ← EvilDMP_ left | 16:59 |
|
polyphem
| i thought git flow hinders ci/cd because of excessive branching wich isolates changes , whereas tbd is better cause steady commits to main are checked in integration pipeline to ensure all devs are "marching" in same direction and divergence and problems are easily discovered as soon as possible | 17:00 |
| ← remedan left | 17:00 |
| ← rapiz left | 17:00 |
|
polyphem
| hmm | 17:00 |
|
imMute
| CI shouldn't matter about your branching scheme. you should be able to run CI against any branch or any commit. | 17:02 |
| ← Akiva left | 17:02 |
|
imMute
| CD shouldn't care about your branching scheme either - you should be able to run the deployment pipeline against any branch or commit (though sanity says you should only run it against some branches) | 17:02 |
|
polyphem
| i realy dont't know , i stumbled upon git flow a few days ago and find it reasonable , then i watched this video (https://www.youtube.com/watch?v=0lS0io4K86Y) which tells that its bad because of CI/CD stuff | 17:04 |
|
imMute
| it's probably more "paperwork" that other models for CD. but CI/CD is totally doable with git flow (and related methods) | 17:04 |
| → remedan joined | 17:05 |
|
polyphem
| so git flow isnt obsolete/deprecated/overcome and is still considered a got model ? | 17:05 |
|
mackerman
| Rants pro and con for any development flow are easy to find | 17:05 |
|
polyphem
| mackerman: guess so | 17:06 |
| ← Sulky_ left | 17:06 |
|
imMute
| ^^ and no, there are still people who use git flow. don't be one of those people that hops on the bandwagon when it changes every 6 months | 17:06 |
|
| as Bjarne said: there are two categories of programming languages [insert git branching model instead]: ones that people bitch about and ones that nobody uses. | 17:07 |
|
polyphem
| imMute: i thought so , how i said before i find git flow a reasonable aproach | 17:07 |
|
imMute
| I also find parts of it reasonable. and if I were working on a webapp-type project, I'd probably go with git flow simply because someone put in the time to make it easy to use from the CLI | 17:08 |
|
polyphem
| imMute: why this constraint to webapp projects ? | 17:09 |
|
imMute
| I'm having a hard time coming up with a generalization of it, but basically webapps have a production service that they run. so having CD to update that service multiple times a day/week make sense. | 17:10 |
|
| but for embedded projects, you don't really have that, so being able to "release" multiple times a day doesn't really make sense. | 17:11 |
|
| same with projects that just release libraries on the internet for other people to use: the time between releases is just typically longer | 17:11 |
|
mackerman
| Git flow assumes there needs to be a persistant always ready to release branch seperate from a development branch. | 17:12 |
|
polyphem
| mackerman: yes the main branch , that is fed from release branches that branch from develop and commit to master , right ? | 17:14 |
|
mackerman
| Others have explained git flow better than I cna. | 17:14 |
|
| * can | 17:14 |
|
| Graph what you doing in a diagram or whiteboard. Find the problems in the process. | 17:15 |
|
polyphem
| thats why you have the separation between main/master an develop | 17:15 |
| ← j`ey left | 17:15 |
|
polyphem
| main always builds is ready , and develop adds features till next releas is merged into main | 17:16 |
| → rgrinberg joined | 17:16 |
| ← Major_Biscuit left | 17:17 |
|
polyphem
| thanks however mackerman and imMute | 17:17 |
| → ph88 joined | 17:18 |
|
ph88
| when i want to use git over ssh should i setup a linux user to use ssh ? | 17:18 |
|
imMute
| ph88: you could use your own linux user. you don't *need* a separate user for the simple cases | 17:18 |
|
ph88
| i don't really have a linux user on the server side, just root | 17:21 |
| → maryo joined | 17:22 |
|
ph88
| it's ssh protocol but will it connect to the normal ssh daemon or is the git server setting up it's own ssh server ? | 17:22 |
|
ikke
| ph88: normal ssh | 17:22 |
|
| a non-root users is advisible | 17:22 |
|
ph88
| how can that normal ssh access the repository ? how does git client know where it is located on the server and what about permissions on that folder ? | 17:24 |
| ← mexen left | 17:25 |
|
imMute
| you pass the path to the repo in the remote URL. and the permissions are "as long as the SSH user can access the files" | 17:25 |
|
mackerman
| Relative paths in ssh URLs are in your home directory. | 17:26 |
| ← tulpa_ left | 17:26 |
| ← rgrinberg left | 17:28 |
|
ph88
| home directory of which user ? | 17:29 |
|
| like there is only 1 repository on the server right ... so if i have 5 different ssh users what happens then ? | 17:30 |
| ← atrigent left | 17:31 |
| ← Gurkenglas left | 17:32 |
| → madewokherd joined | 17:34 |
|
ikke
| ph88: the ssh user you specify in the remote | 17:34 |
| ← ___nick___ left | 17:34 |
|
ikke
| git clone username@domainname:path/to/repo.git | 17:34 |
| ← rsx left | 17:34 |
| → atrigent joined | 17:35 |
| → bn_work joined | 17:35 |
|
mackerman
| For seperate users you might put the repo not in home direcotry, and give persmissions to everyeone who needs them. | 17:36 |
|
ph88
| i am already able to access the repository over https. I didn't create an new ssh user yet | 17:36 |
|
ikke
| ph88: Are you planning to have multiple users access repositories? | 17:36 |
|
ph88
| eh different developers get their own account i guess, but they can use https i guess | 17:37 |
|
ikke
| ph88: do they each get their own repositories, or are they going to push to shared repos? | 17:37 |
| ← drogas left | 17:38 |
|
ph88
| shared | 17:38 |
|
ikke
| Perhaps take a look at !gitolite then | 17:39 |
|
gitinfo
| Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/ Quick example: http://gitolite.com/gitolite/overview/#basic-use-case | 17:39 |
|
ikke
| It's very easy to setup | 17:40 |
|
ph88
| in the docs it says git@... https://docs.gitea.io/en-us/faq/#ssh-issues then when i look at the server /etc/passwd i don't see a git user | 17:40 |
|
| my boss wants me to use gitea | 17:40 |
|
ikke
| ah | 17:41 |
|
| You need to explicitly create that user | 17:41 |
|
| but with gitea, they handle most of this | 17:41 |
| → ThePhilgrim joined | 17:42 |
|
ph88
| there is a gitea user for the deamon, that's all of user i see in /etc/passwd | 17:42 |
|
| gitea:x:465:464:Gitea daemon:/usr/share/gitea:/bin/bash | 17:42 |
|
ikke
| https://wiki.archlinux.org/title/Gitea#Enable_SSH_Support | 17:43 |
| ← The_Blode left | 17:43 |
|
ph88
| thanks ! | 17:45 |
| ← Betal left | 17:46 |
|
mackerman
| See also #gitea channel for help with it | 17:46 |
| ← YuGiOhJCJ left | 17:46 |
| ← rfuentess left | 17:47 |
| → ekathva joined | 17:48 |
| ← ekathva left | 17:48 |
| ← EvilDMP left | 17:48 |
| → irc_user joined | 17:50 |
| → EvilDMP joined | 17:50 |
| ← irc_user left | 17:50 |
| ← tehenderz left | 17:51 |
| → tehenderz joined | 17:51 |
| ← tyson2 left | 17:52 |
|
lungaro_
| is there a way to get a list of just untracked files? | 17:54 |
|
| suitable for deleting them? | 17:55 |
|
Voker57
| git clean -n | 17:55 |
|
imMute
| lungaro_: and use git clean to delete them ;) | 17:56 |
|
lungaro_
| nice | 17:56 |
|
| thanks | 17:56 |
| → rgrinberg joined | 17:57 |
| → AbleBacon joined | 17:57 |
| → The_Blode joined | 17:58 |
| → Sulky joined | 17:59 |
| → vicfred joined | 17:59 |
| → Gustavo6046 joined | 18:02 |
| ← ThePhilgrim left | 18:05 |
| → ThePhilgrim joined | 18:05 |
| → tirnanog joined | 18:15 |
| → Akiva joined | 18:17 |
| → TimWolla joined | 18:21 |
| → jlucas_ joined | 18:23 |
| ← jlucas left | 18:24 |
|
lungaro_
| is it possible to have hooks in git to transparently encrypt and decrypt objects with gpg? Such that, on commit they get encrypted and on checkout they get decrypted/ | 18:26 |
| → zmt00 joined | 18:27 |
|
lungaro_
| i'm gonna say no, as it breaks the git model entirely, but maybe i'm missing something | 18:27 |
| ← Gustavo6046 left | 18:28 |
| → tulpa_ joined | 18:31 |
| → zen_coder joined | 18:32 |
|
imMute
| smudge/clean filters could do that | 18:32 |
| → coot joined | 18:32 |
|
lungaro_
| just trying to have an elegant solution to storing my dotfiles using git and also sharing them. But passwords currently stop me from sharing | 18:33 |
|
| haha | 18:33 |
|
| maybe its as simple as treating all my files as jinja templates or something, but that's kinda annoying | 18:34 |
| ← fdan left | 18:34 |
| ← Akiva left | 18:38 |
| ← fikran left | 18:39 |
| → fikran joined | 18:41 |
| → tyson2 joined | 18:43 |
| → Gustavo6046 joined | 18:48 |
| → vysn joined | 18:50 |
| ← Sulky left | 18:50 |
| ← ph88 left | 18:56 |
| ← maryo left | 18:58 |
| → ubique joined | 18:59 |
| ← TomyWork left | 19:00 |
| ← mw_ left | 19:00 |
| ← Gustavo6046 left | 19:00 |
| → lechner joined | 19:00 |
| ← bluesm left | 19:08 |
| ← igemnace left | 19:09 |
| → Gurkenglas joined | 19:11 |
| → goldfish joined | 19:12 |
| ← duxsco left | 19:16 |
| ← rgrinberg left | 19:17 |
| ← carl- left | 19:19 |
| → mw_ joined | 19:20 |
| → rgrinberg joined | 19:21 |
| → duxsco joined | 19:29 |
| → troyt joined | 19:30 |
| → crashrep joined | 19:31 |
| ← cliluw left | 19:33 |
| ← zen_coder left | 19:37 |
| → arcatech joined | 19:39 |
| → node1 joined | 19:42 |
| ← node1 left | 19:43 |
| → node1 joined | 19:44 |
| → funkytwig_ joined | 19:45 |
| ← node1 left | 19:45 |
| ← funkytwig left | 19:48 |
| ← zmt00 left | 19:50 |
| → node1 joined | 19:50 |
| ← node1 left | 19:51 |
| → node1 joined | 19:51 |
| → cliluw joined | 19:51 |
| ← troyt left | 19:53 |
| ← node1 left | 19:53 |
| → node1 joined | 19:54 |
| → oprypin joined | 19:55 |
| ← coot left | 19:57 |
| → troyt joined | 19:57 |
| ← node1 left | 19:57 |
| ← iomari891 left | 19:57 |
| → coot joined | 19:57 |
| ← ubique left | 19:58 |
| ← Ilyu left | 20:03 |
| → dustinm joined | 20:05 |
| ← natrys left | 20:05 |
| → coot_ joined | 20:10 |
| ← cvmn left | 20:11 |
| ← coot left | 20:14 |
| → Ilyu joined | 20:18 |
| ← coot_ left | 20:23 |
| ← TheCatBehemoth left | 20:26 |
| ← Ilyu left | 20:26 |
| → Betal joined | 20:33 |
| ← rgrinberg left | 20:38 |
| → zmt00 joined | 20:45 |
| ← zmt00 left | 20:48 |
| ← fikran left | 20:48 |
| → fikran joined | 20:50 |
| ← cliluw left | 20:53 |
| ← llh left | 20:54 |
| → cliluw joined | 20:54 |
| → llh joined | 20:55 |
| → zmt00 joined | 20:56 |
| → spare joined | 20:58 |
| → wootehfoot joined | 20:58 |
|
OnlineCop
| I've got a Unity project where some files are .gitignore'd: `*.sln`, `*.csproj`. I want to have Unity re-generate the .sln and .csproj files for me, so I can compare how those files have changed from a fresh regeneration to what it is now. Would I want to `git add --force` those ignored files, push or stash them so I have something to diff against, generate the new ones, and when I'm done, restore those files? | 21:00 |
| → Hawker_ joined | 21:05 |
| ← Hawker_ left | 21:06 |
| → frobnic joined | 21:06 |
| → zebrag joined | 21:07 |
| ← vysn left | 21:13 |
| ← otisolsen70 left | 21:17 |
| ← dsrt^ left | 21:22 |
|
lmat
| j416: Sweet. Rock on! | 21:22 |
|
| OnlineCop: Are there .sln or .csproj files in the repo? | 21:23 |
| → noex joined | 21:25 |
| → anddam joined | 21:27 |
| → MajorBiscuit joined | 21:28 |
|
anddam
| hi, I cloned a github repo, then create a private repo, added it as "secondary" remote. I now want to clone origin onto secondary, i.e. push all branches | 21:29 |
|
eamanu
| in the secondary you should add remote origin | 21:30 |
|
| and then git pull origin | 21:30 |
|
anddam
| do I have to create a tracking branch per each remotes/origin/* ? | 21:30 |
| ← murii left | 21:30 |
|
anddam
| eamanu: what? | 21:31 |
|
eamanu
| If I understand ok, you have a repo X and you want to pull from repo Y? | 21:31 |
|
anddam
| no, I want to clone from X to Y, Y is empty | 21:31 |
|
| push --all Y wil push local branches, but I have only master as tracking branch | 21:32 |
|
| all remotes/origin/FOO and remotes/origin/BAR are missing | 21:32 |
|
eamanu
| ahh | 21:32 |
|
| git fetch? | 21:32 |
|
anddam
| question is if I have to create all local (tracking) branches | 21:32 |
|
| I am fully fetched | 21:32 |
| ← madewokherd left | 21:33 |
| ← lunix00 left | 21:34 |
|
anddam
| I did just parse git branch output, but I wonder if there was a straightforward command to perform that | 21:39 |
|
another|
| git branch -a | 21:41 |
|
j416
| lmat: haha. thanks though. | 21:41 |
| ← junktext left | 21:44 |
| ← Betal left | 21:47 |
|
OnlineCop
| lmat: There aren't any .sln or .csproj files in the repo, no. Since they were all untracked, I wanted to know a good way to "track" them so I could check out the diffs, and then reset the HEAD to before I had modified them. | 21:47 |
| ← xx left | 21:47 |
|
mackerman
| OnlineCop: Or, don't track them, but move them to a different file name, generate the other version, and diff | 21:49 |
| ← aLeSD left | 21:57 |
| ← cliluw left | 21:58 |
| → cliluw joined | 22:00 |
| → junktext joined | 22:00 |
| ← tulpa_ left | 22:01 |
| → duxco joined | 22:02 |
| → coot joined | 22:02 |
| ← duxsco left | 22:03 |
| duxco → duxsco | 22:03 |
| ← maxzor left | 22:03 |
| → tchan joined | 22:05 |
| → anaveragehuman joined | 22:24 |
| → toma joined | 22:27 |
| ← jjakob left | 22:33 |
| ← coot left | 22:33 |
| → jjakob joined | 22:34 |
| → m0viefreak joined | 22:37 |
| → mven joined | 22:37 |
| ← mven left | 22:37 |
| → mven joined | 22:37 |
| → madewokherd joined | 22:49 |
| → nickdiaz1wag209 joined | 22:51 |
| ← ChmEarl left | 22:51 |
|
nickdiaz1wag209
| i feel like sometimes the upstreams are set for me automatically because i dont have to set them very often. maybe a handful of times ever, and i interface with new repos (for me, but these repos have been worked on by other people for a while), pretty often | 22:52 |
|
| when are upstreams automatically set in git? | 22:52 |
| ← troyt left | 22:52 |
|
nickdiaz1wag209
| i created a new repo, and created a new branch. The main has upstream automatically set, but my new branch doesn't. When I use "git pull", it tells me i need to specify which branch i want to merge with" | 22:52 |
|
DoofusCanadensis
| upstreams are set when you check out an existing branch | 22:54 |
|
| the developer needs to set the upstream the first time they push a new branch | 22:54 |
|
nickdiaz1wag209
| ah ok | 22:54 |
|
| everything makes sense then | 22:54 |
|
| if i blow away my current repo, and then just re-clone, it should have all the upstreams set up for all existing branches then | 22:55 |
|
| and it does | 22:56 |
|
mackerman
| git checkout -b <branch> # will do the same as git checkout -b <branch> --track <remote>/<branch> if exactly one tracking branch by that name exists | 22:56 |
|
| And the --guess flag is the default. | 22:56 |
| → troyt joined | 22:56 |
| ← fikran left | 22:57 |
|
nickdiaz1wag209
| "if exactly one tracking branch by that name"... i dont quite understand this. I take it you dont mean another branch with same name. Whats a situation where theres more than one tracking branch? | 22:58 |
|
osse
| if you have more than one remote then you can have both origin/master and myfork/master | 22:58 |
|
mackerman
| Multiple remotes. origin/branch upstream/branch | 22:58 |
|
nickdiaz1wag209
| ahh | 22:59 |
|
| thanks guys :) | 22:59 |
| → fikran joined | 23:00 |
| → BSaboia joined | 23:00 |
| ← BSaboia left | 23:01 |
| ← pizdets_ left | 23:03 |
| → pizdets joined | 23:04 |
| → jimklimov joined | 23:09 |
| → igemnace joined | 23:09 |
| → ChmEarl joined | 23:09 |
| → Celeo joined | 23:09 |
| ← ThePhilgrim left | 23:11 |
| ← Gurkenglas left | 23:13 |
| ← MajorBiscuit left | 23:13 |
| ← jimklimov left | 23:17 |
| → ivanzep joined | 23:18 |
| ← Murr left | 23:19 |
| → Murr joined | 23:19 |
| → mooz joined | 23:22 |
| ← structoha left | 23:22 |
| ← Crispy left | 23:29 |
| → cvmn joined | 23:30 |
| → murii joined | 23:31 |
| ← Pseudocrat left | 23:31 |
| → Pseudocrat joined | 23:33 |
| → Akiva joined | 23:34 |
| ← murii left | 23:35 |
| → lavos joined | 23:46 |
| ← DoofusCanadensis left | 23:47 |
| → duxco joined | 23:47 |
| ← duxsco left | 23:47 |
| duxco → duxsco | 23:47 |
| ← zebrag left | 23:48 |
| ← molt left | 23:49 |
| → foul_owl joined | 23:51 |
| ← furrymcgee left | 23:53 |
| ← palasso left | 23:54 |