Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-06

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

All times shown according to UTC.

Time Nick Message
00:00 SporkWitch double quotes allow for variable expansion and things like newline; single quotes might treat \n as literals
00:00 * SporkWitch can never remember
00:00 rominronin joined #git
00:01 alexandrecvl SporkWitch: I am just testing..
00:02 quetz joined #git
00:02 alexandrecvl SporkWitch: It did not work. bitbucket shows me exactly this: Testing paragraphs:\nparagraph1 \n paragraph2
00:03 alexandrecvl it prints \n as characters, not carriage return
00:03 alexandrecvl I am doing this in dos. would that be a problem?
00:03 SporkWitch interesting...
00:03 SporkWitch no idea, i use real operating systems
00:04 bremner DOS is real mode.
00:04 alexandrecvl I understand.
00:05 durham joined #git
00:05 alexandrecvl Would you suggest another approach?
00:05 durham joined #git
00:07 qpdb joined #git
00:07 mingrammer joined #git
00:09 shmuli joined #git
00:10 chris2 use -F ?
00:11 chris2 or multiple -m, one for each paragraph
00:12 daurnimator joined #git
00:12 deltab yeah, write the message to a file and use -F
00:13 deltab or pipe it in if that's convenient
00:19 mycelium joined #git
00:20 harish joined #git
00:23 Gsham joined #git
00:23 shmuli joined #git
00:25 deadprez joined #git
00:27 bmahe joined #git
00:28 lolmac joined #git
00:31 dsdeiz joined #git
00:31 vrishab joined #git
00:32 hahuang65 joined #git
00:33 deadprez joined #git
00:35 stamina joined #git
00:35 cyphase joined #git
00:40 biotim joined #git
00:43 carif joined #git
00:46 up_the_irons joined #git
00:48 Dispatch joined #git
00:48 shmuli joined #git
00:49 catsup joined #git
00:49 SwiftMatt joined #git
00:54 Salander27 joined #git
00:55 mns_ left #git
00:55 dsantiago joined #git
00:58 mns joined #git
00:59 dodobrain joined #git
01:00 sanscheese joined #git
01:02 rominronin joined #git
01:08 sangy joined #git
01:09 lolmac joined #git
01:10 aidalgol joined #git
01:14 decimad_ joined #git
01:21 arescorpio joined #git
01:22 Opertus joined #git
01:23 SwiftMatt joined #git
01:26 Goplat joined #git
01:28 mingrammer joined #git
01:31 pks joined #git
01:36 rgrinberg joined #git
01:38 kalkin- joined #git
01:39 kalkin- hi
01:39 gitinfo kalkin-: 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.
01:39 kalkin- left #git
01:39 kalkin- joined #git
01:40 kalkin- I have a bare repo with a namespace foo on a server. when i connect for cloning with my client to the server the server executes GIT_NAMESPACE=foo git-upload my/dir.git
01:40 kalkin- On the client side the clone happens to work
01:40 texasmynsted joined #git
01:41 kalkin- but at the end you get an error remote HEAD refers to nonexistent ref, unable to checkout
01:41 kalkin- If i add -b master to git clone. I can circumvent this problem, but I want to fix it for real
01:42 kalkin- Btw: the namespaced repo was created by cloning an existing repo from github, doing git init --barre namespaced_repo.git, added as remote and did GIT_NAMESPACE=foo git push origin --mirror
01:46 d^sh_ joined #git
01:46 xocolatl joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and post-reductionist industrial exuberance | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Be careful when rewriting history. It may push you to use the dark side of the --force
01:49 Gsham joined #git
01:49 clemf joined #git
01:50 Ks3_ joined #git
01:50 dalias joined #git
01:50 shmuli joined #git
01:51 A5101 joined #git
01:51 ochorocho__ joined #git
01:51 HoierM joined #git
01:52 xocolatl okay, I just learned about the reflog.  whew!
01:53 Remram[m] joined #git
01:53 Remram[m] joined #git
01:53 xocolatl hmm.  that got me my content back, but it's all uncommitted.
01:54 Noldorin joined #git
01:58 evanwang joined #git
02:00 cagedwisdom joined #git
02:02 clemf joined #git
02:03 rominronin joined #git
02:05 dalias joined #git
02:06 kalkin- xocolatl: if you have a backup or nothing to loose you can just pick the right commit out of the reflog and do git reset --hard COMMIT
02:07 clemf joined #git
02:08 d^sh joined #git
02:08 harish joined #git
02:14 hexagoxel joined #git
02:14 jstimm joined #git
02:14 mizu_no_oto joined #git
02:16 clemf joined #git
02:17 ASOLAr_ joined #git
02:19 ahr3n joined #git
02:20 clemf joined #git
02:23 Hink joined #git
02:24 fstd_ joined #git
02:24 andlabs joined #git
02:25 kai_ joined #git
02:26 mingrammer joined #git
02:26 checkItOut joined #git
02:27 ASOLAr joined #git
02:28 Gsham joined #git
02:29 rchavik joined #git
02:30 dreiss joined #git
02:32 hahuang65 joined #git
02:34 Hink joined #git
02:34 lolmac joined #git
02:34 zivester joined #git
02:35 nydel07 joined #git
02:37 clemf joined #git
02:38 lagothrix joined #git
02:39 romerocesar_ joined #git
02:39 cqi joined #git
02:40 mycelium joined #git
02:40 Blackpajamas joined #git
02:41 clemf joined #git
02:41 Blackpajamas joined #git
02:42 Blackpajamas joined #git
02:43 clandestino joined #git
02:43 mingrammer joined #git
02:44 gravitron joined #git
02:44 clemf joined #git
02:47 star_prone joined #git
02:48 clemf joined #git
02:52 Blackpajamas joined #git
02:52 clemf joined #git
02:53 Dougie187 left #git
02:58 rewt joined #git
03:00 clemf joined #git
03:00 chachasmooth joined #git
03:02 thiago joined #git
03:02 clemf joined #git
03:03 aavrug joined #git
03:04 kalkin- Back to my namespace problem. I solved it
03:04 rominronin joined #git
03:04 kalkin- git symbolic-ref refs/namespaces/foo/HEAD refs/namespaces/foo/refs/heads/master
03:04 kalkin- The above command will link a head in the proper namespace to the master branch in this namespaces
03:05 kalkin- this fixes git clone
03:07 GT4066 joined #git
03:07 scott_sd joined #git
03:07 chrisshattuck joined #git
03:08 raijin joined #git
03:08 clemf joined #git
03:09 bobtherealbob joined #git
03:11 trimosier joined #git
03:12 scott_sd hi, is set git config --global core.autocrlf false,but it's warning: CRLF will be replaced by LF
03:13 scott_sd i check my config , it does well in other centos , not work in my ubunt
03:14 Vortex35 joined #git
03:15 cagmz joined #git
03:15 shmuli joined #git
03:15 paulh joined #git
03:15 clemf joined #git
03:17 realz joined #git
03:17 mizu_no_oto joined #git
03:18 zacts joined #git
03:21 mehola joined #git
03:27 Andrew_K joined #git
03:28 kadoban joined #git
03:31 ruby_ joined #git
03:32 scottxu hi, i set git config --global core.autocrlf false,but it's warning: CRLF will be replaced by LF in my ubunto system, And other centos system is work ok
03:32 _28_ria joined #git
03:34 sangy joined #git
03:36 Andrew_K joined #git
03:37 Hink joined #git
03:39 Hink joined #git
03:39 rvaldes joined #git
03:47 raijin joined #git
03:48 clemf joined #git
03:52 B_H joined #git
03:54 ochorocho__ joined #git
03:54 harish joined #git
03:54 kn-928 joined #git
03:56 dreiss joined #git
03:56 dodobrain joined #git
04:01 daey_ joined #git
04:03 ayjay joined #git
04:04 phanimahesh joined #git
04:05 rominronin joined #git
04:05 sanscheese joined #git
04:07 BenderRodriguez joined #git
04:09 blackwind_123 joined #git
04:09 raijin joined #git
04:12 Cabanossi joined #git
04:12 paulh joined #git
04:12 navidr joined #git
04:15 vuoto joined #git
04:20 MattMaker joined #git
04:22 Puffball joined #git
04:25 lvns joined #git
04:26 mehola joined #git
04:33 hahuang65 joined #git
04:34 _ikke_ scottxu: Is there a .gitattributes file present?
04:34 scottxu _ikke_, I modify the ~/.gitconfig and .git/config
04:35 scottxu 1 * text=auto
04:35 scottxu 2 *.css linguist-vendored
04:35 scottxu 3 *.less linguist-vendored
04:35 _ikke_ Line 1
04:35 scottxu _ikke_ :this is my .gitattributes content
04:35 _ikke_ that enables normalization for all files
04:36 scottxu ok I fixed it to test
04:37 scottxu in other centos, the  .gitattributes  have same content
04:37 scottxu how can i set * text a value
04:38 _ikke_ What do you mean?
04:38 star_prone joined #git
04:39 scottxu -ikke- , only delete the first line. or how to fixed
04:39 scottxu * text=auto    =>  * -text ?
04:40 _ikke_ Yeah, that will specifically disable it for all files
04:40 e14 joined #git
04:40 _ikke_ for everyone
04:40 scottxu Ok, thank you,  i am to try
04:42 romerocesar joined #git
04:42 deadprez joined #git
04:42 ruby_ joined #git
04:44 trelane joined #git
04:47 cagmz_ joined #git
04:49 Darren_ joined #git
04:54 lolmac joined #git
04:59 star_prone joined #git
04:59 daey_ joined #git
05:02 byteflame joined #git
05:03 Andrew_K joined #git
05:03 Aces_Charles joined #git
05:04 fiddlerwoaroof joined #git
05:05 star_prone joined #git
05:05 subhojit777 joined #git
05:06 laumann joined #git
05:06 rominronin joined #git
05:08 star_prone joined #git
05:17 inflames joined #git
05:17 syg_ joined #git
05:17 syg__ joined #git
05:18 Puffball joined #git
05:18 syg__ joined #git
05:23 SebastianFlyte joined #git
05:23 ruby_ joined #git
05:24 MattMaker joined #git
05:28 nevodka joined #git
05:29 tvw joined #git
05:29 stuh84 joined #git
05:31 ShapeShifter499 joined #git
05:33 MattMaker joined #git
05:46 Raging_Hog joined #git
05:47 hahuang65 joined #git
05:49 inflames joined #git
05:49 lolmac joined #git
05:54 ochorocho__ joined #git
05:56 shmuli joined #git
05:56 shmuli joined #git
05:56 _ng joined #git
05:59 circ-user-OBsh3 joined #git
05:59 zeroed joined #git
05:59 zeroed joined #git
06:00 mohabaks joined #git
06:04 rscata joined #git
06:05 JeroenT joined #git
06:06 chele joined #git
06:08 rominronin joined #git
06:08 zeroed joined #git
06:08 ljc joined #git
06:14 eduardas_m joined #git
06:17 Macaveli joined #git
06:17 ASOLAr joined #git
06:18 holodoc joined #git
06:19 TheVoid joined #git
06:20 Silenced joined #git
06:21 Silenced joined #git
06:24 jknetl joined #git
06:26 satya4ever joined #git
06:28 Rodya_ joined #git
06:29 star_prone joined #git
06:30 yuhlw_ joined #git
06:30 diogenese joined #git
06:34 chele hi guys i am checking this guide (https://www.git-scm.com/book/en/v2/Git-and-Other-Systems-Migrating-to-Git) out to migrate to git (from svn) and when it explains how to make remote branches to local git branches my refs/remotes/origin folder is empty, although the command git branch -r show the branches? What am i doing incorrect? Am I forced to recreate my branches to local git branches manually?
06:38 _ikke_ chele: branches can also be packed
06:38 _ikke_ if git branch -r shows them, you have them locally
06:38 _ikke_ (as remote tracking branches)
06:39 dtux joined #git
06:40 Ratler joined #git
06:43 fees joined #git
06:43 danslo joined #git
06:46 erguven joined #git
06:46 chele _ikke_ so this means is still somehow bound to the svn. if i push now my git to a git server would the branches be pushed? or i have to clone this git project to another location and then push it to a git server ...
06:47 Sceorem joined #git
06:48 lolmac joined #git
06:49 submitnine joined #git
06:52 zeroed joined #git
06:53 osse chele: no, everything is normal
06:53 osse chele: if git branch lists them, they are there no matter what goes on inside .git
06:55 jceb joined #git
06:57 obiwahn i
06:57 obiwahn hi - we want to do some code review and have trouble to find the right commands
06:58 obiwahn there is bob who was on his branch (B) did some work and merged devel (D) from time to time into his branch
06:59 obiwahn Now what do we need to do to find out what changes bob did. compared to devel?
07:01 jknetl joined #git
07:01 obiwahn ok i was really wondering that git diff D...B was not working
07:01 obiwahn but now that my coworker used origin/D he can do the review:)
07:02 amcsi joined #git
07:04 chele osse so migration done when pushed to git server
07:06 pR0Ps joined #git
07:06 boushi joined #git
07:07 rominronin joined #git
07:10 cyan__ joined #git
07:11 rasto joined #git
07:11 laumann joined #git
07:13 d0nn1e joined #git
07:18 delboy1978uk joined #git
07:18 Alienpruts joined #git
07:19 delboy1978uk can i echo out a file on another branches contents without checking it out?
07:19 delboy1978uk or on a specific commit rather
07:20 osse delboy1978uk: git show commit:file
07:20 JeroenT joined #git
07:22 GavinMagnus joined #git
07:23 delboy1978uk osse: i just found that, thanks a lot all the same! :-)
07:24 shmuli joined #git
07:28 quetz joined #git
07:28 qt-x joined #git
07:30 dreiss joined #git
07:30 Balliad joined #git
07:31 Rodya_ joined #git
07:31 DieguezZ joined #git
07:31 eizua joined #git
07:32 lb1c joined #git
07:34 jast _ikke_: thanks, fixed.
07:34 mrpackethead joined #git
07:35 _ikke_ jast: np
07:35 SporkWitch joined #git
07:35 roelmonnens joined #git
07:36 jast still haven't buckled down and added more automation to my let's encrypt thingy
07:36 _ikke_ Just a cron job should work
07:36 jast and I refuse to install the convoluted mess that calls itself the official client
07:36 _ikke_ haha
07:36 _ikke_ ok
07:36 _ikke_ Yeah, that's what I use
07:37 _ikke_ But there are other lighter clients
07:37 jast my own client could technically already be used in cronjobs, but it does not yet automatically renew hostname verifications
07:37 jast so that would be a train wreck waiting to happen
07:38 delboy1978uk left #git
07:39 Oebele joined #git
07:40 shmuli joined #git
07:41 vuoto joined #git
07:42 Lomex joined #git
07:43 star_prone joined #git
07:45 grawity jast: don't like python, use acmetool
07:46 bschindler joined #git
07:46 jast I've already written my own client, actually
07:46 _ikke_ I bet it's in perl
07:46 jast back when there was quite a bit less of a choice
07:46 bschindler Hey, I have a bit of issues understanding submodules... I have a submodule but I just realized that it should track another branch that master. I did that by using git config -f .gitmodules .... (is there an easier way?)
07:47 bschindler If I go into the submodule, checkout the branch, git submodule update will still change back to the master branch... what command do I have to use so that the submodule revision is really changed to that latest branch commit?
07:48 lolmac joined #git
07:48 _ikke_ bschindler: Note that git submodules are initially made to track commits, not branches
07:48 bschindler jup, I know that... detached head state is fine
07:49 jast _ikke_: of course it's in perl :)
07:50 lb1c jast: who would have guessed that ....
07:50 lb1c ;)
07:50 jast lb1c: careful, you'll be running out of nicknames if you keep that up
07:50 lb1c jast: private/work ^
07:50 lb1c < work
07:53 lb1c jast: btw i already gave up, it was basically my age, but i didn't remembered that people really do age
07:53 elect joined #git
07:55 ochorocho__ joined #git
07:58 maroloccio joined #git
07:58 maroloccio hi. need list of branches for script. found this on SO: git for-each-ref --shell --format='%(refname)' refs/heads. can i do this in a simpler way?
07:59 ahmedelgabri joined #git
08:00 anonymuse joined #git
08:00 encod3 joined #git
08:00 ASOLAr joined #git
08:01 erhnsd joined #git
08:01 lb1c django docs: "Oh, and one more thing: making humans edit XML is sadistic!" i need a t-shirt with that ^
08:02 danslo_ joined #git
08:02 shmoon_ joined #git
08:03 shmoon_ ok it seems like i understood this command incorrectly - git push origin master
08:03 chll joined #git
08:03 jast maroloccio: git show-ref
08:03 shmoon_ i always thought if i am on branch xyz and git push origin master will push xyz to origin/master (upstream)
08:03 shmoon_ but seems like it doesn't, it actually pushes local master to remote master ,am i correct
08:03 maroloccio jast: ?
08:03 shmoon_ in order to push current checked out branch to maste ri have to do git push origin xyz:master
08:03 jast shmoon_: yes
08:03 shmoon_ dam
08:03 jast and yes again
08:04 maroloccio jast: outputs more than just branch names?
08:04 shmoon_ i've been thinking that git push origin master will push current checked out branch to origin/master for the last few yrs :|
08:04 shmoon_ and probably messing up at times even
08:04 shmoon_ by adding -f :
08:04 shmoon_ :P
08:04 jast maroloccio: I'm sure it's much easier to read only the second field of each line with that than what you already have
08:04 jast shmoon_: whoops :)
08:05 maroloccio jast: ok. true. but... why is it so hard to read a list of local branch names?
08:05 shmuli joined #git
08:05 ferr joined #git
08:05 danslo_ left #git
08:06 danslo joined #git
08:06 shmoon_ thanks jast
08:06 danslo maroloccio: why not just 'git branch'?
08:07 anonymuse joined #git
08:07 danslo shmoon_: I think that also depends on push.default (which also changed over some recent versions)
08:07 maroloccio outputs magic. colours. and asterisks.
08:07 jast danslo: push.default only affects 'git push' without refspec arguments
08:08 marcogmonteiro joined #git
08:08 danslo ah
08:08 osse maroloccio: for-eah-ref is the scriptf riendly way
08:08 aidalgol joined #git
08:08 zeroed joined #git
08:08 jast maroloccio: we can't really cover every single use case with a really short command. sometimes compromises have to be made.
08:10 lordjancso joined #git
08:10 rafalcpp joined #git
08:10 p4trix joined #git
08:10 osse and given that it's inside a script, why do you care+
08:10 mizu_no_oto joined #git
08:11 maroloccio osse: thank you. maybe there is an easier formulation of that invocation though? git for-each-ref --shell --format='%(refname)' refs/heads
08:11 maroloccio jast: why do you write "we"? are you a git core dev?
08:11 star_prone joined #git
08:12 vmiklos joined #git
08:14 osse maroloccio: how do you read the output?
08:14 ljc joined #git
08:15 maroloccio while read -r branch_name; do ...; done < <(dat-thang)
08:15 JeroenT joined #git
08:15 osse in that case you can remove --shell because that's wrong anyway
08:15 maroloccio yes, i do not need the quotes, i figure it out after copying/pasting from SO. thank you anyway though
08:16 Anticom joined #git
08:16 TomyWork joined #git
08:16 aax joined #git
08:16 bongjovi joined #git
08:16 lucido-cwl joined #git
08:17 lucido-cwl Hi, I did a git pull origin branchname which resulted in a merge
08:17 apotry joined #git
08:17 osse maroloccio:  eval "branches=($(git for-each-ref --shell --format='%(refname)' refs/heads))"; for b in "${branches[@]}"
08:17 osse BOOM
08:17 lucido-cwl how can I view the changes introduced by the last merge?
08:17 King_Hual joined #git
08:17 osse lucido-cwl: git diff merge~1 merge
08:19 lucido-cwl osse, fatal: ambiguous argument 'merge~1': unknown revision or path not in the working tree.
08:20 lucido-cwl I would like to see the changes introduced by the merge that was initiated by git pull origin branchname
08:20 osse lucido-cwl: git diff abc1234~1 abc1234
08:20 osse merge was a placeholder
08:20 Repox joined #git
08:20 lucido-cwl lol
08:21 lucido-cwl I'm a dumbo, a placeholder for?
08:21 daumie left #git
08:21 osse the sha1
08:21 lucido-cwl I have this in the git log: Merge: 26aa0cb 03c8857
08:21 osse if you JSUT pulled then you can do git diff HEAD~ 1HEAD
08:22 * j416 gives osse new keyboard
08:22 lucido-cwl osse, awesome, thanks
08:24 shmuli_ joined #git
08:25 danslo joined #git
08:25 maroloccio osse: are you sure that thing booms?
08:26 harish joined #git
08:27 stonercoder joined #git
08:29 bschindler Hi - what is the proper way to make a submodule "track" a branch other than master? I know submodules are detached but if you do git submodule update --remote, it should go stay/switch/update to that branch...
08:30 star_prone joined #git
08:31 ahmed_elgabri joined #git
08:31 Rodya_ joined #git
08:31 cdown_ joined #git
08:32 lvns joined #git
08:32 t0by joined #git
08:33 hahuang65 joined #git
08:33 jast maroloccio: I contribute occasionally, it's really just a very inclusive "we", though
08:33 maroloccio jast: ok :) well, thanks for your work on git if you are a contributor
08:34 jast and there is no official 'core dev' status, anyway, just people who contribute a lot and people who are lazy (like me :))
08:34 jast which reminds me, I've still got a change to submit sitting in my local clone
08:36 iveqy joined #git
08:37 osse maroloccio: I am.
08:37 qwvsma joined #git
08:37 osse I use it myself
08:37 osse https://github.com/Osse/git-scripts/blob/master/git-brv
08:38 maroloccio osse: so, in your view BOOM means "works" rather than "leaves door open to exploits"? ok.
08:38 osse maroloccio: It was just to show how --shell is meant to be used.
08:39 maroloccio osse: gotcha. thanks for that
08:39 osse I can't see how that's exploitable. Note that the string that is eval'ed does not contain $user_input.
08:39 greendo joined #git
08:42 maroloccio osse: even if a malicious branch name was concocted, i would not see how to exploit either to be honest
08:42 berndl joined #git
08:42 mieko joined #git
08:43 osse eval is safe for grown-ups
08:43 Lomex joined #git
08:43 osse the idea behind --shell is that the command produces in effect code instead of just data.
08:43 osse the the script above we use it to create a mapping between a branch and its upstream :)
08:44 anonymus_ joined #git
08:44 lvns joined #git
08:45 osse But if you dont
08:45 osse But if you don't need it then don't use it.
08:45 biertie joined #git
08:46 dodobrain joined #git
08:47 JeroenT joined #git
08:51 mingrammer joined #git
08:52 sin3t joined #git
08:54 Ezzy joined #git
08:55 blip- joined #git
08:56 blip- hi all, I have a git repo (hosted on bitbucket server).  Since I renamed things there - the https git url changed.  So I did a git remote rm and git remote add to fix it
08:56 blip- but now when i want to push from my local repo - it want's to push ALL commits... rather than just the 1 it should
08:57 blip- the branch names havent changed
08:57 blip- any thoughts ?
08:57 osse do a git fetch
08:58 berndl blip-: check .git/config if the everything is OK.
08:58 lolmac joined #git
08:59 blip- osse, git fetch pulled in 3 branches.  remotes/master, remotes/develop and remotes/test.  i think that aint right
09:00 blip- berndl, the correct url shows up in .git/config
09:01 PCatinean joined #git
09:01 ronskisika joined #git
09:02 osse blip-: did you also give the new remote a new name?
09:02 Raging_Hog joined #git
09:03 blip- osse, no, same name origin
09:03 achadwick joined #git
09:03 blip- osse, git remote rm origin   then git remote add origin <newurl>
09:03 osse blip-: are thebr anches remotes/master, not remotes/origin/master?
09:03 blip- osse, shall i now delete those "remotes/" branches from my local repo ?
09:04 blip- osse, sorry i mistyped.  yes remotes/origin/xyz
09:04 osse blip-: why is that not correct?
09:05 blip- osse, in the past only 2 branches show up - no remote branches (as i recall)
09:05 blip- i just had master and develop.  nothing else in my local repo
09:05 osse blip-: master and origin/master are different thigns
09:05 osse blip-: run 'git branch'
09:06 blip- osse, im panicking lol.  yeah git branch shows just develop and master
09:06 blip- osse, branch -av shows the remotes too
09:06 blip- i guess we're good, i'll try to push
09:06 osse blip-: everything sounds fine
09:07 blip- works perfectly.  awesome !  thanks osse
09:07 osse !remote_tr > blip-
09:07 gitinfo [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote
09:07 osse blip-: and next time, just use 'git remote set-url' :P
09:08 decimad_ joined #git
09:09 nwkj86 joined #git
09:10 blip- osse, ill write that down. ty :)
09:11 dodobrain joined #git
09:12 decimad joined #git
09:15 Lomex joined #git
09:17 netj joined #git
09:21 kurkale6ka joined #git
09:21 decimad_ joined #git
09:21 Darcidride joined #git
09:21 mikecmpbll joined #git
09:22 star_prone joined #git
09:23 milky joined #git
09:30 notebox joined #git
09:30 maroloccio osse: that script you linked.. edit: i=4; ((i >= 3)) && echo ok
09:31 star_prone joined #git
09:32 zonality joined #git
09:34 decimad joined #git
09:34 ljc joined #git
09:37 liamonade joined #git
09:37 Mogget joined #git
09:38 irqq joined #git
09:38 afuentes joined #git
09:39 stonercoder joined #git
09:40 star_prone joined #git
09:40 ljc joined #git
09:40 chachan joined #git
09:41 shmoon_ left #git
09:42 ^7heo joined #git
09:42 ^7heo hey, is it possible to set a submodule to track the head of the external repository?
09:42 chachan hi. After some google search, I'm not sure how to proceed if I want to remove an entire and old branch from my history. Any suggestion?
09:42 ams__ joined #git
09:43 _ikke_ chachan: Depends on what you exactly mean with branch? Do you mean a reference, or a set of commits (which might have been merged in)?
09:43 lolmac joined #git
09:44 chachan _ikke_: a set of commits
09:44 _ikke_ And have they been merged into another branch?
09:45 decimad_ joined #git
09:45 chachan _ikke_: checking, 1 sec
09:45 mingrammer joined #git
09:45 _ikke_ git branch --merged <commit>
09:47 irco joined #git
09:48 chachan _ikke_: yes, but I want to remove them as well
09:49 chachan _ikke_: which <commit> is that?
09:49 z8z joined #git
09:51 chachan oh it's HEAD, to check, thanks
09:51 chachan I don't use merge, I use rebase, does it affect?
09:51 stonercoder joined #git
09:52 _ikke_ You have to use merge sometime
09:52 _ikke_ even if it's a --no-ff merge
09:52 _ikke_ But then you cannot really speak about branches anymore
09:52 chachan hm, just removed rebased commits I guess...
09:53 chachan remove*
09:53 chachan I will rebase and get rid of those
09:53 ThomasLocke joined #git
09:54 amcsi joined #git
09:54 mingrammer joined #git
09:55 rbr joined #git
09:56 ochorocho__ joined #git
09:57 JanC_ joined #git
09:59 throstur joined #git
10:00 throstur I have a git repository for my config files, but now I want to 'freeze' a single file in time so that future changes between machines doesn't affect that one file (without removing the file), can I do that somehow or must I simply avoid committing that one file forever?
10:01 ljc joined #git
10:01 decimad joined #git
10:01 Surfer2010 joined #git
10:05 jast !configfile
10:05 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
10:05 throstur that's not very helpful
10:07 jast the only option not covered there is using the sparse checkout feature to avoid updating that file locally, but it's a bit tricky to set up
10:07 jast let's see, do we have a factoid for that?
10:07 jast !sparse
10:07 gitinfo [!sparse_checkout] Sparse checkout can be used to restrict which files/folders are updated with all checkout and status operations.  It cannot change the tree the checkout is rooted from.  See man git-read-tree
10:08 jast I guess that technically covers it...
10:08 throstur haha, I guess it odes
10:08 chachan jast: https://12factor.net/config
10:09 jast chachan: I'm aware of that philosophy and I don't subscribe to it
10:09 ljc joined #git
10:10 chachan throstur: ok, what about just adding that file to .gitignore?
10:10 jast that's easy to answer: !ignoretracked
10:10 gitinfo [!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
10:10 stamina joined #git
10:10 throstur nice, jast, that was a lot faster than what I was trying to write out
10:12 jast the bot embodies the three virtues of a programmer, as posited by Larry Wall
10:12 throstur !virtues
10:12 throstur !larry
10:12 throstur not letting me be lazy enough it seems
10:12 jast we should totally add it
10:13 throstur I agree
10:13 jast (1) laziness: I don't want to type out the same response many times. (2) impatience: helping people takes so much longer if you have to write lots of things. (3) hubris: the factoids are actually maintained by all of us, and we're all experts. :}
10:15 Sceorem joined #git
10:15 ljc joined #git
10:16 jast .trigger_edit threevirtues The three great virtues of a programmer, according to Larry Wall: laziness (write code that saves work, document so you don't have to explain over and over), impatience (make software anticipate what you need), hubris (make things nobody could want to criticize)
10:16 gitinfo jast: Okay.
10:16 jast that should do it
10:16 dodobrain joined #git
10:17 jast had to compress it a bit, though
10:18 DevAntoine joined #git
10:18 DevAntoine hi
10:18 DevAntoine I'm starting a new blog. I've already got a repo for the existing one. Should I make a new repo are an empty branch on the existing one?
10:18 stonercoder joined #git
10:18 paulh joined #git
10:19 throstur DevAntoine: sounds like it's up to you...
10:25 ljc joined #git
10:27 rorro joined #git
10:33 sin3t joined #git
10:33 hahuang65 joined #git
10:34 dec0n joined #git
10:36 jeffreylevesque joined #git
10:37 star_prone joined #git
10:37 netj joined #git
10:38 nd joined #git
10:39 sqdxxx joined #git
10:43 lolmac joined #git
10:47 spudowiar joined #git
10:47 milky left #git
10:50 norpan joined #git
10:51 Alienpruts joined #git
10:52 rnsanchez joined #git
10:55 Junior joined #git
10:56 sdothum joined #git
10:57 johnmilton joined #git
10:59 GavinMagnus joined #git
11:01 daurnimator DevAntoine: one option you have is an orphan branch
11:01 JeroenT_ joined #git
11:02 daurnimator DevAntoine: but IMO, I'd just continue on from the existing branch *if* you are migrating posts across
11:02 DJ_Spies joined #git
11:03 shirty joined #git
11:07 yalu left #git
11:13 mingrammer joined #git
11:13 simon left #git
11:17 lvns joined #git
11:20 ojdo joined #git
11:21 JeroenT_ joined #git
11:22 lolmac joined #git
11:24 CandyAngel joined #git
11:24 mohabaks joined #git
11:31 leeN joined #git
11:31 pijiu joined #git
11:35 GavinMagnus left #git
11:37 harish joined #git
11:39 sonOfRa joined #git
11:40 ash_workz joined #git
11:43 nwkj86 joined #git
11:43 jost__ joined #git
11:44 phanimahesh joined #git
11:44 ToBeCloud joined #git
11:45 jeffreylevesque joined #git
11:48 Jon28_ joined #git
11:51 Sceorem joined #git
11:52 decimad_ joined #git
11:52 star_prone joined #git
11:53 nilg` joined #git
11:56 qws-user-1228 joined #git
11:56 ochorocho__ joined #git
11:58 a3Dman joined #git
11:58 Dispatch joined #git
11:59 fahadash joined #git
11:59 Megaf joined #git
12:00 star_prone joined #git
12:02 JeroenT__ joined #git
12:03 Gurkenglas joined #git
12:05 arup_r joined #git
12:05 VladGh joined #git
12:05 arup_r left #git
12:05 Puffball joined #git
12:08 CandyAngel If I have a directory structure like $REPO/dir1/dir2/dir3, does changing the contents of dir3 cause a rehash of dir1?
12:09 j416 CandyAngel: if by rehash you mean that its hash changes, then yes
12:09 decimad_ left #git
12:09 _ikke_ It's a merkel tree
12:09 _ikke_ So the has of dir2 is contained in dir1, and the hash of dir3 is contained in dir2
12:09 _ikke_ s/has/hash
12:09 CandyAngel So it may be worth flattening it out (putting dir3 under $REPO) if I have a lot of directories with a lot of files at dir3's depth?
12:09 _ikke_ That's how gits integrity works
12:09 GavinMagnus joined #git
12:10 ^7heo Hmm CandyAngel...
12:10 ^7heo long time no see.
12:10 sballert joined #git
12:10 iveqy CandyAngel: what problem are you trying to solve?
12:10 ^7heo How you're perl-fu?
12:10 ^7heo wow
12:10 CandyAngel ! Theo!
12:10 ^7heo that came out wrong
12:10 _ikke_ woa
12:10 ^7heo how's your perl-fu?
12:10 _ikke_ #alpine #ledger and #git comming together :P
12:10 ^7heo _ikke_: ledger?
12:11 ^7heo was ist das?
12:11 CandyAngel ^7heo: Well.. I'm currently coding a game engine in Perl. Does that count?
12:11 _ikke_ command line accounting tool
12:11 Novitsh joined #git
12:11 ^7heo CandyAngel: are you a permanent resident here?
12:11 ^7heo CandyAngel: So you really care about people not being able to bruteforce your game engine, don't you?
12:11 _ikke_ CandyAngel: To come back to your question. I think it's beneficial to have smaller somewhat deeper trees if I recall correctly
12:12 synthroid joined #git
12:12 BlackPanx joined #git
12:12 ^7heo oh wait yeah sorry, I interrupted a question.
12:12 CandyAngel iveqy: I have very large git-annex, where I have directories like this: $REPO/unsorted/file/$source/$uuid, where each $uuid may have 8000 symlinks each
12:12 CandyAngel I was wondering if making it $REPO/file_$uuid would speed git operations up
12:13 _ikke_ CandyAngel: depends on what the slow part is. Usually it's reading the working tree
12:14 liamonade joined #git
12:15 rgrinberg joined #git
12:16 citizen-stig joined #git
12:17 stonercoder joined #git
12:17 CandyAngel add and commit are the slow operations. Hence looking into the tree storage
12:17 kalkin- left #git
12:18 CandyAngel To be fair, I could make a bespoke solution, but I prefer the integrity that git/git-annex provides
12:19 CandyAngel If the parent hash just uses the child hash, it probably isn't taken any considerable time
12:20 rgrinberg joined #git
12:23 iveqy CandyAngel: afaik the parent hash is calculated with the hash of the child, so it should be fairly fast even if it's probably better with a not that deep tree
12:23 iveqy however, I'm wondering if it's disc seeks that kills your performance
12:24 iveqy perhaps you can explore the options that make git not to look for which files has changed and instead tell git that manually
12:24 CandyAngel Oh, I already do that
12:25 CandyAngel I don't *think* I do anything that causes git to traverse the working directory
12:25 syg_ joined #git
12:25 syg__ joined #git
12:25 brunodlz joined #git
12:26 CandyAngel The most frustrating thing is when it is doing 'git add'.. and there is no load (cpu and IO are idle). I can't tell what it is doing..
12:27 iveqy CandyAngel: this is interesting. Perhaps you should send an email to the mail list?
12:27 iveqy usually you get pretty good responses from there from people that really know this stuff
12:28 CandyAngel Sure, I'll do that next time I get that situation
12:28 inflames joined #git
12:28 _ikke_ Yeah, mailing list is recommended
12:28 CandyAngel Other times I get CPU idle and really low IO (like.. 600Kb/s). Which could be seek lag I guess..
12:28 _ikke_ The response is pretty good there
12:28 _ikke_ CandyAngel: yeah, lots of links don't result in a lot of throughput
12:29 CandyAngel :P
12:29 CandyAngel Also considered the idea of RAID1'ing .git with a ramdisk. What could possibly go wrong? :D
12:30 _ikke_ hehe
12:31 andlabs joined #git
12:32 rahtgaz joined #git
12:32 Balliad joined #git
12:32 maroloccio joined #git
12:32 JeroenT_ joined #git
12:33 Emperor_Earth_ joined #git
12:36 paws_ joined #git
12:38 Puffball joined #git
12:39 afuentes joined #git
12:40 snowbound joined #git
12:40 Ryanar joined #git
12:41 snowbound left #git
12:42 quadgrande joined #git
12:43 ayjay joined #git
12:44 GodGinrai joined #git
12:45 jimi_ joined #git
12:45 rgrinberg joined #git
12:45 cyan__ joined #git
12:46 osse maroloccio: what do you mean?
12:46 zrak joined #git
12:46 wpumup joined #git
12:49 fmcgeough joined #git
12:49 altendky joined #git
12:50 PCatinean joined #git
12:50 crose joined #git
12:50 Noldorin joined #git
12:53 bsanford joined #git
12:57 zivester joined #git
13:00 Balliad joined #git
13:02 mflow joined #git
13:02 byteflame joined #git
13:03 ertes joined #git
13:05 ertes hi…  magit question:  in the latest MELPA version of magit the "upstream" was split into upstream and push-default, which is great, except for one feature i really liked:  the 'r l' key (rebase interactively all unpushed commits)
13:05 marcelofr joined #git
13:05 ertes is there a way to bring that back?
13:06 al-damiri joined #git
13:08 j416 ertes: git rebase -i @{u}
13:09 j416 ertes: or make an alias so that you can just e.g. g ri @{u}
13:10 ertes yeah, that used to be built into magit, but it's gone =/
13:11 j416 don't know what magit is, but that's a way to do it
13:11 kadoban joined #git
13:11 _ikke_ emacs git plugin
13:11 thiago_ joined #git
13:11 j416 ah
13:11 ertes j416: magit is the reason i started enjoying git =)
13:11 j416 pff :P
13:13 Vinnie_win_z joined #git
13:15 mingrammer joined #git
13:15 mingrammer joined #git
13:16 brandonw joined #git
13:16 jceb joined #git
13:18 cdg joined #git
13:18 cdg joined #git
13:19 Dredge joined #git
13:20 zonality joined #git
13:20 shinnya joined #git
13:22 ertes this does exactly what i need, but it's twice as much to type: r - i p
13:23 sangy joined #git
13:23 StatutoryApe joined #git
13:23 star_prone joined #git
13:24 inflames joined #git
13:24 StatutoryApe Either I haven't had enough tea this morning or Google is just failing me.  I can 'git tag --points-at <hash>' but what if I want all tags on all commits that were merged in the most recent merge to master?
13:26 emmajane joined #git
13:28 ilmari StatutoryApe: git tag --merged <commit>
13:28 ilmari <commit> defaults to HEAD
13:28 osse and subtract the list produced by git tag --merged <some earlier commit>
13:28 BlackMaria_netsp joined #git
13:32 quadgrande joined #git
13:32 BlackMaria joined #git
13:33 notebox joined #git
13:34 deadprez joined #git
13:36 amcsi joined #git
13:37 ExoUNX joined #git
13:37 quadgrande joined #git
13:37 sin3t joined #git
13:38 maroloccio osse: well, this version check could use that >= https://github.com/Osse/git-scripts/blob/master/git-brv#L4
13:39 griffindy joined #git
13:40 sanketdg joined #git
13:41 sanketdg joined #git
13:41 Ryanar joined #git
13:42 sanketdg joined #git
13:42 osse maroloccio: the requirement is 4.2, not 4.
13:42 StatutoryApe ilmari, osse: thanks, that gets me a lot closer!
13:42 sanketdg joined #git
13:42 osse StatutoryApe: I like your nick
13:43 StatutoryApe specifically 'git tag --merged $(git merge-base devel master)'
13:43 sanketdg joined #git
13:45 Lomex joined #git
13:45 stonercoder joined #git
13:46 Khisanth joined #git
13:47 kugel_ joined #git
13:47 kugel_ joined #git
13:47 maroloccio osse: ok, you are right. i was wrong.
13:50 Ryanar joined #git
13:51 BlackPanx joined #git
13:52 Jellyg00se joined #git
13:52 defrag joined #git
13:52 Endarked joined #git
13:53 Gsham joined #git
13:53 umbSublime joined #git
13:54 Salander27 joined #git
13:56 Xrayez joined #git
13:56 AaronMT joined #git
13:56 roelmonn_ joined #git
13:57 roelmonn_ joined #git
13:57 AaronMT joined #git
13:57 ochorocho__ joined #git
13:58 phaleth joined #git
13:59 jceb joined #git
14:00 Macaveli joined #git
14:00 danslo_ joined #git
14:01 roelmonnens joined #git
14:02 Lomex joined #git
14:05 johnmilton joined #git
14:09 madewokherd joined #git
14:11 ResidentBiscuit joined #git
14:11 e14 joined #git
14:11 Pieplay joined #git
14:11 anonymuse joined #git
14:13 akitada joined #git
14:16 Salander27 joined #git
14:16 ruby_ joined #git
14:16 t4nkd joined #git
14:18 CheckDavid joined #git
14:18 kugel_ joined #git
14:21 Cassiopaya joined #git
14:21 afuentes joined #git
14:22 Dougie187 joined #git
14:23 Anticom joined #git
14:24 IlNominePatre joined #git
14:24 marcelofr joined #git
14:27 ahmed_elgabri joined #git
14:27 liamonade joined #git
14:27 quadgrande joined #git
14:29 ahmedelgabri joined #git
14:32 BrianBlaze420 joined #git
14:32 mikecmpb_ joined #git
14:33 morenoh149 joined #git
14:33 chris2 joined #git
14:33 abyx joined #git
14:33 dhollinger joined #git
14:34 abyx left #git
14:34 abyx joined #git
14:34 sanketdg joined #git
14:34 cyphase joined #git
14:35 clemf joined #git
14:35 ShekharReddy joined #git
14:35 hahuang65 joined #git
14:35 Repox joined #git
14:37 VagabondAzulien joined #git
14:37 Rodya_ joined #git
14:39 masak how come when I check out a new --orphan branch, all of my files from the old branch end up in the staging area? :)
14:39 pijiu2 joined #git
14:40 star_prone joined #git
14:40 masak (as opposed to, say, being untracked files)
14:41 nullie your index is not changed
14:41 osse probably because they where already there
14:41 Ezzy What can the option `core.autocrlf` (and its friends from gitattributes - `eol=lf` and `eol=crlf`) possibly affect? Am I right, that if any of them is enabled - git will convert file into LF upon commiting and convert them back on checkout (detecting separators using its config files)?
14:41 Ezzy Is there are a way to make `git show <revision>:<path>` return same content as `git checkout <revision> -- <path>` would set to the file?  It looks like `git show` ignores crlf conversion rules (And, I assume, everyone else ignores them too).
14:41 Ezzy What would happen if .gitattributes were changed? Will git use local version or will try to read it from the affected revision?
14:43 satbyy joined #git
14:43 satbyy joined #git
14:46 _ikke_ Ezzy: Yeah, it only affects when converting from the working tree to the index and reverse
14:47 fahadash joined #git
14:49 e14 joined #git
14:50 robotroll joined #git
14:52 e14 joined #git
14:52 jaeckel joined #git
14:52 drbean joined #git
14:54 flopsec joined #git
14:55 tjone270_ joined #git
14:55 dmto joined #git
14:56 tjone270_ joined #git
14:57 _ADN_ joined #git
14:57 stonercoder joined #git
14:57 danslo joined #git
14:58 Gitzilla_ joined #git
14:59 zivester joined #git
15:01 WizJin joined #git
15:02 vassagus joined #git
15:02 Salander27 joined #git
15:03 synchron- left #git
15:04 subhojit777 joined #git
15:04 synchronous joined #git
15:04 chigang_ joined #git
15:05 ruby_ joined #git
15:07 eivarv joined #git
15:07 liamonade joined #git
15:08 ahmedelgabri joined #git
15:09 perlpilot_ joined #git
15:11 jeffreylevesque_ joined #git
15:12 deadprez joined #git
15:13 Gsham joined #git
15:13 ertes left #git
15:14 ruby_ joined #git
15:15 Urbany joined #git
15:15 mikecmpbll joined #git
15:15 m0viefreak joined #git
15:17 star_prone joined #git
15:19 vrishab joined #git
15:19 crayon joined #git
15:19 PCatinean joined #git
15:20 d10n-work joined #git
15:20 mjuszczak joined #git
15:22 ash_workz_ joined #git
15:23 asti joined #git
15:23 asti hello
15:23 asti I deleted some fiels by accident and I want to revert
15:23 asti what command do I use to revert to the HEAD position (to discard the delete that I did)
15:23 settermjd joined #git
15:24 GodGinrai asti: for just the particular file? Or for everything?
15:24 asti everything
15:24 asti :)
15:24 GodGinrai `git reset --hard HEAD`
15:25 zyeoamn joined #git
15:26 freimatz joined #git
15:26 danslo joined #git
15:27 quadgrande joined #git
15:28 tyreld joined #git
15:28 afuentes joined #git
15:29 deadprez joined #git
15:30 robotroll joined #git
15:30 vassagus joined #git
15:31 r4z joined #git
15:31 vassagus joined #git
15:32 ruby_ joined #git
15:32 rubie joined #git
15:34 InfoTest joined #git
15:36 thiago joined #git
15:37 atis_ joined #git
15:38 Rodya_ joined #git
15:40 dreiss joined #git
15:41 roelmonnens joined #git
15:42 roelmonnens joined #git
15:43 asti GodGinrai: thanks a lot
15:45 tilpner joined #git
15:45 fmcgeough joined #git
15:45 ShekharReddy joined #git
15:46 GodGinrai asti: np
15:47 Gurkenglas joined #git
15:47 Topic for #git is now Welcome to #git, the place for git help and stomach cramps | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-clone has nothing to do with reproduction. So stop that.
15:47 Eugene was kicked by Eugene: Eugene
15:47 Eugene joined #git
15:47 cyphase joined #git
15:48 TheVoid joined #git
15:49 EvilPenguin joined #git
15:49 Ryanar joined #git
15:49 garyserj what is the difference between git reset --hard HEAD, vs git reset --hard?
15:50 _ikke_ Nothing
15:51 ^7heo garyserj: the difference is that in the latter case, you don't have to type HEAD.
15:51 deadprez if you wanted to reset to a diff commit you could specify some other commit code instead of HEAD
15:53 crayon joined #git
15:53 crayon joined #git
15:54 stuh84 joined #git
15:54 notebox joined #git
15:56 M-shine joined #git
15:56 diogenese joined #git
15:57 PabloR joined #git
15:58 ochorocho__ joined #git
15:58 PabloR After reinstalling Mavericks and bringing back my backed up stuff I started having issues with git.  When running any git command a window popped up: `the git command requires the command line dev tools` with the options `Get Xcode` (from app store) or `Install`.  I clicked on install and some git commands worked but it’s looking for the system config file in a different location.
15:58 PabloR `git config --list --system` displays “fatal: unable to read config file '/Library/Developer/CommandLineTools/usr/etc/gitconfig': No such file or directory”. BUT the file was never there but at /usr/local/git/etc/gitconfig. So I copied the file to the location the computer is looking for and so far it works.  Why is it looking in a different location? Was this the correct solution? OR should I change a PATH somewhere instead?
15:59 quadgrande joined #git
16:00 Eugene PabloR - /etc/gitconfig is the default location for the "system" level gitconfig file; the rest of that sounds like the prefix added by your (OS X?) install
16:01 Eugene The lack of this file shouldn't(?) cause any errors during normal usage; what are you doing thats giving a problem?
16:01 Eugene And can you provide a !transcript
16:01 gitinfo Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
16:01 PabloR Eugene It may be but I don't know why it added the prefix
16:01 Eugene Me neither; I'm not a Mac owner and just guessing ;-)
16:02 PabloR I had some aliases I created that weren't working
16:02 actinide joined #git
16:02 Eugene bash or git aliases?
16:02 PabloR Now it works, but I'm not sure what I did it's ok. Git aliases
16:02 Orion3k joined #git
16:03 Eugene Did you close and restart your terminal session?
16:03 Eugene (after installing git)
16:04 atis_ joined #git
16:04 synthroid joined #git
16:04 PabloR I believe I did. I'll do again since I just downloaded a new version to see if it fixed. Just a sec
16:05 synthroid joined #git
16:05 Eugene Likely related. I reckon that Xcode(or something) is setting up the env vars that git needs to look for everything in the right place, since it isn't in /etc
16:05 PabloR See, another issue is that git —version displays git version 1.9.5 (Apple Git-50.3) but I downloaded several git versions later including 2.6, 2.8 & 2.10.0 so I don’t know which version I’m actually using and how to get the latest to work
16:05 Darren_ joined #git
16:05 Eugene Generally you only have one installed
16:06 thiago joined #git
16:06 Eugene `which git` should tell you the path to the git binary, which might help a bit
16:06 PabloR I just downloaded form https://git-scm.com/downloads
16:06 rominronin joined #git
16:07 PabloR which git displays /usr/bin/git
16:07 guampa joined #git
16:07 tvw joined #git
16:07 Eugene I will need to defer to a Mac expert, should there be one around
16:07 cdg joined #git
16:07 PabloR Ok. Thanks!
16:08 markelite joined #git
16:08 PabloR Anybody Mac user that can help me?
16:09 qpdb joined #git
16:10 boushi joined #git
16:10 LeBlaaanc joined #git
16:10 cyphase joined #git
16:10 Pyrogerg joined #git
16:11 e14 joined #git
16:11 notebox joined #git
16:12 berndl PabloR: I'm a Mac user. What's up?
16:12 lvns joined #git
16:12 PabloR Hi berndl. Having a couple of different issues with git
16:12 PabloR git —version displays git version 1.9.5 (Apple Git-50.3) but I downloaded several git versions later including 2.6, 2.8 & 2.10.0 so I don’t know which version I’m actually using and how to get the latest to work
16:12 e14 joined #git
16:13 PabloR I don't recall how I downloaded git for the first time
16:13 PabloR But I just downloaded form https://git-scm.com/downloads
16:14 _ikke_ (not a mac user) have you tried homebrew?
16:15 laumann joined #git
16:15 PabloR _ikke_ No, I don't think I did. I know there's discussion about what's the best methods. At some point somebody told me not to use it
16:16 _ikke_ ok
16:16 perlpilot PabloR: if you have an older version of git, you can also clone the git repo from github and follow the instructions in there on how to build it and install it yourself (if you have a taste for adventure ;-)
16:16 terminal_echo joined #git
16:17 PabloR +perlpilot I don't have a taste for adventure. I don't know much about systems. And every time I touch something fixing it takes me lots of time
16:18 PabloR So, question is why would I keep seeing old versions when I download new ones
16:19 _ikke_ PabloR: Probably because they install it in a different location and the system version has precedence
16:19 archaic joined #git
16:19 crayon joined #git
16:19 crayon joined #git
16:20 wwftvt joined #git
16:20 PabloR _ikke_ Do you know how can I change the system to look for the new version instead?
16:20 _ikke_ PabloR: I recall something about the one apple provides is 'protected'
16:21 zonality joined #git
16:22 _ikke_ What version of OSX do you have?
16:22 berndl PabloR: just install from homebrew.
16:22 PabloR mavericks
16:22 notebox joined #git
16:24 PabloR berndl I'm concern because some people have said they had some issues when using homebrew.
16:24 PabloR and I'm not very knowledgeable at systems
16:25 PabloR But anyway, currently git is working. My main issue is the one I wrote before that. I'll copy it below
16:26 PabloR <PabloR> After reinstalling Mavericks and bringing back my backed up stuff I started having issues with git.  When running any git command a window popped up: `the git command requires the command line dev tools` with the options `Get Xcode` (from app store) or `Install`.  I clicked on install and some git commands worked but it’s looking for the system config file in a different location.
16:26 PabloR `git config --list --system` displays “fatal: unable to read config file '/Library/Developer/CommandLineTools/usr/etc/gitconfig': No such file or directory”. BUT the file was never there but at /usr/local/git/etc/gitconfig. So I copied the file to the location the computer is looking for and so far it works.  Why is it looking in a different location? Was this the correct solution? OR should I change a PATH somewhere instead?
16:26 Orion3k joined #git
16:27 cyphase joined #git
16:28 danslo joined #git
16:30 e14 joined #git
16:30 Silenced_v2 joined #git
16:30 Silenced_v2 joined #git
16:31 rgrinberg joined #git
16:31 nitric joined #git
16:32 sdothum joined #git
16:32 kyan joined #git
16:34 ansimation joined #git
16:34 mycelium joined #git
16:35 dreiss joined #git
16:35 Dispatch joined #git
16:36 ksefchik joined #git
16:37 clr joined #git
16:38 Rodya_ joined #git
16:39 durham joined #git
16:42 ruby_ joined #git
16:43 SteffanW joined #git
16:44 ochorocho__ joined #git
16:46 dmarr joined #git
16:46 nidr0x joined #git
16:47 ruby_ joined #git
16:48 anth0ny joined #git
16:50 circ-user-OBsh3 joined #git
16:55 _ikke_ PabloR: Has to do with how that specific git version was built
16:56 sangy joined #git
16:56 _ikke_ This one was built to not mess with system files
16:56 _ikke_ (everything is under /Library/Developer/CommandLineTools/)
16:57 chrisshattuck joined #git
16:57 wcpan joined #git
16:57 Rodya_ joined #git
16:58 eivarv joined #git
16:59 hahuang65 joined #git
17:00 PabloR _ikke_ so copying my config file to the new location is ok then?
17:00 notebox joined #git
17:01 cyphase joined #git
17:01 PabloR Instad of changing a path somewhere?
17:01 matsaman joined #git
17:02 matsaman does git add -A work the same regardless of location within git-tracked hierarchy?
17:02 timvishe` joined #git
17:03 deadprez joined #git
17:03 PaulCapestany joined #git
17:03 Lomex joined #git
17:03 mikecmpbll joined #git
17:05 AnarchyAo joined #git
17:05 Rodya_ joined #git
17:07 QwertyDragon joined #git
17:08 rominronin joined #git
17:08 clemf joined #git
17:08 dviola joined #git
17:08 sametsisartenep joined #git
17:09 sametsisartenep Hi there
17:09 gitinfo sametsisartenep: 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.
17:09 _ikke_ PabloR: Changing that path would require recompiling git, so yeah, moving it is the only option
17:09 _ikke_ PabloR: Note that, if it's only for your user, ~/.gitconfig is a much better place to put these things
17:09 ahmedelgabri joined #git
17:10 sametsisartenep How could I disable gpg signing for a single repo?
17:10 ProbabilityMoon joined #git
17:10 _ikke_ matsaman: " If no <pathspec> is given when -A option is used, all files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories)."
17:11 ahf joined #git
17:11 _ikke_ sametsisartenep: git config commit.gpgSign false
17:11 _ikke_ this will disable it for the current repo only
17:11 _ikke_ matsaman: So, only from the current dir and deeper
17:12 thiago joined #git
17:12 mingrammer joined #git
17:12 sametsisartenep Thanks _ikke_
17:13 _ikke_ matsaman: Just tested it, and it does seem to add *all* files
17:14 chrisshattuck joined #git
17:14 PabloR _ikke_ I have my global config file at /Users/pablo/.gitconfig and the system config file was at /usr/local/git/etc/gitconfig but now is at /Library/Developer/CommandLineTools/usr/etc/gitconfig. But I haven't chosen the paths. They were added by default
17:16 sametsisartenep jump
17:16 sametsisartenep ^ Woops, sorry about that
17:16 _ikke_ PabloR: Like I said, that's choosen at compile time
17:16 ProbabilityMoon joined #git
17:17 _ikke_ The system config location
17:17 liamonade joined #git
17:17 PabloR _ikke_ ok. Thanks
17:21 Darcidride_ joined #git
17:21 cdg joined #git
17:21 cyphase joined #git
17:22 Groscheri joined #git
17:22 |ifei5g00d joined #git
17:22 Groscheri joined #git
17:24 raijin joined #git
17:26 hahuang65 joined #git
17:29 _sjs joined #git
17:30 ProbabilityMoon left #git
17:30 ProbabilityMoon joined #git
17:30 dreiss joined #git
17:32 Sasazuka joined #git
17:32 pouet joined #git
17:33 danimal2 joined #git
17:33 danimal2 joined #git
17:33 matsaman _ikke_: from any location in hierarchy, you mean?
17:34 zacts joined #git
17:34 _ikke_ In recent versions of git, git add -A will include any file in the working tree, no matter where you are
17:34 matsaman okay, groovy, thanks
17:34 matsaman and I can test that with just git add -A and then... git diff --staged ?
17:34 Ryanar joined #git
17:34 _ikke_ git status
17:35 liamonade joined #git
17:36 matsaman okay thanks again =)
17:36 matsaman _ikke_: you wouldn't know the version that was added/changed, offhand?
17:36 matsaman re: "In recent versions..."
17:36 cyphase joined #git
17:38 aax joined #git
17:38 _ikke_ matsaman: v2.0.0
17:39 matsaman thanks thrice =)
17:44 irqq joined #git
17:46 jceb joined #git
17:55 ahmedelgabri joined #git
17:55 multi_io joined #git
17:56 cyphase joined #git
17:56 jwest joined #git
17:57 Ryanar joined #git
18:00 Lomex joined #git
18:01 e14 joined #git
18:01 ansimation joined #git
18:02 govg joined #git
18:02 kulelu88 joined #git
18:02 rjack2 joined #git
18:03 sssilver joined #git
18:05 zarel joined #git
18:06 terminal_echo joined #git
18:06 chrisshattuck joined #git
18:06 mingrammer joined #git
18:06 ShekharReddy joined #git
18:07 rominronin joined #git
18:10 Balliad joined #git
18:11 runlevl4 joined #git
18:13 Salander27 joined #git
18:14 Xizor joined #git
18:14 sssilver_ joined #git
18:14 cyphase joined #git
18:17 stonercoder joined #git
18:20 jwest joined #git
18:21 Flaghacker joined #git
18:28 cdown joined #git
18:28 JanC_ joined #git
18:29 sametsisartenep joined #git
18:29 Remram[m] joined #git
18:29 Ineentho[m] joined #git
18:29 M-mistake joined #git
18:29 M-meznak joined #git
18:32 cyphase joined #git
18:32 jimi_ joined #git
18:36 gumnos joined #git
18:36 e14 joined #git
18:36 star_pro_ joined #git
18:36 Koopz joined #git
18:37 chrisshattuck joined #git
18:37 gumnos Is there a way to do a git-reset on a branch other than HEAD? Based on my reading, it looks like git-reset always acts on HEAD and I'd like to move/repoint a branch label to an different commit. I can stash+checkout+reset+checkout+unstash but wondered if there was something obvious I was missing
18:38 _ikke_ If you have not checked out this branch, you can use git branch -f <name> <commit> to repoint a branch
18:39 gumnos _ikke_: sounds exactly like what I want to do. Thanks!
18:39 _ikke_ If you want to check out this branch at the same time, you can also use git checkout -B <name> <commit>
18:41 Koopz left #git
18:42 gumnos it was a "arg, I've been working on master and should have been working on $BRANCH, so I made $BRANCH and continued work there, but master (unpushed) now points into a WIP, so I want to move it back to where upstream points". The "branch -f" did just what I needed. Thanks again!
18:42 mykespb joined #git
18:43 _ikke_ right
18:44 ahmedelgabri joined #git
18:44 bgerber joined #git
18:46 chrisshattuck joined #git
18:46 liamonade joined #git
18:47 yohnnyjoe joined #git
18:47 cyphase joined #git
18:48 Darren_ joined #git
18:51 AaronMT_ joined #git
18:53 AaronMT__ joined #git
18:53 SpeakerToMeat joined #git
18:54 liamonade joined #git
18:55 pungi-man joined #git
18:57 ansimation joined #git
18:57 e14 joined #git
18:59 satbyy joined #git
19:00 satbyy joined #git
19:00 qpdb joined #git
19:02 texasmynsted joined #git
19:02 LeBlaaan_ joined #git
19:02 rideh joined #git
19:03 rideh I want to use cron job with a bare repo to poll for changes (git pull branch) and publish them to a remote work tree on that same host. seems my post-merge hook wont work as there is no head in bare. Any suggestions?
19:04 Guest86 joined #git
19:05 Spec-Chum joined #git
19:07 cyphase joined #git
19:08 rominronin joined #git
19:08 Rodya_ joined #git
19:11 Pulp joined #git
19:12 _ikke_ there is a HEAD in a bare repo
19:13 aidalgol joined #git
19:13 moritz uhm, but can you merge in a bare repo?
19:13 _ikke_ But merging in hooks and cron-jobs is not advisable
19:13 _ikke_ No, you cannot
19:13 _ikke_ You need a working tree for that
19:13 moritz then a post-merge hook is pointless
19:13 cdown_ joined #git
19:13 Ryanar joined #git
19:14 mohabaks joined #git
19:14 moritz in a bare repo, fetch should be enough, afaiu
19:14 _ikke_ Usually you push to a bare repository
19:15 Balliad joined #git
19:17 loopy joined #git
19:17 moritz rideh: so you likely want a post-receive hook. Also !deploy
19:17 gitinfo rideh: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
19:17 NeonSynth joined #git
19:17 moritz or post-update
19:18 cyan__ joined #git
19:18 moritz (post-receive if you want to be able to reject pushes, post-update if you don't)
19:18 e14 joined #git
19:18 _ikke_ pre-receive if you want to reject them
19:18 _ikke_ post-receive is too late
19:18 Salander27 joined #git
19:19 _ikke_ and the other one is just update
19:19 e14 joined #git
19:19 _ikke_ sorry, post-update also exists
19:20 biotim joined #git
19:20 cyphase joined #git
19:20 rgrinberg joined #git
19:21 Silenced joined #git
19:25 deadprez joined #git
19:25 cagedwisdom joined #git
19:26 byteflame joined #git
19:28 spudowiar joined #git
19:30 danslo_ joined #git
19:30 netcarver joined #git
19:32 nights_ joined #git
19:32 Gitzilla_ joined #git
19:33 cyphase joined #git
19:34 byteflam1 joined #git
19:35 Silenced joined #git
19:35 byteflame joined #git
19:36 rgrinberg joined #git
19:37 sssilver joined #git
19:37 texasmynsted joined #git
19:38 netj joined #git
19:40 mingrammer joined #git
19:42 vuoto joined #git
19:45 e14 joined #git
19:46 antranigv joined #git
19:47 antranigv so, I should add *.swp in .git/info/exclude to ignore all vim swp files, aye?
19:47 antranigv if it's a file, it should be the file path?, from the git root dir?
19:48 grawity it would be more useful to add it to your global ~/.gitignore, but yes
19:48 antranigv ah, didn't know about the global one, thanks grawity ! :))
19:48 cyphase joined #git
19:48 grawity well I suppose it's ~/.config/git/ignore these days
19:49 johnmilton joined #git
19:49 LeBlaaanc joined #git
19:50 _ikke_ Yeah, unless you set it manually
19:50 grawity apparently there *wasn't* a global default before
19:51 _ikke_ Nope, you had to set it
19:51 parallel21 left #git
19:54 chrisshattuck joined #git
19:54 crose joined #git
19:54 rgrinberg joined #git
19:55 cdg joined #git
19:56 raijin joined #git
19:56 boombatower joined #git
19:57 stonercoder joined #git
19:57 texasmynsted joined #git
19:57 l4v2 joined #git
19:59 Rodya_ joined #git
20:03 AnarchyAo joined #git
20:04 Xizor joined #git
20:05 FroMaster joined #git
20:07 shinnya joined #git
20:09 rominronin joined #git
20:12 cyphase joined #git
20:14 duderonomy joined #git
20:15 shpew12 joined #git
20:15 Emperor_Earth joined #git
20:16 bongjovi joined #git
20:17 shpew12 I'm trying to set up git on an apache server, but whenever I try to pull from my local computer, it always times out with no messages of any errors. Does anyone know why this might be happening? This is the first time trying to set up this remote from the server.
20:17 antranigv hmm, say I want to ignore mylove.txt, but I did git add it before, I also can see it now in git ls-files; how to remove it? :)
20:18 _ikke_ antranigv: git rm --cached mylove.txt
20:18 _ikke_ shpew12: GIT_TRACE=1 git pull
20:19 antranigv _ikke_: thankie! :)
20:20 _ikke_ grazie
20:20 cdown joined #git
20:22 treehug88 joined #git
20:25 raijin joined #git
20:25 star_prone joined #git
20:26 bluezone joined #git
20:27 cyphase joined #git
20:27 _leb joined #git
20:28 Darren_ joined #git
20:30 skylite_ joined #git
20:31 grumble joined #git
20:31 eivarv joined #git
20:31 mloy joined #git
20:32 raijin joined #git
20:32 e14 joined #git
20:34 mloy Hi, I forked a repo on github and now the repo I forked is a commit ahead on a development branch and I need to pull that commit. How can I update my forked repo?
20:34 shpew12 Thank you _ikki_. I'm so now I'm getting an 'unable to access' message, is there some type of configuration I need to address before fetching from my computer?
20:34 mloy Oh wait, I should set it to upstream
20:41 Rodya_ joined #git
20:43 yohnnyjoe joined #git
20:46 cyphase joined #git
20:48 FuzzySockets joined #git
20:50 GavinMagnus left #git
20:51 raijin joined #git
20:53 denimsoft joined #git
20:56 greendo joined #git
20:57 anonymuse joined #git
20:58 yoh is there a gid command to discover the date of a last commit which modified for each file in a repository (efficiently, e.g. if I have a thousand files) or in current directory
20:58 z8z joined #git
20:59 e14 joined #git
21:01 shpew12 joined #git
21:01 aidalgol joined #git
21:02 kadoban yoh: git log -- the_file  would be a good start
21:02 i7c git log --pretty=%cd -1 -- path/to/file
21:02 i7c Or --pretty=%ct if you want unix time stamps
21:03 yoh that would be for 1 file... what if I have a thousand?
21:03 dsdeiz joined #git
21:03 yoh looping would be too long
21:03 kadoban Are you looking for a thousand different answers, or which commit changed any of them, or?
21:03 yoh the last commit which changed each file
21:04 cyphase joined #git
21:04 yoh pretty much -- I want to provide a view similar to github where it notes when each file (or directory by aggregation) was last changed
21:04 yoh like 'mtime', but since git doesn't record those -- would be date/time of the last commit which modified it
21:04 yoh indeed I could do it with git log per each file, or somehow traversing entire git log FILES until I find a record for each file, but both are inefficient
21:05 i7c Well
21:05 kadoban I don't think git can answer that efficiently on its own, you'd likely have to build up some db on top.
21:05 i7c either you loop over files or you loop over commits in date order and collect the information that way.
21:05 i7c And what kadoban says.
21:06 peepsalot i have a branch i've been working in, and right now i want to rebase mybranch onto master, does it matter if I already pushed a lot of changes on my branch to origin/mybranch  before this rebase?
21:06 kadoban peepsalot: It depends, is anyone else using that branch, or have a copy of it, or care about it?
21:06 yoh i7c, kadoban: ok -- just thought to check if I am not missing some obvious to experts procelain command ;)
21:07 kadoban Yep, AFAIK you're not.
21:07 i7c !rewrite
21:07 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
21:07 peepsalot kadoban, not really, it just needs to be merged back into master after this
21:08 peepsalot well, and a code review before that
21:08 peepsalot so just needs to be used for a code review
21:08 kadoban peepsalot: If it's only you it's likely okay, you'll have to do a push -f and if you have that branch on any other computers they'll have to be updated manually or whatever (don't do a pull)
21:08 terminal_echo joined #git
21:10 rominronin joined #git
21:15 Balliad joined #git
21:15 vdl joined #git
21:19 rgrinberg joined #git
21:19 l4v2 joined #git
21:20 e14 joined #git
21:23 d0nn1e joined #git
21:24 SteffanW joined #git
21:25 deadprez joined #git
21:26 elastix joined #git
21:27 elastix hi guys what does it mean that git is decentrlalized/?
21:27 DomeMasterYolo joined #git
21:27 DomeMasterYolo hello
21:27 gitinfo DomeMasterYolo: 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.
21:28 DomeMasterYolo is there anyway I can run git archive but specify the directory of the repo
21:28 nikivi joined #git
21:28 DomeMasterYolo so I don't need to cd
21:28 DomeMasterYolo first
21:28 DomeMasterYolo ty
21:29 Hink joined #git
21:29 e14 joined #git
21:31 rgrinberg joined #git
21:31 spudowiar joined #git
21:31 maroloccio joined #git
21:32 DieguezZ joined #git
21:32 e14 joined #git
21:32 joshc DomeMasterYolo: you can use git --git-dir=$path <command>
21:33 Hink joined #git
21:33 DomeMasterYolo thanks joshc
21:33 DomeMasterYolo its weird joshc why is that not in the man page?
21:33 _ikke_ man git
21:33 gitinfo the git manpage is available at http://jk.gs/git.html
21:34 _ikke_ It's in there
21:34 DomeMasterYolo hrm ok not in git archive man
21:34 DomeMasterYolo but I'll read whole one :)
21:35 mkopriva joined #git
21:35 _ikke_ DomeMasterYolo: Because it's a parameter that works for all commands
21:35 dodobrain joined #git
21:35 _ikke_ git <general_params> <subcmd> <subcmd_params>
21:36 cyphase joined #git
21:37 DomeMasterYolo ok thanks
21:37 DomeMasterYolo I'm doing: git --git-dir='./apps/device-manager/' archive master
21:37 DomeMasterYolo and its saying not a git repository
21:37 DomeMasterYolo it definitely is
21:38 denimsoft joined #git
21:38 _ikke_ DomeMasterYolo: use -C, that will do both --git-dir and --work-tree
21:39 chrisshattuck joined #git
21:39 DomeMasterYolo tried already _ikke_
21:39 DomeMasterYolo git -C "$(pwd)/apps/device-manager/" archive master
21:39 DomeMasterYolo says unknown option "-C"
21:40 _ikke_ Then your version of git is too old
21:40 DomeMasterYolo hrm
21:40 DomeMasterYolo I@ll just do it manually
21:40 DomeMasterYolo its quicker
21:40 DomeMasterYolo thanks for the help
21:41 _ikke_ introduced in 1.8.5
21:41 ansimation joined #git
21:41 _ikke_ We're at 2.10.0 now
21:44 ringer1 left #git
21:45 Ringer joined #git
21:47 ahr3n joined #git
21:48 hecliunyx joined #git
21:48 clemf joined #git
21:48 Brando753-o_O_o joined #git
21:50 Rodya_ joined #git
21:50 dsantiago joined #git
21:50 Dispatch_ joined #git
21:52 cyphase joined #git
21:52 jrozner joined #git
21:52 dsantiago joined #git
21:54 inflames joined #git
21:54 jrozner I've been working in a long living branch working on an new feature. I last rebased on master about a month ago and have finally gotten everything wrapped up. I squashed and went to rebase but in some of the files that are both modified I'm seeing only only the master version and not options to resolve. Is there a reason certain hunks wouldn't be presented as changed?
21:55 Puffball joined #git
21:56 dsantiago joined #git
21:56 _sjs joined #git
21:58 duderonomy joined #git
21:59 e14 joined #git
22:00 iokill joined #git
22:01 DomeMasterYolo joined #git
22:02 _sjs joined #git
22:03 copumpkin joined #git
22:04 copumpkin is there a straightforward way to take an arbitrary directory (even outside of a git repo) and asking git to compute the tree hash that directory would have (recursively doing all the usual work) if it were stored in a git repo?
22:04 copumpkin I can do the various parts myself, but then I need to recursively traverse the folders, pay attention to .gitignores, and other intricacies that it seems like git is probably better at than I am
22:05 Dougie187 left #git
22:05 osse copumpkin: I think the easiest way would be to yolo it by abusing --git-dir and --work-tree
22:05 copumpkin osse: hmm, how would that work?
22:05 _leb joined #git
22:05 andlabs joined #git
22:06 osse copumpkin: export GIT_DIR=$(mktempd -d); export GIT_WORK_TREE=thatdiryouwant; git init; git add .; git commit -mlolrofl; git rev-parse HEAD^{tree}
22:06 osse something like that
22:06 osse woops. mktempd -d
22:07 osse woops again. mktemp -d
22:07 endiruna joined #git
22:07 osse (copumpkin: setting GIT_WORK_TREE and GIT_DIR is the same as using --git-dir and --work-tree)
22:08 amdi_ joined #git
22:08 copumpkin oh, cute :)
22:08 copumpkin that doesn't seem too painful, I'll give it a go, thanks!
22:08 atomi joined #git
22:09 HoierM joined #git
22:09 osse copumpkin: I've found several times that if I want to do something "as if it were a git repo" it's easier to actually create a repo :P
22:10 osse you can quote me on that
22:11 copumpkin hah fair!
22:11 rominronin joined #git
22:11 Mission-Critical joined #git
22:13 jefcolbi joined #git
22:13 Gsham joined #git
22:15 paulh_ joined #git
22:15 jimi_ joined #git
22:15 jimi_ joined #git
22:17 deadprez joined #git
22:17 Noldorin joined #git
22:18 MattMaker joined #git
22:18 Ryanar joined #git
22:19 SebastianFlyte joined #git
22:20 MattMaker joined #git
22:21 Ryanar joined #git
22:23 Puffball joined #git
22:23 ojdo joined #git
22:24 tlaxkit joined #git
22:25 DomeMasterYolo joined #git
22:26 _sjs joined #git
22:26 Mobutils joined #git
22:27 sangy joined #git
22:29 EvilPeng1 joined #git
22:30 liamonade joined #git
22:30 ahf joined #git
22:31 atomi joined #git
22:37 Puffball joined #git
22:37 osse copumpkin: Sooo did it do the trick?
22:37 zacts joined #git
22:40 DieguezZ joined #git
22:42 rgrinberg joined #git
22:42 lightstalker joined #git
22:44 cyphase joined #git
22:44 Raed|Mobile joined #git
22:49 Gurkenglas joined #git
22:50 byteflame joined #git
22:50 * copumpkin osse: sorry got pulled into something more pressing but will try it soon
22:50 copumpkin hah not sure where the /me came from
22:52 NeonSynth_ joined #git
22:55 shmuli joined #git
22:57 cyphase joined #git
22:58 realz joined #git
22:59 ayjay has anyone got git-http-backend authenticating from mysql?
23:04 al-damiri joined #git
23:06 ksefchik joined #git
23:09 disi joined #git
23:09 thiago joined #git
23:10 zivester joined #git
23:12 rominronin joined #git
23:13 ksefchik joined #git
23:14 _sjs joined #git
23:17 Pulp joined #git
23:18 mrpackethead joined #git
23:19 ayjay i'm finding it funny that i just git cloned git and then uninstalled git through apt-get so that i could make install git
23:20 ayjay https://imgflip.com/i/1a5iqu
23:22 disi joined #git
23:24 govg joined #git
23:24 disi joined #git
23:26 dsdeiz joined #git
23:27 same_ol_geez joined #git
23:28 Atlantic777 joined #git
23:28 Atlantic777 joined #git
23:28 same_ol_1eez joined #git
23:28 pouet joined #git
23:29 nyuszika7h joined #git
23:32 e14 joined #git
23:33 e14 joined #git
23:33 govg joined #git
23:33 cyphase joined #git
23:34 e14 joined #git
23:36 atomi joined #git
23:36 e14 joined #git
23:36 clemf joined #git
23:37 mikecmpbll joined #git
23:39 SwiftMatt joined #git
23:39 Impaloo joined #git
23:40 ISmithers joined #git
23:41 UserOO7 joined #git
23:44 zacts joined #git
23:46 qws-user-1228 joined #git
23:48 danmackay joined #git
23:48 qws-user-1228 joined #git
23:49 MattMaker joined #git
23:49 Ryanar joined #git
23:51 qws-user-1228 joined #git
23:51 _sjs joined #git
23:51 Gsham joined #git
23:53 Ryanar_ joined #git
23:56 Impaloo joined #git
23:56 byteflame joined #git
23:58 r4z joined #git
23:58 dsdeiz joined #git
23:59 UserOO7 joined #git
23:59 tyreld joined #git

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