Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-02

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

All times shown according to UTC.

Time Nick Message
00:00 TyrfingMjolnir add and commit done
00:02 brent__ joined #git
00:03 debian__ joined #git
00:04 Muzer joined #git
00:14 buzzLightBeer joined #git
00:18 Mobutils joined #git
00:21 julius left #git
00:26 shgysk8zer0_ joined #git
00:28 CussBot joined #git
00:28 svm_invictvs joined #git
00:30 robattila256 joined #git
00:31 t0by joined #git
00:33 bronson joined #git
00:35 peepsalot joined #git
00:37 YuGiOhJCJ joined #git
00:38 dsdeiz joined #git
00:45 King_Hual` joined #git
00:52 PaulCape_ joined #git
00:52 Blendify git reset hard to undo local commits right?
00:53 preaction yes
00:54 aarobc joined #git
00:54 Aleric Not just undo, --hard also throws away everything you did in that commit.
00:54 TyrfingMjolnir What to do to modify in git a file I modified with vim?
00:54 TyrfingMjolnir Similar to git add
00:55 Aleric I have no idea what you're asking
00:58 TyrfingMjolnir I added a file to a folder
00:58 TyrfingMjolnir and I edit a file in the folder I cloned from the repo
00:58 TyrfingMjolnir I do git add file
00:59 TyrfingMjolnir then git push origin master
00:59 TyrfingMjolnir The added file is added to the repo
00:59 Aleric Also  git add editted_file
00:59 TyrfingMjolnir Oh
00:59 holodoc joined #git
00:59 Aleric the 'add' doesn't mean add to git repo but add to 'index'
00:59 TyrfingMjolnir So add is UPSERT
01:00 Aleric The index is what you are going to commit next 'git commit'. You can see what you added to the index with 'git diff --cached'
01:00 Aleric Also with 'git status'
01:02 Aleric You can even add some of the changes that you made to a file, not all changes, by picking them manually with: git add -p editted_file
01:02 Aleric or undo that again (the other way, removing it from the index) with: git reset -p
01:03 newbie1 joined #git
01:05 mizu_no_oto joined #git
01:10 nickabbey joined #git
01:11 almy joined #git
01:11 aidalgol joined #git
01:14 Aleric Argh, just delete a file... work of a whole year gone :/
01:14 Aleric deleted*
01:14 Aleric of the year 2017 that is.
01:14 preaction isn't that why you use version control?
01:15 Aleric Yes, I but hadn't committed what I did today to that file :p
01:17 Aleric There, I recovered :)
01:18 cornfeedhobo left #git
01:18 preaction woo! backups!
01:18 slappymcfry joined #git
01:20 boombatower joined #git
01:21 blackwind_123 joined #git
01:22 Aleric No, I retyped what I did. From the last commit done in 2016. Man, stop ruining my joke :p
01:22 g5pw joined #git
01:22 inflames joined #git
01:24 nydel07 joined #git
01:29 shgysk8zer0_ joined #git
01:30 hahuang61 joined #git
01:31 robattila256 joined #git
01:31 Hess joined #git
01:34 Tobbi joined #git
01:40 arescorpio joined #git
01:50 blackwind_123 joined #git
01:51 binBlob joined #git
01:54 binBlob I managed to do something really stupid: deleting my .git folder. With photorec I managed to recover the logs/HEAD and some random pack and idx files. Can I somehow extract something out of those files?
01:56 Aleric Don't you have an upstream repository? You never did a 'git push'?
01:56 binBlob I do have to most stuff but some files are missing.
01:57 Aleric When was the last time you did a push?
01:58 bannakaffalatta joined #git
01:58 binBlob Well everything that I wanted to merge into the upstream repo is save, some orphan branches that had some misc stuff never had been pushed.
01:59 Aleric I think you lost everything you never pushed.
02:00 Aleric To recover the .git, just clone it again... what about:
02:00 Aleric mv .git .git.away
02:00 Aleric mkdir .git
02:00 Aleric cd .git
02:00 Aleric git clone --bare http://remote-url
02:00 Aleric are whats the command exactly..
02:01 Aleric that might put stuff in .git/name
02:01 binBlob yeah I managed to recreate the repo again its just the missing scripts in those orphan branches
02:01 Aleric Seems you need a normal backup, or a recovery tool then, not git commands.
02:02 Aleric (I suppose that it is, instead of 'cd .git': git clone --bare remote-url-here .git)
02:02 binBlob ohh well, good that it bit me while the important files are safe ... guess I also have to push my orphans
02:03 Aleric I make back ups, daily :p
02:04 webdev007 joined #git
02:04 debian_ joined #git
02:04 Aleric There is a lot more you can lose than your git repo
02:08 leeN joined #git
02:13 pks joined #git
02:15 diogenese joined #git
02:17 pandeiro joined #git
02:18 Raed joined #git
02:18 Nilesh_ joined #git
02:19 finalbeta joined #git
02:20 snowkidind joined #git
02:23 cdown joined #git
02:26 dsdeiz joined #git
02:33 bronson joined #git
02:46 Vampire0_ joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and silly hats | 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 | Repository is actual size
02:50 looper joined #git
02:53 d^sh joined #git
02:55 kyan joined #git
02:58 buffffal00 joined #git
03:01 binBlob left #git
03:04 aavrug joined #git
03:04 Phrohdoh joined #git
03:05 Phrohdoh How can I detect if the current repo has no commits? Doing `git rev-parse --short head` errors when there are no commits with quite a bit of output and I can't seem to get redirection working there so I'd like to have git tell me there are no commits.
03:06 bluezone joined #git
03:06 Mobutils_ joined #git
03:08 Orbitrix joined #git
03:08 kadoban Phrohdoh: --quiet ?
03:08 Guest85439 left #git
03:08 Orbitrix joined #git
03:08 kadoban Oh you're not doing --verify ... or maybe you are, I dunno. But --quiet only makes sense for --verify.
03:09 kadoban Maybe do uhm,   git rev-parse --verify HEAD && your command
03:10 karstensrage joined #git
03:11 dirtyroshi joined #git
03:11 Emperor_Earth joined #git
03:12 Phrohdoh Thanks for the tips! :-)
03:12 chachasmooth joined #git
03:19 jebacja joined #git
03:22 FishPencil joined #git
03:23 FishPencil Can I search the full patch diff for a specific string?
03:24 Aleric grep?
03:24 kadoban FishPencil: Are you looking for git log -S or git log -G perhaps?
03:25 wladca_robakow joined #git
03:26 buffal0 joined #git
03:26 dreiss joined #git
03:28 Phrohdoh left #git
03:28 dmc joined #git
03:30 elh9 joined #git
03:31 hexagoxel joined #git
03:32 hahuang61 joined #git
03:32 wladca_robakow left #git
03:36 elh9 joined #git
03:38 MeltedLux joined #git
03:38 AfroThundr joined #git
03:40 Raed joined #git
03:40 Nemo_ joined #git
03:44 NeverDie joined #git
03:46 sunri5e joined #git
03:52 pks joined #git
03:53 hahuang61 joined #git
03:57 Vortex34 joined #git
04:02 Limes_ joined #git
04:04 Lyqyd joined #git
04:07 fission6 joined #git
04:08 fstd_ joined #git
04:08 a_thakur joined #git
04:12 sarbs joined #git
04:12 Blendify What command will return the current revision?
04:13 AfroThundr joined #git
04:14 AfroThundr joined #git
04:14 dsdeiz joined #git
04:20 rwp Blendify, ?? git rev-list HEAD
04:20 cagomez joined #git
04:20 pks joined #git
04:22 rwp Blendify, ?? git rev-list --max-count 1 HEAD
04:23 Blendify rwp, yep thanks
04:25 Electrometro joined #git
04:26 netj joined #git
04:26 Milos joined #git
04:31 AfroThundr joined #git
04:34 mehola joined #git
04:37 JanC_ joined #git
04:43 subhojit777 joined #git
04:46 DINOWILLIAM joined #git
04:47 mehola_ joined #git
04:50 axl_ joined #git
04:54 sbulage joined #git
04:57 wladca_robakow joined #git
05:00 ^peter^ joined #git
05:09 gfixler joined #git
05:09 pks joined #git
05:13 dweelie joined #git
05:22 ^peter^ joined #git
05:26 ^peter^ left #git
05:42 dsdeiz joined #git
05:44 cyan__ joined #git
05:47 eehackr_ joined #git
05:48 phanimahesh joined #git
05:49 mobutu joined #git
05:49 d0nn1e joined #git
05:52 johnnyfive joined #git
05:55 shams joined #git
05:55 shams left #git
05:55 phanimahesh joined #git
05:56 Cabanossi joined #git
06:01 tojo joined #git
06:01 Milos joined #git
06:02 mizu_no_oto joined #git
06:02 govg joined #git
06:03 PioneerAxon_ joined #git
06:03 tojo joined #git
06:04 ayogi joined #git
06:05 Shentino joined #git
06:07 tojo joined #git
06:07 YuGiOhJCJ joined #git
06:12 PioneerAxon joined #git
06:12 bcc joined #git
06:12 bcc joined #git
06:13 tojo joined #git
06:23 dsdeiz joined #git
06:25 tojo joined #git
06:33 SwiftMatt joined #git
06:35 shgysk8zer0_ joined #git
06:35 MeltedLux joined #git
06:36 nd joined #git
06:46 clemf joined #git
06:48 g5pw joined #git
06:49 Raging_Hog joined #git
06:54 ThomasLocke joined #git
06:59 ayjay_t joined #git
07:01 dreiss joined #git
07:04 sbulage joined #git
07:11 khfeng joined #git
07:12 khfeng_ joined #git
07:12 _jan joined #git
07:12 JeroenT joined #git
07:18 bayman joined #git
07:20 bayman i can't get push my local commit because it says the remote contains work that i do not have locally.  I want to ignore those changes on the repo and allow me to git push. how do i do that?
07:21 rewt rebase first
07:21 tvw joined #git
07:22 bayman how do i do that/
07:22 bayman can i git reset to the commit prior to last git push?
07:25 chele joined #git
07:25 lordjancso joined #git
07:25 rewt git rebase
07:26 zeroed joined #git
07:26 zeroed joined #git
07:28 g5pw joined #git
07:30 eehackr_ joined #git
07:30 Orbitrix joined #git
07:31 Orbitrix joined #git
07:41 Sasazuka joined #git
07:41 Sceorem joined #git
07:41 bayman left #git
07:45 vmiklos joined #git
07:47 mahendratech joined #git
07:53 ThomasTang joined #git
07:55 ayjay_t joined #git
08:01 danslo joined #git
08:03 elh9 joined #git
08:03 jknetl joined #git
08:08 fbwnd joined #git
08:10 nivag joined #git
08:14 Shock- joined #git
08:14 Singmyr joined #git
08:14 a_thakur joined #git
08:15 zefferno joined #git
08:16 a_thakur joined #git
08:20 eduardas_m joined #git
08:22 JeroenT joined #git
08:26 dimi1947 joined #git
08:27 byte512 joined #git
08:27 jagob joined #git
08:30 blur3d joined #git
08:30 JeroenT joined #git
08:31 aidalgol There wouldn't happen to be a config option to name --no-edit the default for merges (with no conflicts), would there?
08:34 ShapeShifter499 joined #git
08:40 bcc joined #git
08:40 bcc joined #git
08:42 JeroenT joined #git
08:46 Shock- joined #git
08:47 JeroenT joined #git
08:48 Balliad joined #git
08:49 jast aidalgol: you can set it for individual branches (git config branch.foo.mergeoptions --no-edit) or for everything using an environment variable (GIT_MERGE_AUTOEDIT=no)
08:50 jast however, in normal use there should be no need to do _that_ many merges...
08:57 _ikke_ They changed the default not without reason
08:58 JeroenT joined #git
09:12 rasto joined #git
09:17 Shock- joined #git
09:17 Raging_Hog joined #git
09:18 Lea2 joined #git
09:18 dodobrain joined #git
09:22 King_Hual joined #git
09:24 auzty joined #git
09:26 dimi1947 joined #git
09:27 bdeferme joined #git
09:29 metachr01 joined #git
09:30 wget joined #git
09:30 Tanfrieze joined #git
09:31 markovh joined #git
09:31 Synthead joined #git
09:35 ki0 joined #git
09:37 askb joined #git
09:39 marcogmonteiro joined #git
09:43 ayjay_t_ joined #git
09:43 ayjay_t_ joined #git
09:44 ayjay_t_ left #git
09:46 cjohnson joined #git
09:46 dzho joined #git
09:46 trelane joined #git
09:46 trelane joined #git
09:47 aax joined #git
09:47 ayjay_t okay so, case study: my server, Comp-B, has a `git clone --bare` of Comp-A's RandoRepo. Comp-C clones Comp-B, commits changes, then `git push` changes back to Comp-B. Comp-B then `git fetch` to get upstream changes from Comp-A. Is there a merge step on Comp-B to consolidate push's from Comp-C and fetch's from Comp-A?
09:47 PCatinean joined #git
09:48 Shock- joined #git
09:49 ThomasLocke joined #git
09:49 ThomasLocke joined #git
09:49 Anticom joined #git
09:49 lightstalker joined #git
09:50 clmsy joined #git
09:51 phanimah1sh joined #git
09:52 rominronin joined #git
09:54 _ikke_ ayjay_t: not that I'm aware of
09:54 _ikke_ you cannot push and fetch in one command
09:57 ayjay_t no that i know... i do a push from my home computer to my server which serves the source i'm modifying, and then i want to rebase the server
09:57 g5pw joined #git
09:57 ayjay_t i mean i realize i could probably do it in serveral different orders
09:57 ayjay_t but if the server has a --bare repo, can it handle merge conflicts? maybe its best to do all this from a working directory? i'm not really sure what the best workflow is
09:57 phanimahesh joined #git
09:57 crater2150 joined #git
09:58 _ikke_ ayjay_t: You cannot merge in a bare repository (or rebase)
09:58 _ikke_ You need a working tree for those operations
09:58 King_Hual joined #git
09:58 ayjay_t yeah, that makes sense. but then, out of curiosity, how would it handle conflicts from a push to it with customizations, and then a subsequent fetch from upstream
09:59 Lea2 joined #git
09:59 JeroenT_ joined #git
10:00 Juzzika joined #git
10:01 ayjay_t joined #git
10:01 JeroenT_ joined #git
10:02 jast ayjay_t: actually git clone --bare doesn't set up refspecs, so you can't 'git fetch' without doing that setup work yourself
10:02 fling joined #git
10:02 jast and depending on how you set it up, the fetch will either fail or overwrite the changes that were pushed by Comp-C
10:03 jast suppose you used --mirror instead of --bare... then a later 'git fetch' would simply overwrite anything that gets in its way
10:04 ayjay_t okay thanks jast, i actually did use mirror not bare
10:04 jast the difference is in the refspecs (see the 'config' file in the bare repo)
10:04 ayjay_t yeah i've noticed it, i don't really understand that /*/*/ stuff yet
10:04 jast +refs/*:refs/* -- the '+' means: no mercy :)
10:04 chll_ joined #git
10:05 jast without the '+' it will abort if a fetch would truncate history
10:05 jast refspecs are actually fairly simple. left side is source, right side is destination, so my example means: take refs/* from the source (remote) repo and put it in refs/* in the local repo
10:06 ayjay_t i've decided to `git clone` and keep the master(default) branch around as the working directory, and then let comp-cs clone that and push a branch to maintain changes
10:06 ayjay_t ohh
10:06 jast the normal setup for non-bare clones is: +refs/heads/*:refs/remotes/origin/* (for example)
10:06 jast which means: take the remote branches (stuff in refs/heads/) and put it in refs/remote/origin/ locally
10:06 gajus joined #git
10:07 ayjay_t okay hmm poop i'm still pretty weak on the internals
10:07 jast push uses refspecs, too. same logic: source (local) on the left, destination (remote) on the right
10:08 ayjay_t all in {.git/,}config
10:08 jast again, that's pretty simple. names in git (branch names, tag names, ...) are stored in refs. a ref maps a name to a git object (a commit, most of the time).
10:09 ayjay_t sooooooo okay
10:09 jast to avoid name clashes, the refs are internally put in different paths, local branches go in refs/heads, tags go in refs/tags, mirrors of remote branches go in refs/remotes
10:09 ayjay_t so refs/remotes/{tags,heads}?
10:09 ayjay_t i mean i can look at this point, thanks for the help tho
10:09 jast good guess, but wrong ;)
10:09 jast git doesn't remember remote tags, unlike branches
10:10 ayjay_t really?
10:10 jast and in fact git never distinguishes where a tag came from, so if you have multiple remotes that use the same tag name for different things, it's not going to work
10:10 ayjay_t aren't those kind of importnat
10:10 ayjay_t wait so do you get the remote tags?
10:10 ayjay_t but it doesn't remember where it came from
10:11 ayjay_t or does it just not get the remote tag
10:11 jast remote tags always end up in your local refs/tags/
10:11 jast so, exactly the same as tags you created locally
10:11 serialoverflow joined #git
10:12 jast side note, an easy way to see all refs is 'git show-ref' (you can use various filters on it, too)
10:12 JeroenT joined #git
10:12 jast I find it's easy to understand what's happening if you can actually see it :)
10:13 ayjay_t i've never tried it, i'll check it out
10:14 jast and if you like colourful pictures you can look at !gcs and get pretty much the full story as a slideshow
10:14 gitinfo [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html
10:15 jast hmm, I guess that could do with some rephrasing
10:17 jast .trigger_edit concepts "Git Concepts Simplified" presents all the important structures in Git, step by step, including selected internal details so it becomes much easier to understand what's going on whenever something's going on. http://gitolite.com/gcs.html
10:17 gitinfo jast: Okay.
10:17 vrlx joined #git
10:17 xaa joined #git
10:17 pbrewczynski joined #git
10:18 ElGrandeAmigo joined #git
10:18 ayjay_t lol i'm drowning jast, i've been working for like 12 hours, but i've bookmarked that link
10:19 jast heh, well, no need to hurry on my account :)
10:21 Shock- joined #git
10:22 jast I hope you're going to be able to stop working soon, though. 12 hours is plenty...
10:23 g5pw joined #git
10:23 Nitesh joined #git
10:25 rnsanchez joined #git
10:26 aax joined #git
10:26 Serpent7776 joined #git
10:29 Lea2 joined #git
10:30 tango_ joined #git
10:34 tlaxkit joined #git
10:38 ShapeShifter499 joined #git
10:40 rnsanchez_ joined #git
10:41 _ADN_ joined #git
10:41 Panacea joined #git
10:47 xaa joined #git
10:51 netj joined #git
10:53 Shock- joined #git
11:00 davimore joined #git
11:00 dsdeiz joined #git
11:01 rominronin joined #git
11:04 JeroenT joined #git
11:05 aw1 joined #git
11:07 rominronin joined #git
11:10 khfeng joined #git
11:17 HateDread joined #git
11:18 HateDread Hi all. Trying to set the committer date to the author date for every file I interactively rebase, but this --exec has no effect: $ git rebase -i SHA --exec 'GIT_COMMITTER_DATE=$GIT_AUTHOR_DATE; export GIT_COMMITTER_DATE'
11:18 HateDread Have I done something obviously wrong?
11:20 HateDread Alternatively: if I've made a mistake in a commit I've already pushed a while ago, what's the 'best practice' for correcting it, if not rebasing and changing history? I can't find much on what to do in this situation
11:20 grawity rebase --exec doesn't have the special magic to pick up environment variables
11:20 dsdeiz joined #git
11:20 grawity (which normally only propagate "downwards", not upwards to git-rebase itself)
11:20 grawity you could do the same with filter-branch --env-filter, though
11:21 HateDread Can I do that for all commits only onwards from a particular one?
11:22 HateDread Not looking to do it to all commits, is all.
11:25 Shock- joined #git
11:28 grawity probably
11:28 j416 filter-branch takes a revision range
11:29 fbwnd joined #git
11:29 j416 e.g. `git filter-branch <flags here> somecommit..HEAD`
11:33 _jan left #git
11:34 HateDread I've tried the following, but I get 'Cannot create a new backup', which I can't see how it relates? $ git filter-branch --env-filter 'GIT_COMMITTER_DATE=$GIT_AUTHOR_DATE; export GIT_COMMITTER_DATE' 5cb3b90eb29b711a9819289b49452b0c03187961..HEAD
11:34 HateDread I must be misunderstanding you
11:34 j416 HateDread: try reading the rest of the error message
11:35 HateDread j416: Sorry, I have. I have no idea why it's talking about backups at all.
11:35 j416 HateDread: -f
11:36 HateDread Ohhhh, I get it. It just wants me to force it -.- I thought I was somehow running some unintended operation to perform a backup
11:36 HateDread Duh
11:36 j416 it creates a backup of whatever you had before running filter-branch
11:36 joki joined #git
11:36 j416 -f is to overwrite the last backup
11:37 HateDread Ah that makes more sense, thank you.
11:38 pry0cc joined #git
11:39 j416 o/
11:41 ThomasTa1g joined #git
11:41 elh9 joined #git
11:42 JeroenT joined #git
11:44 jast I'm confused, what's the purpose of changing the committer date?
11:45 HateDread Because I have no idea what I'm meant to do to recover from pushing a mistake 12 commits ago on a private repo, I've been trying to insert a commit into history and force push it, but didn't want the dates reset in the rebase
11:46 HateDread Can't find best practices for this that aren't talking about a local mistake
11:47 HateDread And after I canceled a git filter-branch env-filter I made in error, I have a .git-rewrite folder I can't remove :)
11:50 HateDread Okay, solved that last one. Now, what do people suggest to fix this situation? Commit is pushed 12 deep on remote, and the ones after it depend on it, but it's broken. What's the 'recommended' way to solve that?
11:51 HateDread Should I just commit a fix and say "Fix for _____ error"?
11:51 ertesx joined #git
11:53 elh9 joined #git
11:55 andrew710 joined #git
11:56 tlaxkit joined #git
11:57 Shock- joined #git
12:01 HateDread No but really - what do you do when fixing bugs deeper in commit history and already pushed? I'm trying to find out what you're 'supposed' to do (this repo is in my portfolio), but not getting anywhere and I'd really like to get back to work :)
12:01 HateDread I just have no idea what the practice is - nobody's shown me how to use Git.
12:01 tobiasvl HateDread: sure, just make a fixup commit
12:01 JeroenT joined #git
12:01 dede_ joined #git
12:02 HateDread tobiasvl: That's not a noob move? I had always thought commits should all be atomic and beautiful :P
12:04 tobiasvl hehe, yeah, but rewriting pushed history is also a sin. you just have to balance it.
12:04 j416 HateDread: I generally try to work on a separate branch, that I avoid pushing to master (or what have you) until it has been baking for a little while. All too often I'll find something that should have been part of an earlier commit, only minutes after I've pushed things. I commit to some branch, then let it rest for a while, then merge. For personal projects that others don't care about, I generally just work
12:04 j416 on one branch and force push like mad, though.
12:05 finalbeta joined #git
12:05 HateDread j416: Yeah, I've been working on master and force pushing, but that won't save me when the mistake is in the past
12:07 HateDread Every other commit is atomic and beautiful, so it feels bad to have this one that I messed up in the history. It's like the first scratch on a new car
12:07 nettoweb joined #git
12:07 rivarun joined #git
12:08 tuor joined #git
12:17 Panacea joined #git
12:17 JeroenT joined #git
12:21 jnavila joined #git
12:23 mda1 joined #git
12:24 manuelschneid3r joined #git
12:27 mehola joined #git
12:28 Shock- joined #git
12:33 schneider joined #git
12:34 sandwichmaker joined #git
12:35 cdown joined #git
12:36 sandwichmaker joined #git
12:37 dsdeiz joined #git
12:37 dsdeiz joined #git
12:38 DrRobotic joined #git
12:39 JeroenT joined #git
12:41 phanimah1sh joined #git
12:41 joshc joined #git
12:41 ShapeShifter499 joined #git
12:44 sandwichmaker joined #git
12:45 joshc I want to be able to have a private repository that we push to for our group, but still be able to pull in changes from the original authors repository (school project, we're given some files that may update later). What should I look up to do something like this?
12:46 cdown_ joined #git
12:46 grawity on the "private repo" side, try gitlab/bitbucket or set up your own on a Linux server
12:46 grawity on the local side, just make sure both repos are added to `git remote`
12:48 joshc ah so its that simple. cool, thanks
12:51 HateDread Hey j416, thanks for your help earlier. Got it all working! Turns out your range stuff was fine, I was just checking the results in SourceTree, and its GUI wouldn't update the timestamps without a restart :P
12:51 HateDread Well, opening and closing that specific repo
12:52 HateDread I fixed the bad commit, tweaked the message, then ran git filter-branch -f --env-filter 'GIT_COMMITTER_DATE=$GIT_AUTHOR_DATE; export GIT_COMMITTER_DATE' TheTweakedSHA..master
12:52 HateDread And then force-pushed. Bingo!
12:55 sdothum joined #git
12:57 ojdo joined #git
13:00 Shock- joined #git
13:00 thiago joined #git
13:01 j416 HateDread: nice
13:02 j416 HateDread: next time I would simply ignore the committer date; leave it set to the real committer date
13:03 j416 author date will be there anyway.
13:03 HateDread j416: I just didn't like that all of the rebased commits were 'now' rather than when they actually occurred. I liked tracking how regular my changes were
13:03 HateDread Aye, but SourceTree uses committer date for the main date display afaik :P
13:03 j416 I ser
13:04 j416 see*
13:04 HateDread Pedantic I know
13:04 j416 you'll probably find that you'll br rebasing and fixing a lot later anyway
13:05 j416 to the point where fixing dates is just cumbersome
13:05 HateDread Yeah true enough
13:06 HateDread As I said before; it's like the first scratch on a new car. The rest of the history is perfect :P
13:06 j416 and you'll realise the info is not very useful either since commit frequency akd dates say very little about reality
13:07 j416 and*
13:08 HateDread It's all very new to me. I'm sure I won't give a damn soon enough
13:10 j416 :)
13:11 j416 I used to care about those same things
13:11 d1z_ joined #git
13:12 rnsanchez joined #git
13:13 Cavallari joined #git
13:14 swords joined #git
13:15 Tobbi joined #git
13:19 [0xAA] joined #git
13:22 rnsanchez joined #git
13:22 rishi joined #git
13:24 tlaxkit joined #git
13:26 demize joined #git
13:27 nowhere_man joined #git
13:28 Discovery joined #git
13:29 almy joined #git
13:31 IlNominePatre joined #git
13:31 PeterJCLaw joined #git
13:32 robattila256 joined #git
13:32 Shock- joined #git
13:34 cdown_ joined #git
13:35 PeterJCLaw afternoon; I submitted a tiny patch to <git@vger.kernel.org> around the start of December, but haven't seen any responses. I'm wondering what the average time between submission and responses was and whether I'd messed up somehow? (I've not contributed anything to git before)
13:39 afuentes joined #git
13:41 OnBrokenWings joined #git
13:43 cdown_ joined #git
13:45 cdown joined #git
13:45 thebird joined #git
13:46 wget joined #git
13:46 wget joined #git
13:46 nowhere_man joined #git
13:46 thebird left #git
13:47 JeroenT joined #git
13:49 modin joined #git
13:53 ome joined #git
13:58 JeroenT joined #git
13:58 jimi_ joined #git
14:00 HoierM_ joined #git
14:00 jimmyeatworld joined #git
14:01 ghormoon joined #git
14:01 ghormoon hi, can I add --stdlayout to already checked out repo? it seems it didn't pick it up without it and it clones it out for like half an hour :(
14:02 ghormoon using git-svn
14:03 JeroenT joined #git
14:03 isysd joined #git
14:03 Shock- joined #git
14:04 thiago no, you need to clone it again
14:04 ghormoon damn :(
14:04 ghormoon I hate svn :D
14:05 rnsanchez_ joined #git
14:06 BSaboia joined #git
14:06 grawity svnsync it to a local directory, then clone until it works, then edit the URL
14:07 govg joined #git
14:07 enckse joined #git
14:07 howdoi joined #git
14:07 grawity (with --use-svnsync-props)
14:08 ghormoon I'm pretty sure it worked with --stdlayout a year ago, when I did the same mistake first time :D
14:08 ghormoon so now I'll just let it finish and it will be ok
14:08 storrgie joined #git
14:08 ghormoon this is a repo where once or twice a year someone wants me to do 1line change instead of a developer that is sick/on a vacation
14:08 guampa joined #git
14:09 hhee joined #git
14:10 rishi joined #git
14:13 enckse joined #git
14:14 storrgie joined #git
14:15 nettoweb joined #git
14:17 aavrug joined #git
14:17 ExoUNX joined #git
14:17 nowhereman joined #git
14:18 Orbitrix joined #git
14:18 JeroenT joined #git
14:20 a_thakur joined #git
14:21 MafiaInc joined #git
14:23 jagob joined #git
14:24 grumble joined #git
14:25 [0xAA] joined #git
14:26 cdg joined #git
14:27 g5pw joined #git
14:27 PeterJCLaw left #git
14:29 ShekharReddy joined #git
14:30 Jackneill joined #git
14:32 Serpent joined #git
14:32 BSaboia joined #git
14:32 rivarun joined #git
14:33 finalbeta joined #git
14:35 Shock- joined #git
14:38 Tobbi joined #git
14:39 jnavila joined #git
14:39 cyan__ joined #git
14:40 unbalanced joined #git
14:40 ShapeShifter499 joined #git
14:41 Gloomy joined #git
14:49 aarobc joined #git
14:51 dweelie joined #git
14:54 lektrik joined #git
14:54 DINOWILLIAM joined #git
14:55 roxlu_ left #git
14:59 nettoweb joined #git
15:00 f0rks joined #git
15:01 g5pw joined #git
15:04 esc joined #git
15:04 esc joined #git
15:04 dsdeiz joined #git
15:04 dsdeiz joined #git
15:06 Jonno_FTW joined #git
15:06 g5pw joined #git
15:06 DanmerZ joined #git
15:07 serialoverflow joined #git
15:07 Shock- joined #git
15:15 ispn joined #git
15:16 nickabbey joined #git
15:16 dsdeiz joined #git
15:19 subhojit777 joined #git
15:24 _rnsanchez_ joined #git
15:25 kedare joined #git
15:25 tmsmith joined #git
15:26 nicksloan joined #git
15:27 elsevero joined #git
15:30 lektrik joined #git
15:37 Orbitrix joined #git
15:37 Orbitrix joined #git
15:39 Shock- joined #git
15:40 hashpuppy joined #git
15:42 Endarked joined #git
15:45 cdg_ joined #git
15:46 overlord_tm joined #git
15:53 zzz joined #git
15:54 eduardas_m joined #git
15:59 davimore_ joined #git
16:02 g5pw joined #git
16:05 Raging_Hog joined #git
16:08 aax joined #git
16:09 clemf joined #git
16:12 Shock- joined #git
16:13 fission6 joined #git
16:15 hexagoxel joined #git
16:19 blackwind_123 joined #git
16:21 rwb joined #git
16:24 mkoskar joined #git
16:29 mehola joined #git
16:32 phanimahesh joined #git
16:34 jnavila joined #git
16:39 GT4066 joined #git
16:39 jagob joined #git
16:39 Corosus joined #git
16:40 PaulCapestany joined #git
16:41 mizu_no_oto joined #git
16:42 lacour joined #git
16:42 jimi_ joined #git
16:42 dreiss joined #git
16:44 Shock- joined #git
16:46 Khisanth joined #git
16:47 tmcmahon joined #git
16:49 oaao joined #git
16:50 nettoweb joined #git
16:51 Cavallari joined #git
16:52 DINOWILLIAM joined #git
16:57 PaulCapestany joined #git
16:59 ertesx joined #git
17:00 PaulCape_ joined #git
17:02 doener joined #git
17:05 mizu_no_oto joined #git
17:06 cagomez joined #git
17:08 cagomez_ joined #git
17:10 kpraveen joined #git
17:10 sea-gull joined #git
17:13 dviola joined #git
17:16 svm_invictvs joined #git
17:17 HoierM joined #git
17:18 Shock- joined #git
17:20 tvw joined #git
17:21 pks joined #git
17:24 rominronin joined #git
17:25 govg joined #git
17:25 tuor joined #git
17:27 NeverDie joined #git
17:27 tuor joined #git
17:31 zacts joined #git
17:31 elsevero joined #git
17:33 Phrohdoh joined #git
17:34 Phrohdoh How does git find `git-foo-bar` when I execute `git foo-bar`? Does it manually iterate over the paths in $PATH looking for an executable `git-foo-bar` or does it just tell the shell to execute the first `git-foo-bar` it finds?
17:34 mizu_no_oto joined #git
17:35 Phrohdoh (of course the latter looks at $PATH too, I'm just wanting to know if git does this manually)
17:47 dendazen joined #git
17:49 ljubak joined #git
17:49 jimi_ joined #git
17:52 Shock- joined #git
17:53 Darcidride joined #git
17:55 worstadmin joined #git
17:55 regedit joined #git
17:55 stevenxl joined #git
17:55 cfoch joined #git
17:55 howdoi joined #git
17:55 epic joined #git
17:56 Hess joined #git
17:56 Hess joined #git
17:56 addshore joined #git
17:56 jleclanche joined #git
17:56 svm_invictvs joined #git
17:56 moop joined #git
17:56 etcinit joined #git
17:57 da5id joined #git
17:57 contracode joined #git
17:57 codedmart joined #git
17:57 parliament joined #git
17:57 pbrewczynski joined #git
17:57 adambrenecki joined #git
17:57 ELLIOTTCABLE joined #git
17:57 MLM_ joined #git
17:57 belak joined #git
17:57 hussam joined #git
17:57 WillMoogle joined #git
17:57 kireevco joined #git
17:58 angelsl joined #git
17:58 martin_g joined #git
17:58 huhlig joined #git
17:58 [diecast] joined #git
17:58 stealthii joined #git
17:58 vcoinminer joined #git
17:58 Ferris_ joined #git
17:58 ilmari Phrohdoh: it seems to scan libexecdir and then $PATH
17:58 pizzaops joined #git
17:58 dunk joined #git
17:59 ghostlight joined #git
18:00 fahadash joined #git
18:00 yoyoyo_____ joined #git
18:00 bbhoss joined #git
18:00 ilmari and stats every file found starting with git-, presumably to determine if it's executable, even if it doesn't match the given command
18:01 NeverDie joined #git
18:03 Phrohdoh ilmari: Thanks! If you're looking at the code for that could you link me to it?
18:03 Phrohdoh If not no problem, that is all pretty explanatory.
18:05 thiago joined #git
18:05 unborn left #git
18:06 Tobbi joined #git
18:10 DS01 joined #git
18:10 shgysk8zer0_ joined #git
18:12 ilmari Phrohdoh: sorry, I just straced it and looked at the INSTALL file for the name of the configure/make parameter
18:12 ayjay_t is there a hook for clone?
18:13 shpew12 joined #git
18:13 kpraveen left #git
18:13 ayjay_t (i'm aware of checkout)
18:13 shgysk8zer0 joined #git
18:13 preaction ayjay_t: not that i'm aware of, as a clone creates the repo. so there can be no hooks until after the clone is complete
18:14 ayjay_t oh no i mean.... on the server side
18:14 ayjay_t if someone runs git clone http://sample.com, i'm looking for a hook on sample.com
18:14 Phrohdoh ilmari: thanks anyway, very insightful :-)
18:15 ayjay_t unless wait, if they run git clone --no-checkout does that mean you don't get any data from the server?
18:15 ayjay_t just a empty repo with the correct remote refs?
18:15 bremner !tias
18:15 gitinfo Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.
18:16 bremner but no, that's not what it means.
18:16 bremner the object store is updated with the history corresponding to those refs
18:16 preaction what do you intend to do with this server-side hook?
18:16 ayjay_t another layer of authentication
18:17 preaction ssh isn't good enough?
18:17 ayjay_t it's against policy to give users to everyone who needs access to the git server, so we use http only
18:18 preaction you don't need to give full user accounts to use ssh
18:18 preaction !gitolite
18:18 gitinfo Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/
18:18 ayjay_t yeahhhh i'm aware of gitolite
18:19 ayjay_t everyone loves it, i reinvented the wheel, i know
18:19 preaction okay, why not try it since it can likely fix your problems?
18:19 ayjay_t for what its worth, it's been a *great* learning experience
18:19 preaction congratulations. i might also then recommend that since gitolite is open source, you are free to rewrite the wheel using it as a guide
18:19 prg318 joined #git
18:20 ayjay_t i mean, for what its worth, i agree with you
18:20 bremner ayjay_t: in any case, all the hooks there are are documented in man githooks
18:20 gitinfo ayjay_t: the githooks manpage is available at http://jk.gs/githooks.html
18:20 ayjay_t thanks bremner, i read it
18:21 aw1 joined #git
18:22 ayjay_t i came in here to confirm my suspicions
18:22 ayjay_t but preaction: i have a feeling that since this is the very last feature we need, we're going to end up modifying http-backend.c
18:23 ayjay_t *shrug* you live you learn
18:23 elsevero joined #git
18:23 duderonomy joined #git
18:23 justanotheruser joined #git
18:23 buffal0 joined #git
18:24 Shock- joined #git
18:24 rominronin joined #git
18:29 fassl joined #git
18:29 fassl hello, can anybody tell me how to create a branch in a hook?
18:30 ayjay_t lol that sounds disasterous but maybe you could try https://libgit2.github.com/
18:32 rudi_s fassl: Use the normal git tools?
18:33 BlessJah using git tools sounds more reasonable
18:33 bremner i.e., use git branch??
18:34 fassl rudi_s: yep trying that now
18:34 fassl i tried git checkout but that didnt work onviously
18:35 fassl *ob
18:35 BlessJah also, !xy
18:35 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
18:35 fassl but then it creates a new branch from master, how can i tell it to do it from develop branch?
18:35 vargas joined #git
18:36 fassl commiting changes to a specifiv file should create a new branch -> release-version
18:36 BlessJah no, it's not how it is supposed to work
18:37 rewt do you mean a tag should be created?
18:37 fassl no
18:38 BlessJah fassl: git branch <name> <rev> is command you're looking for
18:38 Singmyr joined #git
18:39 BlessJah however I advice to reconsider your workflow
18:40 fassl BlessJah: thanks
18:40 AlineGomes joined #git
18:41 fassl but why? is it so bad to automate that? i change the version, it creates a new branch on which buildbot listens and issues a build
18:42 DS01 left #git
18:42 BlessJah you don't need branch for every release, and branches (why not tags?) could be created by CI anyway
18:43 AlineGomes joined #git
18:45 mizu_no_oto joined #git
18:45 fassl BlessJah: i'm trying to go with this http://nvie.com/posts/a-succ​essful-git-branching-model/
18:45 fassl it has tags for like major releases, and release branches for not major releases if i got it correctly
18:46 blackwind_123 joined #git
18:49 BlessJah oh, I have assumed you wanted to keep those branches
18:50 BlessJah fassl: as long as you purge them as soon as they're merged into master, it should be fine
18:51 cagedwisdom joined #git
18:53 mizu_no_oto joined #git
18:53 Atm0spher1c joined #git
18:53 fassl BlessJah: yeah that was the plan
18:55 BlessJah fassl: if that's viable and your team is medium to large, force them to keep their feature branches in forks or own projects or you'll end up with pile of dead branches to sift thruogh each time one needs to create something
18:56 Shock- joined #git
18:57 jnavila joined #git
19:03 bcc joined #git
19:03 bcc joined #git
19:04 lebster joined #git
19:14 acetakwas joined #git
19:14 fassl BlessJah: there won't be that many of feature branches, maybe about 5 at a time and they should also be purged after they are done and merged to develop, as with the release branches i think it should be fine?
19:18 BlessJah "should be purged" and "will be purged" - I've seen project with 1.5k branches with team of maybe 50
19:18 fassl ouch
19:19 nickabbey joined #git
19:20 stick-shift joined #git
19:21 fassl we are just 5 people and meet every so often and we'll try to remind each other of purging, should be manageable
19:24 fassl BlessJah: thanks again for the cmd, it works, yay!
19:25 BlessJah no problem
19:28 Shock- joined #git
19:30 LiENUS joined #git
19:30 m0viefreak joined #git
19:34 jottr joined #git
19:36 jeffreylevesque_ joined #git
19:36 shgysk8zer0 joined #git
19:43 satifant joined #git
19:45 Phrohdoh left #git
19:47 [log] joined #git
19:49 mizu_no_oto joined #git
19:49 NeverDie joined #git
19:52 eehackr_ joined #git
19:52 mizu_no_oto joined #git
19:55 rominron_ joined #git
19:55 diogenese joined #git
19:55 [log] joined #git
19:56 [log] joined #git
19:59 [log] joined #git
19:59 jost joined #git
20:00 [log] joined #git
20:00 [log] joined #git
20:02 heftig_ joined #git
20:03 nowhereman joined #git
20:03 zeller joined #git
20:03 teadrop_ joined #git
20:04 Shock- joined #git
20:05 angular_mike_ joined #git
20:06 jw4242 joined #git
20:06 twisted` joined #git
20:11 bcc_ joined #git
20:11 theskillwithin joined #git
20:11 HoierM joined #git
20:18 Electrometro joined #git
20:20 thiago joined #git
20:25 acetakwas joined #git
20:32 ki0_ joined #git
20:32 d0nn1e joined #git
20:36 kisonecat joined #git
20:37 kpease joined #git
20:39 cdg joined #git
20:42 SpeakerToMeat joined #git
20:44 manuelschneid3r joined #git
20:44 buzzLightBeer joined #git
20:47 ratdeptrai joined #git
20:48 Shock- joined #git
20:54 nickabbe_ joined #git
20:54 Balliad joined #git
20:57 jottr joined #git
20:59 muahah joined #git
21:00 aax joined #git
21:02 muahah joined #git
21:04 cudg joined #git
21:07 umbSublime joined #git
21:07 umbSublime joined #git
21:13 e14 joined #git
21:14 dsdeiz joined #git
21:15 SpeakerToMeat joined #git
21:15 sword joined #git
21:18 safe joined #git
21:22 overlord_tm joined #git
21:23 robotroll joined #git
21:25 ratdeptrai joined #git
21:26 rominronin joined #git
21:27 umbSublime joined #git
21:29 Shock- joined #git
21:29 alexruf joined #git
21:30 acetakwas joined #git
21:36 mizu_no_oto joined #git
21:37 eehackr_ joined #git
21:37 bcc joined #git
21:37 bcc joined #git
21:38 guyz joined #git
21:38 WaReZ joined #git
21:38 holodoc joined #git
21:39 netj joined #git
21:41 clemf joined #git
21:41 str_ joined #git
21:44 str joined #git
21:45 ratdeptrai joined #git
21:47 CheckDavid joined #git
21:51 mizu_no_oto joined #git
21:52 _ADN_ joined #git
21:53 cdown joined #git
21:54 jottr_ joined #git
22:02 Shock- joined #git
22:04 msonntag joined #git
22:04 eehackr_ joined #git
22:04 ISmithers joined #git
22:06 blackwind_123 joined #git
22:12 davimore__ joined #git
22:13 paws_ joined #git
22:14 jave joined #git
22:17 ratdeptrai joined #git
22:22 WayToDoor joined #git
22:30 davimore__ joined #git
22:32 jstein_ joined #git
22:33 mellernoia joined #git
22:33 Shock- joined #git
22:34 nicksloan joined #git
22:36 chrx joined #git
22:37 nicksloan joined #git
22:41 buffal0 joined #git
22:41 fsckd joined #git
22:44 Electrometro joined #git
22:45 Electrometro joined #git
22:45 vdv joined #git
22:47 bayman joined #git
22:49 askb joined #git
22:51 mizu_no_oto joined #git
22:53 t-mart joined #git
22:56 acetakwas joined #git
22:57 rominronin joined #git
22:59 bayman left #git
22:59 Anja_ joined #git
22:59 NeverDie joined #git
23:00 cagomez joined #git
23:00 buffal0 joined #git
23:00 Noldorin joined #git
23:02 dsdeiz joined #git
23:02 dsdeiz joined #git
23:02 holodoc joined #git
23:03 rizonz when I revert a merge the files are still in master, why is that ?
23:04 Shock- joined #git
23:04 cyan__ joined #git
23:06 Mobutils joined #git
23:06 nickabbey joined #git
23:08 cagomez joined #git
23:09 jost_ joined #git
23:10 ratdeptrai joined #git
23:12 NeverDie joined #git
23:14 Mobutils joined #git
23:14 cbreak reverting merges is tricky, maybe you reverted the wrong side of the merge
23:16 jottr_ joined #git
23:17 JanC_ joined #git
23:17 buffal0 joined #git
23:18 neanderslob joined #git
23:27 rizonz cbreak: yeah this is weird, all is gone and my commit/merge exists there
23:27 cagedwisdom joined #git
23:28 cbreak reverting doesn't remove history
23:28 cbreak in particular, reverting a merge does not remove the merge
23:28 rizonz damn
23:28 rizonz so what is best ?
23:28 t-mart joined #git
23:29 cbreak depends on what you want
23:29 ToxicFrog joined #git
23:29 slappymcfry joined #git
23:29 cbreak !revert
23:29 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
23:29 rizonz my status back before my commit I merged
23:29 ratdeptrai joined #git
23:30 rizonz oh!
23:30 rizonz but I pushed it
23:30 rizonz that was the issue
23:30 fission6 joined #git
23:31 clemf_ joined #git
23:31 rizonz so I actualy need to fix my remote
23:33 rizonz this kinda sucks
23:34 Shock- joined #git
23:34 cdown joined #git
23:36 bcc joined #git
23:36 bcc joined #git
23:36 bekks hi all
23:37 bekks Is there a way to run an action via a hook after pushing a new branch to repo?
23:38 bekks Technically, after pushing a new branch, I need to replace "x.y.z" with the name of the branch in all files in the new branch.
23:38 nickabbey joined #git
23:39 zivester joined #git
23:42 ismaris joined #git
23:46 holodoc joined #git
23:57 fatalhalt joined #git
23:59 robotroll joined #git

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