IRCloggy #git 2020-06-28

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2020-06-28

← bolovanos left00:04
← tiin57 left00:08
→ tiin57 joined00:11
← _cipher left00:18
← SwiftMatt left00:19
← m0viefreak left00:20
→ Muimi joined00:21
→ dedowsdi joined00:21
← _Vi left00:24
→ MarioMey joined00:25
← dedowsdi left00:31
→ SwiftMatt joined00:32
← squirrel left00:33
← theorangeone left00:34
→ bambanx joined00:34
→ darkbit joined00:37
← tiin57 left00:38
← qpdb left00:38
→ qpdb joined00:38
← Serus left00:41
→ tiin57 joined00:41
← NeoCron left00:46
→ oatmealraisin joined00:51
→ maryo joined00:52
← maryo_t left00:55
→ squirrel joined00:58
→ dedowsdi joined00:59
→ _0xDEADBEEF joined01:00
← _0xDEADBEEF left01:05
← Samian left01:05
← d1b left01:07
← tiin57 left01:08
→ d1b joined01:08
→ tiin57 joined01:12
→ seaef joined01:12
→ pmcnabb0 joined01:13
← wyre left01:14
← segnior left01:15
← pmcnabb left01:15
pmcnabb0 → pmcnabb01:15
→ wyre joined01:15
→ segnior joined01:15
→ Muimi_ joined01:19
← Muimi left01:22
Muimi_ → Muimi01:22
→ libertyprime joined01:24
→ rook_flood joined01:24
rook_flood hi folks. does `git push --dry-run` send non-error output to stdout? if not, where does it go?01:25
→ doublex_ joined01:25
← AtumT_ left01:28
→ wymillerlinux joined01:29
← lukd left01:30
→ lukd joined01:31
→ Serus joined01:33
← inkbottle left01:35
→ inkbottle joined01:36
← tiin57 left01:38
← bocaneri left01:38
→ tiin57 joined01:41
← seaef left01:41
← stux|RC left01:41
→ stux|RC joined01:44
← SuperLag left01:44
→ orbyt_ joined01:48
→ bocaneri joined01:51
← Hello71 left02:02
→ Hello71 joined02:04
→ waveclaw joined02:06
← tiin57 left02:08
← lagothrix left02:09
→ lagothrix joined02:09
→ tiin57 joined02:11
← SwiftMatt left02:12
→ causasui joined02:15
→ SwiftMatt joined02:18
→ CodeSlingerPaul joined02:23
← CodeSlingerPaul left02:28
← Cabanossi left02:30
← rafasc left02:33
← inkbottle left02:35
→ Cabanossi joined02:35
→ inkbottle joined02:35
← tiin57 left02:38
← Muimi left02:39
→ tiin57 joined02:41
→ blahboybaz joined02:44
rook_flood /go jazz02:56
← SwiftMatt left02:56
← tiin57 left03:07
blahboybaz What s happening when you do $ git rebase <branchname> ? Is it rebasing the branch you are on onto <branchname> ?03:09
→ tiin57 joined03:12
← lucasb left03:23
← theoceaniscool left03:26
→ ferdna joined03:27
→ gxt_ joined03:32
rook_flood blahboybaz: yeah, it "plays back" your branch on top of whatever is in <branchname>03:33
blahboybaz rook_flood: So it puts the branch I'm on (have checked out) onto the branch I name in the command03:34
?03:34
← waveclaw left03:34
← iam730 left03:34
blahboybaz For example, I'f I'm on master and have a development branch that is a couple commits ahead of master, I do a03:35
← gxt left03:35
blahboybaz I do a $ git rebase development and master is moved onto the tip of development?03:35
→ iam730 joined03:37
← tiin57 left03:38
blahboybaz I'm having a diffictult time telling what is happening in the operation. If I do what I described above I can still checkout the development branch after the operation is performed (so the development branch must still be there) and I can checkout the mater branch again too (so the master branch must still be there).03:38
Is it just placeing a copy (since the branch is still there it must not get deleted)03:38
Marmotte if you are on master and run "git rebase development", this will reset master on the last commit of development, then replay all commits that were on master but not on development on top of this "new" master03:39
after the operation, development will not be modified, and master will be like "development + some commits from master"03:39
← thiago left03:40
→ tiin57 joined03:41
← darkbit left03:41
→ freshpassport joined03:42
rook_flood blahboybaz: what Marmotte said and also: think of branch names as references to points in history in a graph representing all histories that your repository knows about03:43
→ darkbit joined03:43
← bambanx left03:47
blahboybaz I"m not sure I'm understainding a few words being used in the post. Marmotte: "reset" (is this a keyword or something? What action is it referring to?). And "replay" (is this a keyword or something? What action is it referring to?). And, so let me get this straight. For example: Suppose master has 2 commits - z and x, and suppose development has 3 commits a, b, and c and I $ git rebase development when on master. I will03:50
ultimately end up with a master branch that has commits z, x, a, b, and c and a development branch that remains the same with commits a, b, and c ? Furthermore the develpmnent branch continues to have the same ancestor (branching point) as it did beofore the rebase?03:50
← kleisli__ left03:52
→ YuGiOhJCJ joined03:52
→ kleisli joined03:52
← pac1 left03:52
Marmotte development will not be modified, like rook_flood said, think of it as a shortcut to name the last commit of that branch03:53
if your master branch is "o - z - x" and development is "o - a - b - c", then running "git rebase development" from master will change master to "o - a - b - c - z - x"03:54
← wymillerlinux left03:55
blahboybaz Well I would have never thought of that03:55
← orbyt_ left03:56
blahboybaz Marmotte: And the development branch remains as it was and is o-a-b-c then?03:56
→ bavi joined03:56
Marmotte exactly03:57
blahboybaz still have two independent branches after the rebase right? A development branch as it was before (o-a-b-c) and a master that is now o-a-b-c-z-x03:57
ok03:57
Marmotte rebase is simple "pick a branch, overwrite my current branch with that, and redo commits that were on my current branche but not on the other"03:58
blahboybaz Why does it inserte the development branch content at the point where development branches off of master as opposed to appending it to the end of master?03:58
inserte\insert03:59
In other words I would have thought that master would end up as o--z-x-a-b-c not o - a - b - c - z - x04:00
Marmotte "git rebase development" means "recreate my current branch based on development branch"04:00
← EmmaT left04:00
Marmotte what you describe can be achieved using cherry-pick :)04:01
blahboybaz That's fine. I just wondered why it inteposes / inserts it at a point than glues it to the tip but ok04:01
← veegee left04:04
← watabou left04:04
→ watabou joined04:05
→ EmmaT joined04:06
blahboybaz Then what is the difference between $ git rebase <branch> and $ git merge --no-ff <branch> ?04:06
I tried both in separate test repos and $ git merge --no-ff <branch> seemed to have an additional commit (the merge commit) but I couldn't tell what was happening to branches comparatively04:07
← tiin57 left04:08
→ tiin57 joined04:11
← libertyprime left04:13
→ libertyprime joined04:18
← kleisli left04:19
← crose left04:22
← prepend left04:23
→ g00s joined04:35
← inkbottle left04:35
→ inkbottle joined04:35
← tiin57 left04:38
→ tiin57 joined04:41
← cbreak left04:43
→ cbreak joined04:44
← xcm left04:44
→ kleisli joined04:44
← kegster left04:49
→ kegster joined04:52
← dedowsdi left04:53
← hussar left04:54
→ bitwinery joined05:05
← bitwinery left05:06
→ bitwinery joined05:06
← tiin57 left05:08
→ tiin57 joined05:11
← causasui left05:14
→ st-gourichon-fid joined05:16
← g4570n left05:22
← bitwinery left05:30
→ maryo_s joined05:36
← tiin57 left05:37
← ShapeShifter499 left05:38
→ ShapeShifter499 joined05:38
← maryo left05:40
→ tiin57 joined05:41
← leah2 left05:41
→ [Brain] joined05:49
← MarioMey left05:50
→ MarioMey joined05:50
→ dedowsdi joined05:51
← Brain left05:52
← g00s left05:53
→ leah2 joined05:54
→ Muimi joined05:57
← libertyprime left06:01
← sudoforge left06:06
← tiin57 left06:08
→ tiin57 joined06:12
→ snowkidimd joined06:20
← Goplat left06:20
← umask077 left06:23
→ kleisli_ joined06:24
→ Guest20 joined06:25
← kleisli left06:26
← blahboybaz left06:33
← tiin57 left06:38
← gavlee left06:38
→ gavlee joined06:39
← kupi left06:39
→ Tawonga_ joined06:39
→ jaziz1 joined06:40
← Tawonga left06:40
→ tiin57 joined06:41
→ tgunr joined06:42
→ Brain joined06:46
← [Brain] left06:49
→ xcm joined06:53
→ geowiesnot joined06:53
← maryo_s left06:56
→ dfee joined07:01
← Heirlung left07:03
→ calcul0n joined07:06
→ mightyjens joined07:07
← tiin57 left07:08
→ umask077 joined07:10
→ tiin57 joined07:11
→ Heirlung joined07:11
← geowiesnot left07:14
→ SwiftMatt joined07:28
← st-gourichon-fid left07:29
← dfee left07:30
→ vdamewood joined07:31
← inkbottle left07:35
→ inkbottle joined07:35
← SwiftMatt left07:37
← tiin57 left07:37
→ feriman joined07:40
← lankanmon left07:40
→ quetz joined07:41
→ tiin57 joined07:41
→ lankanmon joined07:42
→ TheWild joined07:42
← freshpassport left07:44
← bocaneri left07:46
← Betal left07:47
→ bolovanos joined07:52
← MarioMey left07:54
← mat001 left07:56
← Guest20 left07:58
→ bocaneri joined07:59
← bocaneri left07:59
→ g00s joined08:02
← otisolsen70__ left08:04
→ bocaneri joined08:05
→ hamess joined08:05
hamess weird question but can i undo a "git restore"?08:05
← tiin57 left08:08
→ seaef joined08:08
→ NeoCron joined08:09
← xcm left08:11
→ tiin57 joined08:11
← ferdna left08:18
← bolovanos left08:21
← seaef left08:23
→ shush joined08:30
→ xcm joined08:31
← shush left08:34
→ haslo joined08:35
← tiin57 left08:38
→ tiin57 joined08:41
→ st-gourichon-fid joined08:42
← bavi left08:43
→ [Brain] joined08:45
← mightyjens left08:46
← Brain left08:47
← hqdruxn08_ left08:57
→ bolovanos joined08:57
← caskd left08:57
→ dfee joined08:57
← dfee left08:58
→ hqdruxn08 joined08:59
→ caskd joined08:59
→ oragadam joined09:03
→ Brain joined09:06
← tiin57 left09:08
← [Brain] left09:09
← YuGiOhJCJ left09:11
→ tiin57 joined09:11
zatumil undo?09:12
→ Guest20 joined09:12
ikke If it discarded any uncommitted changes, then no09:17
hamess dang09:19
ty09:19
← hamess left09:19
→ hamess joined09:20
hamess part09:20
← hamess left09:20
→ SwiftMatt joined09:24
← lightstalker left09:27
← SwiftMatt left09:33
← Atlenohen left09:35
← Shentino left09:37
→ lightstalker joined09:37
← tiin57 left09:37
→ SwiftMatt joined09:40
→ Shentino joined09:41
→ tiin57 joined09:41
← xcm left09:42
→ xcm joined09:42
← SwiftMatt left09:43
← gxt_ left09:45
→ nQk joined09:46
nQk I did a "git stash apply" but there is a conflict with two files. How can I view the stashed version?09:46
Oh, I noticed there are comments in those files09:47
→ [Brain] joined09:47
→ libertyprime joined09:48
← Brain left09:49
nQk disregarding the comments, does the file contain all the code from both stash and normal version?09:49
← foul_owl left09:50
nQk what does the ======= mean exactly?09:50
← Guest20 left09:52
→ wxg joined09:58
→ theorangeone joined10:03
→ foul_owl joined10:06
← watabou left10:06
← tiin57 left10:08
→ tiin57 joined10:11
← nQk left10:16
← oragadam left10:18
← g00s left10:23
← wxg left10:25
TheWild folks, I was having fun playing with git's low level mechanics.10:26
Can the whole repository (okay, without config) be reconstructed having just the output of "git cat-file --batch --batch-all-objects" and "git for-each-ref"?10:26
→ shush joined10:31
← andy25225 left10:31
→ freddieptf joined10:31
← shush left10:35
← tiin57 left10:38
← xcm left10:38
→ xcm joined10:38
← magic_ninja left10:41
→ tiin57 joined10:41
→ andy25225 joined10:42
→ oragadam joined10:44
← freddieptf left10:46
← TheWild left10:49
← calcul0n left10:50
→ calcul0n joined10:52
← tgunr left10:55
→ tgunr joined10:58
→ freddieptf joined11:05
← freddieptf left11:07
← tiin57 left11:07
← oragadam left11:08
← SWAT left11:08
→ freddieptf joined11:08
← akem left11:08
→ emmanuelux joined11:09
→ tiin57 joined11:11
← zatumil left11:12
→ TheWild joined11:15
→ SWAT joined11:16
← xcm left11:21
→ xcm joined11:21
← vdamewood left11:25
→ wildlander joined11:28
canton7 TheWild, reconstructed in what sense?11:30
TheWild, ah I see. I'd suspect so, although you'd need to play around with the output of git for-each-ref a bit to make sure you've got all the information you need11:32
← mebus left11:36
← tiin57 left11:38
→ aw1 joined11:38
→ tiin57 joined11:41
→ suffer joined11:42
→ m0viefreak joined11:47
← jetchisel left11:48
→ Phylock joined11:59
→ freshpassport joined12:00
← bolovanos left12:03
← tiin57 left12:08
← cliluw left12:10
→ cliluw joined12:10
→ tiin57 joined12:11
← m0viefreak left12:12
← Phylock left12:13
→ bkuhlmann joined12:14
→ theoceaniscool joined12:16
rook_flood hi folks. does `git push --dry-run` send the non-error output to stdout? if not, where does it go?12:16
← bkuhlman_ left12:17
← freddieptf left12:17
→ Brain joined12:19
← andy25225 left12:19
→ _0xDEADBEEF joined12:21
← [Brain] left12:22
← Ignacy left12:24
← rustyshackleford left12:24
→ Phylock joined12:25
→ [Brain] joined12:28
→ andy25225 joined12:29
← Brain left12:30
→ osse joined12:30
← Eryn_1983_FL left12:30
→ shush joined12:31
← shush left12:36
→ k3yp- joined12:37
← tiin57 left12:37
← k3yp left12:38
→ Ignacy joined12:38
→ Eryn_1983_FL joined12:38
k3yp- → k3yp12:38
→ freddieptf joined12:40
→ tiin57 joined12:41
← osse left12:52
← diogenese left12:52
→ diogenese joined12:53
→ Guest20 joined12:58
→ veegee joined13:01
← f8e4 left13:07
← tiin57 left13:07
→ tiin57 joined13:11
→ mat001 joined13:12
← _0xDEADBEEF left13:21
→ Olipro joined13:21
← xcm left13:32
→ xcm joined13:32
← tiin57 left13:38
← Guest20 left13:38
→ tiin57 joined13:41
→ syr joined13:43
← freddieptf left13:44
→ sglavoie joined13:50
← sglavoie left13:52
← bocaneri left13:54
→ freddieptf joined13:57
← freddieptf left13:59
→ seaef joined13:59
← seaef left14:00
→ seaef joined14:06
→ orbyt_ joined14:07
→ bocaneri joined14:07
← tiin57 left14:07
← maxwilliamson left14:09
→ maxwilliamson joined14:10
→ tiin57 joined14:11
← seaef left14:17
← FFY00 left14:22
→ cd joined14:22
→ geowiesnot joined14:23
→ FFY00 joined14:23
← dedowsdi left14:26
← Hello71 left14:26
→ Hello71 joined14:27
← omfgwhofarted left14:29
j416 rook_flood: stderr or stdout, if any14:31
← andy25225 left14:31
→ BPL joined14:31
← freshpassport left14:32
rook_flood there is visible output, but I can't seem to grab it from stdout unless I use --porcelain. not sure why14:32
j416 how are you grabbing it?14:33
or, well, not grabbing it14:33
← tiin57 left14:37
→ maryo_s joined14:40
→ tiin57 joined14:41
→ andy25225 joined14:43
← Cabanossi left14:46
→ Goplat joined14:47
← geowiesnot left14:50
→ Cabanossi joined14:50
← feriman left15:00
→ g4570n joined15:05
→ thiago joined15:06
← tiin57 left15:07
→ crose joined15:10
→ tiin57 joined15:11
← noclue left15:16
← Hello71 left15:18
← opal left15:19
→ Hello71 joined15:20
→ bkuhlman_ joined15:21
→ opal joined15:22
→ m0viefreak joined15:22
← theoceaniscool left15:23
→ _Vi joined15:23
← bkuhlmann left15:24
rook_flood j416: executing in a subshell. just a sec, I'll make an example15:27
← opal left15:28
rook_flood j416: https://pastebin.com/294kfxCc15:29
m0viefreak git push writes to stderr by default. --porcelain it writes to stdout15:31
→ opal joined15:31
rook_flood m0viefreak: thank you. for a command like `git push --dry-run origin master`, I see output like "Everything up-to-date" - any idea where this output is written to?15:32
m0viefreak stderr15:32
output="$(git push --dry-run origin master 2>&1)"15:33
try this15:33
→ shush joined15:36
rook_flood !! awesome, thank you m0viefreak. this simplifies things. I assumed it worked differently because of a typo elsewhere in my script15:36
→ PavelB joined15:37
← tiin57 left15:37
→ MarioMey joined15:39
→ tiin57 joined15:41
j416 indeed.15:43
← m0viefreak left15:46
→ akem joined15:46
→ m0viefreak joined15:46
← shush left15:46
← iam730 left15:50
→ dfee joined15:51
→ ferdna joined15:51
→ shush joined15:52
→ iam730 joined15:52
← shush left15:57
← tiin57 left16:07
→ Newami joined16:08
← Newami left16:08
→ sudoforge joined16:10
→ tiin57 joined16:11
esotericnonsense what's an efficient way to find the first mention of a pattern in a git repository? I mention efficient specifically because a lot of the answers online seem to basically die on large repos, I want to find out when a flag was added to the linux kernel16:20
← dfee left16:25
→ shush joined16:25
→ tinga joined16:28
← shush left16:29
tinga Hi. Is there a tool to update broken symlinks in Git repositories? I.e. that go back through history (while tracking movements of the symlink entry itself), find when the symlink wasn't broken, then track the pointed-to file back to the present and replace the symlink with one that points there?16:30
← chiastre_ left16:30
← wrksx left16:30
→ AtumT joined16:34
→ chiastre_ joined16:35
→ wrksx joined16:36
← tiin57 left16:37
tinga Does the silence mean that there isn't? :) If so, would you be interested in such a tool?16:38
→ kupi joined16:41
→ tiin57 joined16:41
→ troulouliou_div2 joined16:46
← aw1 left16:50
← vicfred left16:54
← Phylock left16:59
→ wootehfoot joined17:03
← snowkidimd left17:05
← tiin57 left17:07
← kleisli_ left17:08
j416 tinga: bisect should be able to help you find when it broke, then you can use filter-branch or the like to fix it17:10
→ tiin57 joined17:11
← hbnrf left17:13
→ hbnrf joined17:14
→ dfee joined17:15
→ ch1astre joined17:15
← chiastre_ left17:15
← drbean left17:17
→ Betal joined17:17
→ drbean joined17:17
→ oriba joined17:29
→ lythq joined17:35
gitinfo set mode: +v17:36
← tiin57 left17:37
→ tiin57 joined17:41
→ bvdw joined17:45
→ lucasb joined17:45
← tgunr left17:46
← andreas303 left17:47
→ aw1 joined17:49
→ andreas303 joined17:50
→ tgunr joined17:52
← SpeakerToMeat left17:56
→ SpeakerToMeat joined17:57
← theorangeone left17:58
→ theorangeone joined17:59
→ rangergord joined18:00
← SpeakerToMeat left18:01
rangergord I'd like to do a search-and-replace on all text files in a directory (recursive), but be prompted for each change to approve it or not. Like, show the line being replaced, ideally with some of the lines before and after for context, then I'm asked to choose whether to apply a replace or move on to the next.18:02
→ SpeakerToMeat joined18:02
rangergord before I write my own script, is there an estblished way of doing this?18:02
→ paws_ joined18:03
→ _leb joined18:04
← Ignacy left18:05
← theorangeone left18:07
← tiin57 left18:07
→ theorangeone joined18:07
← polyrob left18:10
→ polyrob joined18:10
→ tiin57 joined18:11
← aw1 left18:11
→ aw1 joined18:12
← dfee left18:14
nedbat rangergord: sounds like a feature of your text editor, not git.18:16
← BPL left18:18
rangergord It's for the terminal actually. And it's tangential to git :P18:19
← Muimi left18:24
tinga j416, git bisect won't tell me what the current path is to use. Also I don't want to modify history, just make a new commit.18:24
j416 tinga: what will?18:25
tinga j416, what I mean is, track renames.18:25
I don't know of any tool that does track those except some I wrote myself.18:26
j416 you mean there's a symlink that references something tracked?18:26
tinga Symlinks pointing inside the repository, yes18:26
local18:26
j416 rename detection isn't exact, so you may want human eyes on it anyway18:26
→ BPL joined18:26
j416 sounds like a handy tool, if you have a lot of symlinks that you tend to forget you have.18:27
tinga R100 is exact and if the tool does just those I'm already happy18:27
→ watabou joined18:27
j416 tinga: it could be a deletion and an addition without intention of rename18:27
perhaps unlikely, but possible18:27
tinga In connection with the symlink target disappearing it should be pretty unproblematic.18:28
j416 but since you're not modifying history that's probably good enough; even with a lower similarity.18:28
perhaps it would be sufficient to have a tool that'd find all symlinks and when/if they broke.18:29
tinga I'd love if it tracked the moves of the targets and sources from breakage points on, too.18:30
j416 updating them would of course be a nice-to-have.18:30
tinga This is a wiki style repository and has about 1000 symlinks and 5000 targets; there is tons of moving of stuff going on.18:30
j416 whoa.18:31
tinga So there are many cases where things get renamed multiple times before the broken link is noticed.18:31
j416 I can see your problem then.18:31
tinga More to the point, I'd like to avoid having to update any symlinks manually at all once I've got that tool :)18:31
Hello71 rangergord: I mean... git add -A; sed whatever; git checkout -p18:32
j416 tinga: perhaps a checker would be good to have, as a hook or whatnot.18:32
tinga: so that fewer symlinks are broken to begin with18:32
tinga Yeah, given a hook the logic could be a bit simpler (no history tracking).18:32
j416 or maybe you could generate all the symlinks from scratch18:33
tinga Still given that the algorithm is pretty straightforward, given a good API into Git, I was hoping this already exists.18:33
(the version including looking back.)18:33
And if it doesn't exist I'm probably going to write it. Not sure in which language though; suggestions welcome. (Rust is pretty solid and fast, but portability/accessibility poor. Perl is probably still used a lot in the core, so perhaps the way to go, but I haven't seen such history tracking functionality there; maybe I should look harder?)18:35
← tiin57 left18:37
← _leb left18:38
→ Akuli joined18:39
tinga (Python? C? Both painful. OCaml? I might do it in the latter/ReasonML since I'm currently learning that.)18:40
→ tiin57 joined18:41
Akuli i have a remote named tp and a branch tp/foo, it shows up in git log --graph --decorate --pretty=oneline --abbrev-commit --all18:41
but 'git branch -D tp/foo' says "error: branch 'tp/foo' not found"18:41
→ Ignacy joined18:42
→ causasui joined18:48
→ freddieptf_ joined18:49
← _Vi left18:51
→ bkuhlmann joined18:55
← bkuhlman_ left18:59
← justanotheruser left19:01
→ voidSurfr joined19:03
← ewomer left19:04
→ dfee joined19:05
← haslo left19:05
← dfee left19:06
← tiin57 left19:07
→ tiin57 joined19:11
← bkuhlmann left19:15
→ vpw joined19:16
← orbyt_ left19:19
← wildlander left19:24
← onizu left19:25
← causasui left19:26
j416 Akuli: does 'git branch' show it?19:26
Akuli no, but 'git branch -a' shows remotes/tp/foo19:27
j416 then it's a remote tracking branch.19:27
it's not a local branch.19:28
(you only have a local read-only copy of it)19:28
Akuli is 'git fetch --prune' meant for deleting those?19:28
j416 indeed19:28
Akuli thanks19:28
j416 you can set fetch.prune to true to have fetch do that by default19:28
git config --global fetch.prune true19:29
thiago configures that19:30
thiago should probably configure the pull method to rerbase now that it warns us19:30
→ zatumil joined19:31
← tgunr left19:34
← tiin57 left19:37
→ tiin57 joined19:40
← random_yanek left19:41
← MarioMey left19:42
→ Thierry joined19:44
← dmc left19:47
← PavelB left19:47
→ _Vi joined19:47
→ MarioMey joined19:47
→ k3yp- joined19:48
MarioMey Hello, there. (16:41:06) MarioMey: I would like to test a pull request: https://github.com/obsproject/obs-studio/pull/288619:48
I don't know how to do it. I compile OBS here, it's no problem. But, my knowledge about git is very short.19:48
How should I do?19:48
← k3yp left19:49
k3yp- → k3yp19:49
← caskd left19:49
→ orbyt_ joined19:49
→ dmc joined19:51
← vpw left19:51
TheWild bare repository and only fast forwards are accepted. If it is not fast forward, I'm renaming that particular ref slightly so it's not lost.19:52
then how the hell this happened?19:52
dangling commit 09bf644cb9972e9665559c59561a8da6f85de65119:52
← drbean left19:53
← ferdna left19:53
→ drbean joined19:54
→ justanotheruser joined19:59
← Thierry left20:07
← tiin57 left20:07
→ wnbeser joined20:08
→ tiin57 joined20:11
→ caskd joined20:15
→ bamdad joined20:17
← Human_G33k left20:19
← m0viefreak left20:20
→ Lucas_Gray joined20:20
→ HumanG33k joined20:21
→ feriman joined20:23
← paws_ left20:23
→ Human_G33k joined20:27
← st-gourichon-fid left20:28
← HumanG33k left20:28
→ mikami joined20:30
← wnbeser left20:30
← mikami left20:30
→ HumanG33k joined20:30
← Human_G33k left20:31
→ shush joined20:31
→ shicks2525 joined20:35
j416 TheWild: is that on the server?20:36
TheWild well, let's check. I'll clone it in some other place20:37
← tiin57 left20:37
j416 no, did you run fsck on the server, or locally?20:37
TheWild well, I have no rights to the server (it's GitHub)20:41
→ tiin57 joined20:41
j416 then that commit is local20:41
it has nothing to do with github20:41
← cbreak left20:46
← maryo_s left20:47
→ wymillerlinux joined20:47
→ cbreak joined20:47
← BrianBlaze left20:48
← BPL left20:49
← MarioMey left20:57
→ BrianBlaze joined20:59
→ jetchisel joined21:00
→ rustyshackleford joined21:01
← lythq left21:02
→ omnireq joined21:02
→ random_yanek joined21:03
← tiin57 left21:07
← Akuli left21:08
→ tiin57 joined21:10
← tanuki left21:11
→ kleisli_ joined21:17
→ ferdna joined21:18
← tango_ left21:18
→ tango_ joined21:25
← bocaneri left21:32
← quetz left21:32
← drbean left21:33
→ drbean joined21:33
← shush left21:34
← tango_ left21:35
← wymillerlinux left21:36
← ferdna left21:37
← tiin57 left21:37
→ wymillerlinux joined21:38
← foul_owl left21:38
→ morph joined21:38
→ nessonic joined21:40
→ tiin57 joined21:40
→ gxt_ joined21:42
← lightstalker left21:45
→ mowcat joined21:46
← freddieptf_ left21:46
→ bocaneri joined21:48
→ foul_owl joined21:52
← tejr left21:52
← gschanuel left21:54
→ lightstalker joined21:55
← justanotheruser left21:55
→ tejr joined21:58
← kupi left22:00
→ g00s joined22:03
← tiin57 left22:07
→ tango_ joined22:08
→ Human_G33k joined22:10
→ tiin57 joined22:11
← HumanG33k left22:14
→ geowiesnot joined22:15
→ PavelB joined22:16
← feriman left22:16
← foul_owl left22:21
← tango_ left22:21
← geowiesnot left22:23
→ wnbeser joined22:24
→ shush joined22:29
← wnbeser left22:30
← nessonic left22:32
← calcul0n left22:33
→ foul_owl joined22:34
← Ignacy left22:36
← tiin57 left22:37
← Zumochi left22:39
→ tiin57 joined22:41
← darkbit left22:44
← sudoforge left22:50
← g00s left22:51
← kjartan left22:53
→ kjartan joined22:54
→ sudoforge joined22:57
→ lainon joined22:57
← mowcat left22:58
→ mowcat joined22:58
← NeoCron left23:00
→ fstd_ joined23:02
← mowcat left23:03
→ mowcat joined23:03
← aw1 left23:06
← yuljk left23:06
← fstd left23:07
fstd_ → fstd23:07
→ yuljk joined23:07
← omnireq left23:07
← tiin57 left23:07
→ omnireq joined23:07
← _Vi left23:09
→ nicolas17 joined23:09
→ justanotheruser joined23:10
← wymillerlinux left23:10
→ tiin57 joined23:11
nicolas17 what's going on here?23:11
"git clone https://invent.kde.org/utilities/krusader"23:11
"git branch --contains bb76da596" shows that commit hash is reachable from master23:11
"git show --stat bb76da596" shows that commit modifies krusader/org.kde.krusader.appdata.xml23:12
"git log -- krusader/org.kde.krusader.appdata.xml | grep bb76da596" but git log restricted to that path doesn't return that commit23:12
← hexnewbie left23:13
← lainon left23:14
→ Technodrome joined23:15
← andy25225 left23:16
→ F0rTex joined23:19
← storrgie left23:21
→ storrgie joined23:22
← voidSurfr left23:22
← Technodrome left23:23
← AtumT left23:23
→ voidSurfr joined23:23
nicolas17 ahh turns out history simplification is doing this...23:26
→ dedowsdi joined23:26
nicolas17 bb76da596 made changes in a side branch, and when the branch was merged into master, those changes were dropped (-s ours?) so they are indeed not relevant to explaining the current state of the file23:26
--full-history avoids that commit pruning23:27
→ Technodrome joined23:30
← ShapeShifter499 left23:31
→ ShapeShifter499 joined23:31
→ pinpox joined23:33
← voidSurfr left23:33
→ _7C00h joined23:36
→ fission6 joined23:37
← tiin57 left23:37
fission6 i did a git merge into a branch and carried a bunch of changes i didn't expect -- then pushed the branch up to git, how can i undo the merged changes and push back upstream23:38
→ tiin57 joined23:41
→ vicfred joined23:44
← nicolas17 left23:45
← fission6 left23:49
← libertyprime left23:51
→ Ignacy joined23:53
← downunder left23:55
← shush left23:56
→ downunder joined23:57
→ libertyprime joined23:58
→ igemnace joined23:59

Logs Search ←Prev date Next date→ Channels Documentation