{"thread":{"id":"263","subject":"Catching up: git-pasky-0.6.2 broken?","startedAt":"2005-04-23T11:47:58Z","lastAt":"2005-04-23T21:25:05Z","messageCount":5,"participants":["Russell King","Martin Schlemmer","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"1371","messageId":"20050423124758.B32116@flint.arm.linux.org.uk","threadId":"263","inReplyTo":null,"subject":"Catching up: git-pasky-0.6.2 broken?","fromName":"Russell King","fromEmail":"rmk@arm.linux.org.uk","sentAt":"2005-04-23T11:47:58Z","receivedAt":"2005-04-23T11:47:58Z","isPatch":false,"sender":{"key":"rmk@arm.linux.org.uk","avatar":null},"body":"Hi,\n\nI've been away from git stuff since about Wednesday due to eye problems.\nYesterday and today, I've been trying to catch up, but I'm running into\nproblems.\n\nI grabbed git-pasky-0.6.2, and followed Linus' message about converting\nrepositories.  I've updated all the \"heads\", and cleaned out all the old\nsha1 files.  After updating, I did a read-tree for the tracked head,\nfollowed by checkout-cache -f -a and update-cache --refresh.\n\nTherefore, in theory, everything should be in sync.\n\nHowever, git pull now has nasty side effects.  At first I thought this\nwas down to something still being out of sync.  However, on the second\npull, it's still producing the same complaints.\n\nIt's almost although git has a single patch file subversely written into\nit to apply lpfc and qla changes which it's trying to apply irrespective\nof the objects downloaded.\n\nAny ideas what's going on?\n\nFirst pull\n==========\n\nMOTD:\t\nMOTD:\tWelcome to the Linux Kernel Archive.\nMOTD:\t\nMOTD:\tDue to U.S. Exports Regulations, all cryptographic software on this\nMOTD:\tsite is subject to the following legal notice:\nMOTD:\t\nMOTD:\tThis site includes publicly available encryption source code\nMOTD:\twhich, together with object code resulting from the compiling of\nMOTD:\tpublicly available source code, may be exported from the United\nMOTD:\tStates under License Exception \"TSU\" pursuant to 15 C.F.R. Section\nMOTD:\t740.13(e).\nMOTD:\t\nMOTD:\tThis legal notice applies to cryptographic software only.\nMOTD:\tPlease see the Bureau of Industry and Security,\nMOTD:\thttp://www.bis.doc.gov/ for more information about current\nMOTD:\tU.S. regulations.\nMOTD:\t\n\n\nreceiving file list ... done\n00/2609c5adf1ac2cda36a0f0a70edd12f00216a2\n...\nff/ba7c235ad94e3c1e0074cb209504e6ea25afe3\n\nsent 6332 bytes  received 3234006 bytes  36613.99 bytes/sec\ntotal size is 65480464  speedup is 20.21\n\nreceiving file list ... done\nclient: nothing to do: perhaps you need to specify some filenames or the --recursive option?\nTree change: c4d541106bc5d0a2134aaf9e8735eee3c70b0db2:efab7739d99eae948971140b2aa3dddf7f72c900\n*100644->100644\tblob\t8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154\tMakefile\n*100644->100644\tblob\tfaab8c2a03ebda9eb4e12c35f5398733320484f0->3864b33562ee973643c7800e1129c1fa3239d2ed\tarch/alpha/kernel/systbls.S\n*100644->100644\tblob\t8d182e875cd72e64b49869386bf090ba23df6793->16dbc4151be43b8e671869b2a52220f47ec0b6ac\tarch/i386/kernel/cpu/amd.c\n*100644->100644\tblob\t6a717d4d2bc5d44f07b57c01683196ef7f51f349->c60785c046bebd09452b3c73b54df90e6dd3a937\tarch/sparc64/kernel/time.c\n*100644->100644\tblob\tf94ea8a44051524639412986ac1d86677df5c9c2->f80bafee8669fbcb0420d6e5173ea1f79e863082\tarch/x86_64/lib/getuser.S\n*100644->100644\tblob\t0dee1fdcb16280d3d0bb0053ab8634072adfda45->5828b8191667da13f3295034a685f474746ce3b2\tarch/x86_64/lib/putuser.S\n*100644->100644\tblob\t97ff364c04341ef866ecd4d70e60e0a1e415b743->6cb0b586c29761d2e3873219a692f83ace1017d6\tdrivers/ieee1394/ohci1394.c\n*100644->100644\tblob\t3c092117a8eae4a7916967b065ac447f999946e9->260a323a96d38c07003f80b92c2b3dad5c2c025a\tdrivers/isdn/i4l/isdn_ppp.c\n*100644->100644\tblob\t12de80884b1aa6e4240e5a40360369b9dd9b270b->f65ca3b2da6f3fcdb464cd8f9d0b53b5611103b1\tdrivers/net/tg3.c\n*100644->100644\tblob\td48887d9032501413515a7b53fcb183737de490f->8de6f21037bae13910b0f9c8f075a8d38b89db69\tdrivers/net/tg3.h\n*100644->100644\tblob\tbf3273eb1c8b78764d4b7c563a2585181925e9a4->49d1cd99d5accfadf2eb276644f57a8f1ffec27a\tdrivers/sbus/char/rtc.c\n*100644->100644\tblob\td74b99dab7ec8d11003a176fa4685f2b9f85c4ae->e60f9338e44ad4a2eb938adcc70a491c9a09815d\tdrivers/scsi/aic7xxx/aic7xxx_osm.c\n*100644->100644\tblob\t8caaf2e5e47c01815e5e570b67d1c329a0e91402->39b788d95e39d9eb8f11578552f03933ad0b4e52\tdrivers/serial/sunsab.c\n*100644->100644\tblob\t23d19d39432080cf72a1b9ecfee9ca8a7c5eda4e->ddc97c905e14cc7a158a22f339379d0129e81551\tdrivers/serial/sunsu.c\n*100644->100644\tblob\t3099630d0c3d0b0e4cd17513085c1c1500784dc3->9d9d2009ad8caa3af457d263afa5c8717227016a\tdrivers/video/tgafb.c\n*100644->100644\tblob\tc4e70e8617eb6b269891c06ace602dce81f12998->535bc425f243bd7cb9fd0b469c50cc2d3bdb102c\tinclude/asm-alpha/unistd.h\n*100644->100644\tblob\t925d54cee475ed9976455fddb35f8768f6020ff0->7232528e2d0c13771f6f62af20de13455aedb30b\tinclude/asm-ia64/bitops.h\n*100644->100644\tblob\t7c357dfbae50dc400b63c39e0f6add7a214a28a7->4fb4e439b05c35eca06daf2762936939c3e1b333\tinclude/asm-ia64/gcc_intrin.h\n*100644->100644\tblob\tccf2f5f82d7f516b29f8ce841d24e394612f4b47->1f9b1356a48e9e84261676e449597ba05ecaaf88\tinclude/asm-sparc64/mostek.h\n*100644->100644\tblob\taf9bf175a223cf44310293287d50302e0fd3f9e9->ae2cd5b09a7cc523e96640d805eb97e299da8907\tinclude/asm-sparc64/pgtable.h\n*100644->100644\tblob\t11efa474865bd20eef9b0a13f42749a6e999da2a->d1f91a4f24ae59f78ed81dbed825cb09f9677e5c\tinclude/asm-sparc64/spinlock.h\n*100644->100644\tblob\tf1f75fde8cd46d668b5fe68b64259939a0f0f17a->6a1897481942e5dcfd1314d5f7b81e2c6ae36280\tinclude/linux/pci_ids.h\n*100644->100644\tblob\taa35797ebfbf773fae3203094d6c6628ed7bcf35->22b701819619cd6403b834284deecdbdcfb553d4\tinclude/linux/skbuff.h\n*100644->100644\tblob\tfb95ecb6fe0357de875dd66896b4d48a731927d4->875edbba396d2601fce49e8e1c88f90195b56698\tinclude/net/ax25.h\n*100644->100644\tblob\td1fea5c3dda1b08989e8acfed841129e229421b5->876dbac71060860956f2e939c81efe2b91512775\tnet/appletalk/ddp.c\n*100644->100644\tblob\t33f1685dbb771abd4db19520fa709a701909421c->a57a9268bd2436e565cdaf1e15cc9dcf10bb14c7\tnet/atm/resources.c\n*100644->100644\tblob\t6ff803154c046d6e174713951962331e1fef7548->f7c449ac1800cffe9cb355806886f7d1d19e8950\tnet/atm/signaling.c\n*100644->100644\tblob\t33b1a376302702fea9de736808a7923b0695e9b1->707097deac3deb4957741204c7944e01521f3c0f\tnet/ax25/af_ax25.c\n*100644->100644\tblob\t04d711344d559e712f5389315e596684933e1fe1->bba0173e2d6500a44954871389fc5e35396dffa2\tnet/ax25/ax25_ip.c\n*100644->100644\tblob\t3475a3ac9343e38e2d051402f34676b956fd65cf->94557b1a1fa2acedd47b30c3e51b9733eb02b53a\tnet/ax25/ax25_out.c\n*100644->100644\tblob\t8cf72707af8bbcf7ede4fcf1775887cbe910df6e->99694b57f6f565d36f6787f58c8faa43cced25d2\tnet/ax25/ax25_subr.c\n*100644->100644\tblob\td69ad90e58116594de2d66a26f9bc78dfa183d95->44dfaf8f04afd7cbde0487a5a35ccef5eb4f48ce\tnet/core/rtnetlink.c\n*100644->100644\tblob\tbf02ca9f80ac15bfaddf9ef0624e94c5623802e0->f65b3de590a96ff2ecc7df6b7a4b9020a641e549\tnet/core/skbuff.c\n*100644->100644\tblob\tf52c87a9268a772398e937a80730d576ab32a066->4df4fa3c5de047e3ee099b64b38c4948b2dd406a\tnet/core/sock.c\n*100644->100644\tblob\t9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596\tnet/ipv4/route.c\n*100644->100644\tblob\t6baddfbedca3f90adaef9f22e2e97d889cbdc945->8a213238f2873e8a985bf1c85b1f8f347d8f7d8c\tnet/ipv4/udp.c\n*100644->100644\tblob\t5ffde14ddc09547085f02646e4399053429f3cbd->7196ac2f2d1688d410e2f51973f90c0118549c63\tnet/ipv6/addrconf.c\n*100644->100644\tblob\t49208ba75094a32c18987070727b4f6998d78680->0f0711417c9da71d7595e6019033b8976d479b03\tnet/ipv6/ip6_output.c\n*100644->100644\tblob\t5488ad0de4f6bd227665657fc65b7fce4fafcca4->1352c1d9bf4d35f6619d3dce4996b69578bdb2d2\tnet/ipv6/raw.c\n*100644->100644\tblob\t1db59f11f37d687318ae8cbd5e2ea6e48142ca97->d11747c2a763f27a0a37eae59352bf61891a26b8\tnet/xfrm/xfrm_state.c\nTracked branch, applying changes...\nFast-forwarding c4d541106bc5d0a2134aaf9e8735eee3c70b0db2 -> efab7739d99eae948971140b2aa3dddf7f72c900\n\ton top of c4d541106bc5d0a2134aaf9e8735eee3c70b0db2...\ndiff: Documentation/scsi/qla2xxx.revision.notes: No such file or directory\ndiff: drivers/scsi/qla2xxx/qla_listops.h: No such file or directory\ndiff: drivers/scsi/scsi_obsolete.h: No such file or directory\nThe next patch would create the file Documentation/scsi/ChangeLog.lpfc,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file Documentation/scsi/ChangeLog.lpfc.rej\nThe next patch would create the file Documentation/scsi/lpfc.txt,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file Documentation/scsi/lpfc.txt.rej\nThe next patch would create the file arch/arm/lib/bitops.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file arch/arm/lib/bitops.h.rej\nThe next patch would create the file drivers/scsi/lpfc/Makefile,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/Makefile.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_attr.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_attr.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_compat.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_compat.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_crtn.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_crtn.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_ct.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_ct.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_disc.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_disc.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_els.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_els.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_hbadisc.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_hbadisc.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_hw.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_hw.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_init.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_init.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_logmsg.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_logmsg.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_mbox.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_mbox.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_mem.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_mem.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_nportdisc.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_nportdisc.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_scsi.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_scsi.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_scsi.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_scsi.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_sli.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_sli.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_sli.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_sli.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_version.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_version.h.rej\nThe next patch would create the file drivers/scsi/qla2xxx/qla_attr.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/qla2xxx/qla_attr.c.rej\nThe next patch would create the file Documentation/aoe/todo.txt,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file Documentation/aoe/todo.txt.rej\nThe next patch would create the file Documentation/kref.txt,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file Documentation/kref.txt.rej\n\nSecond pull\n===========\n\nMOTD:\t\nMOTD:\tWelcome to the Linux Kernel Archive.\nMOTD:\t\nMOTD:\tDue to U.S. Exports Regulations, all cryptographic software on this\nMOTD:\tsite is subject to the following legal notice:\nMOTD:\t\nMOTD:\tThis site includes publicly available encryption source code\nMOTD:\twhich, together with object code resulting from the compiling of\nMOTD:\tpublicly available source code, may be exported from the United\nMOTD:\tStates under License Exception \"TSU\" pursuant to 15 C.F.R. Section\nMOTD:\t740.13(e).\nMOTD:\t\nMOTD:\tThis legal notice applies to cryptographic software only.\nMOTD:\tPlease see the Bureau of Industry and Security,\nMOTD:\thttp://www.bis.doc.gov/ for more information about current\nMOTD:\tU.S. regulations.\nMOTD:\t\n\n\nreceiving file list ... done\n0d/535d65eea6aa98bcd6e4e4b4f797c1fde76d7b\n24/0676f75390f530b4b66521bbaf6b8b1a8e3df4\n39/1f2ade8823149f217991eb02911bf3dacce050\n43/765d4b40a4a3c64f2a32b684f4041e2f01644d\n67/3f29d947909a1be0e3775c633d2067a032541c\n68/0815c59c80b53903030462d797b828f903946f\n71/30667107cd3ab9d6802b69bab63c7d22f20bd4\n72/28a8ff004baa2eea325c0dc1286ef38306828d\n73/5cd74942b2cb978b58e687bc398e965b14a6f9\n7c/43aea5f7f7d9b96b7d9837fa029e16b62ef5df\n8d/3a9291b47f835c43c25d916e400828d590798f\naa/aff8e835197c8bd0cbbbbabb7eefde0aabe1a8\nab/489271df7495243e4e0ca6e1f96cd29eb364a9\nb4/467b2d08a139961e709cfb41bd1f9280249155\nb4/f26bd7be080b1c231039213e92c654be69dedd\nb8/d8b883e6f029e99c35c88f853501740e322131\nc4/cb74271bca0d0da13cc650a1021f4c8a0a5b87\nca/1536db339408c146fad0eba08919d4fcc80d97\ncc/e8ba589e47e268f952f50e8e84bf1e71e0daea\nd5/35fc13bf9828e006c83a3eaf37f343ccbd43af\ndf/6c6804ce1d383c878ab071bce8125125d96abc\ne8/0715f8be1ed15ce5e6721d3787e5f7071e4320\neb/b89be2aa2dba5acbcaf7773414ff7ca51a1b87\nef/3fd7265b67c8b6152ad3557162b8488d142231\n\nsent 592 bytes  received 1020532 bytes  18072.99 bytes/sec\ntotal size is 65546393  speedup is 64.19\n\nreceiving file list ... done\nclient: nothing to do: perhaps you need to specify some filenames or the --recursive option?\nTree change: efab7739d99eae948971140b2aa3dddf7f72c900:df6c6804ce1d383c878ab071bce8125125d96abc\n*100644->100644\tblob\t19b02adce68cd315d7d44cc13ab7cdc29bb82c83->ebb89be2aa2dba5acbcaf7773414ff7ca51a1b87\tarch/ia64/ia32/ia32_signal.c\n*100644->100644\tblob\t105c7fec8c6d20b128631c1e46fb4c892cd274f9->8d3a9291b47f835c43c25d916e400828d590798f\tarch/ia64/kernel/head.S\n*100644->100644\tblob\tcf3f8014f9ad6fecfb5f0f43d257b539540074a6->ef3fd7265b67c8b6152ad3557162b8488d142231\tarch/ia64/kernel/mca_asm.S\n*100644->100644\tblob\t91293388dd2947c67d941f7b487b100bb7060fdc->7c43aea5f7f7d9b96b7d9837fa029e16b62ef5df\tarch/ia64/kernel/process.c\n*100644->100644\tblob\t5318f0cbfc260b3bd3295a5fd0b9daffe045d0c7->ca1536db339408c146fad0eba08919d4fcc80d97\tarch/ia64/kernel/smpboot.c\n*100644->100644\tblob\tea1ed377de4cf5d7577b98a120267973abbdfce5->240676f75390f530b4b66521bbaf6b8b1a8e3df4\tinclude/asm-ia64/sal.h\nTracked branch, applying changes...\nFast-forwarding efab7739d99eae948971140b2aa3dddf7f72c900 -> df6c6804ce1d383c878ab071bce8125125d96abc\n\ton top of efab7739d99eae948971140b2aa3dddf7f72c900...\ndiff: Documentation/scsi/qla2xxx.revision.notes: No such file or directory\ndiff: drivers/scsi/qla2xxx/qla_listops.h: No such file or directory\ndiff: drivers/scsi/scsi_obsolete.h: No such file or directory\nThe next patch would create the file Documentation/scsi/ChangeLog.lpfc,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file Documentation/scsi/ChangeLog.lpfc.rej\nThe next patch would create the file Documentation/scsi/lpfc.txt,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file Documentation/scsi/lpfc.txt.rej\nThe next patch would create the file arch/arm/lib/bitops.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file arch/arm/lib/bitops.h.rej\nThe next patch would create the file drivers/scsi/lpfc/Makefile,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/Makefile.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_attr.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_attr.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_compat.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_compat.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_crtn.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_crtn.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_ct.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_ct.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_disc.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_disc.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_els.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_els.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_hbadisc.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_hbadisc.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_hw.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_hw.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_init.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_init.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_logmsg.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_logmsg.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_mbox.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_mbox.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_mem.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_mem.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_nportdisc.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_nportdisc.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_scsi.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_scsi.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_scsi.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_scsi.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_sli.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_sli.c.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_sli.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_sli.h.rej\nThe next patch would create the file drivers/scsi/lpfc/lpfc_version.h,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/lpfc/lpfc_version.h.rej\nThe next patch would create the file drivers/scsi/qla2xxx/qla_attr.c,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file drivers/scsi/qla2xxx/qla_attr.c.rej\nThe next patch would create the file Documentation/aoe/todo.txt,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file Documentation/aoe/todo.txt.rej\nThe next patch would create the file Documentation/kref.txt,\nwhich already exists!  Assume -R? [n] \nApply anyway? [n] \nSkipping patch.\n1 out of 1 hunk ignored -- saving rejects to file Documentation/kref.txt.rej\n\n\n-- \nRussell King\n\n"},{"id":"1374","messageId":"20050423151238.C32116@flint.arm.linux.org.uk","threadId":"263","inReplyTo":"20050423124758.B32116@flint.arm.linux.org.uk","subject":"Re: Catching up: git-pasky-0.6.2 broken?","fromName":"Russell King","fromEmail":"rmk@arm.linux.org.uk","sentAt":"2005-04-23T14:12:39Z","receivedAt":"2005-04-23T14:12:39Z","isPatch":false,"sender":{"key":"rmk@arm.linux.org.uk","avatar":null},"body":"On Sat, Apr 23, 2005 at 12:47:58PM +0100, Russell King wrote:\n> I've been away from git stuff since about Wednesday due to eye problems.\n> Yesterday and today, I've been trying to catch up, but I'm running into\n> problems.\n> \n> I grabbed git-pasky-0.6.2, and followed Linus' message about converting\n> repositories.  I've updated all the \"heads\", and cleaned out all the old\n> sha1 files.  After updating, I did a read-tree for the tracked head,\n> followed by checkout-cache -f -a and update-cache --refresh.\n> \n> Therefore, in theory, everything should be in sync.\n> \n> However, git pull now has nasty side effects.  At first I thought this\n> was down to something still being out of sync.  However, on the second\n> pull, it's still producing the same complaints.\n> \n> It's almost although git has a single patch file subversely written into\n> it to apply lpfc and qla changes which it's trying to apply irrespective\n> of the objects downloaded.\n> \n> Any ideas what's going on?\n\nCould the problem be related to some random garbage left in .git/add-queue\nand .git/rm-queue?\n\nIf so, how did these files get generated in the first place, and why\nweren't they removed when they were finished with?\n\nIMHO updating a repository from an external source should _NOT_ be\naffected by the presence (or absense) of these two files, which\ncontain only _local_ state information.\n\n-- \nRussell King\n\n"},{"id":"1375","messageId":"20050423152102.D32116@flint.arm.linux.org.uk","threadId":"263","inReplyTo":"20050423151238.C32116@flint.arm.linux.org.uk","subject":"Re: Catching up: git-pasky-0.6.2 broken?","fromName":"Russell King","fromEmail":"rmk@arm.linux.org.uk","sentAt":"2005-04-23T14:21:02Z","receivedAt":"2005-04-23T14:21:02Z","isPatch":false,"sender":{"key":"rmk@arm.linux.org.uk","avatar":null},"body":"On Sat, Apr 23, 2005 at 03:12:39PM +0100, Russell King wrote:\n> On Sat, Apr 23, 2005 at 12:47:58PM +0100, Russell King wrote:\n> > Any ideas what's going on?\n> \n> Could the problem be related to some random garbage left in .git/add-queue\n> and .git/rm-queue?\n> \n> If so, how did these files get generated in the first place, and why\n> weren't they removed when they were finished with?\n> \n> IMHO updating a repository from an external source should _NOT_ be\n> affected by the presence (or absense) of these two files, which\n> contain only _local_ state information.\n\nOk, don't bother looking into this - I'm now completely git-free here.\nI think I'll prefer to use the old diff and patch method to submit\nstuff to Linus, until git has progressed sufficiently such that it\ndoesn't end up wasting hours of my time.\n\nYes, it's a radical solution, but since I _can't_ get it to work for\nme, it's the only one which will allow me to get any real work done.\n\n(and it all looked soo promising pre-0.6.2)\n\n-- \nRussell King\n\n"},{"id":"1376","messageId":"1114273192.27940.17.camel@nosferatu.lan","threadId":"263","inReplyTo":"20050423152102.D32116@flint.arm.linux.org.uk","subject":"Re: Catching up: git-pasky-0.6.2 broken?","fromName":"Martin Schlemmer","fromEmail":"azarah@nosferatu.za.org","sentAt":"2005-04-23T16:19:52Z","receivedAt":"2005-04-23T16:19:52Z","isPatch":false,"sender":{"key":"azarah@nosferatu.za.org","avatar":null},"body":"On Sat, 2005-04-23 at 15:21 +0100, Russell King wrote:\n> On Sat, Apr 23, 2005 at 03:12:39PM +0100, Russell King wrote:\n> > On Sat, Apr 23, 2005 at 12:47:58PM +0100, Russell King wrote:\n> > > Any ideas what's going on?\n> > \n> > Could the problem be related to some random garbage left in .git/add-queue\n> > and .git/rm-queue?\n> > \n> > If so, how did these files get generated in the first place, and why\n> > weren't they removed when they were finished with?\n> > \n> > IMHO updating a repository from an external source should _NOT_ be\n> > affected by the presence (or absense) of these two files, which\n> > contain only _local_ state information.\n> \n> Ok, don't bother looking into this - I'm now completely git-free here.\n> I think I'll prefer to use the old diff and patch method to submit\n> stuff to Linus, until git has progressed sufficiently such that it\n> doesn't end up wasting hours of my time.\n> \n> Yes, it's a radical solution, but since I _can't_ get it to work for\n> me, it's the only one which will allow me to get any real work done.\n> \n> (and it all looked soo promising pre-0.6.2)\n> \n\nYou did try 0.6.3?  Think it fixed some annoying bugs.  Also pull and\nreinstall it to make sure one or two others might be fixed.\n\n\n-- \nMartin Schlemmer\n\n"},{"id":"1417","messageId":"20050423212505.GB13222@pasky.ji.cz","threadId":"263","inReplyTo":"20050423151238.C32116@flint.arm.linux.org.uk","subject":"Re: Catching up: git-pasky-0.6.2 broken?","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-04-23T21:25:05Z","receivedAt":"2005-04-23T21:25:05Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sat, Apr 23, 2005 at 04:12:39PM CEST, I got a letter\nwhere Russell King <rmk@arm.linux.org.uk> told me that...\n> Could the problem be related to some random garbage left in .git/add-queue\n> and .git/rm-queue?\n\nQuite likely.\n\n> If so, how did these files get generated in the first place, and why\n> weren't they removed when they were finished with?\n\nThat was a bug in git apply, fixed for quite some time already.\n\n> IMHO updating a repository from an external source should _NOT_ be\n> affected by the presence (or absense) of these two files, which\n> contain only _local_ state information.\n\nNote that the latest git-pasky (post-0.6.3) is already completely\nqueues-free.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"}]}