Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-14

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

All times shown according to UTC.

Time Nick Message
00:04 SmashingX joined #git
00:04 SmashingX there was a command that add a file and leave a comment at the same time with commit right?
00:04 madewokherd joined #git
00:06 j7k6 joined #git
00:08 zzz joined #git
00:09 matsaman there's git commit -a, which is sometimes the same as what people want
00:09 duderono_ joined #git
00:11 svm_invictvs joined #git
00:11 SmashingX matsaman: yes, thats what I wanted, thanks
00:12 texasmynsted How is this?  I 'get branch -avv' see a branch, do a git co of that branch.  Then do a git pull, and get an error
00:12 jstimm joined #git
00:12 texasmynsted Your configuration specifies to merge with the ref 'refs/heads/foo' from the remote, but no such ref was fetched.
00:13 texasmynsted but it just set it up
00:13 lauren left #git
00:14 GavinMagnus joined #git
00:16 Somelauw left #git
00:16 gugah joined #git
00:17 mozzarella joined #git
00:20 jfr joined #git
00:20 chipotle joined #git
00:21 MrC joined #git
00:22 Levex joined #git
00:26 invisbl_ joined #git
00:26 durham joined #git
00:27 Darren_ joined #git
00:27 bocaneri joined #git
00:27 sucks joined #git
00:28 j7k6 joined #git
00:29 matoro joined #git
00:30 mischat joined #git
00:31 Levex joined #git
00:34 levex_ joined #git
00:34 xlegoman joined #git
00:39 zzz_ joined #git
00:41 mischat joined #git
00:41 Levex joined #git
00:43 Tobbi joined #git
00:44 Groovin joined #git
00:45 heroux joined #git
00:47 durham joined #git
00:50 mikecmpbll joined #git
00:52 Levex joined #git
00:52 pur3eval joined #git
00:57 dsantiago joined #git
00:59 safe joined #git
01:00 e01 joined #git
01:00 e01 joined #git
01:03 ToBeCloud joined #git
01:04 Groovin joined #git
01:06 Darren_ joined #git
01:06 peeps[lappy] joined #git
01:08 inovas joined #git
01:09 kyan joined #git
01:09 spacemud joined #git
01:09 BSab joined #git
01:11 nickabbey joined #git
01:12 deepak___ joined #git
01:13 invisbl joined #git
01:13 ecuanaso joined #git
01:16 gopar joined #git
01:16 eblip joined #git
01:17 Taikibansei joined #git
01:18 dsantiago joined #git
01:18 askb joined #git
01:19 LeBlaaanc joined #git
01:19 sagerdearia joined #git
01:20 clemf joined #git
01:23 lhx joined #git
01:24 lhx Branching strategy question: I just converted several submodules into one mono-repo. Trying to decide on branching strategy. I'd like to be able to see dev history for each project... would a long-lived branch for each project that only merges with --no-ff be the way to go? Thoughts? How do other monorepos do their branches? Google was pretty silent.
01:29 GarethAdams joined #git
01:31 arescorpio joined #git
01:33 miczac joined #git
01:34 dsantiago joined #git
01:35 GavinMagnus left #git
01:38 leeN joined #git
01:39 jameser joined #git
01:40 cqi joined #git
01:43 om_henners joined #git
01:43 mischat joined #git
01:44 nathan__ joined #git
01:45 matsaman joined #git
01:46 ecuanaso joined #git
01:48 Sasazuka joined #git
01:49 jameser joined #git
01:49 duderonomy joined #git
01:50 raspado joined #git
01:53 pur3eval joined #git
01:54 Gsham joined #git
01:54 DolpheenDream joined #git
01:54 kst123 joined #git
01:59 Darren_ joined #git
02:06 j7k6 joined #git
02:11 ratdeptrai lhx: I'm no expert and maybe I don't understand exactly what you mean, but if the projects are in discrete subdirectories, "git log <subdir-name>" will show just the commits on files in that directory (and subtree), even if you mix commits to different projects on the same branch.
02:12 ratdeptrai Otherwise, seems like a pain to maintain separate branch for each subproject. If the projects are discrete sets of files, and you also want to do a separate branch for each project, I wonder what is gained by having them in the same repo?
02:12 nickabbey joined #git
02:14 bejeb joined #git
02:16 Nilesh_ joined #git
02:16 Vampire0_ joined #git
02:17 raspado joined #git
02:17 finalbeta joined #git
02:17 pks joined #git
02:18 LiftLeft joined #git
02:20 nettoweb joined #git
02:21 durham_ joined #git
02:22 glspi joined #git
02:22 cdg joined #git
02:23 sagerdearia joined #git
02:24 skinkitten_ joined #git
02:24 skinkitten joined #git
02:27 dcy joined #git
02:28 YottaByte joined #git
02:28 YottaByte can someone explain to me what origin/my_branch is, from my understanding it's a read-only representation of the remote branch, but what is that remote branch? is origin known as a remote?
02:28 lhx ratdeptrai: didn't know log could do that that easily
02:28 lhx ratdeptrai: bout to try that out. You're a godsend
02:29 j7k6 joined #git
02:29 duderono_ joined #git
02:30 lhx ratdeptrai: hell yeah... now I can do my typical feature branches off of master workflow... thanks!
02:31 berndj is there a way to sneakily re-edit staged changes without having to edit the working file? i've accidentally let some trailing whitespace sneak into a staged commit and would prefer to stalin it out of history
02:33 DINOWILLIAM joined #git
02:37 DINOWILLIAM left #git
02:38 LiftLeft joined #git
02:38 rewt YottaByte, origin is the remote (another copy of the repo you're in); origin/branch is the branch on the remote (at the time of your last fetch)
02:38 DINOWILLIAM joined #git
02:38 Vampire0 YottaByte, exactly
02:38 DINOWILLIAM left #git
02:39 YottaByte what does git fetch do? update all remotes?
02:39 DIDAVISION joined #git
02:39 rewt it fetches all commits from the remote that you don't already have
02:39 rewt and branches/tags
02:39 Vampire0 berndj, like `git reset -p`?
02:39 dcy berndj, what do you mean by "staged commit"? If you haven't committed the changes, just edit the file, and stage the file again
02:40 YottaByte so can I do git checkout origin/branch? I imagine I wouldn't be able to stage anything there because it's read-only?
02:40 Vampire0 dcy, is that questionable?
02:40 rewt YottaByte, you can, but then that would probably get you a detached HEAD
02:40 YottaByte what is that?
02:41 berndj dcy, i've git add -p'ed them, but not committed. but in my optimism i already made a subsequent set of edits that move the icky whitespace-containing code around, so i'd have to undo all those edits just to edit the whitespace right
02:41 Vampire0 rewt, YottaByte fetch only gets tags in the history of branches you also fetch. If you want all tags you need to tell it
02:41 gopar joined #git
02:41 rewt meaning that any commits you commit will still go in, but unless you create a branch or tag, you'll basically lose them if you switch to another branch
02:41 Vampire0 berndj, I already told you
02:42 berndj Vampire0, yeah, i'm reading the man page now, never knew reset had that option
02:46 rewt (you can still get to them by the hash, but git cleans up every so often, so eventually that will fail too)
02:46 Vampire0 YottaByte, !zomb
02:46 gitinfo YottaByte: [!zombie] Brainzz! More brainzzzz!  For information about detached heads, see !detached
02:46 YottaByte !detached
02:46 gitinfo A detached HEAD (aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
02:46 Vampire0 berndj, it is the same as `git add -p`, just with resetting, presenting you all staged hunks, letting you unstage or edit them individually
02:46 brent__ joined #git
02:46 mischat joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and a bag of wheeee | 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 | Are you even reading this? Prove it by submitting to https://madeitwor.se/git-jokes
02:49 mizu_no_oto joined #git
02:54 pur3eval joined #git
02:54 d^sh joined #git
02:54 ecuanaso joined #git
02:56 dsantiago joined #git
02:56 Vampire0 berndj, yep, changes quite often, I also learn something new each day. :-D
02:57 Vampire0 ok, maybe not each day
02:58 a3Dman joined #git
02:58 dave0x6d joined #git
03:00 reznord I'm sorry for asking here again, anyone used github api here? I tried asking the same question in #github, but there is no response at all
03:00 reznord Anyone here used github api to fetch some details ?
03:01 nutron joined #git
03:02 Vampire0 yes
03:02 ojdo joined #git
03:02 durham joined #git
03:04 ecuanaso joined #git
03:05 leah2 joined #git
03:05 Oatmeal joined #git
03:06 Vampire0 reznord, yes
03:07 reznord Vampire0: so, i am trying to use axios to make API calls, but it is giving me an error with 404 not found. Don't know where I am going wrong
03:07 Vampire0 I don't know what axios is, but what is your URL?
03:08 reznord Vampire0: api.github.com/users/reznord
03:09 Vampire0 add what you want
03:10 peterR`` joined #git
03:10 Vampire0 reznord, api.github.com/users/reznord/repos
03:10 d1z joined #git
03:12 om_henners joined #git
03:13 jimklo_ joined #git
03:13 jimi_ joined #git
03:17 Vortex34 joined #git
03:19 Gsham joined #git
03:20 zzz joined #git
03:21 LiftLeft joined #git
03:24 hexagoxel joined #git
03:24 fstd_ joined #git
03:24 cedrix joined #git
03:25 shgysk8zer0_ joined #git
03:25 rchavik joined #git
03:28 chachasmooth joined #git
03:30 Goplat joined #git
03:31 j7k6 joined #git
03:31 ecuanaso joined #git
03:33 cdown joined #git
03:34 mizu_no_oto joined #git
03:34 duderonomy joined #git
03:35 durham joined #git
03:35 ozmage joined #git
03:36 styx_ joined #git
03:37 serialoverflow joined #git
03:42 gelei007 joined #git
03:42 nckpz_ joined #git
03:46 menip joined #git
03:46 mischat joined #git
03:50 Emperor_Earth joined #git
03:51 kasual joined #git
03:54 pur3eval joined #git
04:01 Vampire0_ joined #git
04:02 sunri5e joined #git
04:03 DINOWILLIAM joined #git
04:03 DIDAVISION joined #git
04:07 j7k6 joined #git
04:12 sbulage joined #git
04:17 Guest55 joined #git
04:21 sagerdearia joined #git
04:22 czar_x joined #git
04:26 czar_x joined #git
04:27 mehola joined #git
04:27 ayogi joined #git
04:29 bruce_lee joined #git
04:33 Cabanoss- joined #git
04:33 Darren_ joined #git
04:39 diogenese joined #git
04:40 t-mart joined #git
04:40 venmx joined #git
04:41 clemf joined #git
04:42 danimal2 joined #git
04:46 endiruna1 joined #git
04:48 mischat joined #git
04:51 Taikibansei joined #git
04:52 raspado joined #git
04:55 pur3eval joined #git
04:56 menip joined #git
04:56 cdown joined #git
04:57 NimeshNeema joined #git
04:58 ankit_tyagi joined #git
05:02 t-mart joined #git
05:02 shgysk8zer0_ joined #git
05:03 daynaskully joined #git
05:06 xall joined #git
05:09 SlizardWizard joined #git
05:09 SlizardWizard is there a way to temporarily revert commits, i broke some part of my code and i have no  clue how long ago it was. I just can't figure out how it broke.
05:09 SlizardWizard i did google it but every answer says something different, from git reset HEAD, to git checkout, git revert,
05:10 lhx SlizardWizard: go read about git blame
05:10 rivarun joined #git
05:11 JanC_ joined #git
05:11 lhx SlizardWizard: https://git-scm.com/book/en/v2/Git-Tools-Debugging-with-Git
05:12 SlizardWizard i think that name is very appropiate
05:12 lhx SlizardWizard: and git bisect
05:12 lhx :)
05:12 clemf joined #git
05:13 SlizardWizard i think bisect is more what i need to use though, because i swear this code was working on friday
05:13 lhx git reset is going to 'detach' a bunch of commits, and unless you know what you're doing, they're hard to get back
05:13 lhx then just checkout an earlier commit and see if that's working
05:13 reznord left #git
05:14 lhx do a `git log --oneline --graph --decorate` to find the commits
05:14 SlizardWizard yeah that is what i thought, i have used it before to revert commis
05:14 lhx then a `git checkout WXYZ`
05:14 lhx once you find the last good commit, you can decide what you want to do and come back in here and ask us
05:15 SlizardWizard okay makes sense
05:15 lhx reset is going to get rid of the descendants from that commit, which may not be what you want
05:15 SlizardWizard yep on friday it did work
05:15 Andrew_K joined #git
05:16 lhx then move forward in your commits until you get to the earliest non wokring commit
05:16 SlizardWizard yeah thats what i am doing
05:16 lhx and then you can do a git diff between the good and the bad
05:17 l4v2 joined #git
05:22 hexagoxel joined #git
05:24 lhx SlizardWizard: http://stackoverflow.com/questions/3528245/whats-the-difference-between-git-reset-mixed-soft-and-hard for when you find and want to decide how to do your reset
05:28 Murrito joined #git
05:32 j7k6 joined #git
05:32 SlizardWizard thanks for the help, not going to reset it, i found the problem
05:32 lhx reset might still be what you want depending on how extensive the fix
05:34 SlizardWizard nah its a pretty easy fix, just need to change one line from "$this->contactID = $ids['ContactID'];
05:34 SlizardWizard to $this->contactID = $ids['Contact']['ContactID'];
05:34 lhx k
05:35 lhx nn all ZZzzZZzz
05:36 SlizardWizard i forgot to change to change the primary key return to match the new format i changed it to
05:36 invisbl joined #git
05:39 d1z joined #git
05:40 jimklo joined #git
05:49 mischat joined #git
05:50 Groovin joined #git
05:52 cyberz joined #git
05:56 pur3eval joined #git
05:56 dcy joined #git
05:58 Derperpe1 joined #git
06:00 gelei007 joined #git
06:00 ozmage joined #git
06:02 dvdchr joined #git
06:03 mohabaks joined #git
06:05 howdoi joined #git
06:07 rajat_ joined #git
06:08 j7k6 joined #git
06:09 thiago joined #git
06:09 rivarun joined #git
06:12 rscata joined #git
06:13 nickabbey joined #git
06:14 dec0n joined #git
06:14 govg joined #git
06:14 basiclaser joined #git
06:16 overlord_tm joined #git
06:26 mohabaks joined #git
06:26 tchan joined #git
06:27 patarr joined #git
06:31 HurricaneHarry joined #git
06:31 dersand joined #git
06:32 bakibour joined #git
06:33 bakibour left #git
06:33 bourbaki joined #git
06:34 bourbaki Hidiho, can i get the filenames commited in the pre-commit hook?
06:34 Raging_Hog joined #git
06:35 Perspicaciosity joined #git
06:35 preaction like, do you want the args to "git commit"? or do you want to know what's staged via "git status"?
06:37 bourbaki I thought that i get it as a prarameter, just read though that i need to call git in the script again, correct?
06:37 bourbaki http://stackoverflow.com/questions/2412450/git-pre-commit-hook-changed-added-files
06:38 preaction you probably have to call git again, yes. some hooks get input on stdin though
06:38 bourbaki What is the working directory?
06:39 bourbaki Is it based on the root or the commit hooks directory?
06:39 xall joined #git
06:39 preaction my guess it would be the pwd, the directory they're running the git commit command from
06:40 preaction but that sounds like something you could easily figure out with a hook that was just: `echo $(pwd)`
06:40 bourbaki Right
06:40 bourbaki Is there any good way to get the full path of the filename then?
06:40 venmx joined #git
06:41 preaction git status --porcelain will have the full relative path of the filename
06:41 zeroed joined #git
06:41 zeroed joined #git
06:41 bourbaki Ah :)
06:41 bourbaki Thanks
06:42 bourbaki Er well, yeah but then i need to get to the root again, which i do not necessarily know.
06:42 preaction i said relative path
06:42 bourbaki Yes
06:42 preaction relative to what?
06:42 bourbaki Relative to the root
06:42 preaction no
06:42 bourbaki of the repo
06:42 preaction relative to the current directory
06:42 freimatz joined #git
06:42 bourbaki ❯ git status --porcelain MM GUI/App.xaml.cs
06:42 bourbaki And i have been in a subfolder of my repo
06:43 preaction huh. did not know porcelain did that...
06:45 bourbaki git rev-parse --show-cdup
06:45 bourbaki Will give me the relative path to the root :)
06:48 BlessJah n/r
06:50 SWAT joined #git
06:51 mischat joined #git
06:52 waveclaw joined #git
06:52 mischat joined #git
06:53 ThomasLocke joined #git
06:53 ThomasLocke joined #git
06:54 netj joined #git
06:54 oskarkv joined #git
06:55 dreiss joined #git
06:57 pur3eval joined #git
07:02 Vampire0 joined #git
07:02 j7k6 joined #git
07:02 lordjancso joined #git
07:03 armyriad joined #git
07:05 cyphase joined #git
07:09 Jan- left #git
07:09 oskarkv joined #git
07:09 KekSi joined #git
07:10 sarri joined #git
07:11 sarri joined #git
07:14 chele joined #git
07:16 ihradek joined #git
07:16 jimklo joined #git
07:22 j7k6 joined #git
07:23 sbulage joined #git
07:26 mohabaks joined #git
07:27 ToxicFrog joined #git
07:30 j7k6 joined #git
07:36 sgen joined #git
07:36 Gloomy joined #git
07:36 jnavila joined #git
07:38 MineCoins joined #git
07:38 acetakwas joined #git
07:45 JeroenT joined #git
07:47 jnavila_ joined #git
07:49 Silenced joined #git
07:50 Silenced joined #git
07:52 lowellcayce joined #git
07:54 lowercaseman joined #git
07:54 cqi joined #git
07:57 pur3eval joined #git
07:58 GodGinrai joined #git
08:01 ToxicFrog joined #git
08:03 jimsio joined #git
08:03 ronskisika joined #git
08:04 mischat joined #git
08:04 qt-x joined #git
08:05 ronskisika joined #git
08:06 Wulf joined #git
08:06 jagob joined #git
08:08 venmx joined #git
08:08 lowercaseman joined #git
08:13 Random832 joined #git
08:15 nickabbey joined #git
08:16 ToxicFrog joined #git
08:18 blahdodo joined #git
08:20 dc5ala joined #git
08:25 ngm joined #git
08:25 ThiefMaster left #git
08:26 ThiefMaster joined #git
08:27 mohabaks joined #git
08:28 patarr joined #git
08:31 ToxicFrog joined #git
08:34 xbob joined #git
08:35 staafl_ joined #git
08:42 aard_ joined #git
08:43 Balliad joined #git
08:44 djb-irc joined #git
08:46 coco joined #git
08:52 matt___ joined #git
08:54 ferr1 joined #git
08:56 infernix joined #git
08:56 borkr joined #git
08:58 pur3eval joined #git
08:58 afuentes joined #git
09:00 mikecmpbll joined #git
09:00 Snugglebash joined #git
09:02 Whiskey I try to make a hook before the commit is accepted but i don´t get it to work as i like
09:02 blahdodo joined #git
09:02 Whiskey As it don´t show anything espect from say that it exited abnormally
09:03 moritz !hook
09:03 gitinfo [!hook_pitfalls] Guidelines for writing hooks: 1. Consume all input (cat >/dev/null if you don't want it). 2. If you use any 'cd', also 'unset GIT_DIR'. 3. Don't git-pull in a hook (or any other script).
09:03 cfwnob joined #git
09:03 dcpc007 joined #git
09:04 djb-irc joined #git
09:04 Whiskey this is what i try http://ideone.com/tWL1uB
09:05 _ikke_ Are you checking the arguments?
09:05 Whiskey yeh
09:06 osse Whiskey: after the puts does it implicitly return 1 ?
09:06 Raging_Hog joined #git
09:06 Whiskey it don´t return anything
09:06 Whiskey as i don´t see any of the put massages
09:06 _ikke_ Is this meant as a pre-commit hook?
09:07 osse what is the name of the hook? where is it?
09:13 bongjovi joined #git
09:13 xall joined #git
09:14 marcogmonteiro joined #git
09:14 Whiskey pre-commit
09:15 Whiskey no pre-commit-msg
09:15 Whiskey its supose to check if massage correct or not
09:16 _ikke_ Note that it does not get the commit message as arguments
09:16 _ikke_ Whiskey: did you make the file executable?
09:16 Whiskey yes
09:16 Whiskey how do it get the commit massage and how to check it if not arguments
09:17 Dumblez0r joined #git
09:17 mohabaks joined #git
09:18 mikecmpbll joined #git
09:18 osse read standard input
09:19 osse actually... it should be named commit-msg, and the first argument is the name of the file that holds the message
09:20 _ikke_ pre-commit is run before the commit message is known
09:20 osse you should read man githooks again'
09:20 gitinfo the githooks manpage is available at http://jk.gs/githooks.html
09:20 vuoto joined #git
09:20 _ikke_ pre-commit-msg too
09:20 osse _ikke_: that doesn't exist :P
09:21 _ikke_ s/pre/prepare/
09:21 _ikke_ Better?
09:21 osse \o/
09:21 _ikke_ Whiskey: You want the commit-msg hook
09:22 _ikke_ "This hook is invoked by git commit, and can be bypassed with the --no-verify option. It takes a single parameter, the name of the file that holds the proposed commit log message. Exiting with a non-zero status causes the git commit to abort. "
09:22 flaviodesousa joined #git
09:22 Whiskey yes i have that
09:22 Whiskey i just don´t know how to get the actully commit
09:23 osse read the file whose name is in $argv
09:23 _ikke_ That file contains the commit message
09:23 Whiskey i have argv
09:24 Whiskey but it still don´t get it
09:24 _ikke_ argv is a filename, not the commit message
09:24 Whiskey no its a variable
09:24 osse the contents of it is a filename
09:25 _ikke_ And it's list, not a scalar
09:25 Whiskey well it show no output
09:25 Whiskey i give up i come no where whit this crap
09:25 osse are you reading what we're writing?
09:25 Whiskey yes
09:26 osse then read the file whose name is in $argv
09:26 Whiskey puts $argv is empty
09:26 _ikke_ Is the script named commit-msg, placed in .git/hooks, and executable?
09:26 osse what is the name of them hook ?
09:26 Whiskey its named commit-msg
09:27 Whiskey anc its executable
09:27 _ikke_ .
09:27 Whiskey yes what do you need to know?
09:27 _ikke_ does .git/hooks/commit-msg <filename> do something?
09:29 Whiskey what?
09:29 Whiskey what the hell is <filename>
09:29 _ikke_ Replace it with the path of a file which contains a test commit message
09:30 Whiskey so
09:30 Whiskey commit-msg "string"
09:30 _ikke_ Not the commit message itself, a path
09:30 venmx joined #git
09:31 _ikke_ echo "Test message" >commit-message; .git/hooks/commit-msg commit-message
09:31 nettoweb joined #git
09:31 polyrob joined #git
09:32 Whiskey i don´t fallow
09:32 Whiskey where do i execute that, it the hook folder?
09:32 _ikke_ In the root of your project
09:32 Whiskey or it .git path
09:32 Whiskey ok
09:32 Whiskey works
09:33 osse can you show us
09:33 gelei007 joined #git
09:33 osse !transcript
09:33 gitinfo Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
09:34 lss8 joined #git
09:34 Whiskey http://codepad.org/ocfduUnm
09:35 osse hooray
09:35 Whiskey but it still don´t show it when i try to commit
09:36 Whiskey Actully it did strange
09:37 Anticom joined #git
09:38 noteness joined #git
09:38 mischat joined #git
09:38 Whiskey this not working
09:39 osse hooray
09:39 osse !transcript
09:39 gitinfo Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
09:39 Whiskey ffs
09:39 Whiskey check
09:39 Whiskey http://codepad.org/ocfduUnm
09:39 t0by joined #git
09:39 t0by joined #git
09:40 Whiskey else it just say its nothing to check in when i try to commit new changes
09:40 osse I've seen that
09:40 osse I want to see what happens when you try to commit somethign
09:40 osse you can use commit --amend
09:41 sostenuto joined #git
09:41 raatiniemi joined #git
09:41 Whiskey i don´t know what it does and i hate this damn software!
09:41 osse to test your hook you need to commit. to commit you need to actually make a change. or you can use commit --amend to recreate the current commit
09:41 Whiskey but i don´t care
09:42 _ikke_ ..
09:42 Whiskey it don´t read my changes to the source
09:42 osse commit -a then
09:42 _ikke_ If you don't care, are we supposed to care then either?
09:42 Whiskey iii sorry
09:43 Whiskey idiot try to work in right folder :D
09:43 jave joined #git
09:43 Whiskey anyways the hook not executed
09:43 Whiskey its just commited
09:44 _ikke_ Whiskey: And no output at all?
09:44 Whiskey i get the massage
09:44 Whiskey but it not read the argv
09:44 Whiskey if {[regexp -nocase {^(Added|Changed|Deleted|Fixed|Improved): ((?:[a-z]+ )*[a-z]+)} $argv]} { that one passes
09:46 masuberu joined #git
09:46 _ikke_ Whiskey: Because it's a filename
09:46 _ikke_ it's *not* the commit message
09:48 osse this still?
09:48 _ikke_ And take into account that commit messages can be multiline
09:49 theoceaniscool joined #git
09:49 skunkz joined #git
09:49 Whiskey so how do i read the massage how many times have i ask that?
09:50 osse read the file!!!!
09:50 _ikke_ I don't know tcl
09:50 ffabi joined #git
09:50 achadwick joined #git
09:50 vivuroy joined #git
09:50 _ikke_ How do you read files in tcl?
09:50 Whiskey ooo
09:50 Whiskey read
09:51 osse http://wiki.tcl.tk/367
09:51 Whiskey https://tcl.tk/man/tcl8.6/TclCmd/read.htm
09:51 Whiskey does the file only contain the massage?
09:51 _ikke_ Whiskey: http://sprunge.us/bKHD
09:51 _ikke_ This works
09:51 _ikke_ (in sh)
09:53 osse try it and see
09:53 Whiskey yeh cat open the file i guss
09:54 _ikke_ http://wiki.tcl.tk/367
09:54 ElGrandeAmigo joined #git
09:54 Whiskey Massage: tes
09:54 Whiskey i got it out
09:55 miczac\away joined #git
09:55 chll_ joined #git
09:56 _ikke_ osse: ah, you already provided that page
09:56 skunkz joined #git
09:56 Whiskey still don´t show it do
09:57 Whiskey but i can see the massage in the that i commited
09:57 osse you have to read the message into a variable and to the regex on that variable
09:58 Whiskey i have do that
09:58 skunkz joined #git
09:58 Whiskey http://codepad.org/nSdz5JGX
09:58 ffabi joined #git
09:58 GodGinrai joined #git
09:59 pur3eval joined #git
10:00 invisbl joined #git
10:00 Whiskey Hmmm somethig not corrrect
10:01 _ikke_ Whiskey: You need to exit 1 when it's wrong, not when it's correct
10:01 Whiskey yeh
10:02 Whiskey but it don´t matter, think i found the problem
10:04 Whiskey :D
10:04 nettoweb joined #git
10:06 gxk joined #git
10:06 Whiskey Hmm strange
10:06 dsdeiz joined #git
10:06 warthog9 joined #git
10:07 gxk is there way to move/copy remote data into separate directory? trying to save time of additional clone.
10:07 Whiskey it complain on everything
10:08 BSAlb joined #git
10:08 _ikke_ Check your expression then
10:09 ffabi joined #git
10:11 Whiskey Thanks alot for your help all
10:11 Whiskey I still not works, but i know what it is :)
10:12 alexandre9099 joined #git
10:12 AG joined #git
10:13 zefferno joined #git
10:20 Masber_080 joined #git
10:22 d0hboy joined #git
10:24 King_Hual joined #git
10:24 ffabi joined #git
10:25 CheckDavid joined #git
10:29 patarr joined #git
10:30 austin987 joined #git
10:32 nedbat i have two remotes, origin and nedbat. When I do "git checkout master", it puts me on nedbat/master.  How do I get onto origin/master?
10:33 nedbat "git checkout origin/master" puts me in detached head.  I can edit .git/config myself to update the remote for the master branch, but is there a way to do this from the command line?
10:33 Gloomy joined #git
10:34 tobiasvl nedbat: "git checkout master" doesn't put you on nedbat/master – it puts you on master, which tracks nedbat/master
10:34 nedbat tobiasvl: ok, how do i change what master is tracking?
10:35 tobiasvl nedbat: git branch master -u nedbat/master
10:35 tobiasvl sorry
10:35 nedbat tobiasvl: thanks!
10:35 tobiasvl git branch master -u origin/master
10:35 tobiasvl is what you wanted
10:35 nedbat it worked, yes, i used origin.
10:36 ffabi joined #git
10:36 dsdeiz joined #git
10:36 dsdeiz joined #git
10:36 Whiskey strange
10:37 tvw joined #git
10:37 Whiskey it won´t accept it commit hook
10:38 nribec joined #git
10:43 mohabaks joined #git
10:43 Gloomy joined #git
10:44 Whiskey What the hell is wrong whit git commits
10:45 Whiskey Of some reason its whitespace in there
10:45 Whiskey How do you check if it any whitespaces in it whitout removeing them :D
10:45 _ikke_ tcl question
10:46 _ikke_ A git commit message is not limited to just a single line
10:46 _ikke_ So your hook needs to account for that
10:46 Whiskey what do you mean?
10:46 _ikke_ A commit message is multiline
10:47 Whiskey Massage: Test message <-- test only show one line in my test
10:47 _ikke_ Sure, but what happens if someone commits "Message: test message
10:47 _ikke_ Sure, but what happens if someone commits "Message: test message\n\nThis is some text explaining why I did implement this specific change"
10:48 Whiskey thats not the quiestion now ight?
10:48 _ikke_ well, those enters in there are whitespace
10:48 Whiskey yes but its not in my test case and it still fail
10:48 _ikke_ Where do you see whitespace
10:48 Whiskey I don´t see any thats the problem
10:49 Whiskey i put out whats in argv and it shows only what i write in the commit
10:49 Whiskey and even if its correct it fail
10:49 mischat_ joined #git
10:49 inflames joined #git
10:49 YuGiOhJCJ joined #git
10:49 _ikke_ did you test the regular expression?
10:50 jfr joined #git
10:50 Whiskey yes
10:50 Whiskey its correct
10:50 Whiskey http://ideone.com/tWL1uB
10:51 Whiskey https://gist.github.com/antonstarlid/badf542ed4c716c6d6ce8fa1e127d63a
10:51 _ikke_ Even if you put enters in the message for example
10:51 _ikke_ ?
10:51 pur3eval joined #git
10:51 ozmage joined #git
10:52 _ikke_ https://ideone.com/d8689s
10:53 _ikke_ I only added the \n in line 1
10:54 Whiskey well that maybe accept other shit
10:54 _ikke_ Having multine commit messages is very normal
10:54 rnsanchez joined #git
10:54 Whiskey that works
10:54 _ikke_ You cannot restrict them to just one line without returns
10:54 _ikke_ multiline*
10:55 Whiskey well as long i don´t do a multiline there should not be any
10:55 Whiskey thats why i think it strange
10:55 Whiskey damit
10:55 Whiskey echo "Added: test test " >commit-message; .git/hooks/commit-msg commit-message <---- you see any multiline there?
10:55 _ikke_ Whiskey: yes
10:55 Whiskey even that it need \n in the end to accept the hook
10:55 Whiskey where?
10:55 _ikke_ echo adds a \n
10:55 osse you should probably split $massage on newlines and only consider the first line
10:56 Whiskey how should i know that :/
10:57 _ikke_ Whiskey: I would use osse's approach
10:57 _ikke_ Just concentrate on the first line
10:57 Whiskey yeh
10:58 _ikke_ Whiskey: try printf hello world vs echo hello world, and you see that echo adds a new line
10:58 Whiskey :D
10:58 _ikke_ printf "hello world"
10:58 Whiskey well the commit does it from git also then
10:58 _ikke_ yes
10:59 _ikke_ Whiskey: try git commit without -m, and you'll see
11:00 Whiskey lets see if this work
11:02 pihpah joined #git
11:02 Whiskey so better control it whit
11:02 Whiskey ^(?:Added|Changed|Deleted|Fixed|Improved):
11:02 Whiskey and allow user do whatever them like after that
11:03 overlord_tm joined #git
11:03 _ikke_ Right
11:03 pihpah I would like to run a script after git pull, what git hook suits that?
11:03 osse post-merge
11:04 pihpah Thanks
11:04 mischat joined #git
11:04 Whiskey well atlest that works
11:06 jameser joined #git
11:07 dviola joined #git
11:13 Whiskey _ikke_: can´t you do \n in the commit massage?
11:13 Whiskey or does it need to be outside it
11:13 Whiskey "mycommit" \n\n "this is my explain of what i have done" ?
11:14 adamru joined #git
11:14 Whiskey what i see is no way to do new lines :D
11:15 adamru joined #git
11:15 Snugglebash joined #git
11:16 _ikke_ Whiskey: Leave out -m (with the message), and you'll get an editor, where you can add as much enters as you like
11:17 osse you can also press enter inside the quotes
11:18 theoceaniscool joined #git
11:18 _ikke_ right
11:18 Snugglebash joined #git
11:18 jast you can write all your code using cat and shell redirection, too
11:18 pihpah Can I run a custom script after I clone/pull from a repository? I would like to run an installation script, to be precise I would like to copy files from the repo to different locations, after repository was cloned or I pulled from that repostitory. Git hooks seem to be per-repository basis so I have to install my hooks by hands.
11:19 Whiskey :D
11:19 aax joined #git
11:20 jast pihpah: exactly, hooks and the like are never installed automatically for security reasons. put your script in a well-known location inside the repo and run it manually.
11:21 pihpah jast: hmm, that's an idea. I just wanted some magic and not doing installation manually.)
11:21 Whiskey :D
11:21 pihpah Okay
11:21 jast you'll have to do it manually once, after that if your script is invasive and evil enough it can take care of all subsequent pulls ;)
11:21 aax joined #git
11:22 pihpah So be it.
11:26 patarr joined #git
11:26 mohabaks joined #git
11:28 mischat_ joined #git
11:28 pR0Ps joined #git
11:28 sbulage joined #git
11:31 tomaw joined #git
11:31 venmx joined #git
11:31 garethdaine joined #git
11:39 marcogmonteiro joined #git
11:39 redeemed joined #git
11:42 ozmage joined #git
11:44 czar_x joined #git
11:45 cousteau joined #git
11:45 blahdodo joined #git
11:46 cousteau I removed a bunch of text from a file into another file, and `git add`ed that file.  Now `git commit` says that the original file was both renamed and modified.  Is that normal?
11:46 osse cousteau: if you removed over 50% yes
11:47 osse it makes no difference
11:47 cousteau ok, and will I have trouble with the file being simultaneously "renamed" and "modified"?  Will the commit be reversible?
11:47 _ADN_ joined #git
11:47 gugah joined #git
11:48 g105b joined #git
11:48 osse by "it makes no difference" I really mean it. it doesn't matter what git status says
11:48 suttonwilliamd joined #git
11:48 cousteau ok, thanks :)  (I just wanted to be sure, sorry for the insistence)
11:49 ozmage_ joined #git
11:53 ertesx joined #git
11:54 kent\n joined #git
11:55 scoobertron joined #git
11:58 eb0t joined #git
11:59 GodGinrai joined #git
12:00 muldover joined #git
12:04 muldover joined #git
12:06 jameser joined #git
12:06 borkr joined #git
12:06 bongjovi joined #git
12:08 mischat joined #git
12:11 pur3eval joined #git
12:11 garethdaine joined #git
12:12 nowhereman joined #git
12:13 Guest17683 left #git
12:15 nowhere_man joined #git
12:16 nickabbey joined #git
12:16 a3Dman joined #git
12:16 a3Dman joined #git
12:16 DolpheenDream joined #git
12:18 pks joined #git
12:19 mohabaks joined #git
12:19 j7k6_ joined #git
12:25 Tobbi joined #git
12:27 ij joined #git
12:28 Macaveli joined #git
12:29 a3Dman joined #git
12:31 Snugglebash joined #git
12:31 _ikke_ cousteau: note that rename detection is harder when the files is both renamed and modified in the same commit
12:33 venmx joined #git
12:38 pwndave joined #git
12:38 Cork joined #git
12:39 mohabaks joined #git
12:39 mizu_no_oto joined #git
12:41 adamru joined #git
12:45 Jackneill_ joined #git
12:45 Revya joined #git
12:46 Revya Hello.
12:46 gitinfo Revya: 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.
12:47 chipotle joined #git
12:47 Revya so, I'm new to git. I mistakenly do git init on the home directory. does rm -rf .git clean this mistake completely?
12:47 osse es
12:47 osse y
12:48 dcpc007 yes
12:48 finalbeta joined #git
12:48 j416 Revya: that'll remove the entre repository, yes
12:48 j416 entire, even
12:48 osse pro tip: mkdir testdir; cd testdir; git init; ls -a
12:49 j416 such professional
12:50 ozmage joined #git
12:50 Revya .gitconfig on the home folder is not part of this, right?
12:51 j416 Revya: correct.
12:51 osse follow my pro top!
12:51 osse tip
12:51 Revya ok. Thanks!
12:54 Revya left #git
12:56 synthroid joined #git
12:58 mohabaks joined #git
13:04 ChiLL_SurF joined #git
13:04 xbob joined #git
13:06 mgedmin why did my git suddenly forget how to 'git checkout -'?
13:06 ij left #git
13:06 mgedmin oh
13:06 jameser joined #git
13:06 mgedmin because I accidentally rm'ed the branch that was previously checked out
13:07 mgedmin the error message is very misleading (error: pathspec '-' did not match any file(s) known to git.) instead of something like "branch FOO does not exist any more"
13:08 ocbtec joined #git
13:09 jimi_ joined #git
13:09 BackEndCoder joined #git
13:12 RahulAN joined #git
13:12 RahulAN Hi all
13:12 RahulAN is there any way to get the c function in git diff
13:12 RahulAN on diff between 2 C files ?
13:14 garethdaine joined #git
13:16 Arban joined #git
13:16 murphy_besac joined #git
13:16 JeroenT joined #git
13:19 jast mgedmin: that's because 'git checkout' accepts either a commit reference or a path
13:19 jast (or both, but that's not the tricky case :))
13:20 str joined #git
13:21 l4v2 joined #git
13:22 vivuroy joined #git
13:23 mgedmin RahulAN: are you looking for git diff -W ?
13:26 cdown joined #git
13:29 nettoweb joined #git
13:29 GodGinrai joined #git
13:32 murphy_besac left #git
13:32 b100s joined #git
13:32 byte512 joined #git
13:32 b100s are there answer to question: shoul i never commit to master? : )
13:33 Ryanar joined #git
13:34 venmx joined #git
13:34 MineCoins joined #git
13:34 Derperpe1 joined #git
13:34 _ikke_ That's entirely upto you
13:34 _ikke_ depends totally on your workflow
13:35 Cork joined #git
13:35 b100s _ikke_, shure :) what do you think about it?
13:35 b100s what is your workflow?
13:36 _ikke_ For simple projects, I don't hesitate to commit on master, for bigger projects, I try to streamline it more
13:37 jameser joined #git
13:38 xaa hi, could you tell me why this git status results, please ? http://i.imgur.com/CgxZuBp.png
13:39 _ikke_ xaa: something created a file called ":"
13:40 xaa damn you have right. sry I didn't know it was possible to name a file :
13:40 xaa n
13:40 _ikke_ There only very few disallowd characters on linux filesystems
13:40 xaa thanks _ikke_
13:41 * cousteau wonders how many files/directories starting with "-" do people here have
13:41 _ikke_ ext* has only \0 and /
13:41 cousteau _ikke_, afaik those are \ and null
13:41 cousteau ah right :)
13:41 cousteau and yes, /, not \
13:42 robattila256 joined #git
13:43 _ikke_ apparently you can even create files with / in them
13:43 _ikke_ https://serverfault.com/a/440339/1615
13:43 cousteau (it's kind of weird that you can name a file \t\r\x8F.txt but not /.txt)
13:43 _ikke_ AH, that just creates a directory
13:44 cousteau obviously
13:45 cousteau or throw an error if the directory doesn't exist
13:45 cousteau touch foo/bar and touch 'foo/bar' are the same
13:46 _ikke_ Oh lol, I apparently already had a dir called foo
13:46 cousteau » Though useful as a joke to pull on one's assistants. – Magellan Oct 19 '12 at 20:05
13:46 jeffreywen joined #git
13:46 cousteau Hahahaha!
13:46 yottabyte joined #git
13:46 cousteau _ikke_, I just go to /tmp for all my tests
13:46 _ikke_ hehe
13:46 cousteau /tmp is the best sandbox ever
13:47 jeffreywen Is it possible to commit to one repository ... and have two other repositories somehow also pick up the change? (without committing three separate times)
13:47 mohabaks joined #git
13:48 yottabyte what is the optimal workflow for merging into a branch? say my branch B → A. what I do is first I pull A into B, resolve any conflicts, then checkout A, and pull B into A
13:48 Nilesh_ joined #git
13:50 jmdb joined #git
13:50 dendazen joined #git
13:53 re1 joined #git
13:53 _sfiguser joined #git
13:53 TheWild joined #git
13:53 TheWild hello
13:54 TheWild how comes that for something as basic as "git, force ask login" google serves me stackoverflow as first results, not git documentation?
13:54 yottabyte pretty much every time I do git fetch I get unable to updatel ocal ref. then I have to "git gc --prune=now" then I can run it, but then when I try git pull origin branch, same thing
13:55 _sfiguser hello all, what's the difference between git fetch and git clone  ?
13:55 _sfiguser i read online and canont understand
13:56 _ikke_ TheWild: Ask google
13:56 jeffreylevesque joined #git
13:56 _ikke_ yottabyte: What message do you get when you fetch
13:57 _ikke_ _sfiguser: git clone is run the first time, to do several steps: init a repository, setup remotes, fetch, create a local branch and check that out
13:58 _ikke_ _sfiguser: git fetch gets new history from the remote and updates local tracking branches
13:58 tvw joined #git
14:01 yottabyte _ikke_: I guess it's often when I try git pull: "unable to update local ref" but I think I saw the asme message when trying git fetch or git fetch origin as well
14:02 _ikke_ yottabyte: Nothing else?
14:02 _ikke_ Just unable to update local ref?
14:04 yottabyte it'll show like every branch and some hash and then some arrows, it's a whole thing
14:05 Derperpe1 joined #git
14:05 theoceaniscool joined #git
14:05 ash_workz joined #git
14:05 Gsham joined #git
14:06 skinkitten_ joined #git
14:06 skinkitten joined #git
14:07 Raging_Hog joined #git
14:07 mohabaks joined #git
14:08 yottabyte _ikke_: http://pastebin.com/60kyXaUk this is in a branch I'm in where I'm just doing "git pull"
14:08 yottabyte I'm getting it like every single time
14:08 _ikke_ yottabyte: What OS are you on?
14:08 yottabyte if I do git gc --prune=now and then do git pull, it'll work the first time
14:08 yottabyte windows 8.1
14:08 _ikke_ yottabyte: Do you have an idea of the branchname?
14:09 HardlySeen joined #git
14:10 yottabyte yeah
14:10 _ikke_ Does it contain special characters?
14:11 Snugglebash joined #git
14:11 yottabyte other than / and -, no, it's like "feature/ticket-25252"
14:12 yottabyte you can actually see the names in my pastebin link above
14:12 cdg joined #git
14:12 grawity is the local (clone) repo on dropbox or some weird fs?
14:13 grawity what happens if you do a `git pack-refs --all --prune`?
14:13 _ikke_ yottabyte: git config --get-regex remote\.
14:13 grawity (which should leave you with an empty .git/refs/)
14:13 yottabyte what does that do
14:14 grawity which one
14:14 _ikke_ yottabyte: can you check what that config command returns
14:15 yottabyte origin.url is my remote repo's url, it's correct
14:15 yottabyte remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
14:15 _ikke_ That looks correct
14:16 shiriru joined #git
14:18 jimi_ joined #git
14:19 cdg_ joined #git
14:20 _ikke_ yottabyte: Are you using git lfs by chance?
14:20 chipotle joined #git
14:20 thebird joined #git
14:21 _ikke_ I'm annoyed that people only present solution, and don't point to the underlying problems
14:21 dil3mm4 joined #git
14:26 ShekharReddy joined #git
14:26 govg joined #git
14:27 jerv joined #git
14:27 yottabyte I am not
14:28 yottabyte I don't even know what that is
14:28 yottabyte this is recent problem though
14:28 yottabyte maybe I need to restart my computer
14:29 shinnya joined #git
14:29 rgrinberg joined #git
14:30 t0by joined #git
14:31 wiesel joined #git
14:31 frobnic joined #git
14:32 theoceaniscool joined #git
14:33 GodGinrai joined #git
14:34 jdl joined #git
14:35 AaronMT joined #git
14:37 Derperpe1 joined #git
14:40 Mogget joined #git
14:41 chipotle joined #git
14:44 iamthad joined #git
14:44 altendky joined #git
14:45 nod joined #git
14:45 EmeraldExplorer joined #git
14:45 noahsussman joined #git
14:46 beckyconning___ joined #git
14:46 MLM_ joined #git
14:46 janx joined #git
14:46 CheckDavid joined #git
14:46 sr___ joined #git
14:46 g105b joined #git
14:46 Bilge joined #git
14:46 AG joined #git
14:46 gajus joined #git
14:47 lebster joined #git
14:47 mroth joined #git
14:48 meZee joined #git
14:48 rideh joined #git
14:48 HedgeMage joined #git
14:48 cschneid joined #git
14:48 POQDavid joined #git
14:49 contracode joined #git
14:49 xbob joined #git
14:50 Es0teric joined #git
14:50 ariver joined #git
14:50 mgedmin joined #git
14:50 Raging_Hog joined #git
14:51 Kamilion joined #git
14:52 BinGOs joined #git
14:52 kristofferR joined #git
14:53 bumpy joined #git
14:53 aw1 joined #git
14:56 mquin joined #git
14:56 sns joined #git
14:56 Dougie187 joined #git
14:56 nettoweb joined #git
14:57 Caelum joined #git
14:57 lejit joined #git
14:57 Random832 joined #git
14:58 rt joined #git
14:59 onmeac joined #git
14:59 luke_penn joined #git
15:00 YuGiOhJCJ joined #git
15:01 robotroll joined #git
15:01 mischat_ joined #git
15:02 thebird joined #git
15:03 mikecmpbll joined #git
15:04 kristofferR joined #git
15:04 ozmage joined #git
15:04 Cork joined #git
15:07 elsevero joined #git
15:07 cdown joined #git
15:07 xpk joined #git
15:08 kristofferR joined #git
15:08 rnsanchez joined #git
15:09 crose joined #git
15:09 tonyj joined #git
15:10 skinkitten joined #git
15:10 skinkitten_ joined #git
15:11 Guest81556 joined #git
15:13 nomicos joined #git
15:15 nickabbey joined #git
15:18 YuGiOhJCJ joined #git
15:19 Whiskey What file do i need to edit after the commit
15:19 Whiskey to zip last rivision or current build or whatever
15:20 mohabaks joined #git
15:21 Starky joined #git
15:22 JamEngulfer joined #git
15:22 Ozymandy joined #git
15:23 cousteau Whiskey, do you mean to make a backup?
15:24 Whiskey yeh or anything else copy of current code
15:24 Whiskey or whatever it can be
15:24 Whiskey post-update seems to be the answer
15:24 shgysk8zer0_ joined #git
15:25 cousteau well, just zip the current directory, or if you only want the code and not the git-related info, all of the current directory except the .git directory
15:26 altendky i am looking to search from a particular revision and identify all surrounding revisions that have not changed a certain line in a certain file (an interface version number).  similar to a bidirectional blame but i need to collect all revisions and also explore multiple branches.  is this silly?  any existing functionality like this?
15:27 Whiskey I want to do it after someone have done a push
15:27 Whiskey so i need to know what hook it is
15:28 tcorneli joined #git
15:30 rafalcpp joined #git
15:31 OR joined #git
15:32 LeBlaaanc joined #git
15:32 Guest81556 left #git
15:34 venmx joined #git
15:35 thib joined #git
15:36 gugah joined #git
15:36 sgen joined #git
15:36 patarr joined #git
15:36 CEnnis91 joined #git
15:37 eroux joined #git
15:39 thebird joined #git
15:42 navidr joined #git
15:43 mda1 joined #git
15:45 fk joined #git
15:45 Whiskey and no answer on that one
15:45 Derperpe1 joined #git
15:48 publio joined #git
15:48 mischat joined #git
15:49 ^7heo ok guys
15:49 ^7heo I got a power outtage and...
15:49 ^7heo apparently git was in the middle of a write operation.
15:49 ^7heo now I get:
15:49 ^7heo error: object file .git/objects/89/bc6f56ab4e0c210f5daaaa43d736eeda18b06a is empty
15:49 ^7heo error: object file .git/objects/89/bc6f56ab4e0c210f5daaaa43d736eeda18b06a is empty
15:49 ^7heo fatal: loose object 89bc6f56ab4e0c210f5daaaa43d736eeda18b06a (stored in .git/objects/89/bc6f56ab4e0c210f5daaaa43d736eeda18b06a) is corrupt
15:49 ^7heo error: object file .git/objects/e3/cc213ec77604e80907c4b1066588740cba52a0 is empty
15:49 ^7heo for any git operation.
15:49 ^7heo fatal: unable to read e3cc213ec77604e80907c4b1066588740cba52a0
15:50 ^7heo kinda sucks.
15:50 synthroid joined #git
15:50 ^7heo if anyone has any idea how to solve that mess, I'd be happy.
15:50 Snugglebash joined #git
15:50 mikecmpb_ joined #git
15:51 _ikke_ Yay
15:51 Snugglebash joined #git
15:51 seni joined #git
15:51 kristofferR joined #git
15:51 ^7heo _ikke_: yep.
15:52 _ikke_ So that 'history' is gone, unless you have a backup. I'd try to reset the refs to a point that's not corrupt
15:52 _ikke_ (corruption should be recent)
15:52 ^7heo well yes, that's the point.
15:52 _ikke_ The reflog is your best bet
15:52 ^7heo $
15:53 ^7heo $ cat .git/objects/89/bc6f56ab4e0c210f5daaaa43d736eeda18b06a
15:53 ^7heo $
15:53 ^7heo damn.
15:53 ^7heo Well, at the same time, it said it is empty.
15:53 dreiss joined #git
15:53 ^7heo but still. HEAD is empty. crap.
15:53 _ikke_ Right
15:53 _ikke_ Is HEAD itself empty?
15:54 ^7heo yeah thats the head ref.
15:54 seni If I push my local branch to remote with force that will overwrite the remote branch correct?
15:54 ^7heo ah you mean the head file? No. That's how I found that ref.
15:54 ^7heo seni: yes.
15:54 jerv what would be a good way to sort all heads by commit date?
15:54 ^7heo shell? :P
15:55 Guest55 joined #git
15:56 ph88 joined #git
15:56 Murii joined #git
15:56 xall joined #git
15:56 _ikke_ jerv: man git for-each-ref
15:56 gitinfo jerv: the git-for-each-ref manpage is available at http://jk.gs/git-for-each-ref.html
15:57 Es0teric joined #git
15:57 ^7heo _ikke_: is there a git command to sort objects by date?
15:57 ^7heo _ikke_: or do I do it with find?
15:58 luizbag joined #git
15:58 jerv _ikke_: thanks
15:58 _ikke_ ^7heo: I would look at the reflog to find a recent commit for the branch that's 'corrupt'
15:58 inflames joined #git
15:58 richardlitt joined #git
15:59 ^7heo _ikke_: issue is
15:59 ^7heo _ikke_: I have not really used the history so far.
15:59 _ikke_ jerv: git for-each-ref --sort='authordate' --format="%(authordate) %(refname:short)" refs/heads
15:59 ^7heo _ikke_: I was doing something kinda stupid: git commit --amend -p
15:59 jerv _ikke_: thanks even more :)
15:59 ^7heo _ikke_: so I have no link between objects.
16:00 ph88 how come i get   git fatal: Unable to find remote helper for 'https'   but another user can issue the same git clone command without problems ?
16:01 _ikke_ ^7heo: What do you mean?
16:02 dreiss joined #git
16:03 ph88 oh i found the problem
16:04 ph88 i use git 1.8.3.1 and it works now, is it important to upgrade ?
16:05 ^7heo _ikke_: that I have not created a tree yet.
16:05 ^7heo _ikke_: it's just one commit, that I amend continuously.
16:05 osse ph88: what are you saying? that it works with 1.8.3.1 but not with some earlier version?
16:06 patarr joined #git
16:06 ^7heo yaaay, found objects with content in them!
16:06 mda1 joined #git
16:06 ph88 osse, those questions are not related
16:06 osse oh
16:06 ph88 it didn't work with git 2.9   and it works now with git 1.8
16:06 King_Hual` joined #git
16:07 Whiskey i question still remain, what hook is the one to use after everything is done to pack current code in to a zip file thats made after the hook so for current revision if that more clear
16:07 osse ph88: what you just said makes me think they are related after all :O
16:07 ph88 i'm just asking if there are good reasons to upgrade git from version 1.8.3.1
16:07 ph88 sorry :P
16:07 kpease joined #git
16:08 _ikke_ ^7heo: the reflog should still record all of them
16:09 ^7heo _ikke_: I get the output I pasted above for ANY git command.
16:09 kpease_ joined #git
16:09 ^7heo (excepted git show with a hash)
16:09 Whiskey ????
16:09 ph88 how can i find out when git 1.8.3.1 was released ?
16:09 mda1_ joined #git
16:10 ph88 oh i think i found a good page for it
16:10 _ikke_ ^7heo: You should be able to manually inspect the reflog
16:10 ph88 10 june 2013
16:10 ^7heo _ikke_: where?
16:10 _ikke_ .git/logs/reflog
16:10 _ikke_ sorry, .git/logs/HEAD
16:11 osse ph88: you could look over the release notes for the major versions. the github and atlassian blogs sometimes write up a summary.
16:11 ^7heo oh cool.
16:11 _ikke_ ^7heo: what does git rev-list --count --all return?
16:11 osse ph88: not sure if there are any *important* reasons, but there are plenty of good ones
16:11 ^7heo _ikke_: the same message as pasted above.
16:11 _ikke_ ok
16:11 qqx Whiskey: You probably want a post-receive hook for that.
16:12 ^7heo _ikke_: again, `git` commands fail.
16:12 qqx Whiskey: man githooks
16:12 gitinfo Whiskey: the githooks manpage is available at http://jk.gs/githooks.html
16:12 ^7heo all of them so far.
16:12 _ikke_ ^7heo: some do not, but I suspected this one to fail too
16:12 ^7heo (but the git show command)
16:12 _ikke_ I was just curious how many objects there were
16:12 leeN joined #git
16:13 _ikke_ But you see you keep doing git commit --amend?
16:13 Snugglebash joined #git
16:14 ^7heo _ikke_: I do not understand your last question.
16:15 ^7heo _ikke_: I moved my .git/HEAD to another branch.
16:15 ^7heo _ikke_: I can now use more git commands.
16:17 _ikke_ right
16:17 _ikke_ You just need to fix that branch then
16:17 ^7heo I copied the repo, and did a git reset --hard in the copy.
16:17 garethdaine joined #git
16:18 jimklo joined #git
16:19 Darren_ joined #git
16:19 ^7heo _ikke_: the good thing about having no history, is that I only care about restoring the files in the state they were.
16:19 kjsaihs joined #git
16:20 wiesel joined #git
16:20 joki joined #git
16:21 ych joined #git
16:21 MineCoins joined #git
16:22 thebinary joined #git
16:24 noecc joined #git
16:27 kpease joined #git
16:27 mohabaks joined #git
16:28 heroux joined #git
16:30 ResidentBiscuit joined #git
16:31 svm_invictvs joined #git
16:34 mikecmpbll joined #git
16:36 jstimm joined #git
16:36 ochorocho joined #git
16:37 Ranmaru joined #git
16:37 Snugglebash joined #git
16:38 tolland joined #git
16:38 mischat_ joined #git
16:39 garethdaine joined #git
16:40 ^7heo how do I know what kind of object an object is?
16:41 ^7heo I mean, from links, since the object is empty.
16:41 ^7heo because otherwise I'd use git cat-file
16:41 brent__ joined #git
16:41 theoceaniscool joined #git
16:41 matsaman joined #git
16:41 xmajedz joined #git
16:42 Synthead joined #git
16:43 KMaia2 joined #git
16:43 a_thakur joined #git
16:44 a_thakur joined #git
16:44 _ikke_ A commit links to another commit object (through the parent header) and to a tree object (tree header)
16:44 _ikke_ a tree links to blobs and other trees
16:44 thebird joined #git
16:44 Nerbrun joined #git
16:46 tang^ joined #git
16:50 liberpater How would I go about merging any submodules in my repository to be just in my repository?
16:50 thiago joined #git
16:51 matoro joined #git
16:51 tcorneli joined #git
16:53 ozmage joined #git
16:53 thebinary joined #git
16:54 durham joined #git
16:54 cagomez joined #git
16:54 durham joined #git
16:55 madewokherd joined #git
16:59 skinkitten joined #git
16:59 skinkitten_ joined #git
17:00 pur3eval joined #git
17:00 synthroid joined #git
17:01 tlaxkit joined #git
17:01 Derperpe1 joined #git
17:03 cjohnson I'm inheriting an ancient server whose deploy process works via git pull and rsync. I also have transferred repositories to a new github account but I can't seem to figure out which user I need to grant access to for it to pull
17:03 thebird joined #git
17:03 cjohnson anybody know how I can inspect teh git pull request to see what it's logging in as?
17:03 cjohnson does it just send an ssh key or does it include a username?
17:03 _ikke_ cjohnson: git remote -v show
17:03 cjohnson that shows the remote url but I'm trying to figure out which user it was pulling as before
17:04 cjohnson so I can grant that user access to the new repo
17:04 cjohnson I have updated the url to the new url
17:04 _ikke_ For ssh, it depends on what key you use
17:04 nickabbey joined #git
17:04 _ikke_ with http, the username is in the url (or manually provided)
17:04 kadoban If it's not in the URL or otherwise in git's config, then likely git has no idea. It'd probably be whatever default one SSH uses, your own username I think, or whatever it was configured to use.
17:05 ^7heo _ikke_: well, I have a tree linking to a (missing) tree.
17:05 cjohnson it's a git url
17:05 ^7heo _ikke_: how do I remove that link?
17:05 cjohnson so does it just send my normal ssh key and then github determines which user it is based on that key?
17:05 _ikke_ ^7heo: You have to create a new tree
17:05 kadoban If you have a running setup, there's some environment variable to have git output a bunch of debugging crap from its SSH calls.
17:05 cjohnson what happens if two users have the same key?
17:05 _ikke_ ^7heo: and update all commits recursively that refer to that tree
17:05 kadoban cjohnson: They aren't allowed to.
17:05 _ikke_ (man git replace)
17:05 gitinfo the git-replace manpage is available at http://jk.gs/git-replace.html
17:05 cjohnson kadoban: ah. well poop
17:05 _ikke_ ^7heo: brb
17:06 ^7heo _ikke_: I wish I could create a new tree.
17:06 vivu joined #git
17:06 ^7heo _ikke_: but I don't know how.
17:06 ^7heo _ikke_: ok :)
17:06 osse if it's a git url then there's no auth at all
17:07 thiago joined #git
17:08 kadoban If it's *actually* github, and that wasn't a standin, then the username you should be using is "git"  Like, git@github.com and then yes it figures out your github username from the key you provide.
17:08 cjohnson Ok I get it. so the previous owners of the repo have a git user established with this key, and I either need to change keys to a user I control, or grant permission to that previous user to my repo
17:08 cjohnson yes it's github
17:08 nickabbey joined #git
17:08 cjohnson so then the question becomes how can I reverse lookup the username from github. and I no longer have a working setup since the repo was officially transferred to my new account
17:08 cjohnson I'll email old company IT dept and pray they know the details
17:09 Celelibi lol
17:09 kadoban If you have the key you can ask github for the username, if that's what you mean.
17:09 Celelibi I wasn't expecting this.
17:09 cjohnson kadoban: yes that would be perfect, how can I do that
17:09 Celelibi I did a rebase that removed and recreated the current directory.
17:09 kadoban You just ssh into git@github.com, providing that key, and it'll say "hi <whoever you are>, now fuck off" or something along those lines.
17:10 cjohnson beautiful
17:10 Celelibi Then git was lost.
17:10 cjohnson kadoban: you rock, that was it
17:10 kadoban Cool, always glad to help.
17:10 _ikke_ ^7heo: man git mk-tree
17:10 gitinfo ^7heo: the git manpage is available at http://jk.gs/git.html
17:11 pungi-man joined #git
17:11 _ikke_ man git mktree
17:11 gitinfo the git-mktree manpage is available at http://jk.gs/git-mktree.html
17:11 _ikke_ that one ^
17:17 hahuang61 joined #git
17:18 BlackMaria joined #git
17:19 kpease joined #git
17:19 mohabaks joined #git
17:21 tristanp joined #git
17:22 jimklo_ joined #git
17:22 jagob joined #git
17:23 systemovich joined #git
17:23 lordjancso joined #git
17:26 eroux joined #git
17:28 systemovich joined #git
17:32 Synthead joined #git
17:33 MillerBoss joined #git
17:33 ayogi joined #git
17:35 jmdb left #git
17:35 venmx joined #git
17:37 jost_ joined #git
17:39 tcorneli joined #git
17:41 Derperpe1 joined #git
17:43 zumba_addict joined #git
17:46 zzz joined #git
17:47 solarfly joined #git
17:48 zumba_addict hi. my teammate created a new repo but wasn't aware he was going to create a readme file which he put on master. Before I knew it, I already created a test branch and also created a pull request so it can be merged to master. The pull request is showing conflit
17:48 zumba_addict so I went back to master and ran git pull. I had a conflict on readme file which I fixed locally
17:49 nckpz joined #git
17:49 zumba_addict I also closed my pull request because of that conflict
17:50 zumba_addict so now that i've fixed readme in master, I went back to my test-branch then I ran git merge master. It says Already-upto date
17:50 zumba_addict does it mean I can create another pull request and it should no longer show conflict?
17:50 _ikke_ If you already merged, there is nothing left for a PR
17:51 zumba_addict oops, i was wrong
17:51 zumba_addict I got this when I try to switch
17:51 zumba_addict README.md: needs merge and also error: you need to resolve your current index first
17:51 zumba_addict i'm still in master
17:52 zumba_addict looks like i need to run git commit
17:52 zumba_addict You have unmerged paths. (fix conflicts and run "git commit")
17:52 _ikke_ Did you fix the conflict?
17:52 zumba_addict yes
17:52 _ikke_ git add readme..
17:52 zumba_addict don
17:52 ToBeCloud joined #git
17:52 _ikke_ then commit
17:52 zumba_addict cool
17:52 zumba_addict error: commit is not possible because you have unmerged files
17:52 _ikke_ zumba_addict: what does git status return?
17:53 zumba_addict my bad
17:53 zumba_addict so git commit worked this time
17:53 zumba_addict i can now switch to my test-branch right?
17:53 _ikke_ right
17:53 zumba_addict cool
17:53 zumba_addict then git merge master?
17:54 _ikke_ That will probably fast-forward
17:54 zumba_addict it's saying this Your branch is up-to-date with 'origin/test-branch'
17:54 cagomez joined #git
17:54 zumba_addict the content of readme is actually the same
17:55 zumba_addict should I run that command?
17:55 zumba_addict i just want to make my pull request clean of conflicts
17:55 lowercaseman joined #git
17:55 _ikke_ zumba_addict: You already merged locally, there is nothing left to make a pull request from
17:56 _ikke_ (the usual way to do this is by rebasing your branch
17:56 _ikke_ )\
17:56 zumba_addict but our master needs to have my changes in test-branch
17:56 zumba_addict remote
17:56 zumba_addict oh ok
17:57 zumba_addict can I cancel everything i did so I can start from rebase?
17:57 _ikke_ sure
17:58 zumba_addict git reset HEAD~ ?
17:58 cjohnson I've got a gist that I've been treating as a repo, a coworker forked it and made several revisions. I want to import the combination of both our gists as a new public repo. So I imported his gist as a repo and cloned it to my local machine. Then I ran
17:58 cjohnson git remote add upstream my-gist-url
17:58 cjohnson How do I merge my commits into the new repo?
17:58 cjohnson git merge upstream/master ?
17:59 _ikke_ zumba_addict: while on master, and you want to add --keep
17:59 _ikke_ cjohnson: you first need to fetch
17:59 cjohnson git merge upstream/master gives me "not something we can merge". even after "git fetch"
17:59 cjohnson nevermind
17:59 cjohnson git fetch upstream
18:00 cjohnson merging now. thanks rubber ducky
18:00 _ikke_ :-)
18:01 zumba_addict git reset HEAD~ --keep ?
18:01 boombatower joined #git
18:02 thiago joined #git
18:02 _ikke_ Yeah
18:03 _ikke_ Might be that you need to place the --keep option before the ref
18:03 zumba_addict oh ok
18:03 zumba_addict git reset --keep HEAD~
18:03 _ikke_ right
18:04 zumba_addict doing it now
18:04 hahuang61 joined #git
18:05 zumba_addict this is what I see now since I made a change in readme earlier - Your branch and 'origin/master' have diverged,
18:05 kpease_ joined #git
18:05 gugah joined #git
18:05 zumba_addict the readme is the fixed one
18:09 zumba_addict got conflict when I ran ` git pull --rebase origin master`
18:09 zumba_addict on readme again
18:10 cdleonard joined #git
18:10 _ikke_ right
18:11 zumba_addict weird that branch name is 5babab4
18:11 zumba_addict git commit was also successful
18:11 _ikke_ You are on a detached HEAD right now
18:11 _ikke_ git rebase --continue
18:11 zumba_addict cool
18:11 zumba_addict is it ok that I ran git commit already?
18:12 _ikke_ Yeah, git rebase --continue is smart enough to detect that
18:12 zumba_addict k
18:12 gopar joined #git
18:12 _ikke_ (The special case is when you haven't done a commit yet
18:12 _ikke_ )
18:12 zumba_addict i'm getting this, No changes - did you forget to use 'git add'?
18:12 zumba_addict but i already did
18:12 zumba_addict i think it's because i ran git commit already
18:13 vdv joined #git
18:15 _ikke_ zumba_addict: Might be that you created an 'empty' commit by fixing the conflict
18:15 zumba_addict I'm getting this - http://pastebin.com/Akp3PgWn
18:16 zumba_addict i get that every time i execute git rebase --continue
18:16 zumba_addict should I execute git rebase --skip
18:17 pfloyd joined #git
18:17 VladGh joined #git
18:17 zumba_addict i'm still in detached state
18:17 _ikke_ What does git show return?
18:17 zumba_addict one sec
18:17 zumba_addict title is Fixed conflict in README.md
18:18 _ikke_ Does the diff show something?
18:18 zumba_addict then many diff
18:18 zumba_addict + symbols
18:18 _ikke_ right
18:18 _ikke_ Then I guess it should be okay to skip
18:18 zumba_addict oh cool
18:19 _ikke_ Those are the changes you expect?
18:19 pfloyd left #git
18:19 zumba_addict i also see the diff in README which shows my frient's changes
18:19 zumba_addict yes
18:19 zumba_addict the changes are correct
18:19 pfloyd joined #git
18:19 zumba_addict i'll skip it now
18:19 vuoto joined #git
18:19 pfloyd I have a git repository hosted on an NFS file system and when a new branch is created, I'd like to push that branch to some other sites in the company (basically mirrors of that git repository).  Is there a post-branch hook or something similar I can use to accomplish that?
18:19 zumba_addict Your branch is ahead of 'origin/master' by 1 commit.
18:20 zumba_addict now I will switch to test-branch and run git merge master. Correct?
18:20 chardan joined #git
18:20 zumba_addict using  git merge origin/master
18:20 Juzzika joined #git
18:21 zumba_addict got the same conflict in my test branch, LOL
18:21 zumba_addict i'll fix it then submit it
18:21 tang^ joined #git
18:22 synthmeat joined #git
18:22 duderonomy joined #git
18:24 causasui joined #git
18:25 Es0teric joined #git
18:26 chardan joined #git
18:26 pur3eval joined #git
18:26 cagomez joined #git
18:27 pfloyd left #git
18:28 thebird joined #git
18:28 Juzzika joined #git
18:28 joshszep joined #git
18:29 borkr joined #git
18:29 OnBrokenWings joined #git
18:30 pfloyd joined #git
18:30 pfloyd I tried the "update" hook, but it's not being triggered. In this case, there's automation that's basically running "git branch" in the bare repo.  Is there a hook that gets executed when that happens?
18:31 nickabbey joined #git
18:33 VladGh joined #git
18:33 nunchuck joined #git
18:36 venmx joined #git
18:37 matoro joined #git
18:39 jeffreylevesque_ joined #git
18:39 jccn joined #git
18:40 finalbeta joined #git
18:42 Juzzika joined #git
18:42 TomyLobo joined #git
18:43 ftoulemon joined #git
18:43 apotry joined #git
18:45 liberpater I have the following commit: http://sprunge.us/JGQD
18:45 liberpater How do I remove it as a submodule and instead commit all the files?
18:46 BackEndCoder joined #git
18:46 zumba_addict btw, i want to create a father repo(lol) which will contain a template. This template should be pulled by other repo. How can I update other repos when I update the father repo?
18:46 troulouliou_dev joined #git
18:47 _ikke_ zumba_addict: git doesn't have something for that
18:47 zumba_addict got it
18:47 zumba_addict i'll have to write a script then that goes into each repo
18:49 PCatinean joined #git
18:49 jeffreylevesque joined #git
18:49 PCatinean can anyone please tell me how I can specify the ssh key to be used when I try to make a git clone?
18:49 _ikke_ PCatinean: Through ssh config
18:51 PCatinean _ikke_, what do I write there? I tried github github.com everything
18:52 PCatinean I would later like to do it per repository but I can't do it for host now
18:52 _ikke_ PCatinean: You'd have to alias the hostname
18:52 Guest85 joined #git
18:52 cores joined #git
18:52 _ikke_ Host alias1\nHostname github.com
18:52 PCatinean well neither works now
18:52 PCatinean for user/repo on github.com
18:52 PCatinean how would I do it?
18:53 joshszep joined #git
18:53 _ikke_ Can you show what you tried?
18:53 PCatinean sure
18:53 PCatinean That's one: https://hastebin.com/edurozuzor.js
18:53 _ikke_ You cannot set a user
18:53 _ikke_ use should be git
18:54 _ikke_ user*
18:54 PCatinean okay
18:54 joshszep joined #git
18:54 PCatinean and the rest is ok?
18:54 _ikke_ Well, hostname and host being the same is redundant
18:54 qqx PCatinean: You might want to add `IdentitiesOnly yes`.
18:54 PCatinean yet it still tries to use my standard id_rsa key
18:55 PCatinean ok added
18:55 PCatinean Well that seems to have changed it qqx, it no longer requires password meaning it's using the other id_rsa
18:55 _ikke_ How did you call the file
18:56 PCatinean id_rsa_customer
18:56 PCatinean and id_rsa_customer.pub
18:56 PCatinean I mean dynapps sorry
18:56 _ikke_ I meant the config file, but you already solved it
18:56 PCatinean I see i've pasted it already
18:56 Juzzika joined #git
18:58 _ikke_ qqx: nice one, didn't know that one
18:58 _ikke_ qqx: Would that also work for ssh-copy-id?
18:59 PCatinean What does that parameter do/
18:59 PCatinean Without it it didn't work at all
18:59 _ikke_ PCatinean: Tells ssh to only use that specific key, even when the ssh-agent supplies more keys
18:59 qqx I don't think that would do anything for ssh-copy-id. My copy has the -i option to specify that.
18:59 _ikke_ qqx: right
18:59 PCatinean Oh I see
19:00 PCatinean Seems it switched but I get permission denied due to public key, which either means the public key is not uploaded there
19:00 causasui joined #git
19:00 PCatinean Or I messed up somewhere
19:00 PCatinean Because the first time I wanted to test if it works I just moved the id_rsa keys to another dir and used the other ones
19:00 jstimm joined #git
19:01 PCatinean When I switched back the original id_rsa files Nothing worked
19:01 PCatinean I had to reboot for things to go back to normal
19:01 ispn joined #git
19:01 tang^ did you do ssh-add at any point in time?
19:01 PCatinean ssh-add? no
19:01 tang^ that'll keep a key in memory despite you moving them in and out of .ssh
19:01 PCatinean I just generated a new keep
19:02 PCatinean key*
19:02 ^7heo so
19:02 ^7heo I magciiaiiliiliiiiiiiiiiiiiiiii solved the problem
19:03 ^7heo (for those who don't know, that's how the sailfish spells magically)
19:03 _ikke_ How did you solve it?
19:03 PCatinean ok guys thanks for the tips, much appreciated
19:03 ^7heo Magically
19:03 PCatinean I will try to solve this tomorrow
19:03 PCatinean Have a great evening guys
19:04 ^7heo _ikke_: aka no idea
19:05 ^7heo _ikke_: git looks a little more automagic to me now.
19:05 Balliad joined #git
19:05 pfloyd Is there no hook that is called when "git branch" is run to create a new branch?
19:05 kasual joined #git
19:06 Endorphine joined #git
19:06 _ikke_ pfloyd: nope
19:08 pfloyd bummer :/ thanks
19:08 hobodave joined #git
19:08 _ikke_ What do you want to achieve?
19:08 Endorphine_ joined #git
19:08 Sasazuka joined #git
19:09 pfloyd _ikke_: I mentioned it above, but basically we have a git repo on NFS in location A, and some automation to allow people to git branch in that repo in location A.  When they do that, I wanted it to push the branch to locations B/C/D so they can clone that branch locally.
19:10 pfloyd and unfortunately, I do not control the automation that does the "git branch" command in the repository in location A. that's a black box to me (yay corporate bureaucracy)
19:10 nickabbey joined #git
19:11 kpease joined #git
19:13 ihradek joined #git
19:14 cagomez joined #git
19:14 matoro joined #git
19:15 Whiskey what hook is the one to use after everything is done to pack current code in to a zip file
19:15 Kronuz_ joined #git
19:15 a0x10c joined #git
19:16 _ikke_ Not everything has a hook
19:17 _ikke_ man githooks lists them all
19:17 gitinfo the githooks manpage is available at http://jk.gs/githooks.html
19:17 pfloyd _ikke_: it's not a big deal, we have a BKM documented for this.  But was hoping there was a hook so I could just push the branches after they are created to locs B/C/D.
19:17 Snugglebash joined #git
19:18 Whiskey i have read that
19:19 thiago Whiskey: what is "everything is done" ?
19:19 ckb joined #git
19:19 _ikke_ pfloyd: wouldn't checkout / commit hooks working better in that case?
19:19 _ikke_ pfloyd: just creating a branch means that it does not contain any commits yet
19:20 ckb okay guys, I removed files from my repo, but my other servers still think those files are tracked and won’t let me pull. How can I convince my other 2 servers that it doesn’t matter these files are modified?
19:20 _ikke_ ckb: fetch and push don't look at individual files
19:21 Whiskey thiago: well is not that clear?
19:21 Whiskey When the git is done whit everything on remote so the current "source" can be packed
19:21 ckb _ikke_: will the repo ignore a modified file that’s not tracked?
19:21 _ikke_ ckb: do you get a merge conflict when pulling?
19:21 ckb _ikke_: Your local changes to the following files would be overwritten by merge:
19:22 _ikke_ right
19:22 ckb but those are all the files that are untracked
19:22 ckb per the repo… these are config files and logs I’m trying to ignore, btw
19:22 Whiskey as i thnked use it for both pack current source to zip-file and backup current git folder
19:22 _ikke_ ckb: this is a delete/modify conflict, but with untracked files
19:22 ckb _ikke_: what’s my solution?
19:23 _ikke_ ckb: easiest is to rename the local files, and merge, and then remove them again
19:23 Whiskey post-update maybe
19:23 pfloyd _ikke_: yes, but in our usage model this is normal (I can't go into details unfortunately as I am probably not permitted to share exactly what we're doing here).
19:23 thiago Whiskey: no, it's not
19:24 thiago Whiskey: git doesn't do anything unless you run a command
19:24 thiago Whiskey: what command are we talking about?
19:24 _ikke_ pfloyd: sure, no problem, but that's the only thing I can think of
19:24 _ikke_ thiago: I suspect git archive
19:24 Whiskey well git push i think
19:24 pfloyd _ikke_: yeah, understood. thanks!
19:24 Whiskey and when the push is done,
19:24 Whiskey zip current source to a zip file
19:25 ckb _ikke_: rename them, merge, then delete the ones I just renamed and then rename them back to what I’m ignoring?
19:25 _ikke_ correct
19:25 ckb cool… thanks
19:25 Kronuz joined #git
19:25 ckb _ikke_: can I just ignore what I’m renaming them to? or will that cause issues?
19:26 Whiskey thiago: i still think its post-update, but i like to be sure before i try to code on it
19:27 thiago Whiskey: post-update it is
19:27 Whiskey thiago: but you just told me its not?
19:28 crayon joined #git
19:31 _ikke_ Whiskey: post-update runs on the receiving side
19:32 Whiskey whatever that means
19:32 Whiskey when you do git pull, does it also give you the remote hooks or is this folder ignored?
19:32 b100s joined #git
19:33 _ikke_ They do not run locally
19:33 Whiskey what about commit-msg
19:34 Whiskey but it won´t matter if its run locally or not maybe
19:34 Whiskey i just thinked it was more easy to have it on the remote also
19:35 hotratz joined #git
19:35 cdg joined #git
19:37 venmx joined #git
19:40 elsevero joined #git
19:41 jimklo joined #git
19:43 satifant joined #git
19:45 Balliad joined #git
19:46 codemann joined #git
19:48 hashpuppy joined #git
19:52 Whiskey damn its hard to find info how to do whit git
19:52 nickabbey joined #git
19:53 shgysk8zer0 joined #git
19:53 moritz man githooks documents the git hooks
19:53 gitinfo the githooks manpage is available at http://jk.gs/githooks.html
19:54 Whiskey well i try to find out how to zip current code after push
19:54 b100s joined #git
19:54 _ikke_ Whiskey: Why not a local shell alias / function?
19:55 Whiskey ?`
19:55 _ikke_ Why does it need to be a hook?
19:56 Whiskey well how would it else know when update it if it don´t know when its done?
19:57 moritz Whiskey: what problem are you trying to solve?
19:57 Whiskey expert the damn code when a push is done and source is updated every time what is so hard to understand?
19:58 moritz are you trying to do an automatic deployment?
19:58 Whiskey just like http://znc.in/nightly/
19:58 Whiskey yeh thats maybe the name of it
19:58 moritz !deploy
19:58 gitinfo 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:58 moritz https://leanpub.com/deploy
19:59 Whiskey well git can export its own current source right?
20:00 Whiskey on command, the rest is not a problem as it just the source that need to be exported jesus
20:00 Murr joined #git
20:01 Whiskey i just need it to export its own source
20:03 Blkt_ joined #git
20:05 Inial joined #git
20:06 l4v2 joined #git
20:08 jnavila joined #git
20:10 Gsham joined #git
20:11 ShapeShifter499 joined #git
20:13 aw1 joined #git
20:13 synthroid joined #git
20:14 synthroid joined #git
20:16 jccn joined #git
20:16 denisMone joined #git
20:20 zzz joined #git
20:20 liberpater How do I "roll back" to a specific commit?
20:22 yehowyada joined #git
20:22 grawity temporarily (to just look at the files) or permanently?
20:22 Snugglebash joined #git
20:22 karstensrage joined #git
20:23 jstein_ joined #git
20:24 liberpater Permanently
20:24 grawity keeping the leftover commits in history, or throwing them away?
20:24 grawity (the latter will give you all the issues rewriting history has)
20:24 liberpater Keeping them in history is fine
20:25 grawity git checkout <commit> -- . && git commit "Reverting to <foo> because <bar>"
20:25 shgysk8zer0_ joined #git
20:25 grawity the "." is for "current directory"
20:28 nickabbey joined #git
20:28 Tsutsukakushi joined #git
20:28 cagomez joined #git
20:28 dreiss joined #git
20:29 liberpater So I rolled back, but I still see all the files that were committed
20:30 mikecmpbll joined #git
20:30 liberpater It is like it only rolled back that specific commit
20:35 thebird joined #git
20:38 pks joined #git
20:39 hashpuppy when i do a pull request on github, how does it preview the changes?  `git diff master...requested`?
20:39 preaction on the Files tab, approximately that yes
20:40 hashpuppy would it be doing more than that?
20:40 hashpuppy thanks, btw
20:40 preaction what more would it need?
20:40 hashpuppy nothing.  you just said, "approximately"
20:41 preaction because likely it does something else internally that just looks like `git diff <from>...<to>`
20:41 preaction though parsing diffs is pretty easy. i can't know, because i don't work for github
20:42 jedahan joined #git
20:43 mda1 joined #git
20:43 raynold joined #git
20:45 durham_ joined #git
20:46 svm_invictvs joined #git
20:46 jccn joined #git
20:49 cagomez joined #git
20:52 raynold ahh it's a wonderful day
20:54 aidalgol joined #git
20:54 cheater left #git
20:55 stevenxl_ left #git
20:57 miczac\away joined #git
20:58 diogenese joined #git
20:58 AciD` raynold -> it is indeed!
21:01 freddymungo joined #git
21:01 grym joined #git
21:02 dsdeiz joined #git
21:02 Tobbi joined #git
21:02 freddymungo_ joined #git
21:03 Derperpe1 joined #git
21:05 peacememories joined #git
21:06 thebope joined #git
21:08 nettoweb1 joined #git
21:08 pur3eval joined #git
21:09 vuoto joined #git
21:09 johnny56 joined #git
21:10 gopar joined #git
21:10 dsdeiz joined #git
21:10 dsdeiz joined #git
21:12 Es0teric joined #git
21:12 gopar joined #git
21:13 jdl joined #git
21:13 yottabyte joined #git
21:13 gxk joined #git
21:13 DolphinDream joined #git
21:14 Sasazuka joined #git
21:15 Masber_080 joined #git
21:15 joshszep joined #git
21:16 jdl joined #git
21:16 gxk joined #git
21:16 DolphinDream joined #git
21:16 zezba9000 joined #git
21:16 joshszep joined #git
21:17 inflames joined #git
21:17 zezba9000 Hey anyway to update a "local" branch I'm not currently checked out in after I update its origin tracked branch
21:17 tyreld joined #git
21:18 joshszep joined #git
21:18 jedahan joined #git
21:18 _ikke_ zezba9000: If it's just a fast-forward, you can do it without checking out the branch, but otherwise, it's necessary
21:19 zezba9000 So say I have two branches master and dev and I'm checked out in branch master. Then I call "git fetch origin" (which updates origin/master and origin/dev). Now I want to update my local "dev" branch without checking out to it
21:19 joshszep joined #git
21:19 _ikke_ zezba9000: merging / rebasing requires you to checkout out a different branch
21:19 _ikke_ fast-forward is just a matter of moving branches, this can be done without it
21:19 zezba9000 ic, how do you fast forward?
21:20 zezba9000 a local branch without being in it?
21:20 _ikke_ You should first verify if you don't lose any changes
21:20 joshszep joined #git
21:20 zezba9000 I see maybe this was a bad idea.
21:20 _ikke_ git log --oneline dev..origin/dev
21:20 _ikke_ does that return anything?
21:21 _ikke_ sorry, origin/dev..dev
21:21 nikivi hey guys, I have a project where I accidentally committed /out folder in java project
21:21 nikivi https://github.com/nikitavoloboev/java-leetcode
21:21 nikivi I have updated gitignore to ignore .class files
21:21 s17 k
21:21 nikivi but what do I do now to make this change active
21:21 joshszep joined #git
21:21 zezba9000 _ikke_: your first returned changed
21:21 preaction nikivi: git rm -r out
21:22 preaction nikivi: gitignore will never ignore tracked files
21:22 _ikke_ zezba9000: sorry?
21:22 zezba9000 _ikke_: but my reason for wanting this was a flaw in my thinking
21:22 _ikke_ ok
21:22 zezba9000 _ikke_: Sorry never mind
21:22 preaction nikivi: if you want to expunge them from history, you'll have to !rewrite
21:22 gitinfo nikivi: 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:23 nikivi preaction thank you
21:23 nikivi oh and one final thing, perhaps it is a java question though, but do I need to gitignore .iml file?
21:24 preaction i don't know what that file is
21:24 _ikke_ That's a IntellijIdea file
21:24 _ikke_ I'd ignore it
21:24 matoro joined #git
21:24 _ikke_ IntelliJ does have shared settings, but I do not know the details about it
21:26 nikivi I did git rm -r out
21:26 nikivi then did git push
21:27 nikivi but the out folder is still there
21:27 nikivi did I miss a step?
21:28 _ikke_ You need to commit
21:29 nikivi _ikke_ oh I see thank you
21:31 canuk joined #git
21:32 askb joined #git
21:34 Vampire0_ joined #git
21:35 suttonwilliamd_ joined #git
21:35 pur3eval joined #git
21:38 venmx joined #git
21:40 Gsham joined #git
21:41 elisa87 joined #git
21:42 elisa87 please have a look at this, is it a version problem for tensorflow? http://stackoverflow.com/questions/42236574/attributeerror-module-object-has-no-attribute-histogram-when-using-tf-faste
21:42 Derperpe1 joined #git
21:44 _ikke_ elisa87: Is this a #git question?
21:45 elisa87 _ikke_: I have done no change in the code. this is a deep learning repo I was basically running the test command to see if setup is correct and I followed all the steps. However I got this error. I am kind of suspicious if it is a TensorFlow version problem? not sure. The person released tf-faster-rcnn repo very recently and my tf is from back in December.
21:45 Vampire0 joined #git
21:45 cagomez joined #git
21:45 elisa87 so I am unsure if this is causing the problem.  I am just picking a guess _ikke_
21:46 _ikke_ Hard to tell
21:47 cdg joined #git
21:48 s17 elisa87: did you see there is a reply to your question on github about it
21:48 s17 18 minutes ago
21:48 pbrewczynski joined #git
21:55 Sasazuka_ joined #git
21:58 nixjdm joined #git
22:01 _ADN_ joined #git
22:02 venmx joined #git
22:02 Jackneill joined #git
22:06 _ADN_ joined #git
22:06 SwiftMatt joined #git
22:09 blackwind_123 joined #git
22:09 munichlinux joined #git
22:10 Blkt joined #git
22:11 TrentonDAdams joined #git
22:11 TrentonDAdams How do I find which unmerged branch file X has been changed on?
22:12 GodGinrai joined #git
22:12 _ikke_ A challenge, hold on
22:13 _ikke_ git log --all ^HEAD --diff-filter=M X
22:13 _ikke_ Not sure if that works
22:13 piyer I want to cut a branch, revert back to a specific commit, make some changes and merge back to master.
22:14 piyer I did reset head to a commit but when i merged back to master those commit still exist in master.
22:14 piyer git reset --hard <sha>
22:15 piyer what am i doing wrong?
22:15 Noldorin joined #git
22:15 preaction you cut the branch before you reset. so, yes, master still has those commits. they're only gone from your branch. why are you wanting to do this?
22:15 howlinbash joined #git
22:16 piyer preaction: I want to revert back to the old state
22:16 piyer got it
22:16 preaction if you want master to look exactly like your branch, you could reset to the branch
22:17 preaction but that's rewriting history. if you want to keep going forward, use revert
22:17 preaction merge doesn't take a diff, if that's what you were expecting
22:17 piyer I am fine not having that history. git reset --hard <branch>?
22:18 brent__ joined #git
22:18 preaction piyer: yes. but if you're not sure, make a !backup
22:18 gitinfo piyer: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
22:19 piyer Thanks
22:19 ozmage joined #git
22:20 DIDAVISION joined #git
22:20 m0j0 joined #git
22:22 pur3eval joined #git
22:22 Brain joined #git
22:23 _ikke_ TrentonDAdams: git log ^HEAD $(git branch --no-merged) --diff-filter=M X
22:23 piyer preaction: push doesn't work
22:23 piyer should i do git reset HEAD --hard branch?
22:24 zzz joined #git
22:24 preaction piyer: of course push doesn't work. read the error. don't do what it says. you're !rewriting so you need to force it
22:24 gitinfo piyer: [!rewrite] 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
22:24 howlinbash joined #git
22:24 Whiskey How do i get this to work, git archive master | 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on "/home/whiskey/www/git/backup/git.7z"
22:24 Whiskey it 7zip current folder :D
22:25 _ikke_ Whiskey: output format for git archive is tar by default
22:26 Whiskey _ikke_: the compression size is not the best
22:26 _ikke_ Whiskey: So what is the problem with that command?
22:26 howlinbash sorry i was kicked from the server! did anyone see my message above? just need help with --bare repo tracking my dotfiles. cheers
22:26 _ikke_ Whiskey: tar has no compression at all
22:27 Whiskey i can get it down to 40KiB insted of 85 whit zip
22:27 Whiskey thats alot of its alot of backups
22:27 _ikke_ howlinbash: Nope, didn't see a message
22:27 anuxivm joined #git
22:27 Whiskey so thats why i try 7zip
22:28 howlinbash _ikke_, thanks...
22:28 howlinbash hello #git i would like a little help tracking my dotfiles. i've setup a --bare repo ala this primer https://developer.atlassian.com/blog/2016/02/best-way-to-store-dotfiles-git-bare-repo/ but i would like to have a .gitignore so i can ignore everything else but track new dotfiles added to $HOME. Anyone know how to do this?
22:29 _ikke_ Whiskey: you can also do --format=tar.gz
22:29 _ikke_ But if you want to use 7z, that command should work
22:29 howlinbash _ikke_, can you see that? (starts 'hello #git')
22:29 _ikke_ howlinbash: yes
22:29 howlinbash :-D
22:29 Tobbi joined #git
22:31 durham joined #git
22:31 Whiskey tar.gz works
22:31 Whiskey its only 10KiB diffrent
22:31 _ikke_ howlinbash: you can use .cfg/info/exclude as a .gitignore file
22:31 Whiskey _ikke_: can git archive export its own .git folder?
22:32 _ikke_ No, it only exports a singe tree/commit
22:32 _ikke_ if you want the .git folder, you can just put that in an archive
22:32 Whiskey like.......?
22:32 Whiskey i think its a archive im after
22:33 Emperor_Earth_ joined #git
22:33 MattMake_ joined #git
22:33 _ikke_ tar czf my_archive.tar.gz .git
22:33 Whiskey lol
22:33 tristanp_ joined #git
22:33 oaaao joined #git
22:33 Whiskey so outside the git software whit other words
22:33 _ikke_ sure
22:33 muldover01 joined #git
22:33 Rankun joined #git
22:34 Whiskey damit and no way to do it inside it
22:34 NeverDie_ joined #git
22:34 l4v2_ joined #git
22:34 xissburg_ joined #git
22:34 _ikke_ you can create a bundle file
22:34 _ikke_ man git bundle
22:34 gitinfo the git-bundle manpage is available at http://jk.gs/git-bundle.html
22:34 duderono_ joined #git
22:34 pfloyd_ joined #git
22:35 howlinbash _ikke_, that's the file i just found! Hey i may have ended up solving this one by myself. my nix-foo is rising :-D thanks for the timesaver!
22:35 PaulCape_ joined #git
22:35 krainboltgreene_ joined #git
22:35 _ikke_ howlinbash: np
22:35 Whiskey _ikke_: im just after doing a git clone i think in a tar.bz file
22:35 ReenignE- joined #git
22:35 ReenignE- joined #git
22:35 JackMc_ joined #git
22:35 thecomedian_ joined #git
22:35 Whiskey the point of doing it inside git is that you don´t need the path to it
22:35 gopar_ joined #git
22:36 aleb_ joined #git
22:36 durham_ joined #git
22:36 ggherdov__ joined #git
22:36 cmosguy_ joined #git
22:37 AndreSomers joined #git
22:37 kadoban_ joined #git
22:37 ketas- joined #git
22:37 jgrasser_ joined #git
22:37 enleeten_ joined #git
22:37 Buckyy joined #git
22:37 perlpilo1 joined #git
22:37 iamthad_ joined #git
22:37 bejeb_ joined #git
22:37 kentnl joined #git
22:37 Ariadeno_ joined #git
22:37 bambams_ joined #git
22:37 bambams_ joined #git
22:37 OMGOMG_ joined #git
22:37 Rh0nda joined #git
22:37 sbeller_ joined #git
22:37 mitzip_ joined #git
22:38 wcpan_ joined #git
22:38 jlewis_ joined #git
22:38 ftoulemo1 joined #git
22:38 Mogget_ joined #git
22:38 Pieter joined #git
22:38 hvxgr joined #git
22:38 SWAT_ joined #git
22:39 Zoxc_ joined #git
22:39 salamanderrake_ joined #git
22:39 joshszep joined #git
22:40 Travis-42_ joined #git
22:40 Ferris____ joined #git
22:40 dwmw2_go` joined #git
22:41 midgetsp_ joined #git
22:41 nellicus_ joined #git
22:41 RickyB98|BNC joined #git
22:41 KnightsOfNi joined #git
22:41 HedgeMage_ joined #git
22:41 weylin- joined #git
22:41 c0d3d joined #git
22:41 daishan_ joined #git
22:41 Spork_Witch joined #git
22:41 Sigma[Mtp] joined #git
22:41 atrus joined #git
22:41 HalfEatenPie_ joined #git
22:41 mloy joined #git
22:41 lowercaseman joined #git
22:41 TooLmaN_ joined #git
22:42 Xethron_ joined #git
22:42 varesa_ joined #git
22:43 nuck joined #git
22:43 bremner joined #git
22:43 BackEndCoder joined #git
22:43 Virox joined #git
22:43 bremner joined #git
22:43 _ikke_ howlinbash: Not a bad approach btw
22:43 BinGOs joined #git
22:43 jimi_ joined #git
22:44 chipotle joined #git
22:44 cstrahan joined #git
22:44 blackwind_123 joined #git
22:45 skift joined #git
22:45 eldritch joined #git
22:46 lolmac joined #git
22:46 ToeSnacks joined #git
22:46 diget joined #git
22:46 ftoulemon joined #git
22:46 xkr47 joined #git
22:46 RickyB98 joined #git
22:46 phroa joined #git
22:46 holgersson joined #git
22:46 RickyB98 joined #git
22:46 whitby joined #git
22:46 sorressean joined #git
22:46 howlinbash left #git
22:46 WakiMiko joined #git
22:46 gruetzkopf joined #git
22:46 anon861 joined #git
22:46 olbat joined #git
22:46 stfn joined #git
22:46 enckse joined #git
22:46 omegak joined #git
22:47 j416 joined #git
22:47 BackEndCoder joined #git
22:47 thib joined #git
22:47 suttonwilliamd_ joined #git
22:47 foul_owl joined #git
22:47 vdl joined #git
22:47 sunri5e joined #git
22:47 sparr joined #git
22:47 salparadise joined #git
22:47 OverCoder joined #git
22:47 deinspanjer joined #git
22:47 kenansulayman joined #git
22:47 linuxdaemon joined #git
22:47 LiENUS joined #git
22:47 hobodave joined #git
22:47 Mission-Critical joined #git
22:47 gsingh93 joined #git
22:47 bodie_ joined #git
22:48 ryxxed joined #git
22:48 tribly joined #git
22:48 davidosomething joined #git
22:48 Dandelock joined #git
22:48 rideh joined #git
22:48 errr joined #git
22:49 hue joined #git
22:49 Karazhan joined #git
22:49 Bigcheese joined #git
22:49 lhx joined #git
22:49 fuzzybear3965 joined #git
22:49 austin987 joined #git
22:49 spinningarrow[m] joined #git
22:49 nyuszika7h joined #git
22:49 rcn joined #git
22:49 mocoloco joined #git
22:50 chrysa joined #git
22:50 solrize joined #git
22:50 m0ltar joined #git
22:50 leah2 joined #git
22:50 dodobrain joined #git
22:50 _joes__ joined #git
22:50 MLM_ joined #git
22:50 discopatrick joined #git
22:50 ggherdov__ joined #git
22:50 Sheogorath[m] joined #git
22:50 ome joined #git
22:50 RiPer joined #git
22:51 cores joined #git
22:51 nikow joined #git
22:51 zifnab joined #git
22:51 epic__ joined #git
22:51 dreiss joined #git
22:51 sharpy joined #git
22:51 sagerdearia joined #git
22:51 Vortex34 joined #git
22:52 muldover joined #git
22:52 salamanderrake joined #git
22:52 nixjdm joined #git
22:52 howdoi joined #git
22:52 rostam joined #git
22:52 i7c joined #git
22:52 leprechau joined #git
22:52 rxo joined #git
22:52 DelTree joined #git
22:52 texasmynsted joined #git
22:52 gigq joined #git
22:52 BinGOs joined #git
22:52 midgetsp_ joined #git
22:52 kentnl joined #git
22:52 MattMake_ joined #git
22:52 cagomez joined #git
22:52 jost_ joined #git
22:52 lejit joined #git
22:52 Khisanth joined #git
22:52 dikiaap joined #git
22:52 ollien joined #git
22:52 tier2villain_ joined #git
22:52 Vgr joined #git
22:52 iamtakingiteasy joined #git
22:52 unilovelight[m] joined #git
22:52 alaeri[m] joined #git
22:52 elwan7[m] joined #git
22:52 __main__ joined #git
22:52 matumbo joined #git
22:52 xanadu_ joined #git
22:52 Muzer joined #git
22:52 swift1 joined #git
22:52 ilogger2 joined #git
22:52 AlgorithmWizard joined #git
22:52 MajorPay1e joined #git
22:52 prg3 joined #git
22:52 nanga joined #git
22:52 MapMan joined #git
22:52 tinanoo1 joined #git
22:52 mattp joined #git
22:52 cymen joined #git
22:52 voidspacexyz joined #git
22:52 Vaelatern joined #git
22:52 ShoaibJahejo joined #git
22:52 fhackdro- joined #git
22:52 ShadeS joined #git
22:52 pdgwien joined #git
22:52 Jguy joined #git
22:52 miklcct joined #git
22:52 hanneso joined #git
22:52 Wasp joined #git
22:52 Nitesh joined #git
22:52 Forkk joined #git
22:52 Werring joined #git
22:52 cjbrambo joined #git
22:52 llamapixel joined #git
22:52 Furai joined #git
22:52 Fissure joined #git
22:52 howdoi joined #git
22:52 Karazhan joined #git
22:53 venmx joined #git
22:53 i7c joined #git
22:54 krillr joined #git
22:54 hashpuppy joined #git
22:54 milkshoes joined #git
22:54 gmh joined #git
22:54 Maple__ joined #git
22:54 Maple__ joined #git
22:54 Maple__ joined #git
22:55 CEnnis91 joined #git
22:55 Bengi joined #git
22:55 muldover joined #git
22:55 elmcrest joined #git
22:55 Derperperd joined #git
22:56 dtype joined #git
22:56 skift joined #git
22:57 Dougie187 left #git
22:57 dmod_ joined #git
22:57 l2y joined #git
22:57 prosody joined #git
22:58 howdoi joined #git
22:58 ribasushi joined #git
22:59 ismithers joined #git
23:00 d1z joined #git
23:00 LBV_User joined #git
23:00 wizonesolutions joined #git
23:01 pbrewczynski joined #git
23:01 Starky joined #git
23:01 mikecmpbll joined #git
23:01 fmeerkoetter joined #git
23:01 johtso joined #git
23:01 barq joined #git
23:01 kyan joined #git
23:01 angular_mike_ joined #git
23:01 aleb joined #git
23:01 martin_g joined #git
23:01 CIAguy- joined #git
23:02 mnaser joined #git
23:02 dsdeiz joined #git
23:02 dsdeiz joined #git
23:03 m0viefreak joined #git
23:03 monk12 joined #git
23:04 thebope joined #git
23:04 codedmart joined #git
23:04 ozmage_ joined #git
23:05 monk12 hello all, i had a quick question about workflow. right now i have a master branch in git, and we create some feature branches off of it (pretend feature_branch_1 and pretend feature_branch_2). and once feature_branch_1 is done (i'll test it in dev env), merge back to master, and create a tag to test in qa/staging env's and push that tag to prod. my question...
23:05 stealthii joined #git
23:05 monk12 feature_branch_2 now now doesn't have what was merged from  feature_branch_1 into master. I'd like to get them up there. My coworker said just do a rebase of master onto feature_branch_2... is that proper way to do it, or alternative?
23:05 Kulrak joined #git
23:05 Kulrak joined #git
23:06 Puffball_ joined #git
23:06 eshlox joined #git
23:06 osse monk12: you can merge either feature_branch_1 or master into feature_branch_2
23:07 peterR`` joined #git
23:07 lebster joined #git
23:07 graingert joined #git
23:07 raynold joined #git
23:08 timwis joined #git
23:08 monk12 so literally the "git merge".... osse: when would a rebase be more appropriate?
23:08 osse monk12: not sure. depends on how you work with your team
23:08 osse !merge_vs_rebae
23:08 osse !merge_vs_rebase
23:08 gitinfo [!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
23:08 osse monk12: e.g. a rebase necessitates a force push
23:09 monk12 osse: cool thanks I'll check out the link.
23:10 ljc joined #git
23:11 durham joined #git
23:11 fahadash joined #git
23:12 jascott1 joined #git
23:13 qqx joined #git
23:17 Peng_ joined #git
23:17 svara1 joined #git
23:20 Peng_ joined #git
23:20 finalbeta joined #git
23:22 shgysk8zer0_ joined #git
23:26 thebope joined #git
23:27 cschneid joined #git
23:28 Caelum joined #git
23:28 NeXTSUN joined #git
23:32 ecuanaso joined #git
23:33 dwmw2_gone joined #git
23:35 Ryanar joined #git
23:39 Whiskey can git archive only export changed files in last commit?
23:40 Atm0spher1c joined #git
23:41 _ikke_ No, it export the entire commit
23:42 thiago well, it can export trees. But not individual files.
23:43 CussBot joined #git
23:44 dodobrain joined #git
23:45 Whiskey whatever trees is, im not so good at this
23:45 Whiskey entire commit? whit that means ?
23:46 _ikke_ Whiskey: each commit is a snapshot of the working tree as you comitted it
23:46 _ikke_ (so it's not a diff)
23:48 thiago any directory is a tree. Including the top dir of the repository.
23:48 gugah joined #git
23:48 Whiskey so its no way to pick it out
23:49 Whiskey only export whole source or nothing :D
23:49 thiago or a subdirectory
23:49 thiago but you cannot do a per-file choice
23:49 thiago you could write a tar filter that keeps only the files you want
23:50 _ikke_ thiago: git archive does take a path
23:50 _ikke_ or multiple
23:50 _ikke_ Noewhere does it state that this is only restricted to directories
23:50 thiago oh, right
23:50 thiago I was trying a different syntax
23:50 thiago git archive HEAD:configure
23:50 thiago but git archive HEAD -- configure does work
23:51 thiago Whiskey: just pass the file paths that you want to include after the double-dash
23:51 _ikke_ double-dash is not even required
23:51 _ikke_ The ref is required, so there can be no ambiguity
23:52 thiago it's a very good idea when passing data you're reading from another command
23:52 _ikke_ right, makes sense in that case
23:52 thiago if you had a file called "-e", you'd get: error: unknown switch `e'
23:54 nedbat joined #git
23:54 timthowtdi joined #git
23:56 Whiskey thiago: think thats to complicated as i don´t understand
23:56 synchronous joined #git
23:56 _ikke_ Whiskey: git diff --name-only commit~1 commit returns the list of files that has changed
23:56 thiago Whiskey: ok
23:57 _ikke_ Whiskey: if you pass that to git archive, you get what you want
23:57 thiago Whiskey: git archive HEAD -- <pass here the list of files you want in the archive>
23:57 aca20031 joined #git
23:57 thiago you need to find out how to get the list of files. _ikke_ has a suggestion.
23:59 dwmw2_gone joined #git

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