Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-21

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:03 Neelixx_ joined #git
00:08 Gianormagantrous joined #git
00:08 FSadino joined #git
00:10 howitdo joined #git
00:11 souther joined #git
00:12 cmn joined #git
00:15 FSadino joined #git
00:17 Neelixx_ joined #git
00:19 rominronin joined #git
00:22 inflames joined #git
00:23 xaviergmail_ joined #git
00:26 xaviergmail_ joined #git
00:30 SpeakerToMeat joined #git
00:31 Nilesh_ joined #git
00:31 neilthereildeil joined #git
00:31 arescorpio joined #git
00:33 kier joined #git
00:34 PresidentBiscuit joined #git
00:34 xaviergmail_ joined #git
00:37 askb joined #git
00:39 netj joined #git
00:41 sysadmin joined #git
00:41 Kaisyu joined #git
00:41 Gianormagantrous joined #git
00:43 nckpz joined #git
00:46 xaviergmail_ joined #git
00:49 neilthereildeil left #git
00:52 nettoweb joined #git
00:54 anonymuse joined #git
00:54 SwiftMatt joined #git
00:55 dreiss joined #git
00:55 nickabbey joined #git
00:55 xaviergmail_ joined #git
00:56 anonymuse joined #git
00:56 Mannn joined #git
00:57 chromity joined #git
00:57 umpc joined #git
01:00 pwnz0r joined #git
01:02 xaviergmail_ joined #git
01:03 xaviergmail joined #git
01:03 madewokherd joined #git
01:05 bronson joined #git
01:08 mizu_no_oto joined #git
01:09 cqi joined #git
01:13 netj joined #git
01:14 anonymuse joined #git
01:15 spacelord_ joined #git
01:16 mizu_no_oto joined #git
01:18 Sasazuka joined #git
01:18 buffal0 joined #git
01:20 JaredR joined #git
01:26 nkouevda joined #git
01:27 GodGinrai joined #git
01:29 nidr0x joined #git
01:32 col joined #git
01:32 col left #git
01:35 Sasazuka joined #git
01:36 morenoh149 joined #git
01:36 dreiss joined #git
01:43 [0xAA] joined #git
01:45 mizu_no_oto joined #git
01:51 rominronin joined #git
01:53 [0xAA] joined #git
01:56 Siegfried joined #git
01:58 shgysk8zer0 joined #git
02:01 Limes joined #git
02:05 cdown joined #git
02:08 timvisher joined #git
02:09 peeps[lappy] joined #git
02:10 Singmyr joined #git
02:11 anonymuse joined #git
02:18 duderonomy joined #git
02:18 davimore_ joined #git
02:26 fatalhalt joined #git
02:26 cdown joined #git
02:28 ResidentBiscuit joined #git
02:35 d^sh joined #git
02:37 pks joined #git
02:39 Noodlewitt joined #git
02:40 heroux joined #git
02:40 mizu_no_oto joined #git
02:46 moestevens joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:50 svm_invictvs joined #git
02:51 aavrug joined #git
02:55 alhariel joined #git
02:56 bruce_lee joined #git
02:59 refried_ joined #git
02:59 dreiss joined #git
02:59 moestevens joined #git
03:02 Neelixx joined #git
03:06 bronson joined #git
03:08 dduncan joined #git
03:09 dduncan left #git
03:10 Siegfried joined #git
03:12 chromity joined #git
03:15 tmsmith joined #git
03:15 chachasmooth joined #git
03:16 star_prone joined #git
03:19 Andrew_K joined #git
03:22 rominronin joined #git
03:24 morenoh149 joined #git
03:26 cqi joined #git
03:28 GodGinrai joined #git
03:32 Goplat joined #git
03:36 xaviergmail joined #git
03:36 Vortex35 joined #git
03:44 hexagoxel joined #git
03:45 howdoi joined #git
03:45 buffal0 joined #git
03:50 jaguarmagenta joined #git
03:53 landoceansky joined #git
03:54 landoceansky joined #git
03:56 nkouevda joined #git
03:59 sunri5e joined #git
04:00 fstd_ joined #git
04:03 nkouevda joined #git
04:03 fling joined #git
04:08 texasmynsted left #git
04:08 Lyqyd joined #git
04:18 a_thakur joined #git
04:20 robattila256 joined #git
04:20 donught joined #git
04:21 donught joined #git
04:22 anonymuse joined #git
04:31 Mannn joined #git
04:45 subhojit777 joined #git
04:46 venmx joined #git
04:47 armin joined #git
04:54 rominronin joined #git
04:56 cagmz_ joined #git
04:57 robotroll joined #git
05:00 BrianJ joined #git
05:03 cagmz joined #git
05:07 bronson joined #git
05:07 star_prone joined #git
05:09 SwiftMatt joined #git
05:13 cagmz_ joined #git
05:13 dsantiago joined #git
05:13 morenoh149 joined #git
05:13 tvw joined #git
05:17 ayogi joined #git
05:19 diogenese joined #git
05:21 nickabbey joined #git
05:22 Whisket joined #git
05:24 fzxi joined #git
05:25 dreiss joined #git
05:26 adino joined #git
05:27 SwiftMatt joined #git
05:29 GodGinrai joined #git
05:31 BSAlb joined #git
05:32 svm_invictvs joined #git
05:33 mischat joined #git
05:35 howitdo joined #git
05:41 Cabanossi joined #git
05:41 snowkidind joined #git
05:42 gtristan joined #git
05:42 cyphase joined #git
05:52 Bhanu joined #git
05:52 Bhanu i need help
05:55 filter the Puppet link in GitBestPractices points to a redirect.. was going to make a PR to fix it, but the sources were moved..? so here's me leaving a comment
05:56 freimatz3 joined #git
06:01 GodGinrai joined #git
06:06 Silenced joined #git
06:06 somaReverse joined #git
06:06 Silenced joined #git
06:07 rscata joined #git
06:09 uranellus joined #git
06:09 uranellus joined #git
06:10 rivarun joined #git
06:13 blueyed joined #git
06:13 svm_invictvs joined #git
06:14 Anja joined #git
06:14 breezy_ joined #git
06:14 d0nn1e joined #git
06:15 FSadino joined #git
06:16 nickabbey joined #git
06:18 overlord_tm joined #git
06:18 ogny joined #git
06:20 Raging_Hog joined #git
06:24 xall joined #git
06:26 rominronin joined #git
06:26 phroa Bhanu: just ask
06:33 freimatz3 joined #git
06:34 cyphase joined #git
06:40 netj joined #git
06:43 diogenese joined #git
06:46 venmx joined #git
06:47 ThomasLocke joined #git
06:52 bocaneri joined #git
06:54 netj joined #git
06:57 aruns joined #git
07:00 morenoh149 joined #git
07:00 cyphase joined #git
07:00 dermoth joined #git
07:02 Oatmeal joined #git
07:03 theoceaniscool joined #git
07:03 Anja joined #git
07:04 Silenced joined #git
07:08 bronson joined #git
07:08 nivag joined #git
07:10 nickabbey joined #git
07:20 lordjancso joined #git
07:21 Macaveli joined #git
07:23 _28_ria joined #git
07:24 qt-x joined #git
07:25 cyan__ joined #git
07:27 JeroenT joined #git
07:28 zefferno joined #git
07:28 JeroenT joined #git
07:29 ResidentBiscuit joined #git
07:29 zeroed joined #git
07:29 nidr0x joined #git
07:34 leeN joined #git
07:37 pks joined #git
07:37 jaguarma_ joined #git
07:42 venmx joined #git
07:43 Sceorem joined #git
07:43 sea-gull_ joined #git
07:43 dan2k3k4 joined #git
07:44 JeroenT joined #git
07:47 ismithers joined #git
07:47 eduardas_m joined #git
07:48 CIAguy- joined #git
07:50 yaewa joined #git
07:52 rominronin joined #git
07:54 Silenced joined #git
07:54 Silenced joined #git
07:54 dreiss joined #git
07:54 JeroenT joined #git
07:56 ronskisika joined #git
07:59 ronskisika joined #git
08:00 acetakwas joined #git
08:08 Neelixx_ joined #git
08:08 cyphase joined #git
08:08 tmg joined #git
08:08 spacelord_ joined #git
08:09 ignarps- joined #git
08:11 babilen_ joined #git
08:11 sunny256_ joined #git
08:11 trondth_ joined #git
08:11 Ariadeno joined #git
08:11 Gaga joined #git
08:11 Mannn joined #git
08:12 likewhoa- joined #git
08:13 YuGiOhJCJ joined #git
08:14 Sample joined #git
08:14 eduardas_m joined #git
08:14 jamick_ joined #git
08:14 lep2 joined #git
08:15 jab416171_ joined #git
08:15 Celelibi_ joined #git
08:17 wizonesolutions joined #git
08:19 tuor joined #git
08:19 jesk joined #git
08:19 SteffanW joined #git
08:19 star_prone joined #git
08:20 Neelixx_ joined #git
08:23 vdv joined #git
08:23 glebihan_ joined #git
08:23 markovh joined #git
08:23 mgoodwin joined #git
08:23 midgetspy joined #git
08:23 nephyrin` joined #git
08:24 filter joined #git
08:24 markovh joined #git
08:28 Singmyr joined #git
08:29 a_thakur joined #git
08:32 markovh joined #git
08:34 mischat joined #git
08:36 a_thakur joined #git
08:37 flaviodesousa joined #git
08:37 cyphase joined #git
08:41 kurkale6ka joined #git
08:41 Balliad joined #git
08:42 Siegfried joined #git
08:45 Siegfried joined #git
08:47 donught joined #git
08:49 morenoh149 joined #git
08:50 overlord_tm joined #git
08:51 nettoweb joined #git
08:52 anddam joined #git
08:52 anddam can I see what the effect of a push would be?
08:52 jast --dry-run
08:52 anddam case in point: I have a local repo, I worked on a file, I committed my changes
08:52 anddam now I pulled upstream and rebased
08:52 finalbeta joined #git
08:52 theoceaniscool joined #git
08:53 PCatinean joined #git
08:53 anddam and I should be clear for pushing upstream, but I'm pretty sure I'll end screwing up something
08:53 anddam jast: trying, thanks
08:53 jast though you can also see a list of unpushed commits: git log @{u}.. (which is short for HEAD@{upstream}..HEAD
08:54 anddam Updates were rejected because the tip of your current branch is behind its remote counterpart. Integrate the remote changes (e.g.
08:54 anddam ah geez, I cannot get the handle of this
08:54 venmx joined #git
08:54 anddam I just pulled upstream master, I'm locally on master, git pull says "Your branch is ahead of 'origin/master' by 611 commits."
08:55 anddam I figure that's because I haven't pushed to origin yet, (that's my fork on github)
08:55 jast 611 commits? did you really make that many?
08:55 anddam but at the same time that shouldn't affect my pushing to upstream/master
08:55 anddam no I did not
08:55 anddam I did like 3
08:56 anddam the other are from the upstream changes I pulled and rebased upon
08:56 jast okay, so you may have accidentally rewritten rather a lot more history than you intended
08:56 jast oh.
08:56 anddam ok that's good to know
08:56 byte512 joined #git
08:56 jast well that might explain some of it, too
08:57 jast you're trying to push to upstream directly right now?
08:57 anddam but notice that i figure that's how it's supposed to go, I'm ahead of origin/master since I pulled from upstream/master
08:57 encod3 joined #git
08:57 anddam yes I am
08:57 jast it can be helpful to do that 'git log' I suggested, changed to compare to upstream: git log upstream/master..master
08:57 dmc joined #git
08:57 jast lets you see what git thinks is in your local branch but not in the remote repo
08:58 parasite_ joined #git
08:58 nickabbey joined #git
08:59 anddam mm I had already run a push to origin when you asked "611 commits […]"
08:59 willlondon joined #git
08:59 jast yeah, that's the different to origin, but what's the difference to upstream?
09:00 anddam and will log tell me that?
09:00 anddam shouldn't I be using 'diff' command instead?
09:00 jast if you ask it to :) my second example compares to upstream
09:00 star_prone joined #git
09:00 Hetu joined #git
09:00 jast you can, but we don't care about the details of the changes. 'git log' will show which commits git thinks would be pushed, that's enough for us to know right now
09:01 jast I've got to step out for a short meeting but I'll be back in 15 mins or so
09:01 anddam thanks
09:01 anddam btw my shell use @{} as explicity construct for subshell
09:02 anddam and there are a lot of commits in the output of   git log upstream/master..master
09:02 mikecmpbll joined #git
09:03 encod3 joined #git
09:04 safe joined #git
09:07 derk0pf joined #git
09:08 nettoweb joined #git
09:09 elect_ joined #git
09:09 bronson joined #git
09:11 Bhanu left #git
09:12 finalbeta joined #git
09:12 ki0 joined #git
09:14 Anticom joined #git
09:14 JeroenT joined #git
09:16 marcogmonteiro joined #git
09:16 ams__ joined #git
09:16 markovh joined #git
09:16 mgoodwin joined #git
09:16 midgetspy joined #git
09:16 nephyrin` joined #git
09:17 markovh joined #git
09:18 jast anddam: okay, then something probably went wrong in the rebase. do you still have your command history?
09:18 jast perhaps even the output?
09:20 dminuoso So Im preparing a commit and realized that I want to make another commit first. Is there a way to do this without discarding the content of the index?
09:21 phroa soft reset -p so you can unstage the changes you want to commit later; commit what's left
09:21 dminuoso Or should I just commit right away and use rebase interactive to clean it up?
09:21 phroa man git-reset
09:21 gitinfo the git-reset manpage is available at http://jk.gs/git-reset.html
09:21 phroa that's another option
09:21 dminuoso phroa: I don't want to discard the current index. :|
09:21 dminuoso But I think Ill just commit as it is, and use fixups
09:21 jast git stash; (do your other commit); git stash pop --index
09:22 jast easiest way is to reorder the commits with an interactive rebase afterwards, probably
09:22 phroa mm I see, you're not splitting your index into two commits
09:22 dminuoso jast: Yeah. I cant stash because the changes are already in the working tree.
09:22 jast oh, yeah, my bad, actually this:
09:22 dminuoso I'd love to just stash the index. :-)
09:23 clmsy joined #git
09:23 jast git stash; git stash apply; (do your other commit); git stash pop --index
09:23 jast you'll probably have tons of warnings in the last step, though
09:24 jast and I have no idea whether git will manage to apply the index state when the working tree has all its changes restored already
09:24 jast worst case is you can do it manually from the raw stash data
09:25 jast but reordering with rebase -i is likely to be way easier
09:25 dminuoso jast: Yeah.
09:27 anddam jast: not the output
09:28 anddam jast: I checked diff between master and upstream/master and there's only the file I wanted to push
09:28 anddam jast: to be more clear 'git diff master..upstream/master' shows only the commit I wanted to push
09:29 anddam jast: can I take that as the proof that I'm going to only push that change if I push now?
09:31 nettoweb joined #git
09:32 astrofog joined #git
09:35 a_thakur joined #git
09:37 Siegfried joined #git
09:38 osse no
09:39 osse what you will push are all the commits in upstream/master..master
09:40 osse anddam:
09:40 mischat joined #git
09:40 mischat joined #git
09:41 anddam osse: in fact I just pushed the 611 changes
09:41 osse hooraay
09:42 anddam not reall
09:42 anddam y
09:42 osse so maybe 305 commits, 305 reverts and then one commit you wanted
09:42 anddam osse: apart the history change I'd like to confirm I didn't alter any files
09:43 anddam osse: https://github.com/macports/macports-ports/commits
09:43 jnavila joined #git
09:44 Wasp joined #git
09:45 osse anddam:
09:45 anddam osse: tell me
09:46 osse anddam: for all I know you've added 10 GB of porn and the removed it again. But yes, the net effect is just what you see in that git diff
09:48 anddam is the porn safely stored at least?
09:48 osse yes
09:48 anddam good
09:48 anddam I figure there's no rewriting history once it's pushed out there
09:48 anddam and no point in it either
09:49 osse sure there is. but it might be a pain to deal with for everyone but you. that's why it's not recommended
09:49 orfeo joined #git
09:49 alcohol looks to me like you rebased something
09:50 alcohol cause github shows all commits as being added by you but authored by others
09:50 osse that's my guess as well
09:50 anddam I pulled upstream in my local repo and rebased
09:51 Oatmeal joined #git
09:51 overlord_tm joined #git
09:51 anddam then checked the diff and pushed
09:51 anddam what would have been the correct approach instead'
09:51 anddam ?
09:52 osse rebased what ?
09:52 nickabbey joined #git
09:53 Serpent7776 joined #git
09:54 anddam I figure my master
09:54 alcohol anddam: it would help a lot if you could give us your git history (in terms of what commands you ran in what order)
09:54 anddam I see pull is by default "fetch & merge" with a --rebase option to do rebase in place of merge, I figure I didn't need the rebase in first place
09:55 anddam but I had in mind that 'pull' meant 'fetch' instead and that needed to go with a second manual operation, be it merge and rebase
09:55 anddam so I did pull & rebase
09:55 alcohol but what arguments did you pass to rebase?
09:55 venmx joined #git
09:56 anddam nothing
09:56 anddam just 'git rebase'
09:56 anddam let me straight out history
09:56 anddam I've closed terminals multiple times
09:57 osse that should have worked just fine
09:57 osse unless you rewrote a lot of history before you pulled
09:58 ljc joined #git
09:58 anddam I did not, I only touched two files
09:58 anddam well, I did not intentionally, at least
09:59 anddam https://trac.macports.org/wiki/WorkingWithGit#Rebasing here's where I got the 'use rebase' thing
09:59 anddam bold part "We recommend that all developers rebase their changes rather than merge when conflicts occur during pushing."
10:00 JanC_ joined #git
10:01 alcohol i do that too usually, but mostly just because i like to avoid unnecessary merge commits in my history.
10:01 g_zen joined #git
10:01 alcohol and usually i have no conflicts, so pull --rebase is my default setting in gitconfig
10:02 invisbl joined #git
10:03 anddam I have a history but it's not complete, and it's not chronologically sorted, also seems the shell wiped out the current history file when I tried to measure its length
10:06 jknetl joined #git
10:06 alcohol uh. how did you try to measure it? lol
10:07 anddam len(history show)
10:07 alcohol what kind of shell is that? o_O
10:07 anddam but I think that shouldn't affect the history file
10:07 anddam xonsh
10:07 anddam python turned shell
10:07 anddam coincidentally the portfile I was adding to the ports
10:08 alcohol ¯\(°_o)/¯
10:08 achadwick joined #git
10:08 b100s joined #git
10:08 b100s hi2all
10:09 b100s is it possible to see in history all force pushes?
10:09 jast not really. force pushes rewrite history, eliminating what was there before
10:10 jknetl_ joined #git
10:10 jast if the target repository has reflogs enabled (not the default for bare repos, I think), you can review the reflog if you have shell access
10:10 joki joined #git
10:11 howitdo joined #git
10:11 jknetl__ joined #git
10:12 anddam alcohol: I have the history
10:12 orfeo joined #git
10:13 djb-irc joined #git
10:15 anddam https://gist.github.com/anddam/cee0b0f1756439d6789ce43cba60abf2
10:16 anddam it's messy but basically I was pulling and got an error, after repeated attempts I actually read the error message and noticed I had uncommitted changes
10:16 andrew710 joined #git
10:16 osse i see no shenanigans
10:16 anddam so I removed from index a directory I had deleted (twice since I missed -r)
10:17 osse i'm starting to think you have become the victim of history rewriting
10:17 anddam then managed to commit my own desired commit
10:17 anddam then pulled and rebased with no arguments
10:17 jast yeah, I can tell what happened
10:17 anddam osse: I'd like to blame something else rather than me, but truth is I've not a good grasp on that
10:18 jast you rebased and then merged. that is the no-please-god-no combination which merges the old, pre-rebase history with the new history
10:18 anddam s/I've not/I haven't got
10:18 anddam jast: where did I merge?
10:18 jast by using pull
10:18 jast another rebase will *probably* fix it
10:18 anddam without --rebase
10:18 jast yep
10:19 jast oh, you already did that, too
10:19 anddam what would fix mean at this point?
10:19 theoceaniscool joined #git
10:19 jast you made three actual commits, give or take, right?
10:19 anddam yes
10:19 jast and they're at the top of 'git log' right now?
10:19 Hetu joined #git
10:20 anddam yes they are
10:20 jast okay
10:20 fbwnd joined #git
10:20 anddam they are four top ones at https://github.com/macports/macports-ports/commits
10:21 anddam and in my local repo
10:21 anddam what will happen to other people that are going to push now?
10:21 anddam they'll have to pull my "double commits" and rebase on top of those?
10:22 WayToDoor joined #git
10:22 jast oh, dang, I forgot you already pushed to upstream
10:22 jast let me have a quick look at that
10:23 jast chances are that if other people have already fetched this, sad things will happen either way
10:23 fahadash joined #git
10:24 jknetl joined #git
10:25 anddam what should I do in order to limit "damage"?
10:25 jast we should probably try and restore this to its old state as quickly as possible
10:25 overlord_tm joined #git
10:26 anddam jast: I'm all ears, I haven't really an idea how that is done
10:26 jast proposed first step: git push -f upstream 1d95493c9d855973ecb50b4ba652967223458ed3:master -- this will restore the remote branch to what it was before your merge
10:26 anddam remote origin, not upstream?
10:26 anddam my origin is my own fork
10:26 anddam upstream is the project's repo
10:26 jast yeah, we're trying to fix upstream here which is currently pretty broken, aren't we
10:27 jast though...
10:27 jast the history is only extremely ugly
10:27 jast if you think many people probably already have your changes, it might be better to live with that (many, many commits duplicated) rather than go back to the cleaner history
10:28 anddam it's already two hours
10:28 anddam I don't really know
10:28 jast okay, you may want to talk with the other maintainers, then
10:29 anddam I am
10:29 jast example of a duplicated commit in upstream: 1d95493c vs. 47436409
10:29 jast there are many more
10:30 anddam are those ~600 duplicated commits or ~300 ?
10:30 anddam each with its own undo and then redo
10:31 jast it's no undo/redo, actually
10:31 kurkale6ka joined #git
10:31 jast they're just straight up duplicates
10:31 chll_ joined #git
10:32 anddam given I already screwed up I won't pull the trigger on the push
10:32 jast and there are 304 of them
10:32 anddam I'm waiting for confirmations
10:33 djb-irc joined #git
10:33 mindfart joined #git
10:33 anddam what would happen if many people pulled already and I do the push -f ?
10:34 jast well, they won't get rid of their locally messed up repo using merge or a normal pull
10:35 jast which is especially inconvenient if one of them is a contributor
10:35 anddam so the messy history would be only a nuisance but people would keep working as usual
10:35 jast if they don't have any changes of their own yet, they can easily fix it with a hard reset... fixing their local repo after the force push may be a bit of an effort
10:35 anddam while -f could break usual people's workflow
10:36 jast -f will either keep things clean, or quickly be undone by accident, or create one more set of duplicates
10:36 jast depending on how people try to get rid of their error messages :)
10:36 jast but yes, the current history with its duplicates will *work*
10:37 kedare joined #git
10:38 morenoh149 joined #git
10:38 ochorocho__ joined #git
10:39 b100s i made git merge, but want to revert it, how can i do?
10:40 alcohol b100s: locally? remote?
10:40 b100s already pushed
10:40 b100s branch has a lot commtis, so revertt is not good idea too
10:41 alcohol b100s: what is your interpretation of 'revert' ?
10:41 b100s or can i move master to commit before merge?
10:41 alcohol b100s: you can move master back, if you want to, yes
10:41 b100s alcohol, is it ok? no any will be damaged?
10:41 b100s and how can i done it?
10:42 alcohol b100s: the former question is cannot answer for you
10:42 alcohol s/is/i/
10:42 thiago joined #git
10:43 mischat_ joined #git
10:44 willlondon joined #git
10:45 b100s alcohol, what is better? http://stackoverflow.com/questions/7099833/how-to-revert-a-merge-commit-thats-already-pushed-to-remote-branch or http://stackoverflow.com/questions/2389361/undo-a-git-merge-that-hasnt-been-pushed-yet
10:46 alcohol revert is cleaner than reset. but revert simply generates more commits ontop of your merge, reset will remove your merge completely.
10:46 nickabbey joined #git
10:53 cdown joined #git
10:53 b100s wow! alcohol ! looks like i broke something
10:54 b100s now, i start new branch from reverted after merge one, and do again merge
10:54 b100s git says that already up to date
10:54 markus3 b100s: if other people already have your unwanted code, then the choice depends on wether they are willing to do some extra work to adapt to the rebase. rebase is nicer imo, but it also means you're changing history. since you can't change the history of what other people have in their local repositories, then they need to do it explicitly.
10:54 b100s but git diff shows me a big diff, that is real and shoudl be after revert
10:55 kraut joined #git
10:58 mindfart joined #git
11:00 jast that's normal. you can't fully undo merges in the sense that a new merge will pick up all the same things again
11:00 jast to undo the undo, you have to revert the revert...
11:00 _ikke_ yo dawg!
11:00 alcohol yeah uh.. you said you wanted to revert the merge. so why are you merging again?
11:01 Anticom Hi all. When amending to a commit, is the SHA changed?
11:01 selckin yes
11:02 Anticom What's the purpose of amending then?
11:02 Anticom :O
11:02 jast it's for making a small fix prior to pushing
11:02 jast to avoid polluting the history with mini-fix commits
11:02 jast same with interactive rebase which is the big sibling of amend
11:03 Anticom Well i thought it maintained the same hash when amending... i've pushed the commit already, amended to it and force pushed
11:03 Anticom Is there any intention there's a new hash generated?
11:03 jast yeah, that's exactly what you shouldn't be doing most of the time
11:03 Anticom jast: yea but for other reasons i suppose
11:04 Anticom since it's guaranteed that i'm the only one working on that branch, it's no biggie i guess
11:04 jast it's not so much an intention as an effect of Git's concept of cryptographic integrity
11:04 Anticom However i don't understand why git does not recycle the hash in that way. Afaik it's "just" some sort of UUID with no information encoded, right?
11:04 jast false
11:04 jast it's a hash of the commit object
11:04 Anticom oh i see
11:05 jast each git hash is based on the object, so it's also based on all references in the objet
11:05 jast this is why, if you use interactive rebase to change a commit 10 commits back, all the commits after it will get a new hash, too
11:06 jast the big plus is that signing a commit signs all of the files in it, as well as all of the history (assuming you trust the hash function)
11:06 alcohol Anticom: either way, force pushing a new hash or the same hash would both leave people who already pulled your history before the ammend in a frustrated position
11:06 Anticom jast: What's part of the commit object?
11:06 gtristan joined #git
11:06 jast message, parent commit(s), reference to complete state of all files
11:06 jast also author/committer info (name, e-mail and timestamp)
11:07 jast basically everything you can see in 'git log --pretty=raw'
11:07 demize Anticom: You can try doing a `git cat-file commit HEAD` in a repo to show the commit.
11:07 jast yeah, same info
11:08 jast the actual hash is on the binary representation of the same data, to be accurate
11:09 Macaveli_ joined #git
11:10 bronson joined #git
11:10 kraut joined #git
11:11 demize You can also do `git cat-file -p tree-id` to inspect a tree object and such.
11:12 afuentes joined #git
11:14 Sample joined #git
11:16 Cabanossi joined #git
11:17 _28_ria joined #git
11:17 rorro joined #git
11:17 Jackneill joined #git
11:19 Ardethian\work joined #git
11:20 Cabanoss- joined #git
11:21 Macaveli joined #git
11:23 fk joined #git
11:24 ferr1 joined #git
11:30 tvw joined #git
11:30 ResidentBiscuit joined #git
11:30 pbrewczynski joined #git
11:34 jknetl joined #git
11:34 Cabanossi joined #git
11:34 ocbtec joined #git
11:37 fk joined #git
11:37 sawk joined #git
11:38 fhackdroid joined #git
11:39 byte512 joined #git
11:40 fk joined #git
11:41 jaguarmagenta joined #git
11:41 anddam jast: I just figured why you suggested to check lo upstream/master..master
11:42 anddam that was a good call
11:43 jeffreylevesque joined #git
11:44 cdown_ joined #git
11:45 Cabanossi joined #git
11:46 Maple__ joined #git
11:46 Maple__ joined #git
11:46 Maple__ joined #git
11:47 willlondon joined #git
11:48 Seveas joined #git
11:48 aard_ joined #git
11:49 stamina joined #git
11:49 moei joined #git
11:52 jknetl joined #git
11:56 Cabanossi joined #git
11:57 cdown joined #git
11:57 theoceaniscool joined #git
11:58 JuliusN after failed cloning attempt git tells me to 'Please make sure you have the correct access rights'. How do i do that?
11:58 _ikke_ JuliusN: Where are you cloning from:
11:59 JuliusN bitbucket
12:00 JuliusN i just created an rsa key pair by following their instructions
12:00 JuliusN is there a way to ensure that the key pair actually matches?
12:00 _ikke_ JuliusN: try ssh -T <clone url>
12:00 _ikke_ ssh -Tvv <clone_url>
12:00 Derderderd joined #git
12:01 Neelixx joined #git
12:02 JuliusN 'could not resolve hostname' and a few debug logs about ssh config files
12:02 Anticom JuliusN: typo in url?
12:03 JuliusN i copied the url from bitbucket with ssh selected
12:04 JeroenT joined #git
12:04 _ikke_ JuliusN: Make sure it's not the ssh:// version
12:04 _ikke_ that does not work with plain ssh
12:05 JuliusN the url starts with git@
12:05 _ikke_ ok, that's good
12:06 _ikke_ and hostname / nslookup bitbucket.org works?
12:06 rivarun joined #git
12:07 JuliusN nslookup returns addresses yes
12:07 JeroenT joined #git
12:08 Mogget Whenever i do foo = 'test', this will be unicode encoded right? So if I write this to file and wish the output to be UTF-8, I need to encode foo to UTF-8 by doing fp.write(foo.encode('UTF-8'))?
12:09 Mogget This is for 2.6 and 2.7
12:09 Mogget And I realized that i wrote those two lines in the wrong channel. Sorry.
12:09 _ikke_ JuliusN: Mind sharing the complete command you use (I don't mind if you anonymize user / project info
12:09 _ikke_ Mogget: :)
12:10 JuliusN just a sec, i'm checking my workflow
12:11 JuliusN ok so i started by generating a key pair with ssh-keygen. no issues there, the key pairs were successfully created in ~/.ssh/
12:11 stamina joined #git
12:12 encod3 joined #git
12:13 GavinMagnus joined #git
12:13 JuliusN after that i copied the .pub file with pbcopy, went to bitbucket.org account settings, added a new ssh key by pasting the key there
12:14 JuliusN got no warnings there
12:14 _ikke_ Looks alright
12:15 madgen joined #git
12:15 JuliusN i tried to clone with 'sudo git clone' and pasted the ssh url but that didn't work
12:15 JuliusN after that i opened ~/.ssh/config
12:16 JuliusN i added an alias for bitbucket.org
12:17 Anticom JuliusN: why git clone with sudo? :o
12:17 stfn joined #git
12:18 warrantyvoid left #git
12:18 JuliusN just remembered someone claiming it should help, probably on an unrelated issue
12:18 Anticom i can't see why that would help
12:19 JuliusN anyway, in my ssh config i added Host bitbucket, HostName bitbucket.org, IdentityFile ~/pathtorsafile.pub
12:19 kraut joined #git
12:19 manuelschneid3r joined #git
12:21 JuliusN but everytime i try to clone i get repository access denied
12:21 mischat joined #git
12:21 JuliusN do i need to edit the url somehow?
12:21 satifant joined #git
12:23 JuliusN conq: repository access denied.
12:23 JuliusN fatal: Could not read from remote repository.
12:23 JuliusN Please make sure you have the correct access rights
12:23 JuliusN and the repository exists.
12:23 _ikke_ if you use sudo, it does not use your ssh keys
12:24 JuliusN yeah i didn't use sudo last time i tried
12:24 _ikke_ JuliusN: Well, first try to make it work with plain SSH
12:24 _ikke_ If that's not working, it will not work with git either
12:25 rajkumar joined #git
12:25 Cabanossi joined #git
12:25 JuliusN well it doesn't
12:26 _ikke_ Note that those ssh settings will only work if youse bitbucket as hostname, not bitbucket.org
12:26 _ikke_ youse = you use
12:26 JuliusN the debugger says it reads data from both ~/.ssh/config and /etc/ssh/ssh_config
12:26 rnsanchez joined #git
12:27 morenoh149 joined #git
12:27 JuliusN yeah i tried removing the .org as well
12:27 JuliusN 'could not resolve hostname'
12:28 JuliusN although the same error comes with both hostnames
12:28 ski7777 joined #git
12:29 JeroenT joined #git
12:32 rominronin joined #git
12:33 rominron_ joined #git
12:34 nickabbey joined #git
12:36 encod3 joined #git
12:36 madgen left #git
12:38 cyphase joined #git
12:39 JuliusN _ikke_: oh also forgot to mention the step where i added the identity to ssh-agent
12:39 _ikke_ The weird part is that ssh saysa could not resolve host
12:40 JuliusN hmm atlassian's confluence cloud seems to be partly down, but i'm not sure if that even should affect bitbucket
12:41 King_Hual joined #git
12:42 _ikke_ well, nslookup bitbucket works you say
12:42 _ikke_ What system are you on?
12:42 LBV_User joined #git
12:42 JuliusN mac os sierra
12:43 cdown_ joined #git
12:43 JuliusN also after i select 'clone in sourcetree' in bitbucket, sourcetree displays a warning 'this is not a valid source path / url'
12:44 JuliusN maybe i'll just mail back to the devs that their repo isn't working
12:45 cdown__ joined #git
12:46 JuliusN how exactly should i reformat the url?
12:46 _ikke_ git@bitbucket.org/<org>/<project>.git from the top of my head
12:47 _ikke_ git@bitbucket.org:<org>/<project>.git
12:48 JuliusN even with ssh alias in the config?
12:49 JuliusN also i don't recall bitbucket's instructions mention anything about ssh config
12:49 _ikke_ With an alias, you could do git@bitbucket:<org>/<project>.git
12:49 _ikke_ No, because that's not required
12:49 _ikke_ If you use the default ssh key name, ssh will pick it up
12:52 jnavila joined #git
12:52 JuliusN maybe i should remove the configuration then
12:56 Derderderd joined #git
12:56 ojdo joined #git
12:56 JuliusN in my system-wide ssh config there is 'SendEnv LANG LC_*' for all hosts, no idea what that is
12:57 _ikke_ Is more for localization
12:58 qqx That and information about how characters need to be encoded to be displayed properly.
13:01 jmd joined #git
13:02 los joined #git
13:03 johnmilton joined #git
13:04 boombatower joined #git
13:04 ochorocho__ joined #git
13:05 f3r70rr35f joined #git
13:06 JuliusN cloning with https returns a 503
13:06 _ikke_ JuliusN: That looks like a bitbucket issue
13:06 Cabanossi joined #git
13:06 re1 joined #git
13:07 jast Mogget: in case you're still waiting for an answer... this channel is not about python, but generally speaking ASCII text is also valid UTF-8
13:08 jast though I see you did notice that bit about the channel right away
13:08 jast reading the scrollback carefully is too difficult for me, so now you have an extra response anyway. :)
13:10 JeroenT joined #git
13:11 bronson joined #git
13:11 jknetl joined #git
13:12 g_zen joined #git
13:13 esc anyone have a working example for using .ssh/config with a custom ssh-key to access github?
13:13 esc I am currently using:
13:13 esc host *.github.com IdentityFile /home/esc/.ssh_backup/id_rsa
13:13 _ikke_ Host github.com
13:13 _ikke_ IdentityFile ~/.ssh/id_ed25519_github
13:13 esc but that doesn't seem to work
13:13 esc it's still using the wrong key
13:13 _ikke_ That only works for subdomains of github iirc
13:13 _ikke_ not fir github.com itself
13:14 QuestionTime joined #git
13:14 esc ty
13:14 fhackdroid joined #git
13:14 sdothum joined #git
13:17 Neelixx_ joined #git
13:18 acetakwas joined #git
13:20 rominronin joined #git
13:20 joki joined #git
13:23 jnavila joined #git
13:23 umpc joined #git
13:25 ochorocho__ joined #git
13:26 masuberu joined #git
13:27 serialoverflow joined #git
13:27 eduardas_m joined #git
13:29 nickabbey joined #git
13:29 smaudet joined #git
13:29 jmd How can I undo a merge?
13:30 _ikke_ jmd: There is undo and 'undo'
13:30 _ikke_ Did you push the merge?
13:31 jmd _ikke_: No.
13:31 canton7 !fixup
13:31 gitinfo So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
13:31 _ikke_ Is the merge the last thing you did?
13:31 jmd No.
13:32 _ikke_ makes it more complicated
13:32 jmd (But I suppose I could rebase back to it)
13:32 _ikke_ What happened after the merge?
13:32 jmd Just a few commits.
13:32 jmd Let's assume that the merge was the last thing.
13:32 _ikke_ I guess an interactive rebase would fix it
13:33 _ikke_ I think you have to remove the merge commit from the todolist
13:33 jmd I've never tried it with a merge, but I'll give it a go.
13:33 JeroenT joined #git
13:37 ShekharReddy joined #git
13:42 jaguarmagenta joined #git
13:43 moei joined #git
13:45 rly joined #git
13:46 rly How do I check whether a given commit hash already exists in the repository?
13:47 jeffreylevesque joined #git
13:47 jast rly: if git rev-parse doesn't complain about it, it exists
13:47 jast or basically any other operation, such as 'git show'
13:47 _ikke_ git rev-parse --verify
13:48 _ikke_ add -q to surpress output
13:48 diogenese joined #git
13:49 DexterF joined #git
13:49 DexterF hi
13:49 gitinfo DexterF: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
13:50 DexterF newbie q: "git clone git://git.videolan.org/ffmpeg.git ffmpeg" from a firewalled machine with http(s) allowed fails with "git.videolan.org[0: 88.191.250.118]: errno=Connection refused"
13:50 DexterF git issue, server issue, firewall, layer8?
13:51 qqx DexterF: firewall probably. You said http is allowed, but the git:// URL doesn't use that.
13:51 TheWild joined #git
13:52 TheWild git reset d4d9 - will it notify me if there are more commits with hash beginning with d4d9?
13:52 DexterF qqx, so unless the server offers http nothing I can do? which ports do I need for git:// ?
13:52 dfaught joined #git
13:53 SwiftMatt joined #git
13:53 DexterF 9418, got it
13:53 qqx Yeah, that's the one.
13:54 nicksloan joined #git
13:55 dfaught joined #git
13:56 jknetl joined #git
13:56 Derderderd joined #git
13:57 smaudet joined #git
13:57 jknetl joined #git
13:59 a_ok joined #git
14:01 SpeakerToMeat joined #git
14:01 Gsham joined #git
14:02 theoceaniscool joined #git
14:05 mischat joined #git
14:05 rnsanchez_ joined #git
14:06 jimi_ joined #git
14:07 cdown joined #git
14:14 encod3 joined #git
14:15 encod3 joined #git
14:15 anonymuse joined #git
14:16 morenoh149 joined #git
14:17 PioneerAxon joined #git
14:17 jnavila joined #git
14:18 UrsoBranco joined #git
14:19 cdown joined #git
14:20 JeroenT joined #git
14:20 netj joined #git
14:22 ExoUNX joined #git
14:27 fahadash joined #git
14:28 cdown joined #git
14:31 los joined #git
14:31 JeroenT joined #git
14:33 los joined #git
14:34 Thorn joined #git
14:35 grawity TheWild: it will, yes
14:35 JeroenT_ joined #git
14:36 JeroenT__ joined #git
14:38 QuestionTime joined #git
14:41 Potatoes left #git
14:41 habbasi joined #git
14:42 yehowyada joined #git
14:42 cqi joined #git
14:42 los joined #git
14:43 cdown joined #git
14:44 Dougie187 joined #git
14:52 GodGinrai joined #git
14:52 marcogmonteiro joined #git
14:52 Limes joined #git
14:54 nickabbey joined #git
14:55 Es0teric joined #git
14:55 jknetl joined #git
14:57 denisMone joined #git
14:58 rwb joined #git
14:58 Derderderd joined #git
15:00 AaronMT joined #git
15:01 nickabbey joined #git
15:04 Rapture joined #git
15:04 Neelixx joined #git
15:06 e14 joined #git
15:09 _Vi joined #git
15:09 SaberArthur joined #git
15:11 Impaloo joined #git
15:11 bronson joined #git
15:12 BrianJ joined #git
15:17 Akuli joined #git
15:17 leeN joined #git
15:17 Akuli i compiled git yesterday and it works just fine, but if i enter an invalid git command i get this http://dpaste.com/0SH1G9R
15:18 Akuli currently i'm running git from where i compiled it with an alias. do i need to install it to use all features?
15:18 DexterF left #git
15:18 ResidentBiscuit joined #git
15:18 noecc joined #git
15:19 Akuli i mean, i'm using it like this http://dpaste.com/1SA5K69
15:19 Sceorem__ joined #git
15:19 GodGinrai joined #git
15:20 selckin GIT_EXEC_PATH --exec-path like /usr/libexec/git-core whe installed
15:21 Akuli why does listing features require that but nothing else does?
15:22 dlynes joined #git
15:22 Sceorem_ joined #git
15:22 selckin because a lot of them are build-in
15:22 Akuli hmm
15:22 selckin try mergetool
15:22 Akuli what is it supposed to do?
15:22 djb-irc joined #git
15:22 Akuli i want add, commit, push, diff, show
15:22 selckin 'git mergetool' should fail too
15:22 Akuli i don't know how to use anything else, i don't need anything else
15:23 Akuli pull clone :)
15:23 selckin so you're happy to live with a broken install, but are complaining that its complaining about a broken install
15:23 dlynes Is there a reason why git merge sourcebranch would say everything is copascetic, and then git diff sourcebranch would say there's a whole whack of changes?
15:23 selckin can i show you the door
15:23 Akuli selckin, i was just wondering why its doing that
15:23 dlynes I'm using git 2.10.1 (Apple Git-78) if it makes any difference
15:24 dlynes I'm also using git 1.8.4.msysgit.0, with the same results
15:24 fbwnd joined #git
15:24 dlynes git 1.8.4 is part of mingw; Apple git was installed as part of XCode
15:25 selckin thats a valid possible state
15:25 selckin merging does not make both branches equal
15:26 flavius joined #git
15:26 dlynes selckin: No?  I thought that was the whole point of a merge?
15:27 Akuli isn't merge just adding commits from one branch to another?
15:27 perlpilot_ joined #git
15:28 selckin you advance on branch to include the other
15:28 selckin the other is not modified
15:28 dlynes Akuli: Well, as I understand it, it's a bit more than that.  Sometimes you have to resolve conflicts as well, which would be picking pieces of files from one source and picking pieces of files from the other source and merging them together
15:28 Akuli yeah in other words git inserts >>>>> into your files and then we need to decide what to keep and throw away
15:29 perlpilot joined #git
15:29 dlynes selckin, yes.  In my case, I merged development branch into my private branch.  However, the private branch has about 10000 diff lines different from development after the merge
15:29 dlynes I would expect there would be zero diff lines.
15:30 morenoh149 joined #git
15:30 dlynes A lot of those differences are fairly minor but some of those changes clobber previously made bug fixes
15:30 Neelixx joined #git
15:31 Impaloo joined #git
15:31 _ADN_ joined #git
15:31 selckin if branch a modifies line 10, and branch b modifies line 20, you merge b into a, is line 10 no longer modified?
15:31 dlynes is there a way to selectively merge in diffs, so that it's not an all or nothing approach?
15:32 selckin branch a now has 10 and 20 modified
15:32 selckin branch b has 20 modified
15:32 dlynes selckin: shouldn't be, no.  But after merging development into my private branch, I went to merge my private branch into development and it says there's no differences
15:32 selckin yes 20 is already in branch a
15:33 dlynes nvm....I'm dumb...forgot to do the reverse
15:33 ResidentBiscuit I only ever merge when I'm going from my personal branch > some shared branch
15:33 dlynes But how can I selectively merge files instead of the whole tree?
15:33 ResidentBiscuit Just rebase if you're pulling in changes from a shared branch to your personal branch
15:33 plos joined #git
15:35 dlynes ResidentBiscuit: doesn't rebasing squash the history?
15:35 dlynes I've been using git a lot, but still not as familiar with it as I am with subversion
15:36 Vortex34 joined #git
15:37 mda1 joined #git
15:37 ResidentBiscuit Only if you tell it to
15:38 Impaloo joined #git
15:38 re1 joined #git
15:38 ResidentBiscuit An interactive rebase can do many things. If I'm developing and just want the latest dev or master code, I just do a non interactive rebase and move on
15:39 Es0teric joined #git
15:40 Impaloo joined #git
15:41 linuxmodder joined #git
15:42 dlynes ResidentBiscuit: ah...I usually just do a clone, checkout, fetch
15:42 madewokherd joined #git
15:42 dlynes ResidentBiscuit: which I'm guessing does the same thing?
15:43 jaguarmagenta joined #git
15:43 dlynes Also, does git have an equivalent of svn revert?
15:43 ResidentBiscuit No that doesn't update your branch
15:43 dlynes ResidentBiscuit: ah...so it's the same as a merge, then?
15:43 ResidentBiscuit Yes git has revert as well
15:43 ResidentBiscuit Its not the same as a merge
15:44 selckin git checkout -- . == svn revert .
15:44 ResidentBiscuit It puts your changes on top of the changes in the branch you're rebasing onto
15:44 ResidentBiscuit Doesnt create a merge commit
15:44 selckin git revert is completely differend functionallity from svn revert
15:45 ResidentBiscuit Is it? They both create inverse commits
15:46 Akuli left #git
15:47 mischat joined #git
15:52 fbwnd joined #git
15:53 ochorocho__ joined #git
15:53 nisseni joined #git
15:54 iron_houzi Is it possible to do git commit and git push by providing a .gitconfig file on a nonstandard path?
15:54 nisseni Even though I have /wp-content/uploads/* in gitignore, I get this: modified:   wp-content/uploads (untracked content) - how can that be possible?
15:56 nfk joined #git
15:57 jab416171 joined #git
15:59 Derderderd joined #git
16:00 yehowyada joined #git
16:01 dreiss joined #git
16:01 yehowyada joined #git
16:01 khagler joined #git
16:03 jasondockers joined #git
16:03 jasondockers joined #git
16:05 anonymuse joined #git
16:05 mischat_ joined #git
16:07 sathed joined #git
16:08 Hetu joined #git
16:09 cdg joined #git
16:10 rominronin joined #git
16:11 xall joined #git
16:12 Sample joined #git
16:12 shinnya joined #git
16:14 saml joined #git
16:14 subhojit777 joined #git
16:15 LionsMane joined #git
16:16 Dougie187 joined #git
16:18 timvisher joined #git
16:20 peeps[lappy] joined #git
16:20 Derderderd joined #git
16:20 tcorneli joined #git
16:20 tlaxkit joined #git
16:20 theoceaniscool joined #git
16:22 zacts joined #git
16:23 jccn joined #git
16:24 snowkidind joined #git
16:24 nickabbey joined #git
16:25 demize nisseni: Remove the * at the end to ignore the whole directory.
16:26 adino joined #git
16:26 nettoweb joined #git
16:27 rnsanchez_ joined #git
16:30 sparetire joined #git
16:30 mischat joined #git
16:38 al-damiri joined #git
16:39 elect joined #git
16:39 dreiss joined #git
16:40 tyreld joined #git
16:40 cdg_ joined #git
16:40 Snugglebash joined #git
16:44 Es0teric joined #git
16:45 timvisher joined #git
16:48 nettoweb joined #git
16:50 Ryanar joined #git
16:50 Darren_ joined #git
16:51 Derderderd joined #git
16:53 pijiu joined #git
16:54 bernardio joined #git
16:54 mischat joined #git
16:54 cjohnson My guess is it's a dotfile that's causing the message?
16:55 nettoweb1 joined #git
16:55 pijiu joined #git
16:56 cyan__ joined #git
16:57 ThiefMaster just add the whole directory to gitignore instead of its /*
16:57 ThiefMaster git doesn't track directories anyway..
16:58 ThiefMaster and if you have a .keep or something similar in there you can always git add -f it to add it even though it's on ignore
17:00 _rnsanchez_ joined #git
17:01 nettoweb joined #git
17:01 mischat_ joined #git
17:03 Neelixx joined #git
17:03 anddam jast: about the commit mess from earlier this morning, I'm not sure to have understood what the actuall issue was
17:03 anddam jast: if you still recall the "incident"
17:03 anddam jast: was it the rebasing after the merge?
17:04 cagedwisdom joined #git
17:04 iamthad joined #git
17:05 jnavila joined #git
17:05 kadoban joined #git
17:10 romerocesar joined #git
17:11 rominronin joined #git
17:12 howitdo joined #git
17:12 bronson joined #git
17:12 dreiss joined #git
17:14 durham joined #git
17:14 chardan joined #git
17:17 howitdo joined #git
17:17 rominronin joined #git
17:18 crayon joined #git
17:21 PCatinean joined #git
17:24 durham joined #git
17:26 hagridaaron joined #git
17:26 freimatz3 joined #git
17:27 disi joined #git
17:27 CheckDavid joined #git
17:28 pwnz0r joined #git
17:28 austin987 joined #git
17:30 sathed Question... Can I have multiple credential options in my .gitconfig? For example, $ git config --global credential.helper 'wincred' && git config --global credential.helper '!aws codecommit credential-helper $@' && git config --global credential.UseHttpPath true
17:30 sathed My goal is to be able to do a git pull on from our local repo and immediately do a git push to an Amazon CodeCommit repo.
17:34 rominronin joined #git
17:35 lacour joined #git
17:35 denisMone joined #git
17:38 j416 sathed: use ssh?
17:40 nickabbey joined #git
17:42 lolicon joined #git
17:43 e14 joined #git
17:43 lolicon Hey when review consists on very few changes, what's the best way to update pull request? If I amend the commit, the review comments become useless.
17:43 lolicon *off
17:43 jaguarmagenta joined #git
17:44 Learath2 lolicon: commit again?
17:44 j416 lolicon: I usually do a fixup commit, reference that in a reply to the reviewer, and then when the entire review is done (reviewer(s) are happy), I squash all fixups and force-push.
17:44 j416 lolicon: I don't know if there is a better way.
17:44 lolicon It's like a single character change :/
17:44 aswen joined #git
17:44 j416 lolicon: well doing a fixup isn't exactly time-consuming
17:44 bill99 joined #git
17:45 j416 what is, though, is trying to figure out what you changed if you just force-push direclty :)
17:45 adino joined #git
17:45 Learath2 well doesnt cost you anything to do the fixup and upstream can just squash it and then merge
17:45 lolicon j416: Oh I've never used fixup before
17:46 j416 lolicon: git add yourchange && git commit --fixup <somecommit> && git push
17:46 j416 simple as that
17:46 j416 lolicon: --fixup is just a shorthand for typing the commit message subject of the given commit, prefixed by "fixup! "
17:46 lolicon Ah I see.
17:46 clemf joined #git
17:46 j416 lolicon: then, "git rebase -i --autosquash" will read that and help you squash commits in the right order
17:47 j416 lolicon: (configurable to autosquash by default using: git config --global rebase.autosquash true)
17:48 j416 but I do agree that the process is a bit brittle in that you have to explicitly communicate that workflow to your peers
17:48 encod3 joined #git
17:48 j416 we've used it quite successfully at work, it works nicely when everyone is on board with the process
17:48 cagomez joined #git
17:48 j416 but I do wish there was a way with less of an onboarding process
17:49 j416 (if anyone knows, please do share)
17:49 lolicon shouldn't I autosquash before I push?
17:49 j416 that defeats the purpose
17:49 Dougie187 You don't need to before you push. Pushing only pushes committed stuff
17:49 lolicon Or am I squashing after the whole review is done?
17:50 j416 lolicon: the whole point of doing fixups is to not have to force-push (that would mess up the PR and its comments)
17:50 j416 lolicon: squash when all is done and everyone is happy
17:50 j416 lolicon: we even used squash commits for commit message updates. not optimal, but works ok-ish.
17:51 lolicon Ah okay. So if I get it right, I add my change, commit it, send it for review, add review changes and commit --fixup && git push and after the whole review is done autosquash. Does that sound about right? This way after the review is done are comments to the review maintained? As in does it reference code?
17:51 nettoweb joined #git
17:52 j416 lolicon: once you force-push, I'm not sure it's easy to retreive comments.
17:52 j416 maybe.
17:52 j416 I'm not very used to github PRs.
17:52 lolicon During the review, the comments are maintained due to the fix up commits right? We just add the --fixup flag for easier squashing. Does that sound right?
17:52 j416 yes.
17:53 j416 I usually do one fixup commit per review comment I respond to. I feel it makes things very easy to re-review.
17:54 lolicon j416: That sounds fine. Thanks
17:54 j416 lolicon: you just have to be careful if the reviewer is not used to that workflow, so that he/she does not just click the big merge button on github and merge your branch with the fixups unsquashed
17:55 lolicon Right. That's important. Anyway the workflow seems fine so I'll just let everybody on my team know.
17:55 tang^ joined #git
17:56 j416 :)
17:56 encod3 joined #git
17:56 j416 lolicon: I'd write it down in a short guide if I were you.
17:57 nettoweb joined #git
17:58 menip joined #git
17:58 lolicon j416: I would too :)
17:58 evie_hammond joined #git
17:58 spacelord_ joined #git
17:58 ToxicFrog å/buffer 51
17:59 j416 better luck next time, ToxicFrog
17:59 j416 that is a ton of buffers. :D
17:59 davimore__ joined #git
17:59 Domhack joined #git
18:00 j416 ToxicFrog: you know you can meta+j 51, right
18:00 * j416 monologues
18:00 ToxicFrog I didn't! Awesome
18:00 ToxicFrog Thank you
18:00 j416 :)
18:00 lep2 left #git
18:00 ToxicFrog And yeah, it's a lot. A bunch of them are low-traffic channels that I need to /buffer merge
18:00 freimatz3 joined #git
18:01 j416 I have 12 or so buffers.
18:01 j416 odd that you've a scandinavian keyboard but a non-scandinavian-sounding name and country :)
18:01 leprechau joined #git
18:02 sea-gull_ joined #git
18:08 mnunberg joined #git
18:09 mekeor joined #git
18:10 mnunberg hi folks! i split a fairly big file into two (with some minor adjustments). is there a way i can see the diff _as if_ the file was not split?
18:10 _ikke_ Don't think so
18:11 cagmz joined #git
18:11 Learath2 should have commited them one by one first the adjustments then the split or vv
18:11 cagmz say I have an untracked file in a git repo, and my repo is behind from the remote by a few commits. how do I pull the latest commits but keep my untracked file on disk?
18:11 mnunberg good point
18:12 _ikke_ cagmz: git does not touch untracked files
18:12 Learath2 git pull
18:12 cagmz would git reset --hard origin/master delete the untracked file?
18:12 _ikke_ Nope
18:12 _ikke_ only git clean touches untracked files
18:13 osse mnunberg: concatenate them. diff against the temp file
18:14 cagmz weird, a friend pulled my latest git commits and did this; git fetch --all; git reset --hard origin/master; . problem is we have a settings.json that is untracked, and he said that it was deleted. so that's impossible?
18:14 osse git diff --no-index <(git show HEAD:file) <(cat file1 file2) Wooo!
18:16 svm_invictvs joined #git
18:17 freimatz3 joined #git
18:18 kulelu88 joined #git
18:21 jnavila joined #git
18:22 Electrometro joined #git
18:22 romerocesar_ joined #git
18:24 FederationOfNULL joined #git
18:24 Ryanar joined #git
18:24 romeroce_ joined #git
18:24 Mobutils joined #git
18:27 nickabbey joined #git
18:28 InfoTest joined #git
18:28 star_prone joined #git
18:31 manuelschneid3r joined #git
18:32 salamanderrake joined #git
18:33 dreiss joined #git
18:35 Derderderd joined #git
18:35 nickabbey joined #git
18:36 Es0teric joined #git
18:37 rominronin joined #git
18:38 morenoh149 joined #git
18:39 robotroll joined #git
18:39 elbeardmorez joined #git
18:40 mda joined #git
18:42 wizardedit hi there. I've noticed that on Windows 7, .git does not show under explorer or cmd. It does with a git bash shell. I DO NOT have hidden and system folders hidden by default in explorer, as I can see other hidden folders in the same directory. Any ideas what's wrong?
18:43 SwiftMatt joined #git
18:44 TalkToMe joined #git
18:44 Electrometro joined #git
18:45 TalkToMe joined #git
18:45 nettoweb joined #git
18:46 vuoto joined #git
18:46 Electrometro joined #git
18:47 orfeo joined #git
18:47 YuGiOhJCJ joined #git
18:47 rominron_ joined #git
18:48 Gsham joined #git
18:48 hahuang65 joined #git
18:48 jimi_ joined #git
18:48 mda1 joined #git
18:49 macivy joined #git
18:49 riceandbeans still having that gpg issue if anyone can help
18:50 duderonomy joined #git
18:51 macivy left #git
18:51 timothy joined #git
18:52 refried_ joined #git
18:54 mustmodify joined #git
18:54 jstein_ joined #git
18:54 mustmodify I've lost a file. Can I grep through all branches? Or all commits, regardless of branch/tag/etc in the last month?
18:54 Snugglebash joined #git
18:55 orfeo joined #git
18:55 spacelord_ joined #git
18:55 osse mustmodify: git rev-list --all | while read hash; do git grep pattern $hash; done
18:56 Es0teric joined #git
18:57 mustmodify wow ... ok thanks. :)
18:57 zeroed joined #git
18:57 zeroed joined #git
18:59 parasite_ joined #git
19:00 riceandbeans osse: any idea?
19:00 wicga joined #git
19:01 osse nope
19:01 osse never used gpg with git before
19:01 osse barely ever used gpg
19:01 mloy riceandbeans: could you restate the gpg issue?
19:01 Muzer joined #git
19:02 nicksloan joined #git
19:03 riceandbeans > git commit -am "Add protocols support"
19:03 riceandbeans error: gpg failed to sign the data
19:03 riceandbeans fatal: failed to write commit object
19:03 Lipp joined #git
19:03 riceandbeans mloy: the key in use is frequently used
19:03 troulouliou_dev joined #git
19:06 marc_v92 joined #git
19:07 osse riceandbeans: GIT_TRACE=1 git commit... and pastebin the output
19:07 sathed What would be the best way to mirror a local gitblit repo to an aws CodeCommit repo? Hooks?
19:07 riceandbeans god damn it, it's a big in git introduced in 2.10
19:08 riceandbeans http://stackoverflow.com/questions/39494631/gpg-failed-to-sign-the-data-fatal-failed-to-write-commit-object-git-2-10-0
19:08 riceandbeans bug rather
19:08 ki0 joined #git
19:09 riceandbeans http://pastebin.com/ksV9tsC9
19:10 mustmodify osse: That worked, thanks so much!
19:10 mustmodify Still a mystery to hunt down but at least I know it exists!
19:10 osse mustmodify: would be a good idea to print out the hash in the loop if grep succeeds
19:12 rnsanchez joined #git
19:13 bronson joined #git
19:14 mustmodify I did `git show hash` but that file wasn't shown.
19:14 mustmodify So that's weird.
19:14 crayon joined #git
19:14 thesha joined #git
19:14 osse mustmodify: that'll only show the differences between that hash and the previous
19:14 e14 joined #git
19:14 osse if that file has no changes in that commit then...
19:14 mustmodify right...
19:15 mustmodify hunh.
19:15 mustmodify Well, ok.
19:15 osse what do you want to do?
19:15 osse ressurrect the file?
19:15 mustmodify yes.
19:15 osse git checkout hash -- file
19:15 mustmodify ok great, thanks!
19:15 rly joined #git
19:18 tmsmith joined #git
19:18 Hink joined #git
19:19 mustmodify osse: You just saved me an hour or so of work. Thanks. :P
19:19 acetakwas joined #git
19:20 joki joined #git
19:20 Sasazuka joined #git
19:21 aw1 joined #git
19:21 osse mustmodify: maybe do  git log --all -- file so you know you get the latest one
19:21 jnavila joined #git
19:22 ki0 joined #git
19:23 Salander27 joined #git
19:23 mustmodify Well, I had only just created it so the version hasn't changed. :)
19:23 mustmodify Good idea though.
19:24 jaafar joined #git
19:25 Learath2 osse: isnt rev-list already in the proper order?
19:25 venmx joined #git
19:26 osse Learath2: yes, in away. it might be a bit cludgy if there are many branches. anyway i suspected his screen would spew out page upon page of hits
19:26 jstein_ joined #git
19:26 Snugglebash joined #git
19:27 BrianJ joined #git
19:27 mwlang joined #git
19:27 riceandbeans osse: so any ideas?
19:28 Sasazuka joined #git
19:28 osse riceandbeans: i thought you found it. that it was a bug and bla bla
19:28 mwlang is it possible to search all previous commits in any branch for something?  I think I have a developer on the team that keeps overwriting previous commits as I’m seeing several regression bugs I’m about 95% sure we’ve fixed as a team two or three times.
19:29 msafi joined #git
19:30 msafi Hey folks, we have the following situation and would appreciate some help.
19:30 Electrometro joined #git
19:30 msafi Develop branch should have a file called X. Release branch should not have that X file. But we merge from develop to release regularly. Every time we do this merge, we get a conflict because we update X on develop but delete it on release. Is there a way to make git always resolve X file to the deleted version when we merge from develop to release?
19:30 Vampire0 mwlang, what *is* the something you want to search? a specific change in code, changes to a specific file, changes to a specific line, a commit message, ...
19:30 osse mwlang: if you happen to know of a particular string that's missing e.g. "delete[] foo" or somerthing then git log -S'string' is the ticket
19:30 mwlang I’m not sure at this point, but I basically suspect the developer is fixing conflicting merges in the opposite direction to what he should be doing.
19:30 Ragnor joined #git
19:31 Vampire0 Then maybe look through the merge commits he did?
19:31 mwlang Vampire0: I basically want to look for a term I know was used in a fix, but no longer in any of the current revision’s code…”checkout_punchback”
19:31 osse listen to me! listen to me!
19:31 Vampire0 mwlang, as osse said, do what he said :-D
19:31 mwlang osse: just saw
19:32 mwlang so that hunts for the term in the code itself, not just the log?
19:32 osse mwlang: it prints the log of commits that add or remove the given string
19:32 osse add -m if you suspect it happened in a merge
19:32 mwlang osse:  boom!  took me right to it.
19:33 osse Author: Jean Pierre le Douche <moron@yourcompany.com>  ?
19:33 mwlang weird…only thing is, it shows me adding the code with that string…but doesn’t show any commits removing it...
19:33 osse did you -m
19:34 Salander27 joined #git
19:34 mustmodify left #git
19:36 Gsham joined #git
19:36 MrWoohoo joined #git
19:36 noecc left #git
19:38 mwlang yeah, that turned up empty.
19:39 mwlang ok, this means I’m making the mistake, not the other developer.
19:39 mwlang :-D
19:39 Es0teric joined #git
19:39 osse mwlang: but you're saying that string is not in the current file right?
19:39 mwlang basically, I added the new HTML view template to the project that has that name and I know I adjusted the existing view template files to call it.
19:40 anonymuse joined #git
19:40 mwlang sooo…I wiped my local changes out with a git pull and merge, then commited my “fixes” thinking I commited whole thing, when actually, I lost my local changes prior to that commit.
19:41 osse get rekt
19:41 mwlang I can see this clearly because the commit I found with the above search is showing I didn’t commit the full fix at that time.
19:41 * mwlang goes hunting for rekt
19:42 osse mwlang: cool your jets, there
19:42 osse you got rekt, aka. wrecked, aka. stupid 14-yo gamer speak
19:42 mwlang :-)
19:42 mwlang yeah, I found the def.
19:42 ResidentBiscuit When in doubt, just reflog
19:42 osse but since i'm a 14-yo gamer trapped in a body roughly twice that old...
19:43 mwlang we all have our good and bad.   At least now I know and before I went chewing out fellow team members.
19:44 theoceaniscool joined #git
19:44 osse sounds painful
19:44 jaguarmagenta joined #git
19:45 ochorocho__ joined #git
19:45 venmx joined #git
19:45 Darcidride joined #git
19:45 romerocesar joined #git
19:45 wizardedit solved it: https://stackoverflow.com/questions/28048612/cant-see-git-folders-in-windows-even-though-ive-it-set-to-show-hidden-files
19:46 durham joined #git
19:47 _ADN_ joined #git
19:49 mda joined #git
19:49 aidalgol joined #git
19:50 Panacea joined #git
19:53 multi_io joined #git
19:53 [ADN] joined #git
20:01 ejb joined #git
20:04 Phyllotaxis joined #git
20:04 e14 joined #git
20:05 Emperor_Earth joined #git
20:06 Emperor_Earth joined #git
20:06 aard_ joined #git
20:07 nicksloan joined #git
20:08 rominronin joined #git
20:09 technomancy joined #git
20:09 elijah_ joined #git
20:11 javaJake joined #git
20:12 nwkj86 joined #git
20:16 b100s joined #git
20:20 mar77i joined #git
20:20 Electrometro joined #git
20:21 elijah_ joined #git
20:22 derk0pf joined #git
20:23 zeroed joined #git
20:23 rominron_ joined #git
20:23 ispn joined #git
20:26 midgetspy joined #git
20:26 elijah_ joined #git
20:27 _28_ria joined #git
20:27 FSadino joined #git
20:28 _Vi joined #git
20:29 jmd joined #git
20:30 jmd I need to sign about 100 commits. How can I do that easily?
20:30 j416 loop
20:30 j416 or just sign the last one?
20:31 jmd git: 'loop' is not a git command. See 'git --help'.
20:31 j416 well, loop manually
20:31 j416 still, why not sign just the last one?
20:31 jmd <jmd> I need to sign about 100 commits. How can I do that easily?
20:31 j416 yes I read that
20:32 jmd ^^^                              ^^^^
20:32 j416 why is it not enough to sign the last one?
20:32 jmd I need to sign them all.
20:32 j416 why?
20:32 gargola joined #git
20:32 m0viefreak joined #git
20:32 _ikke_ for commit in $(git log --format=%H first..last); do git ...; done
20:32 jmd Otherwise I cannot commit them.
20:32 jmd s/commit/push
20:33 j416 huh.
20:33 j416 what _ikke_ says.
20:33 _ikke_ better to use rev-list instead of git log in this case
20:33 j416 nod
20:33 j416 I wonder if filter-branch could be used
20:34 axti joined #git
20:34 jmd But I would have to type in my passphrase 100 times.
20:35 menip joined #git
20:35 j416 jmd: gpg-agent?
20:35 d0nn1e joined #git
20:36 vdv joined #git
20:36 thiago joined #git
20:36 j416 jmd: http://unix.stackexchange.com/a/188813
20:39 j416 jmd: do you work for some high-security.. entity? or, why is it that you need to sign every single commit?
20:39 j416 out of curiosity
20:40 jmd j416: Becuase the server is configured to reject unsigned commits.
20:40 jccn joined #git
20:41 j416 why?
20:41 _ikke_ security theater
20:41 jmd I dunno? I didn't set it up.  I presume its just how it works.
20:42 j416 unless you have very special reasons it seems rather overkill. :)
20:42 j416 and inconvenient
20:42 _ikke_ j416: jmd has no control over it
20:42 j416 yeah I get that
20:43 _ikke_ j416: https://mikegerwitz.com/papers/git-horror-story
20:43 j416 just pointing out that what they're doing may be just a waste of everyone's time at his workplace
20:43 j416 _ikke_: exactly
20:45 theoceaniscool joined #git
20:45 riceandbeans osse: can you confirm though for sure because I dislike having to downgrade git for something like that
20:46 tang^ joined #git
20:47 osse riceandbeans: did you miss the part where i said I've barely used gpg? i don't even know how to configure it
20:47 osse in any case you could try *up*grading first. 2.11 is out
20:48 [0xAA] joined #git
20:48 breezy_ joined #git
20:49 osse and have you tried the tip given in the SO answer?
20:50 riceandbeans osse: I did what the SO said and it didn't work, and I'm running 2.11 and the bug is still there
20:51 b100s joined #git
20:55 Sample joined #git
20:55 osse i would report it to the mailing list then
20:57 fatalhalt joined #git
20:57 pypi_ joined #git
20:58 fatalhalt joined #git
20:58 ochorocho__ joined #git
20:59 Darcidride joined #git
21:00 osse at least i get the same error
21:00 osse no slightly different
21:01 ResidentBiscuit I've always wondered why people go nuts with commit signing
21:01 kpease joined #git
21:02 osse riceandbeans: can you repaste the GIT_TRACE=1 thing
21:03 fstd joined #git
21:03 riceandbeans ResidentBiscuit: because it ensures it was me that made the commit
21:04 riceandbeans http://pastebin.com/m1pG8CMj
21:05 osse riceandbeans: does   'gpg' '--status-fd=2' '-bsau' 'B53DA0D7' <<<"stuff"   work ?
21:05 shgysk8zer0 joined #git
21:05 Sasazuka joined #git
21:09 riceandbeans no
21:10 osse well that's something
21:10 osse it doesn't work even when git is out of the picture
21:10 technomancy left #git
21:10 riceandbeans osse: BUT
21:10 howitdo joined #git
21:10 riceandbeans gpg --clearsign -bsau B53DA0D7 $filename works
21:11 shgysk8zer0 joined #git
21:12 osse :S
21:13 refried_ joined #git
21:14 bronson joined #git
21:14 j416 riceandbeans: how often have you encountered a problem with someone trying to claim you did something you didn't?
21:16 aw1 joined #git
21:17 osse riceandbeans: so that straight command line gave the same error as git does, but --clearsign fixes it?
21:18 mmlb joined #git
21:20 nettoweb joined #git
21:23 jast anddam: actually the other way around... typically rebasing and then merging causes this kind of history. I've tried to explain it here: !merge_vs_rebase
21:23 gitinfo anddam: [!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html
21:23 Doginal joined #git
21:23 askb joined #git
21:28 synthroid joined #git
21:31 anonymuse joined #git
21:31 invisbl_ joined #git
21:31 invisbl_ joined #git
21:32 re1 joined #git
21:32 JanC joined #git
21:32 BrianJ joined #git
21:33 synthroi_ joined #git
21:35 sznkz joined #git
21:38 alhariel joined #git
21:39 Zordey__ joined #git
21:40 perlpilot_ joined #git
21:40 bcc joined #git
21:40 bcc joined #git
21:40 rominronin joined #git
21:40 jarred_ joined #git
21:41 refried_ joined #git
21:42 frobnic joined #git
21:43 Oatmeal joined #git
21:45 jaguarmagenta joined #git
21:46 anonymuse joined #git
21:46 Ragnor joined #git
21:50 hahuang65 joined #git
21:52 likewhoa joined #git
21:53 Spec-Chum joined #git
21:57 Guest38837 joined #git
21:57 Guest38837 joined #git
21:58 marc7 joined #git
21:59 Gsham joined #git
22:00 Es0teric joined #git
22:00 ejb joined #git
22:00 marc7 could anybody explain why git on ubuntu is starting to apply weird umodes to files that are amended in recent commits?
22:00 Atm0spher1c joined #git
22:00 rnsanchez joined #git
22:01 _ikke_ marc7: have you confirmed that you do not have any umask set in your environment?
22:01 marc7 I have a post-receive hook that triggers a 'git pull', but something recently changed where all the files are basically being forced 'go-rwx' when that shouldn't be happening
22:01 marc7 _ikke_: I'll check to see if my environment has been changed in any way
22:01 kpease joined #git
22:02 anonymuse joined #git
22:03 venmx joined #git
22:03 adino joined #git
22:03 marc7 _ikke_: this is definitely an ubuntu problem, thanks for helping me pin it down.
22:04 nettoweb hello guys, Im using oh-my-zsh but some of git aliases are not working, example: ga => git add  but gst => zsh: command not found: gst
22:04 nettoweb can someone help me?
22:04 bremner nettoweb: there is an omz channel somewhere.
22:04 _ikke_ bremner: alias
22:04 _ikke_ sorry
22:05 _ikke_ nettoweb: alias | grep gst
22:05 nettoweb return nothing
22:05 nettoweb but I'm looking oh-my-zsh repo and there's this command there
22:05 nettoweb and 'alias ga' => git add
22:05 nettoweb so it's loading the git plugin I think
22:06 GavinMagnus joined #git
22:09 WayToDoor joined #git
22:10 nettoweb Seems something was override.., typing just 'alias' I saw at the end of list there's: s='git status'
22:10 treehug88 joined #git
22:10 jimi_ joined #git
22:10 mloy do you have `'alias gst' => git status` nettoweb?
22:10 jimi_ joined #git
22:10 _ikke_ mloy: The omz git plugin defines it
22:11 nettoweb no... just: gs='git status' and gss='git status --short'
22:11 mloy ah, okay thanks
22:11 nettoweb something weird
22:11 mloy so what is gst supposed to do?
22:11 nettoweb git status
22:11 mloy does gs work?
22:11 hahuang61 joined #git
22:12 bremner nettoweb: do you have a document that lists all of the defined aliases, or are you guessing?
22:12 nettoweb alias
22:12 nettoweb bremner
22:12 nettoweb alias on terminal
22:12 LondonOmar joined #git
22:12 nettoweb show the list of all alias, no?
22:12 rewt `alias | grep git` to list all aliases that point directly to git
22:13 mloy gst works fine for me, so it might be being overridden
22:13 nettoweb yeah, appeared those I put here
22:14 mloy I typically just use magit though, didn't realize I had the git zsh plugin configured haha
22:14 saml do you version control ~/  homedir?
22:14 saml so that you can clone it on a new machine some how
22:15 riceandbeans osse: with or without the clearsign, on command line it works
22:15 riceandbeans osse: with a file
22:15 riceandbeans osse: with git it does not
22:15 osse riceandbeans: what about with standard input?
22:15 riceandbeans the same key also signs every email I send daily
22:15 osse echo lol | gpg ... etc.
22:17 riceandbeans osse: http://pastebin.com/xJYETtUa
22:18 osse something is weird with your gpg
22:18 bremner !vcsh
22:18 gitinfo https://github.com/RichiH/vcsh - Version Control System for $HOME - multiple Git repositories in $HOME -- abusing fake bare Git repositories for fun and profit
22:18 bremner saml^
22:18 osse riceandbeans: git writes to gpg's stdin, so that has to work
22:18 riceandbeans ok
22:18 riceandbeans mutt uses a tmp file which works
22:19 alipoor90 joined #git
22:20 alipoor90 I want git to ignore all *~ and #*# files in entire repo, what should I add to exclude file? is this correct?
22:20 alipoor90 **~
22:20 alipoor90 **[#]**[#]
22:21 jast easy: *~ and #*#
22:21 ignarps joined #git
22:22 Noldorin joined #git
22:22 riceandbeans alipoor90: you make have to escape with a \
22:23 jast AFAIK you can't use ** on its own, it only works when followed by a slash
22:23 jast rather, it has to be separated from the rest of the pattern using slashes
22:24 jast but as long as all you're trying to match is the filename itself, you don't need ** at all, just use the original patterns (no complicated thinking required), git will automatically apply them to all subdirs
22:24 Disgeae joined #git
22:25 lektrik joined #git
22:25 griffindy joined #git
22:25 chardan joined #git
22:25 adino joined #git
22:26 riceandbeans osse: so, downgrading gpg to gpg1 fixes stdin
22:26 alipoor90 Thanks
22:26 riceandbeans osse: that also allowed the gpg sign to work
22:27 osse \o/
22:27 bremner riceandbeans: it's likely an issue to do with pinentry and the agent
22:28 riceandbeans well, it means for anything related to git I'm pinned to gpg1 instead of gpg2
22:28 riceandbeans bremner: how do you figure
22:29 lektrik joined #git
22:29 bremner because gpg1 reads passphrases from the terminal, and gpg2 doesn't
22:29 riceandbeans I have pinentry installed
22:29 bremner #gnupg can possibly help you debug that.
22:33 Doginal joined #git
22:35 GavinMagnus left #git
22:38 anuxivm joined #git
22:39 Disgeae joined #git
22:40 jhmfc joined #git
22:46 Panacea joined #git
22:47 rwb joined #git
22:48 kyan joined #git
22:51 jeffreylevesque joined #git
22:52 jhmfc yo, is there a reliable way to tell that a cherry-pick (or rebase) is in progress short of attempting to do another one and getting a message back like "error: a cherry-pick or revert is already in progress"?
22:53 Noodlewitt joined #git
22:54 anonymuse joined #git
22:54 diogenese joined #git
22:54 Surfer2010 joined #git
22:55 osse jhmfc: can't speak for cherry-pick but rebase puts a dir in .git/rebase-merge
22:55 osse i mean it creates that dir
22:56 osse jhmfc: and .git/CHERRY_PICK_HEAD might exist
22:56 osse this is how the zsh prompt thingy works, at least
22:58 tmsmith joined #git
22:58 pypi_ joined #git
22:58 durham joined #git
22:59 durham joined #git
23:00 NeverTired joined #git
23:01 durham joined #git
23:01 fmeerkoetter joined #git
23:01 durham joined #git
23:01 ochorocho__ joined #git
23:03 durham joined #git
23:04 mischat joined #git
23:05 Guest32_ joined #git
23:05 mischat joined #git
23:05 jhmfc osse: thanks, I'll look there
23:06 osse jhmfc: https://github.com/zsh-users/zsh/blob/master/Functions/VCS_Info/Backends/VCS_INFO_get_data_git#L11-L71
23:09 jhmfc osse: cool, so, yeah, it's in sequencer/
23:09 aw1 joined #git
23:10 netj joined #git
23:12 rominronin joined #git
23:14 theoceaniscool joined #git
23:15 bronson joined #git
23:17 mizu_no_oto joined #git
23:20 Dougie187 left #git
23:22 tvw joined #git
23:25 hahuang61 joined #git
23:29 anonymuse joined #git
23:29 Nilesh_ joined #git
23:29 Gsham joined #git
23:30 riceandbeans osse: bremner the problem is solved, setenv  GPG_TTY `tty`      to anyone using tcsh
23:30 emg joined #git
23:31 bremner I know only one tcsh user and he is also a firm svn user ;)
23:31 bremner actually, I know two such people. I start to see a pattern ;)
23:31 austin987 joined #git
23:33 kyan_ joined #git
23:34 osse Two out of three is good enough f the future police
23:34 osse *for
23:34 Seveas I know one *csh user. He uses git, but avoids it as much as possible :)
23:36 Tatou I may have to learn svn cli..
23:36 bremner git-svn ftw
23:36 Seveas poor you
23:36 Tatou bremner: Is that really so easy?
23:37 riceandbeans tcsh is default on dfly/fbsd and I didn't see a need to install extra things like bash/zsh when tcsh is fine enough for me
23:37 Tatou I'm just very bored of svn and it's strict workflow
23:37 riceandbeans if I need to script a shell script I use /bin/sh, if it needs more power, I use perl/ruby/rust
23:37 adino joined #git
23:37 cagomez joined #git
23:40 bremner Tatou: it has always worked for my (non-admin) usage of svn
23:40 Tatou That's all I want
23:40 bremner it's slow for the initial clone.
23:40 Tatou The problem is when we do our multi day forthnightly code freezes
23:41 Tatou I'd love to be able to keep working on different stories and then just push them to the server.. But it's just not easy with svn
23:41 Doginal joined #git
23:41 YuGiOhJCJ joined #git
23:42 mojava- joined #git
23:43 riceandbeans left #git
23:46 jaguarmagenta joined #git
23:46 QuestionTime joined #git
23:49 arescorpio joined #git
23:52 invisbl joined #git
23:53 invisbl joined #git
23:53 jhmfc joined #git
23:53 j416 Tatou: I second git-svn ftw. You don't need a lot of detailed svn knowledge; just understand on some level how it works (branches being directories for example), it'll help.
23:54 Log1x joined #git
23:54 yqt joined #git
23:54 j416 I used to use it daily when stuck in svn world some years ago.
23:55 Tatou I've been trying to suggest we move, but there's no appetite for it
23:56 j416 not to worry, you can move quite fine :)
23:56 j416 let the others be stuck in the misery
23:57 j416 hopefully they'll discover what magic you're capable of and want to learn how you're doing it :)
23:57 j416 (realistically that won't happen)
23:58 j416 just invite any allies to git-svn :)
23:58 Ryanar joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary