Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-22

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

All times shown according to UTC.

Time Nick Message
00:01 anuxivm left #git
00:01 romerocesar joined #git
00:03 SwiftMatt joined #git
00:04 DANtheBEASTman joined #git
00:05 Blleu[m] joined #git
00:09 Blleu[m] left #git
00:12 infernix joined #git
00:12 blahdodo joined #git
00:13 osse Random832: what do you mean?
00:13 Random832 i use vimdiff as the tool, and it highlights any differences between files
00:14 littleforest joined #git
00:14 Random832 i'd like anything that is not a conflict to be the same in all windows so that there's not so much noise
00:14 fuchstronaut joined #git
00:15 osse vimdiff diffs all four at once, so even three of the four buffers have the same content vim will highlight the region in all four
00:15 osse I don't know of a way to do what you want. You might like what Fugitive offers as an alternative
00:15 osse otherwise you'd have to write your own merge tool (IOW: a script that launches vimdiff the way you want it)
00:16 Random832 my point is
00:16 Random832 when there's no conflict i want it to go ahead and put the merged version in all four buffers
00:16 |prawnzy joined #git
00:17 osse you can use :diffget to do that. not sure how to make it automatic
00:17 Random832 and only have the original version of each file in places where there's a conflict
00:17 Random832 ...i want it to be in the files that git passes to the tool
00:17 |prawnzy left #git
00:17 Random832 instead of having the *real* base version, have the merged version with the base's version of each conflict section
00:19 osse ]c :diffput <CR> | diffput 2 | diffput 3 <CR>
00:19 osse oops
00:19 osse ]c :diffput 1 | diffput 2 | diffput 3 <CR>
00:19 osse best I can offer is the tip of creating a mapping to do that (not sure if 1,2 and 3 are the correct numbers though)
00:20 Prawnzy joined #git
00:22 romerocesar joined #git
00:25 ixian joined #git
00:27 pokalyis joined #git
00:27 buddyq joined #git
00:29 skyfaller joined #git
00:30 skyfaller joined #git
00:30 Lor_ joined #git
00:31 ghostlight joined #git
00:34 blahdodo joined #git
00:35 HoierM joined #git
00:38 garzer joined #git
00:39 blahdodo joined #git
00:39 skyfaller joined #git
00:39 skyfaller joined #git
00:39 KnownSyntax joined #git
00:43 romerocesar joined #git
00:46 ahmed_elgabri joined #git
00:46 nettoweb joined #git
00:47 blahdodo joined #git
00:47 yqt joined #git
00:49 Sasazuka joined #git
00:51 sharkz- joined #git
00:54 JamesBaxter joined #git
00:54 fstd_ joined #git
00:55 blahdodo joined #git
00:56 hypercube32 joined #git
01:02 cyan__ joined #git
01:03 aikuma joined #git
01:03 romerocesar joined #git
01:04 littleforest joined #git
01:06 PaulCapestany joined #git
01:06 blahdodo joined #git
01:10 d^sh joined #git
01:15 fuchstronaut joined #git
01:16 Dougie187 left #git
01:18 xameada joined #git
01:22 finalbeta joined #git
01:22 dreiss joined #git
01:24 romerocesar joined #git
01:27 raijin joined #git
01:27 malcon joined #git
01:28 steven_a_s joined #git
01:29 xall joined #git
01:34 nettoweb joined #git
01:35 dsantiago joined #git
01:36 QwertyDragon joined #git
01:41 durham_ joined #git
01:41 nettoweb joined #git
01:42 lykinsbd joined #git
01:46 lykinsbd_ joined #git
01:46 blahdodo joined #git
01:46 romerocesar joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and public-access television programming | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.1 | Getting "cannot send to channel"? /msg gitinfo .voice | git-bisect: No, not like that. Grow up.
01:49 Vampire0_ joined #git
01:50 yaewa joined #git
01:51 Goplat joined #git
01:53 pwnz0r joined #git
01:54 PaulCapestany joined #git
01:56 moei joined #git
01:58 brokensyntax joined #git
01:59 blahdodo joined #git
01:59 pks joined #git
02:00 _geoff joined #git
02:02 sunri5e joined #git
02:03 lykinsbd joined #git
02:06 romerocesar joined #git
02:08 nettoweb joined #git
02:09 zulutango joined #git
02:09 durham joined #git
02:09 liuzhen joined #git
02:10 ruskie joined #git
02:12 Mouzer joined #git
02:14 Milos joined #git
02:14 jbeeze joined #git
02:14 pijiu joined #git
02:15 shafun joined #git
02:15 pijiu joined #git
02:16 fuchstronaut joined #git
02:16 menip joined #git
02:16 pijiu joined #git
02:19 moei joined #git
02:27 romerocesar joined #git
02:27 hexagoxel joined #git
02:28 Random832 osse: thanks
02:29 Random832 it's not perfect but it seems like it should work
02:29 durham joined #git
02:33 qws-user-1228 joined #git
02:36 M64137[m] joined #git
02:36 BinGOs joined #git
02:37 kjsage[m] joined #git
02:38 cdesai joined #git
02:38 monomon[m] joined #git
02:38 fahadash joined #git
02:38 M-shine joined #git
02:39 asdofindia joined #git
02:39 chrysaor joined #git
02:40 cdown joined #git
02:40 saidelike joined #git
02:40 ochorocho__ joined #git
02:41 BackEndCoder joined #git
02:44 lb1c joined #git
02:46 netj joined #git
02:47 chachasmooth joined #git
02:47 romerocesar joined #git
02:52 xameada joined #git
02:53 jaafar joined #git
02:54 svm_invictvs joined #git
02:55 ahmed_elgabri joined #git
02:56 cdown joined #git
03:06 a_thakur joined #git
03:08 romerocesar joined #git
03:15 Vortex34 joined #git
03:16 fuchstronaut joined #git
03:18 lykinsbd joined #git
03:20 srcerer joined #git
03:29 buddyq joined #git
03:29 romerocesar joined #git
03:31 rbern joined #git
03:35 qws-user-1229 joined #git
03:40 vdl joined #git
03:41 CheckDavid joined #git
03:42 coeus0_0 joined #git
03:46 mizu_no_oto joined #git
03:47 zacts joined #git
03:50 romerocesar joined #git
03:51 daynaskully joined #git
03:52 MrWoohoo joined #git
03:52 dreiss joined #git
03:55 wtiger joined #git
03:55 wtiger Hello!
03:57 wtiger I recently all my projects to another machine, and although .git/ dir was copied along, git is describing all files as modified..
03:57 wtiger although git log output seems correct...
04:01 Limes_ joined #git
04:04 littleforest joined #git
04:05 ayjay_t joined #git
04:05 dendazen joined #git
04:08 atomi joined #git
04:10 romerocesar joined #git
04:13 wtiger apparently there were permission changes, git checkout did the job..
04:13 wtiger left #git
04:17 pwnz0r joined #git
04:18 star_prone joined #git
04:26 theshitisay joined #git
04:28 e14 joined #git
04:29 ahmed_elgabri joined #git
04:31 romerocesar joined #git
04:32 dreiss joined #git
04:34 Cabanossi joined #git
04:36 plos joined #git
04:40 PioneerAxon joined #git
04:41 Jameser joined #git
04:42 daey_ joined #git
04:45 cdown joined #git
04:49 ahmed_elgabri joined #git
04:49 mangolisk joined #git
04:51 sevenine joined #git
04:51 railssmith joined #git
04:52 romerocesar joined #git
04:52 joki joined #git
04:54 dsdeiz joined #git
04:55 Electrometro joined #git
04:57 ahmedelgabri joined #git
04:57 kpease joined #git
05:01 wrouesnel joined #git
05:03 bmahe joined #git
05:03 pwnz0r joined #git
05:04 dsdeiz joined #git
05:04 dsdeiz joined #git
05:06 SwiftMatt joined #git
05:10 neunon joined #git
05:10 neunon joined #git
05:13 romerocesar joined #git
05:18 fuchstronaut joined #git
05:23 a_thakur joined #git
05:24 Snich joined #git
05:28 sorenb joined #git
05:30 nilg joined #git
05:34 romerocesar joined #git
05:37 bmahe joined #git
05:38 davimore__ joined #git
05:39 liuzhen joined #git
05:40 diogenese joined #git
05:45 phaleth joined #git
05:46 mrpackethead joined #git
05:52 Shentino joined #git
05:54 a_thakur joined #git
05:54 romerocesar joined #git
05:55 codfection1 joined #git
05:56 Electrometro joined #git
05:58 soerenb_ joined #git
05:59 codfection joined #git
06:00 soerenb_ joined #git
06:00 Rodya_ joined #git
06:01 codfection joined #git
06:05 a_thakur joined #git
06:05 codfection joined #git
06:08 LucaTM joined #git
06:09 glebihan joined #git
06:12 Silenced joined #git
06:13 mehola joined #git
06:13 blackwind_123 joined #git
06:15 romerocesar joined #git
06:17 sword joined #git
06:18 Prawnzy joined #git
06:19 fuchstronaut joined #git
06:19 star_prone joined #git
06:21 xall joined #git
06:24 bmahe joined #git
06:25 gtristan joined #git
06:28 dreiss joined #git
06:30 cyan__ joined #git
06:33 tristanp joined #git
06:35 reim_ joined #git
06:36 lordjancso joined #git
06:36 strugee joined #git
06:36 romerocesar joined #git
06:39 Snich joined #git
06:42 bmahe joined #git
06:48 _geoff joined #git
06:51 bruce_lee joined #git
06:52 bluepixel joined #git
06:53 raijin joined #git
06:54 skyfaller joined #git
06:54 skyfaller joined #git
06:56 kazantip joined #git
06:56 liuzhen joined #git
06:56 phanimahesh joined #git
06:57 romerocesar joined #git
07:00 a_thakur joined #git
07:00 Murii joined #git
07:02 grantwu joined #git
07:02 grantwu I have a strange issue where I can run "git checkout foo" but then git status says I'm not on foo
07:03 oskarkv joined #git
07:03 tango_ grantwu: do you happen to have a file named foo?
07:03 grantwu tango_: ...Oh.  I have a directory called lab3
07:03 grantwu er, foo
07:04 acetakwas joined #git
07:05 phanimah1sh joined #git
07:05 xall joined #git
07:06 tango_ grantwu: try git checkout foo --
07:07 jozwior joined #git
07:07 dreiss joined #git
07:10 grantwu tango_: Thanks
07:11 LucaTM joined #git
07:16 yqt joined #git
07:16 romerocesar joined #git
07:19 fuchstronaut joined #git
07:20 star_prone joined #git
07:25 jknetl joined #git
07:25 liuzhen joined #git
07:31 robotroll joined #git
07:32 arescorpio joined #git
07:34 mrpackethead joined #git
07:36 eka joined #git
07:37 jknetl joined #git
07:41 Snich joined #git
07:41 Prawnzy joined #git
07:43 ochorocho__ joined #git
07:47 mkoskar joined #git
07:47 fuchstronaut joined #git
07:51 bocaneri joined #git
07:55 GavinMagnus joined #git
07:56 GavinMagnus left #git
07:57 SteffanW joined #git
08:02 elastix joined #git
08:04 grantwu left #git
08:08 bket joined #git
08:11 xall_ joined #git
08:12 aidalgol joined #git
08:13 xall__ joined #git
08:15 Raed|Laptop joined #git
08:16 SteffanW2 joined #git
08:17 a_thakur joined #git
08:23 romerocesar joined #git
08:26 bernardio joined #git
08:27 cso joined #git
08:31 aidalgol joined #git
08:31 njbair joined #git
08:32 Andrew_K|2 joined #git
08:34 tristanp joined #git
08:35 vuoto joined #git
08:36 Gloomy joined #git
08:39 GenZai joined #git
08:41 King_Hual joined #git
08:41 Murii joined #git
08:42 aard_ joined #git
08:44 fahadash joined #git
08:44 romerocesar joined #git
08:46 SteffanW joined #git
08:55 SteffanW joined #git
08:56 skyfaller joined #git
08:58 thebope joined #git
09:02 a_thakur joined #git
09:05 romerocesar joined #git
09:06 fees joined #git
09:06 brk_ joined #git
09:13 matthiaskrgr joined #git
09:14 BlaXpirit joined #git
09:17 tjone270 joined #git
09:18 Ciblia joined #git
09:20 BadSnappa joined #git
09:22 star_prone joined #git
09:22 bernardio joined #git
09:22 shubhnik joined #git
09:23 fuchstronaut joined #git
09:23 wget joined #git
09:23 Silenced joined #git
09:25 _ADN_ joined #git
09:26 romerocesar joined #git
09:26 wrouesnel1 joined #git
09:26 _ADN_ joined #git
09:26 overlord_tm joined #git
09:27 madknight joined #git
09:30 Guest18392 joined #git
09:30 Guest18392 joined #git
09:30 ShekharReddy joined #git
09:31 Silenced joined #git
09:32 eka joined #git
09:35 KeelOfSteel joined #git
09:36 balance joined #git
09:37 nd joined #git
09:38 _ADN_ joined #git
09:38 jozwior joined #git
09:39 bernardio joined #git
09:40 scarcry joined #git
09:41 _ADN_ joined #git
09:42 satifant joined #git
09:42 _ADN_ joined #git
09:43 _ADN_ joined #git
09:44 ochorocho__ joined #git
09:45 GavinMagnus joined #git
09:47 romerocesar joined #git
09:48 vuoto joined #git
09:52 ochorocho__ joined #git
09:53 rahtgaz joined #git
09:54 ych joined #git
09:56 ych does git use sha1 to check if file has changed?
09:58 _ikke_ ych: yes
09:59 Jameser joined #git
09:59 _ikke_ for performance reasons git first checks the mtimes of files
10:01 corsibu joined #git
10:02 phaleth joined #git
10:02 ych _ikke_: if i clone a project then all files' mtimes change . how does git know to trigger sha1 in that case?
10:03 ych if mtime1 !=  mtime2 { check_sha1 } ?
10:03 ych and only then upload a new version?
10:05 PCatinean joined #git
10:07 romerocesar joined #git
10:08 corsibu joined #git
10:09 phanimah1sh Think of it this way: git doesn't upload files, it uploads commits. While making a commit you specify files whose changes are to be included
10:12 buzzLightBeer joined #git
10:12 jstein joined #git
10:13 phaleth joined #git
10:16 mikecmpbll joined #git
10:21 armin joined #git
10:22 robotroll joined #git
10:24 fuchstronaut joined #git
10:24 fuchstronaut joined #git
10:27 feep joined #git
10:28 feep hi, how do I make a branch master?
10:28 feep I'm doing some Fun Gymnastics trying to amend an old commit, and I'm in the state I want, but in a temp branch
10:28 feep I want to discard master and replace it with this branch
10:28 romerocesar joined #git
10:29 feep do I just branch -d master, checkout -b master, and fast-forward the temp branch?
10:29 spinningarrow feep: just branch -d master and checkout -b master should work
10:29 feep er, checkout-b master at the fork point*
10:29 feep thanks
10:29 * feep branch -D master
10:29 spinningarrow if you've pushed master you'll need to set up the upstream again
10:29 * feep nervous now
10:30 feep GOT IT.
10:30 feep Thank you!
10:31 feep for reference, this is what I did to amend an old commit
10:31 feep I'm pretty happy with this workflow
10:31 gniourf joined #git
10:31 spinningarrow also when you delete a branch, git prints out the SHA it pointed to so if you save that value somewhere you can always get the old branch back
10:31 feep I made a new commit with my changes, went back to before the commit in question, forked, picked the commit, picked the amendment, forked again, mergesquashed the first fork, picked the changes after it, and made that master
10:32 feep no rebase interactive required!
10:32 spinningarrow Honestly, I'd say interactive rebase is easier but to each their own ;)
10:32 feep yeah but I don't like interactive processes with command line tools
10:32 eihabarabia joined #git
10:32 Peng spinningarrow: Even if you don't save it, you can dig around in the reflog(?)
10:32 feep harder to script, I prefer having simple nouns that I can combine
10:35 SuperSeriousCat joined #git
10:35 gtristan joined #git
10:35 codfection joined #git
10:36 tristanp joined #git
10:36 gtristan joined #git
10:39 ki0 joined #git
10:41 sonOfRa joined #git
10:41 GavinMagnus left #git
10:48 dodobrain joined #git
10:49 romerocesar joined #git
10:54 yqt joined #git
10:56 Darcidride joined #git
10:57 skyfaller joined #git
10:58 corsibu joined #git
10:59 ToBeCloud joined #git
11:00 feep in retrospect, I could have just forked master, then dropped it, then did the whole dance on top of the branchpoint
11:01 feep ie. checkout -b old-master, branch -D master, checkout [before commit to amend], checkout -b temp-amending, pick commit 1, pick commit 2, checkout -b master, squashmerge, cherrypick the rest from old master
11:01 dodobrain joined #git
11:02 feep lemme try that :D
11:04 fuchstronaut joined #git
11:08 sekin0 joined #git
11:09 Guest5044 left #git
11:09 tgummerer joined #git
11:10 romerocesar joined #git
11:12 fuchstronaut joined #git
11:12 fuchstronaut joined #git
11:15 thiemo100 joined #git
11:16 afuentes joined #git
11:17 zeroed joined #git
11:18 compeman left #git
11:20 free_speech joined #git
11:22 nilg joined #git
11:24 feep http://i.imgur.com/qq45nHI.png new plan
11:28 ochorocho__ joined #git
11:30 romerocesar joined #git
11:31 Gloomy joined #git
11:32 Gloomy joined #git
11:33 Gloomy joined #git
11:34 skyfaller joined #git
11:34 skyfaller joined #git
11:35 nuck joined #git
11:35 watabou joined #git
11:39 thiemo100 left #git
11:39 alcohol joined #git
11:39 fstd_ joined #git
11:41 mehola joined #git
11:47 nioncode joined #git
11:47 fiete joined #git
11:48 i7c joined #git
11:48 codfection joined #git
11:48 noctux joined #git
11:49 cdown joined #git
11:50 i7c joined #git
11:50 Ice_Strike joined #git
11:51 finalbeta joined #git
11:51 romerocesar joined #git
11:53 fuchstronaut joined #git
11:55 Prawnzy joined #git
11:55 rax1 joined #git
11:57 emPi joined #git
11:59 cdown_ joined #git
12:00 Vampire0 joined #git
12:01 nettoweb joined #git
12:02 Jackneill_ joined #git
12:02 Learath2 joined #git
12:02 Deviad joined #git
12:02 feep okay yeah I got it now
12:03 feep to amend an old commit: first, branch after the commit (as a marker). then branch before the commit, cherry-pick the commit, amend it with your changes, then rebase --onto before-commit after-commit master
12:04 Anja joined #git
12:05 feep look right?
12:05 feep I mean it works, but idk if I'm missing something obvious (that is not rebase -i)
12:06 brokensyntax joined #git
12:09 feep okay yeah I got it a bit easier
12:09 elementalest joined #git
12:09 elementalest joined #git
12:09 qsx Seveas: does git-spindle support self-hosted gitlab?
12:10 feep branch before the commit, cherry pick the commit, amend, rebase --onto branch [commit hash] master
12:10 feep no need for the second branch
12:10 johnmilton joined #git
12:10 qsx Seveas: also, it broke again https://paste.pound-python.or​g/show/3dLHVl1IFTNTbAF9ny12/
12:11 malcon joined #git
12:11 eihabarabia joined #git
12:12 romerocesar joined #git
12:12 nettoweb1 joined #git
12:13 anonymuse joined #git
12:13 Ice_Strike how do I delete a branch on github?
12:13 GavinMagnus joined #git
12:14 SporkWitch Ice_Strike: http://lmgtfy.com/?q=delete+a+branch+on+github
12:18 rax1 joined #git
12:20 shubhnik joined #git
12:21 CheckDavid joined #git
12:22 codfection joined #git
12:25 leeN joined #git
12:28 floatingman joined #git
12:28 cdg joined #git
12:31 bluepixel joined #git
12:32 Noldorin joined #git
12:33 sdothum joined #git
12:33 dan2k3k4 joined #git
12:34 safe joined #git
12:36 tristanp joined #git
12:38 fuchstronaut joined #git
12:39 btree joined #git
12:41 johnmilton joined #git
12:42 corsibu joined #git
12:43 Anupkumar joined #git
12:46 btree left #git
12:46 Balliad joined #git
12:47 parasite joined #git
12:48 brokensyntax joined #git
12:48 balance joined #git
12:51 alhariel joined #git
12:53 grawity Ice_Strike: push a deletion
12:57 harish joined #git
12:58 mrpackethead joined #git
12:59 buddyq joined #git
13:01 brk_ joined #git
13:02 Rodya_ joined #git
13:02 Guest33993 joined #git
13:03 shubhnik joined #git
13:04 GodEater` joined #git
13:07 m0viefreak joined #git
13:08 zivester joined #git
13:08 robotroll joined #git
13:09 GodEater joined #git
13:09 GodEater joined #git
13:10 fuchstronaut joined #git
13:14 cdown joined #git
13:14 blackwind_123 joined #git
13:15 romerocesar joined #git
13:19 m0viefreak joined #git
13:19 fahadash joined #git
13:20 LarArT joined #git
13:21 uebera|| joined #git
13:21 uebera|| joined #git
13:21 sdlnv joined #git
13:22 barteks2x joined #git
13:25 raijin joined #git
13:25 init0ne joined #git
13:26 Learath2 joined #git
13:26 jozwior joined #git
13:27 dermoth_ joined #git
13:29 zeroed joined #git
13:29 zeroed joined #git
13:30 drmt joined #git
13:30 Megaf joined #git
13:32 Megaf joined #git
13:32 oskarkv joined #git
13:35 romerocesar joined #git
13:36 ieee joined #git
13:36 elsevero joined #git
13:37 Guest83633 joined #git
13:37 CussBot joined #git
13:40 NeXTSUN joined #git
13:42 mehola joined #git
13:43 aard_ joined #git
13:44 phanimahesh joined #git
13:44 LarArT joined #git
13:48 Murii joined #git
13:48 ki0_ joined #git
13:50 bernardio joined #git
13:50 PioneerAxon joined #git
13:50 init0ne joined #git
13:51 dreiss joined #git
13:52 vuoto joined #git
13:52 mt joined #git
13:52 Balliad joined #git
13:52 Megaf_ joined #git
13:56 Prawnzy joined #git
13:56 romerocesar joined #git
13:57 robotroll joined #git
13:58 knittl joined #git
13:59 NeXTSUN joined #git
14:01 shinnya joined #git
14:01 raphink joined #git
14:06 harish joined #git
14:07 sammyo joined #git
14:08 harish joined #git
14:08 Learath2 joined #git
14:08 snowkidind joined #git
14:09 Megaf__ joined #git
14:09 PHPanos joined #git
14:10 mak008 joined #git
14:11 fuchstronaut joined #git
14:12 jstimm joined #git
14:13 HoierM joined #git
14:13 PHPanos joined #git
14:13 Megaf__ joined #git
14:14 anonymuse joined #git
14:16 reim joined #git
14:17 romerocesar joined #git
14:22 rivarun joined #git
14:22 QwertyDragon joined #git
14:23 harish joined #git
14:24 mak008 joined #git
14:27 ki0 joined #git
14:35 Rodya_ joined #git
14:37 tristanp joined #git
14:38 romerocesar joined #git
14:40 bernardio joined #git
14:41 madewokherd joined #git
14:42 tterrag joined #git
14:46 nettoweb joined #git
14:47 mrpackethead joined #git
14:50 raijin joined #git
14:50 GavinMagnus joined #git
14:53 mischat joined #git
14:58 manuel joined #git
14:58 romerocesar joined #git
14:59 JrCs joined #git
15:02 PHPanos joined #git
15:05 star_prone joined #git
15:06 raphink joined #git
15:07 codfection joined #git
15:07 dimi1947 joined #git
15:12 LarArT joined #git
15:12 fuchstronaut joined #git
15:14 Megaf joined #git
15:14 elastix joined #git
15:14 anonymuse joined #git
15:16 Rodya_ joined #git
15:17 HoierM joined #git
15:18 Guest33720 joined #git
15:20 rahtgaz joined #git
15:21 jknetl joined #git
15:26 e14 joined #git
15:26 AndChat51401 joined #git
15:26 AndChat51401 joined #git
15:27 a3Dman joined #git
15:27 AndChat51401 joined #git
15:32 dendazen joined #git
15:33 Megaf joined #git
15:33 rahtgaz joined #git
15:35 autrilla joined #git
15:35 autrilla Why does rebasing and editing the commit message of an old commit result in merge conflicts on the next commit?
15:37 dwts is the local in sync with the remote?
15:37 buddyq hi guys, I have made quite a few changes to custom wordpress plugins. Now for some reason, I am getting headers_already_sent warnings for logging in and it wont login using a plugin that has been working. This is on my localhost system.
15:37 elsevero joined #git
15:37 feep I am  not sure how that's related to git?
15:37 autrilla dwts: yes. I just want to change the commit message for an old commit
15:37 feep did you want #wordpress
15:37 buddyq My question: Is there a way for me to sort of keep these changes around but revert back to my last commit and see if that clears the problem up?
15:38 gdelfino joined #git
15:38 feep sure, just dump them in a branch
15:38 buddyq feep: how do I do that? I'm pretty new to git.
15:38 dwts autrilla: do you get an error for that?
15:38 feep git checkout -b [name of branch]
15:38 feep then just commit them as usual
15:38 feep then git checkout master
15:38 dwts it might help if you share the output
15:38 buddyq I am already on a branch
15:39 feep you can subbranch
15:39 feep it's like a tree
15:39 buddyq same command for making a subbrnach?
15:39 feep when you do checkout -b, it uses your current branch head as a start
15:39 feep yes
15:39 feep buddyq: what a branch is, is just a "tag" (not actually a tag) that indicates the latest commit under that name
15:40 buddyq okay. So make a branch, Then go back to my current branch I'm in now and do a revert? oR reset?
15:40 feep so when you create a branch, all git does is say "okay, I will remember this branch named [bla] whose last commit was [last commit]"
15:40 feep buddyq: nono
15:40 feep make a branch
15:40 feep that _changes nothing_
15:40 feep it's just an internal bookkeeping thing
15:40 feep then, under that branch, commit your changes
15:40 feep which points the branch's name at the new commit
15:40 feep then go back to the previous branch, which stayed at the old commit.
15:40 buddyq SO If I make a branch right now, it wont include my bad changes since I have not commited them?
15:41 e14 joined #git
15:41 feep exactly, the uncommitted stuff is just lying around, git doesn't concern itself with it unless you tell it to or it gets in the way
15:41 buddyq okay, lemme try to make a new branch.
15:41 autrilla dwts: error: could not apply ff58c38... Change yaml import path to mozilla-services
15:41 PHPanos joined #git
15:42 buddyq what should I call this branch?
15:42 feep dude, you are completely free :)
15:42 Guest93869 joined #git
15:42 feep (naming: the one actual hard problem in computer science. that and off-by-one errors.)
15:43 moritz don't forget cache invalidation
15:43 feep shit, that was how the joke went
15:43 mehola joined #git
15:43 feep that makes a lot more sense yeah
15:43 GenZai joined #git
15:43 dwts autrilla: doing a quick google search, got to this: https://help.github.com/articles/resolv​ing-merge-conflicts-after-a-git-rebase/
15:43 feep buddyq: have you considered "bad-changes" :p
15:44 buddyq okay, login is still borked. How can I move this branch to the commit before this one?
15:44 feep ...?
15:44 feep hang on
15:44 feep let me sketch it
15:44 feep you still got something wrong
15:44 autrilla dwts: I'm afraid that's not helpful. I'd expect merge conflict if I actually changed the files, which I didn't.
15:44 feep making a sketch
15:45 Balliad joined #git
15:45 GavinMagnus left #git
15:45 dwts autrilla: your question is why you get that or how to fix it?
15:45 dwts the link I provided probably will help you with the latter
15:46 buddyq what about using git stash??
15:46 autrilla dwts: I know how to fix it
15:46 autrilla dwts: the question is why it's happening
15:46 dwts autrilla: ok, my bad
15:47 Rodya_ joined #git
15:47 shaggycat joined #git
15:47 NeXTSUN joined #git
15:49 feep buddyq: https://sketch.io/render/sk-1e82c​726ed670982983371641b72ec41.jpeg I made a sketch
15:49 codfection joined #git
15:50 feep buddyq: fundamentally speaking, git actually doesn't care what's _actually_ in your directory. git's database is wholly hidden away in .git
15:50 the_2nd joined #git
15:50 feep so when you're talking about branches, or commits, that's _only_ pertaining to its internal state
15:50 feep the only extent to which git cares about your data, is when you're using it to create a new commit by staging some of your changes
15:50 the_2nd I commited a change (only locally) and would like to revert it, while having the files still in this state, so I can only partially commit it
15:50 feep so when I say "make a branch", that does not affect your changes
15:50 clandestino joined #git
15:51 feep all it does is register a new branch name, and point it at the last commit you made, and make it "active"
15:51 feep meaning any new commits you make get forked off at that point, and put under the branch name
15:51 buddyq lol, that's a hell-of-a-sketch
15:51 feep sketch.io ftw
15:51 monoxane joined #git
15:52 feep also git stash is *not* for long-term storage
15:52 feep that's like storing documents in your recycling bin
15:52 feep or your /tmp folder
15:53 feep buddyq: the important part is... branches aren't _things_, like, the foremost thing is the *commits*
15:53 Bloomer joined #git
15:53 feep branches are just names given to commits, that get updated when you make a new commit under them
15:53 m1dnight_ joined #git
15:53 buddyq got it
15:53 buddyq sort of...
15:53 buddyq I understand that basic concept.
15:53 feep say you're at commit A, in branch "branch", you make a new branch "bad-stuff"
15:54 feep now both "bad-stuff" and "branch" point at A
15:54 mrmadcat joined #git
15:54 feep "bad-stuff" is the active branch, you make a new commit B
15:54 feep git tracks "B, of parent A"
15:54 feep and updates bad-stuff to point at B
15:54 PioneerAxon joined #git
15:54 feep "branch" is still at "A" though, so now you can just switch back to "branch"
15:54 feep via checkout
15:54 feep and continue working
15:55 phanimahesh joined #git
15:55 feep and bad-stuff will keep hanging around in git's storage, until you want to mess with it again
15:56 KeelOfSteel joined #git
15:57 Prawnzy joined #git
15:57 buddyq something is wrong.... I have reset --hard to 3 previous commits and nothing is fixing the problem....
15:57 brokensyntax joined #git
15:57 buddyq could be untracked file?
15:57 buddyq or it could be database?
15:57 buddyq hmmmm
15:58 emPi joined #git
15:59 feep that sounds worrying
16:00 feep you have probably inadvertently broken something :D
16:00 feep don't worry, we all did that at first
16:00 * feep fondly remembers "fuck this, nuking folder and checking out again"
16:01 romerocesar joined #git
16:01 buddyq crap.
16:02 buddyq makes me believe my changes were not the culprit... I dont change core files though so I'm confused.
16:02 losingkeys_ joined #git
16:02 buddyq just checked the db and it looks good.
16:04 ahmedelgabri joined #git
16:09 raijin joined #git
16:09 fatalhalt joined #git
16:10 phanimahesh joined #git
16:12 NeXTSUN joined #git
16:15 raijin joined #git
16:20 elastix joined #git
16:21 JamesBaxter joined #git
16:21 romerocesar joined #git
16:22 toothe joined #git
16:22 toothe I have done some uncommitted changes. Is there a way to "migrate" those changes to a different branch?
16:22 elastix joined #git
16:22 toothe oh wait, google.
16:22 grawity !float
16:22 gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
16:23 grawity it's kind of the default behavior
16:23 toothe silly me.
16:24 feep yeah git only cares about your changes inasmuch as they get in the way of its work
16:24 zeroed joined #git
16:24 feep so changes aren't really "on" any branch
16:24 feep until they get committed
16:25 phanimahesh joined #git
16:26 parsnip joined #git
16:26 Learath2 joined #git
16:33 Darcidride joined #git
16:34 anonymuse joined #git
16:35 mrpackethead joined #git
16:35 nfk joined #git
16:35 InfoTest joined #git
16:35 jason237 joined #git
16:41 phanimahesh joined #git
16:42 romerocesar joined #git
16:43 jost joined #git
16:44 hashpuppy joined #git
16:46 robotroll joined #git
16:46 phanimahesh joined #git
16:47 init0ne joined #git
16:51 phanimahesh joined #git
16:51 diogenese joined #git
16:52 malcon joined #git
16:53 dling joined #git
16:54 _geoff joined #git
16:54 Goplat joined #git
16:55 buddyq okay, My live site has the exact same commit as my branch and the login works on the live site. No longer works on my localhost. Same commit is on my github.
16:55 thesha joined #git
16:55 buddyq Maye I changed an untracked file??
16:55 buddyq Is there a way?
16:55 buddyq to know
16:55 mizu_no_oto joined #git
16:56 a_thakur joined #git
17:00 rahtgaz joined #git
17:02 phanimahesh joined #git
17:02 corsibu joined #git
17:03 romerocesar joined #git
17:04 elastix joined #git
17:04 kulelu88 joined #git
17:05 ahmedelgabri joined #git
17:05 alhariel joined #git
17:07 rbern joined #git
17:09 diogenese joined #git
17:11 dling I don't get this, I add a new key in my terminal, ssh-add ~/.ssh/id_username
17:12 dling Then I can successfully authenticate with "ssh -T git@github.com" in that terminal window, but it wont authenticate in new terminal windows I open ??
17:12 cbreak dling: your ssh agent is configured incorrectly
17:12 cbreak dling: on OS X, it somehow works automatically
17:13 cbreak if you're on some other platform, you'll have to find out how to do it
17:13 dling I'm on OS X..
17:13 buddyq joined #git
17:14 grift joined #git
17:15 fuchstronaut joined #git
17:15 fuchstronaut joined #git
17:16 flavius joined #git
17:17 alex1a joined #git
17:17 phanimahesh joined #git
17:18 PHPanos joined #git
17:19 dling Got it to work now, it was something with the config file in .ssh
17:20 thesha joined #git
17:21 vuoto joined #git
17:21 aikuma joined #git
17:22 eihabarabia joined #git
17:22 PHPanos joined #git
17:22 jaafar joined #git
17:23 kadoban joined #git
17:24 romerocesar joined #git
17:28 lykinsbd joined #git
17:32 Rodya_ joined #git
17:32 phanimahesh joined #git
17:37 phanimahesh joined #git
17:41 Rodya_ joined #git
17:42 scarcry joined #git
17:42 star_prone joined #git
17:42 phanimahesh joined #git
17:43 raijin joined #git
17:43 dodobrain umm.. i've got a strange situation. from my master branch: `git merge dev` simply returns 'already up to date'. and yes i can see that the last comit on that branch is showing up in the log for master
17:43 dodobrain *but* there is a file in master where it is missong some content from the dev branch!
17:43 dodobrain how did this happen?
17:43 mehola joined #git
17:44 eshlox joined #git
17:45 romerocesar joined #git
17:48 Rodya_ joined #git
17:48 dviola joined #git
17:50 mkoskar joined #git
17:52 phanimahesh joined #git
17:55 ki0 joined #git
18:01 gtristan joined #git
18:04 thiago dodobrain: you removed the content in the master branch
18:06 ahmedelgabri joined #git
18:07 phanimahesh joined #git
18:08 jknetl joined #git
18:08 Rodya_ joined #git
18:10 apotry joined #git
18:11 Prawnzy joined #git
18:12 QwertyDragon joined #git
18:16 fuchstronaut joined #git
18:16 shubhnik joined #git
18:17 f4 joined #git
18:20 pitastrudl joined #git
18:22 phanimahesh joined #git
18:23 jstein_ joined #git
18:24 Murii joined #git
18:25 yohnnyjoe joined #git
18:25 LandonJH joined #git
18:27 Guest7486 joined #git
18:27 phanimahesh joined #git
18:27 malcon joined #git
18:30 navidr joined #git
18:30 Lor_ joined #git
18:30 murr5y joined #git
18:32 phanimahesh joined #git
18:33 a3Dman joined #git
18:36 xall__ joined #git
18:36 kazantip joined #git
18:37 phanimahesh joined #git
18:41 titankiller joined #git
18:42 mkoskar joined #git
18:44 murr4y joined #git
18:47 Gloomy joined #git
18:47 phanimahesh joined #git
18:48 navidr joined #git
18:52 phanimahesh joined #git
18:53 mehola joined #git
18:59 drmt joined #git
19:01 e14 joined #git
19:07 ahmedelgabri joined #git
19:08 mehola joined #git
19:08 ki0 joined #git
19:09 romerocesar joined #git
19:09 malcon joined #git
19:09 ni291187 joined #git
19:13 ni291187 left #git
19:15 Rodya_ joined #git
19:16 alex1a joined #git
19:16 fuchstronaut joined #git
19:17 emPi joined #git
19:20 dreiss joined #git
19:23 PioneerAxon joined #git
19:24 acetakwas joined #git
19:25 KnownSyntax joined #git
19:25 KnownSyntax joined #git
19:26 acetakwas joined #git
19:28 ahmedelgabri joined #git
19:28 cjbrambo joined #git
19:30 romerocesar joined #git
19:31 yohnnyjoe joined #git
19:31 altendky joined #git
19:31 Prawnzy joined #git
19:32 JamesBaxter joined #git
19:33 phanimahesh joined #git
19:34 alex1a joined #git
19:34 Xethron joined #git
19:35 balance joined #git
19:38 phanimahesh joined #git
19:38 f4 joined #git
19:39 astrofog joined #git
19:39 Spacew00t joined #git
19:39 shakalaka joined #git
19:40 pand0ra joined #git
19:40 xall__ joined #git
19:40 iamthad joined #git
19:42 mehola joined #git
19:43 phanimahesh joined #git
19:44 jason237 joined #git
19:45 vuoto joined #git
19:46 QwertyDragon joined #git
19:46 acetakwas joined #git
19:49 buddyq can you have different gitignore files for different branches?
19:50 preaction buddyq: sure
19:51 mangolisk joined #git
19:53 pand0ra left #git
19:53 xameada joined #git
19:53 balance hi
19:54 KnownSyntax joined #git
19:54 KnownSyntax joined #git
19:55 Rodya_ joined #git
19:56 suchkultur joined #git
19:59 ki0 joined #git
20:02 AndChat51401 joined #git
20:02 AndChat51401 joined #git
20:03 phanimahesh joined #git
20:03 AndChat51401 joined #git
20:05 PioneerAxon_ joined #git
20:05 JyZyXEL joined #git
20:06 jozwior joined #git
20:06 dan2k3k5 joined #git
20:08 phanimahesh joined #git
20:09 theskillwithin joined #git
20:11 mrpackethead joined #git
20:11 eivarv joined #git
20:12 moestevens joined #git
20:13 boombatower joined #git
20:13 phanimahesh joined #git
20:14 EgS joined #git
20:15 ochorocho__ joined #git
20:17 dreiss joined #git
20:20 skunkz joined #git
20:23 phanimahesh joined #git
20:25 qws-user-1228 joined #git
20:25 jpthompson23 joined #git
20:28 phanimahesh joined #git
20:28 Ryiya joined #git
20:30 SwiftMatt joined #git
20:31 K7 joined #git
20:32 romerocesar joined #git
20:32 jimi_ joined #git
20:33 tristanp joined #git
20:34 jozwior joined #git
20:35 brokensyntax joined #git
20:35 AndChat|51401 joined #git
20:36 AndChat|51401 joined #git
20:36 AndChat|51401 joined #git
20:39 sammyo joined #git
20:40 dan2k3k4 joined #git
20:42 fahadash joined #git
20:43 cagedwisdom joined #git
20:44 bond_ joined #git
20:46 nettoweb joined #git
20:46 CEnnis91 joined #git
20:46 acetakwas joined #git
20:47 bmahe joined #git
20:48 phanimahesh joined #git
20:49 mmlb25 joined #git
20:51 jbitdrop joined #git
20:53 phanimahesh joined #git
20:53 romerocesar joined #git
20:55 daurnimator joined #git
20:57 raijin joined #git
20:58 fahadash joined #git
21:05 fuchstronaut joined #git
21:08 ki0 joined #git
21:09 brokensyntax joined #git
21:10 CtrlC left #git
21:11 davimore joined #git
21:13 nilg joined #git
21:13 netcarver joined #git
21:14 romerocesar joined #git
21:15 CEnnis91 joined #git
21:16 e14 joined #git
21:17 qws-user-1228 joined #git
21:18 yohnnyjoe joined #git
21:18 nikivi joined #git
21:19 dreiss joined #git
21:21 nettoweb joined #git
21:22 tristanp joined #git
21:23 msonntag joined #git
21:29 jgrasser_ joined #git
21:32 NeXTSUN joined #git
21:34 xall__ joined #git
21:34 nwkj86 joined #git
21:35 romerocesar joined #git
21:37 nikivi joined #git
21:37 xameada joined #git
21:37 mmlb joined #git
21:38 Prawnzy joined #git
21:39 star_prone joined #git
21:45 elsevero joined #git
21:46 Rr4sT joined #git
21:47 pbrewczynski joined #git
21:51 corsibu joined #git
21:53 sangy joined #git
21:54 ToBeCloud joined #git
21:56 romerocesar joined #git
21:57 boombatower joined #git
21:58 Prawnzy joined #git
21:59 mrpackethead joined #git
21:59 cyphase joined #git
22:01 acetakwas joined #git
22:03 ki0 joined #git
22:03 perlpilot_ joined #git
22:04 mar77i_ joined #git
22:05 cyphase joined #git
22:05 qsx joined #git
22:06 uebera|| joined #git
22:06 Celelibi joined #git
22:06 zulutango joined #git
22:06 feep joined #git
22:06 grawity joined #git
22:06 nettoweb joined #git
22:06 heroux joined #git
22:06 Dohplay joined #git
22:06 ToBeCloud joined #git
22:08 courrier joined #git
22:09 Pablito15 joined #git
22:10 devster31 joined #git
22:10 cyphase joined #git
22:10 Dohplay joined #git
22:10 nettoweb joined #git
22:11 maroloccio joined #git
22:11 eka joined #git
22:12 maroloccio hi. if i rebase --interactive and switch commit 1 and 2 in the list.. the rebase succeeds. then i switch them around again, returning to the same as before.. i am surprised by the fact that the commits do not take the same ids as they had before any swapping.. explanation?
22:12 Guest46738 joined #git
22:12 Dohplay joined #git
22:13 chris2 timestamps probably
22:13 chris2 the tree id should be identical
22:15 maroloccio yeah.. but the timestamps shouldnt change really
22:15 Tykling joined #git
22:15 maroloccio or... should they? and if so.. why?
22:15 maroloccio is a rebase somewhat different from a cherry pick? say 2 cherry picks in different order?
22:16 maroloccio chris2: does it happen to you too? take any rebase.. swap commit 1 and 2 in the list. then back again. same or different ids?
22:16 romerocesar joined #git
22:17 chris2 it recreates the commit. so it uses the new time
22:17 ochorocho__ joined #git
22:18 rewt you can alter the commit date/time to match the author date/time, and then it should result in the same ids after swapping back and forth
22:19 SuperSeriousCat joined #git
22:20 maroloccio does it feel "natural" to you guys that it should recreate the commit rather than just reinsert it in the history graph? how is recreating preferrable to something akin to cherry picking in that case?
22:20 maroloccio i am sure there is some wisdom there i am missing :)
22:21 tristanp joined #git
22:23 sangy joined #git
22:23 rewt you're changing the contents of the files... of course it has to recommit
22:25 einnjo joined #git
22:25 rewt commit A changes the 1st line, and commit B changes the 2nd line... you go from {original}->{only line 1 changed}->{lines 1 and 2 changed} to {original}->{only line 2 changed}->{lines 1 and 2 changed}
22:26 rewt the middle commit has different contents, so different hash, so different commit hash
22:26 rewt the final commit's hash depends on the middle commit's hash, so that's different too
22:26 ayjay_t joined #git
22:27 ki0 joined #git
22:30 apxm joined #git
22:31 lemonpepper24 joined #git
22:31 xameada_ joined #git
22:32 ColdKeyboard joined #git
22:32 dingo-z joined #git
22:37 romerocesar joined #git
22:39 fuchstronaut joined #git
22:39 luke-jr joined #git
22:40 lb1a maroloccio you can always insert the old commits into the rebase interactive if you still have the ID
22:40 f4 joined #git
22:41 lb1a maroloccio just add pick <id> somewhere in the rebase -i process
22:41 lb1a but since a commit i immutable every change to it will ultimatly create a new commit, resulting in a new ID
22:42 maroloccio lb1a: fine. i could do that, and browse the reflog too, i suppose, to reconstruct the exact previous sequence just from not-yet-GCd commits
22:42 lb1a and rebase ist just a series of cherry-picks
22:42 maroloccio lb1a: but how is rebasing changing the commit though
22:42 ResidentBiscuit joined #git
22:42 maroloccio then cherry picks should always result in the same aggregate sha1 right?
22:42 lb1a maroloccio yes, rebase changes the parent
22:42 lb1a no cherry-picks create new commits -> new id
22:42 maroloccio not if i swap commits once and then bring them back how they were before?
22:43 maroloccio i think i get it now..
22:43 lb1a maroloccio so you want wo undo the rebase?
22:43 lb1a s/wo/to/
22:43 ColdKeyboard joined #git
22:43 f4 joined #git
22:44 pikajude joined #git
22:44 tristanp joined #git
22:44 lb1a undoing a rebase is pretty easily done by using reset (--hard)
22:44 lb1a (undo the complete rebase)
22:44 maroloccio when x <- a <- b becomes x <- b <- a even if i reapply a on top of the common base x.. i am not re-applying a DIFF.. i am reapplying that particular commit which changed since it pointed to b temporarily
22:44 kyan joined #git
22:44 maroloccio git rebase --abort
22:45 feep left #git
22:45 lb1a maroloccio if you're in the rebase process then yes rebase --abort should be fine too
22:45 lb1a if you're done use reset to reset the branch to it's previos commit
22:45 acetakwas joined #git
22:46 maroloccio very very odd to me that git rebase is actually RECREATING a as a commit rather than just cherry pick it?
22:46 lb1a maroloccio cherry-picking is creating new commits
22:46 maroloccio if i cherry pick a commit the timestamp of authoring will stay the same on it right?
22:46 maroloccio but cherry picking twice the same commit should result in the same commit sha?
22:47 Random832 maroloccio: no
22:47 maroloccio assume base x... i cherry pick commit a onto x. new sha. i reset to x only. re-cherry pick a onto x... that should give me the same sha... or not?
22:47 lb1a maroloccio no
22:47 lb1a different timestamp
22:47 maroloccio why
22:47 Random832 the commit date
22:47 maroloccio and... should it be that way?
22:47 lb1a yep
22:47 Random832 you can fake the commit date i think
22:48 maroloccio --committer-date-is-author-date
22:48 maroloccio is that is?
22:48 maroloccio is that it?
22:49 Random832 you could do that, or you could hardcode a specific commit date with GIT_COMMITTER_DATE environment variable
22:49 maroloccio let me see if i get what i really need
22:50 lb1a maroloccio i'm not sure why you want to achieve something like that?
22:50 Random832 why do you need the sha to be the same
22:50 lb1a !xy
22:50 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...
22:50 maroloccio i need a certain commit history graph to stay the freaking same if no changes were done in the commit contents so that CI checks calculated on those commit steps can be reused!
22:50 Spinkzeit joined #git
22:50 nettoweb joined #git
22:51 lb1a maroloccio then why starting rebase in the first place?
22:51 maroloccio i am burning cloud computing $ if i am recalculating CI
22:51 eka joined #git
22:51 Random832 you can't do CI based on the tree?
22:51 maroloccio the tree?
22:51 Random832 there's another hash that just refers to the directory contents without the history or the commit message
22:51 maroloccio the tree git object sha?
22:51 f4 joined #git
22:52 maroloccio yeah. the tree with the dir contents and all the subtrees descending.. each with its own sha
22:52 maroloccio the sha that shas all of the shas so that it captures the status of all the commited files at that point, without considering commit message / author / date / etc.. is that what you were saying?
22:52 Random832 yeah
22:52 maroloccio if so, then no.. i can't do that
22:52 Random832 why not?
22:53 anonymuse joined #git
22:53 maroloccio messages have semantics. like pointer to jira ticket id, author has metadata, etc.
22:53 Random832 so make a sha of the tree and the message
22:53 maroloccio it changes if the content is the same but the justification/metadata differ
22:53 tribly joined #git
22:53 Random832 maybe also the patch id
22:53 maroloccio also, it is more logical to me that same commits would result in the same thing
22:53 Random832 it depends on what your CI actually is
22:53 maroloccio yeah dude, all those things were things i was considering
22:54 maroloccio ci is cloud ci, not local jenkins
22:54 Random832 right but what is it actually looking at
22:54 maroloccio the highest level sha. not the tree
22:54 maroloccio the commit
22:54 Random832 no i mean what is it looking at. what are the CI checks being calculated
22:54 Random832 that are eating up all this cpu
22:54 Random832 what are the semantics
22:55 wrouesnel joined #git
22:55 maroloccio oh. it's doing the whole thing. static code analysis. unit testing. functional tests. style conformity. < timeout running time. etc.
22:55 maroloccio it's proper ci :)
22:56 maroloccio i need to see if that command option does the magic
22:56 Random832 most of those things should only care about the tree
22:56 maroloccio ill report back w/ results :)
22:56 maroloccio Random832: certainly true. but we have a thing about attribution of stuff that goes into prod.
22:56 m0viefreak joined #git
22:57 Random832 yeah but you could keep a separate cache of the test results
22:57 maroloccio the attribution metadata magic (and ticket justification) is in the message
22:57 Random832 keyed based on the tree
22:57 maroloccio that would be very smart indeed
22:57 Random832 or you could not rebase things
22:57 maroloccio cause you are right.. content.. really only depends on the tree id. that's smart.
22:57 maroloccio outside my control though. cloud ci is a black box
22:58 buddyq joined #git
22:58 e14 joined #git
22:58 ciscoo joined #git
22:58 maroloccio i will say it on mondya though.. a smart guy on the net made me notice that the content is really something that shouldnt be re-CI'd if the tree stays the same.
22:58 romerocesar joined #git
22:58 maroloccio i wonder why the "thing" doesn't do it already. but that's off-topic here
22:59 corsibu joined #git
22:59 maroloccio still, to me a rebase would be more logical if it preserved dates of the commits it "implants" onto the tip so that "re-implanting".. always results in the same sha
23:00 maroloccio unless i am missing something conceptually elegant there
23:00 Random832 anyway i'd just avoid the rebase - it doesn't look like there are any easy hooks to make it reuse the original committer date and original author date
23:00 Random832 it looks like rebase internally uses machinery that strips the committer and author metadata out - the manpage mentions "git am"
23:01 Random832 er...
23:01 Random832 hmm
23:01 jwcapps joined #git
23:01 Random832 the desription of the --no-ff option implies that by default rebase will do what you want
23:02 Random832 no-one picked up on it because your original question was about cherry-pick
23:02 e14 joined #git
23:02 Spinkzeit joined #git
23:03 Random832 at least in interactive mode
23:03 jwcapps I'm trying to sync up 3 feature branches between each other and master but an octopus merge has conflicts.  Is there a way to do an octopus merge with manual conflict resolution?
23:05 Random832 jwcapps: no.
23:06 Random832 after resolving the conflicts by merging them one-at-a-time, you *could* synthesize a commit with the resulting tree and all the parent commit hashes, but i've been told that's a bad idea.
23:06 maroloccio Random832: i dont know what you mean my friend. i tried git rebase --interactive master twice in a raw, swapping the order of the 1st and 2nd commits in the sequence.. when putting them back the way they were before the swap.. the commit ids are.. different
23:06 afuentes joined #git
23:06 Random832 maroloccio: oh, i thought you meant never having swapped them at all
23:07 maroloccio no no, i swapped them. put them back the way they were. new commits generated. try it. if i git show commit-id they have the same author and date but somehow sha1 to something else, with the same diff applied onto the same tip
23:08 Random832 do you expect to do this often?
23:08 nettoweb joined #git
23:08 Random832 if you make a mistake in a rebase you can get back the original head with the reflog
23:09 maroloccio Random832: you are right.. all the commits are there in the reflog until i somehow get them GCd
23:09 maroloccio look this shows a hint: git show --pretty=fuller commit-id
23:10 maroloccio what changes, in effect, is this: CommitDate
23:10 tristanp joined #git
23:10 maroloccio that changes the sha. if i could only keep that the same as it was before..
23:11 Random832 maroloccio: just because git show can do it doesn't mean rebase can do it.
23:12 Random832 i mean it might be a feature that could be added (to format-patch and am) but it doesn't seem to exist now
23:12 littleforest joined #git
23:14 cdown joined #git
23:17 ochorocho__ joined #git
23:18 justanotheruser joined #git
23:19 romerocesar joined #git
23:19 thebloggu joined #git
23:21 Noldorin joined #git
23:22 codfection joined #git
23:28 mkoskar joined #git
23:33 mizu_no_oto joined #git
23:40 romerocesar joined #git
23:40 fuchstronaut joined #git
23:40 fuchstronaut joined #git
23:44 menip joined #git
23:46 mizu_no_oto joined #git
23:47 mrpackethead joined #git
23:51 tristanp joined #git
23:51 luke-jr left #git

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