IRCloggy #git 2017-12-29

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.

2017-12-29

jcarpenter2 joined00:00
houami left00:02
msev- left00:03
finalbeta left00:04
Mike11 left00:07
msev- joined00:09
houami joined00:09
__main__ joined00:12
xxMatiasFxx joined00:13
BSaboia joined00:13
BSaboia left00:13
xxMatiasxx left00:13
houami left00:14
akushner left00:16
mattcen left00:17
igemnace left00:17
igemnace joined00:18
pandeiro joined00:19
mattcen joined00:19
overlord_tm joined00:21
houami joined00:22
tvw left00:23
houami left00:27
pkx2 left00:29
dege left00:30
metts joined00:31
foul_owl joined00:34
foul_owl How do I search all branches for a file?00:34
houami joined00:34
foul_owl I tried git log --all -- somefile but it doesn't tell me what branch the file is in00:34
Thanks!00:34
Plus it looks like you have to know the exact path00:36
xxMatiasFxx left00:38
cdown joined00:38
houami left00:39
pR0Ps left00:39
HuskyApocalypse joined00:39
avar foul_owl: you take the commits it lists and feed it to git branch --contains <commit>00:42
pR0Ps joined00:42
jstein left00:42
houami joined00:46
manuelschneid3r left00:46
xcm left00:48
xcm joined00:48
houami left00:51
marian1235813 left00:52
ToBeFree joined00:54
gitinfo set mode: +v00:55
ToBeFree left00:55
xaxxon left00:56
dsdeiz left00:58
houami joined00:58
dsdeiz joined00:59
dsdeiz left00:59
dsdeiz joined00:59
whitby left01:02
Cabanossi left01:03
houami left01:03
Forlorn left01:04
whitby joined01:04
Cabanossi joined01:04
Hello71 or --decorate01:07
--graph01:07
houami joined01:10
noobineer joined01:11
noobineer left01:11
re1 left01:12
houami left01:15
ZyX-I left01:16
yohnnyjoe left01:21
aielima left01:21
shinnya left01:21
awkwardpenguin joined01:26
dsdeiz left01:30
dsdeiz joined01:30
clickjack left01:31
awkwardpenguin left01:32
ok91 joined01:32
maheshpec joined01:32
overlord_tm left01:33
houami joined01:35
cdown left01:36
ok91 left01:37
raynold ahh it's a wonderful day01:37
clickjack joined01:38
houami left01:39
safe joined01:40
bkxd joined01:40
Shah2 left01:44
Enphuego left01:45
houami joined01:47
Forlorn joined01:50
houami left01:51
FoxRocks joined01:52
notbenh_ left01:53
Travis-42 left01:53
sebhoss left01:53
huhlig left01:53
stealthii left01:53
tharuin left01:53
Travis-42 joined01:54
notbenh_ joined01:54
sebhoss joined01:55
tharuin joined01:55
huhlig joined01:55
stealthii joined01:55
dsdeiz left01:55
dsdeiz joined01:55
dsdeiz left01:55
dsdeiz joined01:55
tac-tics left01:56
Gustavo6046 left01:57
snits_ left01:57
snits joined01:58
orbyt_ left01:59
dsdeiz left02:01
henriquev left02:01
dsdeiz joined02:01
dsdeiz left02:01
dsdeiz joined02:01
foul_owl How do I find the file if I don't know the exact path though? Thank you!02:01
bkxd left02:01
TomyLobo left02:02
orbyt_ joined02:03
Hello71 dunno. guess you could do git log --all --format=something | xargs git ls-tree | grep02:03
or something02:04
snits left02:06
snits joined02:06
jim left02:06
snits left02:08
xD3C left02:08
snits joined02:09
xD3C joined02:09
phinxy left02:11
xD3C left02:11
jim joined02:12
b0nn foul_owl: I use --stat to list all the files, then search through the output with a /<filename>02:15
pandeiro left02:15
finalbeta joined02:15
foul_owl git --stat? Thanks!02:16
discopatrick left02:16
ficolas joined02:17
current_user left02:17
b0nn git log --stat, sorry02:17
foul_owl Thank you!02:19
How do you not use the pager?02:19
ficolas hello, im trying to download an older version of a git rep to my computer. To do so, I created a fork, and then on the git console I did "git clone myRepp", "git checkout tagName", "git checkout -b newBranchName", but now, how do I download the branch to my computer?02:19
ResidentBiscuit joined02:21
leeN left02:21
igemnace it's all been on your computer since you did git clone02:21
ficolas oh02:21
so how do I access it now?02:21
igemnace the branch? you're already on it; git checkout -b newBranchName creates a new branch then checks it out02:22
ficolas oh that was fast02:23
eshlox left02:23
ficolas I expected some copying time or something O_o02:23
thanks!02:23
Arcaelyx left02:26
igemnace welcome to git :)02:28
ficolas: branches are pointers so they're very cheap. https://git-scm.com/book/en/v2 is a nice read if you have spare time02:29
Noldorin left02:29
pR0Ps left02:29
xaxxon joined02:29
ResidentBiscuit ^ The first three chapters are all you need for everyday usage02:29
lyxus joined02:31
pR0Ps joined02:31
ficolas i'll drop that on the todo learning bookmark folder c:02:33
cdg joined02:38
dsdeiz left02:43
robattila256 left02:44
ilbot3 left02:44
dsdeiz joined02:44
dsdeiz left02:44
dsdeiz joined02:44
cqi joined02:45
thiago left02:45
ojdo joined02:45
ResidentBiscuit left02:51
IanLiu left02:53
ResidentBiscuit joined02:54
tombusby left02:56
ilbot3 joined02:59
tombusby joined03:00
clickjack left03:02
VoradorPT left03:02
dax joined03:03
m0viefreak left03:04
kupad left03:05
clickjack joined03:11
Dragon092 left03:11
Dragon092 joined03:12
lagothrix joined03:13
FoxRocks left03:16
lagothri1 left03:17
xaxxon left03:17
clickjack left03:21
maheshpec left03:22
robattila256 joined03:23
lyxus left03:24
imack joined03:25
chachasmooth_ left03:28
chachasmooth joined03:28
awkwardpenguin joined03:28
bkxd joined03:29
imack left03:31
awkwardpenguin left03:33
Arcaelyx joined03:34
webguynow left03:35
orbyt_ left03:35
webguynow joined03:36
Forlorn left03:37
energizer left03:40
energizer joined03:41
bkxd left03:42
webdev007 left03:43
jtl_ joined03:44
schooner joined03:47
lyxus joined03:47
lyxus left03:49
schooner left03:50
lalomergo joined03:50
ResidentBiscuit left03:50
xxMatiasFxx joined03:52
Amanas left03:55
npgm left03:55
madewokherd left03:56
Noldorin joined03:59
lyxus joined04:01
HuskyApocalypse left04:06
madewokherd joined04:11
xxMatiasFxx left04:12
xxMatiasxx joined04:12
HuskyApocalypse joined04:13
orbyt_ joined04:13
houami joined04:14
HuskyApocalypse left04:15
mizu_no_oto joined04:16
dviola left04:19
raijin joined04:22
shripadr joined04:23
Noldorin left04:24
drewmcmillan left04:25
daynaskully left04:25
lyxus left04:28
igemnace left04:29
daynaskully joined04:30
HuskyApocalypse joined04:31
bkxd joined04:31
webguynow left04:32
webguynow joined04:33
houami left04:39
madewokherd left04:39
FoxRocks joined04:42
akushner joined04:47
imack joined04:47
robattila256 left04:50
schooner joined04:51
MACscr left04:52
igemnace joined04:53
Cabanossi left04:54
ficolas left04:55
dsdeiz left04:56
dsdeiz joined04:56
dsdeiz left04:56
dsdeiz joined04:56
tunekey joined04:56
skalpin left04:56
Cabanossi joined04:57
xxMatiasxx left04:57
madewokherd joined04:58
Claw_wolf joined05:01
Claw_wolf left05:01
Claw_wolf joined05:01
pks left05:03
a3Dman left05:04
pks joined05:04
Iroha left05:05
Iroha joined05:06
houami joined05:08
clickjack joined05:08
lalomergo left05:10
yohnnyjoe joined05:19
orbyt_ left05:21
yohnnyjoe left05:24
justan0theruserjustanotheruser05:27
FoxRocks left05:28
skalpin joined05:30
a3Dman joined05:31
stoopkid left05:31
kupad joined05:33
cdg left05:34
jcarpenter2 left05:35
jcarpenter2 joined05:35
whitby left05:43
mizu_no_oto left05:44
clickjack left05:44
lyxus joined05:45
FoxRocks joined05:51
akushner left05:53
jcarpenter2 left05:54
BenderRodriguez joined05:54
LocaMocha joined05:56
clickjack joined05:57
zumba_addict joined05:57
Arcaelyx left05:57
raijin left05:59
jtl_ left06:00
foul_owl left06:05
cdleonard left06:07
Xiti left06:11
clickjack left06:11
Xiti joined06:12
schooner left06:15
safe left06:17
clickjack joined06:18
Claw_wolf left06:19
ZyX-I joined06:20
Motoko joined06:21
Claw_wolf joined06:21
Claw_wolf left06:21
Claw_wolf joined06:21
akushner joined06:26
StOBlind joined06:27
madewokherd left06:27
kdragon left06:27
kdragon joined06:28
clickjack left06:28
Claw_wolf left06:31
wandering_vagran joined06:34
clickjack joined06:36
Claw_wolf joined06:36
clickjack left06:38
khisanth_ left06:39
dsdeiz left06:40
dsdeiz joined06:40
coumbole joined06:42
Claw_wolf left06:44
ShekharReddy left06:44
Claw_wolf joined06:48
Claw_wolf left06:48
Claw_wolf joined06:48
clickjack joined06:52
khisanth_ joined06:54
lordjancso joined06:55
clickjack left06:56
Claw_wolf left06:58
dsdeiz left06:58
dsdeiz joined06:59
dsdeiz left07:00
dsdeiz joined07:00
bergice_ left07:01
awkwardpenguin joined07:03
FoxRocks left07:06
clickjack joined07:06
awkwardpenguin left07:07
Claw_wolf joined07:09
Claw_wolf left07:09
Claw_wolf joined07:09
dec0n joined07:10
zmt00 joined07:10
zmt00 left07:11
clickjack left07:12
Wetmelon left07:13
KeyJoo joined07:15
JeroenT joined07:17
boombatower left07:17
yohnnyjoe joined07:20
notnull joined07:22
yohnnyjoe left07:25
Claw_wolf left07:26
StOBlind left07:26
JeroenT left07:26
JeroenT joined07:26
StOBlind joined07:27
eduardas_m joined07:29
re1 joined07:30
d0hboy joined07:31
Claw_wolf joined07:33
Claw_wolf left07:33
Claw_wolf joined07:33
clickjack joined07:34
d0hboy left07:35
duderonomy left07:35
clickjack left07:38
Looper left07:43
lyxus left07:48
zumba_addict left07:49
abba joined07:50
ZyX-I left07:56
YuGiOhJCJ joined07:59
YuGiOhJCJ left07:59
YuGiOhJCJ joined08:01
Claw_wolf left08:01
Claw_wolf joined08:02
Claw_wolf left08:02
Claw_wolf joined08:02
McKrakenMcKraken_zzzzz08:02
YuGiOhJCJ left08:10
YuGiOhJCJ joined08:11
Elephantenna joined08:13
masuberu joined08:14
rkta left08:15
lordjancso left08:15
bessamatic joined08:15
HElephant left08:17
goweol1 left08:19
duderonomy joined08:20
bessamatic left08:21
ilyaigpetrov joined08:22
t0adst00l joined08:24
Xiti` joined08:27
MACscr joined08:28
amosbird Hello08:28
lordjancso joined08:29
amosbird how can I make submodule checkout to the latest commit after i did submodule update?08:29
https://la.wentropy.com/vAij08:29
it doesn't move the master branch08:29
Xiti left08:29
Xiti` left08:32
ShekharReddy joined08:32
Xiti joined08:32
dsdeiz left08:35
skylite left08:35
dsdeiz joined08:35
Motoko left08:40
ghost43 left08:41
kadoban left08:41
Claw_wolf left08:42
Claw_wolf joined08:42
Claw_wolf left08:42
Claw_wolf joined08:42
ghost43 joined08:43
marian1235813 joined08:44
katiex7 left08:49
robattila256 joined08:50
skylite joined08:52
phinxy joined08:52
SteffanW joined08:55
goweol joined08:56
Lyqyd joined08:58
ShapeShifter499 joined09:01
Claw_wolf left09:01
Darcidride joined09:02
bket left09:03
awkwardpenguin joined09:04
t_robotham left09:05
clickjack joined09:05
SteffanW left09:06
masuberu left09:07
jorth joined09:08
awkwardpenguin left09:09
bket joined09:09
nitemare joined09:09
cqi left09:10
nitemareGuest2289009:10
PioneerAxon left09:11
goweol left09:12
goweol joined09:14
gitinfo set mode: +v09:14
Guest22890 left09:14
jorth Hi. `git am` refuses to apply a patch: `error: patch failed: ...`. But `git apply` applies the patch without a comment. What's going on here and how do I get `git am` to apply the patch?09:14
I'm using `git am 0001-patch.patch` and `git apply 0001-patch.patch`09:15
howdoi joined09:15
PioneerAxon joined09:16
beerdrop left09:18
CheckDavid left09:19
jorth looks like it works if I pass `--ignore-whitespace` to `am`.09:20
jorth left09:20
Floflobel joined09:21
yohnnyjoe joined09:21
Lyqyd left09:23
bcc left09:24
bcc joined09:25
bcc left09:25
bcc joined09:25
yohnnyjoe left09:25
czart joined09:28
b0nn left09:29
goweol left09:29
beerdrop joined09:32
masuberu joined09:34
overlord_tm joined09:34
shinnya joined09:37
babyflakes joined09:42
notnull left09:43
phluks joined09:46
discopatrick joined09:48
marian1235813 left09:49
bergice_ joined09:52
SteffanW joined09:52
fatalhalt left09:53
duderonomy left09:53
re1 left09:56
mosab joined09:57
chaosruler joined09:57
duderonomy joined09:58
amosbird Hi, is git ls-files affected by .gitignore ?10:09
mosabmos3abof10:09
shripadr left10:14
robattila256 left10:16
grawity there are --options for that10:17
_ikke_ --exclude-standard10:17
Kaisyu left10:19
guideline_ joined10:20
guideline left10:22
marian1235813 joined10:23
kozy left10:24
vilez joined10:24
kozy joined10:25
cdown joined10:26
cdown left10:27
cdown joined10:28
phluks left10:29
thiago joined10:32
YuGiOhJCJ left10:33
MarioBranco joined10:34
schleppel joined10:35
jceb joined10:35
re1 joined10:36
bkxd left10:45
IanLiu joined10:48
wxg joined10:51
bkxd joined10:56
chaosruler left10:56
chaosruler joined10:56
Murr left10:57
Murr joined10:57
wxg left11:06
awkwardpenguin joined11:06
awkwardpenguin left11:11
imack left11:12
DevAntoine left11:14
Copenhagen_Bram left11:16
imack joined11:17
Dewin left11:18
juv joined11:18
ShapeShifter499 left11:18
Copenhagen_Bram joined11:21
yohnnyjoe joined11:22
bkxd left11:23
wxg joined11:23
notnull joined11:24
LogicAside joined11:24
bkxd joined11:25
LogicAsideThatOtherGuy11:25
yohnnyjoe left11:27
nanga left11:28
cdown left11:31
t0adst00l left11:31
Copenhagen_Bram left11:32
navidr joined11:32
nanga joined11:33
nanga left11:33
nanga joined11:33
KeyJoo left11:42
enkrypt left11:42
Dewin joined11:43
Milijus joined11:49
Copenhagen_Bram joined11:49
coumbole left11:50
leeN joined11:51
bkxd left11:51
igemnace left11:54
wxg left11:56
enkrypt joined11:56
[ADN] joined11:56
JeroenT_ joined11:57
TomyLobo joined11:57
wxg joined11:57
JeroenT left12:00
jnavila joined12:02
linus1 joined12:06
bket left12:06
linus1 Hi all. If I've done git cherry-pick foo bar baz, and encountered a conflict with bar which led me to decide that bar shouldn't be included after all, is there a way to skip bar (like with git rebase --skip)?12:07
thiago git cherry-pick advertises a --skip option but I've never got it to work12:13
abort and run it again12:14
linus1 that would cause me to lose some previous conflict resolutions that I'd rather not :(12:14
I don't see the --skip option in the manpage12:15
thiago first of all, that's what rerere is for12:16
linus1 although I suppose I could make a branch from the current HEAD12:16
thiago second, don't cherry-pick the original commits. Cherry-pick the commits you've just made, with the fixes12:16
HEAD is always current12:17
energizer left12:17
linus1 yeah I mean as opposed to the HEAD after aborting the cherry-pick12:18
That did it, thanks for the help :)12:18
so for future reference for myself: cherry-pick one commit at a time or just use rebase12:20
raynold left12:20
cdown joined12:26
ShapeShifter499 joined12:27
metts left12:27
JeroenT_ left12:30
NightMonkey left12:31
imack left12:31
m0viefreak joined12:32
Milijus left12:35
Milijus joined12:36
mos3abof left12:39
mos3abof joined12:39
xxMatiasxx joined12:41
TomyLobo hi, i need to programmatically check for changes to the worktree and index12:41
basically i'd like to have the same check in my script that "git rebase" does before doing anything12:42
ok91 joined12:42
phinxy left12:43
TomyLobo i've seen all kinds of strange solutions on SO12:43
the most promising is "git diff --quiet HEAD"12:43
would that work?12:43
mooasaurus left12:44
mooasaurus joined12:44
houami left12:46
drewmcmillan joined12:46
houami joined12:46
PioneerAxon left12:47
_ikke_ yes12:49
Or diff-tree, which is more suited for scripts in general12:50
xxMatiasxx left12:50
_ikke_ or what you want is diff-files12:51
houami left12:51
PioneerAxon joined12:52
Gustavo6046 joined12:53
TomyLobo hmm, next problem: git ls-tree doesnt have a --exclude parameter and i dont fancy breaking file name integrity by throwing a grep in there (grep can't deal with \0-separated records on the input side)12:54
NightMonkey joined12:54
TomyLobo i remember seeing a script with exclude patterns, but i can neither remember nor google what exactly they looked like12:55
basically i want it to skip .gitignore12:55
the big picture is, i want to remove and replace all files that were present in a certain commit, minus .gitignore12:56
houami joined12:59
_ikke_ TomyLobo: :!<filename> or :(exclude)<filename>12:59
PioneerAxon left13:00
ok91 left13:01
houami left13:03
TomyLobo fatal: :!.gitignore: pathspec magic not supported by this command: 'exclude' (mnemonic: '!')13:04
i guess grep it is, then13:04
PioneerAxon joined13:05
kvik joined13:07
coumbole joined13:08
houami joined13:09
TomyLobo oh, looks like grep -z *does* affect input13:09
pbrewczynski joined13:11
CheckDavid joined13:12
houami left13:13
kvik left13:17
mikecmpbll joined13:18
staafl joined13:18
misosoup joined13:18
houami joined13:18
yohnnyjoe joined13:23
howdoi left13:23
houami left13:23
yohnnyjoe left13:27
houami joined13:28
|ifei5g00d left13:28
Darcidride left13:29
|ifei5g00d joined13:30
Darcidride joined13:30
wxg left13:31
houami left13:33
d^sh left13:37
d^sh joined13:38
houami joined13:38
Tobbi joined13:40
mikecmpbll left13:40
Copenhagen_Bram left13:41
misosoup left13:41
chaosruler left13:41
chaosruler joined13:42
misosoup joined13:43
houami left13:43
m0viefreak left13:44
Copenhagen_Bram joined13:48
houami joined13:48
bergice_ left13:51
houami left13:53
coumbole left13:54
bket joined13:55
wxg joined13:56
houami joined13:58
eduardas_m left13:58
MarioBranco left14:00
houami left14:03
KeyJoo joined14:05
webguynow left14:06
webguynow joined14:07
houami joined14:08
mikecmpbll joined14:10
houami left14:12
karelk joined14:13
daynaskully left14:14
Himanshujha19964 joined14:14
yates joined14:16
yates i'm confused, please help14:16
bket left14:17
yates i accidently deleted some files in a working tree, using the operating system "rm -r" command14:17
yates sips his coffee14:17
Copenhagen_Bram left14:17
daynaskully joined14:18
yates i should say i deleted a directory and all files under it.14:18
houami joined14:18
yates i then performed a "git checkout --" thinking that would restore the working directory and files.14:19
it did not14:19
now when i do a "git status" i see all these files maked with a "D".14:19
Himanshujha19964 Hello everyone, i have a patchset with a cover letter and wish to send each patch in the set to different maintainers using git send-email, could someone please help me ?14:19
yates i do not want to delete these. how do i get from this state to a working tree with my directory and files restored?14:20
Es0teric joined14:20
bremner Himanshujha19964: use git-send-email with multiple --to arguments14:21
and --compose14:21
azerus left14:22
yates ?14:22
houami left14:22
_ikke_ yates: "git checkout -- ."14:23
yates: or instead of the ".", you can also specify the dir name14:23
yates: the dot is significant14:23
yates _ikke_: oh.14:24
so if i do "git checkout -- ." NOW (with all the files i want restored marked with a "D"), the directory/files will be restored?14:24
staafl left14:25
azerus joined14:26
yates i should ask "(with all the files i want restored marked with a "D" when i do a git status)"?14:27
?14:27
yates left14:28
houami joined14:28
Himanshujha19964 <bremner> Could you please elaborate more on this ? git-send-email --to [email@hidden.address] --to [email@hidden.address] 000-scsi-cover.patch 001-scsi-qla4xx.patch 002-scsi-qla2xx.patch so on to 009-scsi-mvsas.patch ?14:30
drewmcmillan left14:30
Himanshujha19964 Would this go as a patch set ?14:31
Also, note every patch has different maintainers!14:31
awkwardpenguin joined14:32
bremner well, if you want to send only patch 1 to maintainer 1, and so one, you'll have to call git-send-email a bunch of times14:32
mosab joined14:32
Himanshujha19964 I have also used --thread=shallow for formatting14:32
bremner note that git-send-email can generate the patches itself.14:32
houami left14:32
mos3abof left14:33
infinisil Whoa, git can send emails? :O14:34
VoradorPT joined14:35
Himanshujha19964 Yes, ql4xxx patch should be sent to only qla4xxx maintainers and not qla2xxx maintainers! And the whole should be a patchset.14:36
awkwardpenguin left14:36
Amanas joined14:36
overlord_tm left14:36
Himanshujha19964 bremner: I hope now you can understand my situation better.14:37
houami joined14:38
jceb left14:40
lordjancso left14:41
Tobbi left14:41
Tobbi joined14:41
Darcidride left14:42
houami left14:42
navidr left14:42
re1 left14:42
Himanshujha19964 Anyone ? _ikke_ ?14:43
drewmcmillan joined14:43
Milijus left14:44
jimmyrcom left14:48
houami joined14:48
tsglove joined14:50
_ikke_ Himanshujha19964: I don't see --thread=shallow in the man pages14:51
tsglove Hello. Beginner here. I am reading this link, and I´m wondering. After merging secondaryBranch into mainBranch... is it normal or do imperative to delete the secondaryBranch?? --> https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging14:51
_ikke_ Himanshujha19964: I think you have to do something with --to-cmd14:51
jceb joined14:52
tsglove On that link I posted, it´s specifically where it states: git branch -d hotfix Do I have to delete that secondaryBranch?14:52
houami left14:53
Himanshujha19964 _ikke_: man git format-patch has this --thread[=<style>]14:53
gitinfo _ikke_: the git-format-patch manpage is available at https://gitirc.eu/git-format-patch.html14:53
_ikke_ right, was looking at git send-email14:54
str joined14:55
Mike11 joined14:56
Himanshujha19964 _ikke_: So what do you suggest now ?14:58
houami joined14:58
wxg left14:58
dec0n left15:00
houami left15:02
cdg joined15:04
yopiji joined15:05
gitinfo set mode: +v15:05
yopiji Hello, I'd need some help with git15:05
madewokherd joined15:06
ResidentBiscuit joined15:06
_ikke_ !just_ask15:07
gitinfo You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)15:07
yopiji We're moving our git repo to a new server. I've looked how to do it, but most guides I saw seem to use an intermediary repo, and don't specify on which server which command should be executed. So I'm a bit confused.15:07
houami joined15:08
yopiji I have access to both the new and old server. Once migrated, the old repo will be deleted, is there a simple way to move the repo ?15:08
I thought about sshing in the new server and trying git clone --mirror oldurl, but I'm not sure if that will work15:09
_ikke_ yopiji: easiest is to just scp / rsync the repos15:09
chaosruler left15:10
yopiji Just copy the whole directory, without needing to edit any config files or something ?15:11
chaosruler joined15:11
shinnya left15:12
imack joined15:12
houami left15:12
imack left15:12
infinisil yopiji: yup, a git server is really just a directory you have ssh access to15:13
_ikke_ yopiji: correct15:13
notnull left15:13
yopiji ok, thanks for the info, we'll try that15:14
_ikke_ yopiji: everything is contained in the .git dir, and the configuration contains no host / location specific data15:14
hunterlabs left15:14
yopiji ok15:14
Hello71 although the clients do15:14
_ikke_ sure15:14
Raed|Laptop joined15:15
Looper joined15:15
hunterlabs joined15:16
vilez left15:17
houami joined15:18
imack joined15:18
al-damiri joined15:18
vilez joined15:19
drewmcmi_ joined15:19
drewmcmillan left15:20
houami left15:22
yohnnyjoe joined15:24
lamont left15:24
CheckDavid left15:26
enkrypt left15:27
houami joined15:28
kadoban joined15:28
yohnnyjoe left15:28
rosco_y joined15:31
houami left15:32
rosco_y I made a new, unmodified branch in my github. How do I fetch the new, empty branch to my cloned repository?15:32
lamont joined15:33
KeyJoo left15:34
abba left15:34
rosco_y in github desktop I can see the new branch, but I'd prefer to be able to do it from the command line.15:34
Noldorin joined15:35
LichtMacher left15:36
houami joined15:37
masuberu left15:38
Raed|Laptop left15:38
bket joined15:38
linuxmodder joined15:39
p4trix joined15:39
kadoban rosco_y: 'git fetch' typically15:42
houami left15:42
kadoban Or if you actually want a local branch to track it you mean, 'git fetch' and then 'git checkout the_branch' will work as a shortcut (leave off the origin/ part)15:43
Gustavo6046 left15:45
konsolebox left15:47
cdg left15:47
Sleepy63 left15:47
cdg joined15:47
houami joined15:47
lamont left15:48
nikheizen left15:49
mooasaurus left15:49
mooasaurus joined15:49
rosco_y kadoban: ty -- I did run "git fetch", but didn't see my new branch. I'm wondering if "git fetch" will only get the branch if it's not empty?15:49
lamont joined15:50
rosco_y I'm a total newb here in git and github. I'm reading "Pro Git" and trying to get up to speed because I want to start using it in my everyday development flow15:51
kadoban I'm not sure what an empty branch is on github. Orphan branches behave a little strangely in git, but it sounded like you made a copy of some other branch and that's what you mean by empty? That should behave normally certainly with fetch.15:51
Raed|Laptop joined15:51
houami left15:52
rosco_y In github, I created a new branch, and It doesn't yet contain any files, so I was thinking of that as an empty branch--is that incrorrect?15:52
sarp joined15:53
kadoban The part about fetch (and this sort of thing) that tends to confuse people is that 'git fetch' only modifies the "remote tracking" branches. So if your remote is named origin and you create/push a branch there named foo, it won't create a local branch for you named foo when you fetch. You'll have origin/foo available though, which will show you the current state of foo as it existed on origin the last time you fetched/pulled15:53
cdg left15:53
konsolebox joined15:53
kadoban rosco_y: Honestly I'm not sure how you create branches on github, I don't think I've ever done that. So I'm unsure exactly what it does.15:53
rosco_y ok, I created the branch in the github webpage. It's sounding like I should have just created the branch locally, worked in it and then pushed it to github. Does that sound about right?15:55
misosoup left15:55
rosco_y I think I've tried created a local branch, and pushing it to github, and it seems as though it complained that "the branch doesn't exist in github."15:56
kadoban That's what I do. I typically avoid doing much on github.com that I can possibly do elsewhere, but I think creating branches on github.com is a rare thing anyway. I'm actually not seeing where you even do it in the UI either15:56
rosco_y: Yeah, you might have to do something extra the first time. Usually it's like 'git push -u origin the_branch' once, and then you can just 'git push' after the first time.15:57
rorro joined15:57
houami joined15:57
rosco_y Thank You kadoban, I'll approach it from that direction for a while. I'm a little hazy on the use of "origin" in my git commands.15:58
Thank you again, I hope everything goes your way!15:59
PaulCapestany left15:59
kadoban Anytime. Pro Git will probably explain it better than I'd manage, the origin part. But it's just an alias for a remote essentially.15:59
mikecmpbll left15:59
fxfitz j416: I landed up getting distracted yesterday and not finishing... does ls-tree give the hash of the file? It doesn't seem like it does...16:00
pburns joined16:00
pburns left16:00
PaulCapestany joined16:02
houami left16:02
cdg joined16:05
houami joined16:07
thallada left16:08
cdg left16:10
chaosruler left16:11
pkx2 joined16:11
houami left16:12
schooner joined16:13
chaosruler joined16:14
ojdo left16:14
kvik joined16:14
kvik left16:14
kvik joined16:14
chachasmooth_ joined16:15
schooner left16:15
chachasmooth left16:16
hunterlabs left16:17
schooner joined16:17
houami joined16:17
StOBlind left16:18
db8093246 joined16:18
cdg joined16:18
hunterlabs joined16:18
SteffanW left16:20
ojdo joined16:21
thallada joined16:21
houami left16:22
mosab left16:24
nidr0x joined16:27
houami joined16:27
Raed|Laptop left16:29
houami left16:31
awkwardpenguin joined16:33
p4trix left16:34
lamont left16:35
rosco_y I just pushed a new branch from my local repo to github, where I merged and then deleted the new Branch. How do I merge the new branch in my local repo to my master before deleting the new branch locally?16:35
rkta joined16:35
rosco_y (I've never merged branches in git)16:36
hunterlabs left16:37
rosco_y do I 1) "git checkout master", and then 2) "git merge NewBranch"?16:37
houami joined16:37
lamont joined16:37
awkwardpenguin left16:38
rosco_y Would "git fetch" synchronize my local repo to match the state of github?16:38
hunterlabs joined16:38
grawity in a way16:39
rosco_y ?16:39
polyzen not the working tree16:39
grawity that is, it'd just update the "origin/<whatever>" pseudo-branches16:39
yopiji left16:41
houami left16:41
staafl joined16:43
imack left16:43
volestorm left16:44
Gustavo6046 joined16:44
volestorm joined16:46
houami joined16:47
hunterlabs left16:47
staafl left16:50
houami left16:51
houami joined16:51
hunterlabs joined16:52
albel727 left16:53
rosco_y left16:53
Phylock joined16:54
Himanshujha19964 left16:58
fission6 joined17:00
Arcaelyx joined17:01
kus_ joined17:01
hunterlabs left17:02
hunterlabs joined17:05
invisbl joined17:08
orbyt_ joined17:09
hotpancakes joined17:10
j416 fxfitz: tias™17:13
fxfitz j416: Eh?17:14
tias?17:14
Not familiar with that...17:14
jast !tias17:18
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.17:18
jast a bit laconic, I guess, but... it works ;)17:18
madewokherd left17:19
jast fxfitz: anyway, you probably already saw that ls-tree outputs hashes for each object, so I guess maybe you were expecting straight up SHA1 hashes of the file contents and finding that you aren't getting those?17:20
fxfitz jast: Ah yeah, totally correct.17:21
TIL tias :-D17:21
jast :)17:21
fxfitz Already did tias :-P17:21
KeyJoo joined17:21
jast not sure anyone else uses "tias", to be honest17:21
anyway. the hashes in git are hashes of the *git objects*17:22
Es0teric left17:22
fxfitz Darn, so no easy way to find what point in history a given hash of a file is. :-(17:23
jast in the case of a file's contents, the git object type is "blob". blobs consist of a small header and the file contents17:23
fxfitz For the record, this is what I'm trying to do: given a file, determine when in git history that file exists.17:23
Essentially, I want to find out how old this file is. :-P17:23
And how far away from HEAD it is.17:23
jast I heard there's an upcoming option for 'git log' and friends to find that kind of thing17:24
fxfitz Ah, that would be nice. :-D17:24
jast anyway, you can easily convert a candidate file into a blob object and get the hash that way: git hash-object <path/to/file>17:24
fxfitz OH! Ok! That's super easy.17:24
yohnnyjoe joined17:25
duderonomy left17:27
maks_ joined17:28
maks_ left17:29
chaosruler left17:29
yohnnyjoe left17:29
chaosruler joined17:30
zivester joined17:30
lamont left17:30
wandering_vagran left17:31
SteffanW joined17:31
schooner left17:33
xaa joined17:33
hunterlabs left17:34
lamont joined17:38
hunterlabs joined17:38
cdg left17:38
sanscoeur joined17:38
cdg joined17:39
fxfitz jast: So, I don't think I can get a base case working. For example, getting it to run with what is at HEAD right now.17:40
WAIT17:40
I think I may have just got it.17:40
because left17:40
fxfitz jast: yeah, got it. THANKS17:40
jast great17:41
side note, if you're not doing this already, save yourself some work and use ls-tree with -r :)17:41
fxfitz Yup, that's what i got, based on recommendations from yesterday17:42
Well, here it is for rev in $(git log --format=%H --follow myri10ge.c); do git ls-tree -r $rev | grep -q d73bebb0d7c6828ea21b22a339332df8ede366fe && git log -1 --oneline $rev; done17:42
jast ah, right. I'm just way late, then, as usual17:42
fxfitz This whole experience shows me that I need to learn waaay more about git.17:42
jast if you only want the hash from 'git log', you may as well use 'git rev-list' instead which defaults to outputting hashes (but needs a commit arg, e.g. HEAD)17:43
cdg left17:43
jast hmm, but rev-list possibly doesn't support --follow...17:43
armyriad left17:43
jast never mind17:43
because joined17:43
fxfitz Hehe yeah, I started with rev-list, but it seemed to be faster if I already knew the file.17:43
jast yeah, makes sense17:44
fxfitz Well damn, base case found something which means its all set up right, but when searching for my actual hash of what I want, it found nothing. Must mean they must have a modified it. :-/17:44
hash-object can work with any file, even if it's not in the git repository?17:44
jast yes17:44
fxfitz Gotcha. Okay. Strange, seems like that kernel module in Centos isn't in the mainline kernel history...17:45
phinxy joined17:45
tombusby left17:47
tombusby joined17:47
roler joined17:47
cdown left17:48
madewokherd joined17:49
tombusby left17:50
rkta left17:50
tombusby joined17:51
neunon left17:51
SteffanW left17:51
duderonomy joined17:53
roler left17:53
SteffanW joined17:53
pts92 joined17:53
neunon joined17:53
Wetmelon joined17:56
ok91 joined17:58
cdg joined17:58
schooner joined17:59
Floflobel left17:59
Lyqyd joined18:01
thallada left18:02
ok91 left18:02
sarp left18:03
thallada joined18:03
duderonomy left18:03
Tobbi left18:03
armyriad joined18:03
str left18:05
str joined18:06
jcarpenter2 joined18:08
thallada left18:08
NightStrike joined18:09
albel727 joined18:10
hotpancakes left18:10
thallada joined18:11
raynold joined18:13
yohnnyjoe joined18:14
staafl joined18:17
clickjac_ joined18:23
katiex7 joined18:23
dimi1947 joined18:25
brainproxy joined18:25
clickjack left18:26
Lyqyd left18:26
brainpro1 left18:27
Tobbi joined18:28
thallada left18:30
xxMatiasxx joined18:31
thallada joined18:31
cdown joined18:33
awkwardpenguin joined18:35
hotpancakes joined18:36
nidr0x left18:37
rkta joined18:39
staafl left18:39
staafl__ joined18:39
awkwardpenguin left18:39
Es0teric joined18:42
schooner left18:42
kus_ left18:44
mns left18:44
schooner joined18:44
mns joined18:44
Darcidride joined18:45
duderonomy joined18:45
hunterlabs left18:46
brainpro1 joined18:47
Tobbi left18:47
daveomcd left18:49
brainproxy left18:50
discopatrick left18:50
hunterlabs joined18:51
Es0teric left18:51
cdown left18:53
nidr0x joined18:53
Es0teric joined18:53
paul424 joined18:53
pts92 left18:54
namstdnsk joined18:55
namstdnsk left18:57
hunterlabs left18:57
hunterlabs joined18:59
Tobbi joined19:01
Es0teric left19:02
rorro left19:03
Es0teric joined19:05
voker57 left19:05
voker57 joined19:06
voker57 left19:06
voker57 joined19:06
clickjack joined19:08
clickjac_ left19:09
sat-aton joined19:11
sat-aton left19:11
sat-aton joined19:11
czart left19:11
czart joined19:12
hunterlabs left19:12
kvik left19:13
hunterlabs joined19:13
kvik joined19:14
satifant left19:16
opalepatrick joined19:16
dviola joined19:16
hunterlabs left19:16
staafl__ left19:17
staafl joined19:18
houami left19:19
mattcen left19:19
houami joined19:20
kvik_ joined19:20
randomstrangerb joined19:23
kvik left19:23
staafl__ joined19:23
staafl left19:24
mattcen joined19:24
houami left19:24
randomstrangerb left19:27
nidr0x left19:28
LocaMocha left19:29
j416 fxfitz: try it and see?19:31
nd joined19:33
kp__ joined19:34
schooner left19:35
randomstrangerb joined19:35
kp__ left19:35
nd_ left19:35
kp__ joined19:35
adamretter joined19:35
nevodka left19:35
nevodka joined19:36
adamretter Halfway through a rebase, I accidentally `git rebase --abort`, I then undid that by consulting the reflog and running `git reset --hard HEAD@{1}`. I finsihed working through all the commits in my rebase, but when I got to the last one `git rebase --continue` reports: "fatal: cannot resume: .git/rebase-apply/final-commit does not exist.". Is there someway I can resolve this?19:37
staafl__ left19:42
staafl joined19:42
staafl left19:43
staafl joined19:43
invisbl left19:43
nidr0x joined19:44
staafl left19:44
staafl joined19:44
schooner joined19:45
energizer joined19:46
yohnnyjoe left19:48
ZyX-I joined19:49
houami joined19:49
Xiti left19:50
adamretter left19:52
cdown joined19:53
Xiti joined19:53
houami left19:54
SteffanW left19:56
Gurrz joined19:57
polyzen ouch lol19:58
houami joined19:59
staafl left19:59
staafl__ joined19:59
cdown left19:59
staafl__ left20:02
staafl__ joined20:02
hotpancakes left20:03
averell left20:03
hotpancakes joined20:03
hotpancakes left20:04
hotpanca_ joined20:04
houami left20:04
rosco_y joined20:05
ilyaigpetrov left20:05
yohnnyjoe joined20:05
rosco_y I have an entry in my .gitigore that reads20:06
oops20:07
\/[Ll]ibrary/20:07
shoot, it reads: /[Ll]ibary/20:07
my question is, is this telling git to ignore Library/ contents in the root diirectory?20:08
linuxmodder left20:08
Gustavo6046 left20:08
tang^ yes20:09
fission6 left20:09
houami joined20:09
rosco_y tang^ thank you. This is the way .github delivers the .gitignore if you specify a "Unity" .gitignore. I am a little confused as to why they would have it specify ignore directories in the root.20:10
tang^ because Unity will download Libraries only to the root of the project and you don't need those binaries in your repo20:11
rosco_y Maybe I have to run the git commit command from the directory in which the Libary folder exists....I'll try that20:11
schooner left20:12
rosco_y I'm obviously doing something wrong, because all the directories specified in the .gitignore get included in my commits20:13
randomstrangerb left20:13
staafl__ left20:13
rosco_y So that was my question tang^--Thank You :)20:13
randomstrangerb joined20:13
Gustavo6046 joined20:13
rosco_y left20:13
houami left20:14
tang^ rosco_y: did you have the .gitignore file at start of your project? it won't affect files already committed.20:14
staafl joined20:14
tang^ oh, gone20:14
staafl__ joined20:16
staafl left20:16
hunterlabs joined20:19
houami joined20:19
Es0teric left20:20
kp__ left20:20
cebor_ left20:20
kp__ joined20:20
cebor joined20:20
Es0teric joined20:21
fstd_ joined20:22
hattkunskapz joined20:22
Darcidride left20:23
houami left20:23
Sasazuka joined20:23
hunterlabs left20:24
fstd left20:25
fstd_fstd20:25
cust joined20:27
boombatower joined20:29
houami joined20:29
houami left20:34
mikecmpbll joined20:34
CheckDavid joined20:38
paul424 left20:38
brainproxy joined20:39
houami joined20:39
Darcidride joined20:40
dimi1947 left20:40
Darcidride left20:41
chaosruler left20:41
brainpro1 left20:41
hunterlabs joined20:41
chaosruler joined20:42
houami left20:43
chaosruler left20:45
VG234 joined20:45
chaosruler joined20:46
houami joined20:49
brainpro1 joined20:50
VG234 How do you handle configuration files with git? For example, say I want to store .bashrc in a remote. The home directory you clone to on each machine would be different. I know I can check out the file, but I'd like to be able to update it to remote from each machine.20:50
bremner !vcsh20:51
gitinfo https://github.com/RichiH/vcsh - Version Control System for $HOME - multiple Git repositories in $HOME -- abusing fake bare Git repositories for fun and profit20:51
schooner joined20:51
brainproxy left20:52
houami left20:53
juvenal_lunch left20:56
bergice_ joined20:56
VG234 bremner: Thanks. The, "on the author's talk page" times out. Is this a shell?20:58
schooner left20:58
houami joined20:59
houami left21:04
ZyX-I left21:05
averell joined21:05
duderonomy left21:08
houami joined21:09
hunterlabs left21:11
houami left21:13
hunterlabs joined21:14
str left21:15
houami joined21:19
mattcen left21:21
houami left21:23
pelegreno left21:23
pelegreno joined21:25
mattcen joined21:26
staafl__ left21:27
houami joined21:29
staafl joined21:29
houami left21:33
Sasazuka left21:35
Es0teric left21:36
EternalEclipse left21:37
jimmyrcom joined21:38
houami joined21:38
jceb left21:40
duderonomy joined21:40
MaximusColourum joined21:43
houami left21:43
m0viefreak joined21:43
Es0teric joined21:43
kvik_ left21:45
Teremy joined21:46
kvik_ joined21:46
kvik_ left21:46
kvik joined21:46
houami joined21:48
selckin left21:51
gugah joined21:51
selckin joined21:51
houami left21:53
ZyX-I joined21:53
duderonomy left21:55
hotpanca_ left21:57
mlopezviedma joined21:57
hotpancakes joined21:57
bkxd joined21:58
anjen joined21:58
houami joined21:58
njbair left21:59
ok91 joined21:59
shinnya joined22:01
jcarpenter2 left22:01
houami left22:03
ok91 left22:04
hotpancakes left22:04
njbair joined22:05
karelk left22:08
Seveas vcsh is awesome22:08
houami joined22:08
staafl left22:10
kozy left22:11
kozy_ joined22:11
TomyLobo this vcsh sounds interesting22:12
how does it keep the other repos from appearing as untracked files?22:12
houami left22:13
dege joined22:13
TomyLobo or does it, even?22:13
belmoussaoui joined22:13
bkxd left22:14
Gustavo6046 left22:15
Gustavo6046 joined22:15
Gustavo6046 left22:15
belmoussaoui left22:16
anjen left22:16
belmoussaoui joined22:17
Amanas left22:18
houami joined22:18
Gustavo6046 joined22:18
Gustavo6046 left22:19
VG234 left22:21
Gustavo6046 joined22:22
houami left22:22
phluks joined22:23
ZexaronS joined22:23
Es0teric left22:26
nidr0x left22:27
houami joined22:28
boutcher left22:32
houami left22:33
Amanas joined22:35
Seveas TomyLobo: I do that by simply having * in the .gitignore for each of the repos :)22:36
TomyLobo ah22:37
nidr0x joined22:37
TomyLobo so it doesnt do that by itself?22:37
dimi1947 joined22:37
Seveas nope22:37
TomyLobo and it also manages .gitignore (and i presume .gitattributes)?22:38
houami joined22:38
Seveas it doesn't manage them, but it does set core.excludefile to ~/.gitignore.d/$name_of_repo, and you can simply track that file22:38
in1t3r_ joined22:38
Seveas not sure about gitattributes/gitmodules, I don't use those22:39
pkx2 left22:39
shiva__ joined22:40
in1t3r left22:40
Seveas .gitattributes is handled like .gitignore, .gitmodules is not handled specially so it would be a pain to have multiple repos with submodules22:41
masuberu joined22:41
stoopkid joined22:41
dimi1947 left22:42
randomstrangerb left22:42
houami left22:43
in1t3r_ left22:43
randomstrangerb joined22:43
tonyj left22:44
chaosruler left22:46
houami joined22:48
PaulCapestany left22:51
cdown joined22:52
houami left22:52
mikecmpbll left22:53
marian1235813 left22:53
jnavila left22:53
cdg left22:53
CheckDavid left22:56
PaulCapestany joined22:57
Murr left22:57
Murr joined22:57
houami joined22:58
ResidentBiscuit left22:59
houami left23:02
KeyJoo left23:04
ok91 joined23:04
houami joined23:08
maqbool_ joined23:09
bkxd joined23:09
houami left23:13
phluks left23:16
houami joined23:18
leeN left23:18
leeN joined23:19
thallada left23:19
Gustavo6046 left23:20
thallada joined23:21
randomstrangerb left23:21
randomstrangerb joined23:22
houami left23:22
spacefan2 joined23:24
Amanas left23:25
spacefan2 left23:25
The_Woodsman joined23:26
cdown left23:26
spacefan2 joined23:26
The_Woodsman i'm running git bundle verify {my bundle} and getting {my bundle} is okay , but when i try to pull from that bundle, i'm unable to. any ideas on that? strikes me as weird that the bundle would be okay, but i'm told "{my bundle} does not appear to be a git repository"23:27
tunekey left23:27
houami joined23:28
johnlage left23:29
johnlage joined23:29
HuskyApocalypse left23:31
houami left23:32
[ADN] left23:33
_ADN_ joined23:33
hotpancakes joined23:35
nidr0x left23:35
dsnow_dsnow23:36
HuskyApocalypse joined23:36
houami joined23:38
dsnow left23:39
hunterlabs left23:39
awkwardpenguin joined23:39
dsnow joined23:40
nevodka left23:41
hunterlabs joined23:41
Dodgy-Debaser joined23:41
houami left23:42
Bajax left23:43
MoziM left23:45
bkxd left23:45
bkxd joined23:45
avar you don't pull it, you run git bundle unbundle on it23:45
ZyX-I left23:46
awkwardpenguin left23:46
HuskyApocalypse left23:46
dave0x6d left23:46
nevodka joined23:47
houami joined23:47
schleppel left23:48
TinkerTyper left23:48
kvik left23:49
TinkerTyper joined23:50
kvik joined23:50
MaximusColourum left23:51
Phylock left23:51
houami left23:52
Bajax joined23:53
chachasmooth_ left23:53
spongedob joined23:53
chachasmooth joined23:54
cdown joined23:54
shinnya left23:55
houami joined23:57

Logs Search ←Prev date Next date→ Channels Documentation