Re: Feature request: --format=json

2017-04-24 Thread shawn wilson
On Mon, Apr 24, 2017 at 5:28 AM, Duy Nguyen wrote: > On Mon, Apr 24, 2017 at 3:33 PM, shawn wilson wrote: >> Late to the party, but I too would also like json format output (mainly so I >> could pipe stuff to jq instead of looking at the man page for which %thing >> I'

signing commits using gpg2

2017-09-02 Thread shawn wilson
send_simple(0) failed: locking failed Please insert the card and hit return or enter 'c' to cancel: c gpg: selecting openpgp failed: general error gpg: encrypted with 3072-bit RSA key, ID 41826CFB, created 2017-03-13 "Shawn Wilson " gpg: public key decryption failed: genera

Re: signing commits using gpg2

2017-09-05 Thread shawn wilson
feel this was a bigger PITA than it needed to be), I'm on git 2.7.5 from Fedira. On Tue, Sep 5, 2017 at 9:40 AM, Michael J Gruber wrote: > shawn wilson venit, vidit, dixit 02.09.2017 23:11: >> tl;dr - how do I get git to use gpg2 to sign things? >> >> I'm using g

split directories into branches

2016-07-04 Thread shawn wilson
I've got a chef cookbook repo where everyone started developing cookbooks in a single dev branch (not project specific). Minus a few edge cases, it should be fairly simple to split this up into feature branches based on /cookbooks/. I tried: $ git filter-branch --subdirectory-filter cookbooks/--

Re: split directories into branches

2016-07-04 Thread shawn wilson
On Mon, Jul 4, 2016 at 1:39 PM, Konstantin Khomoutov wrote: > On Mon, 4 Jul 2016 12:45:39 -0400 > shawn wilson wrote: > > > To achieve what you're after I used `git subtree split` followed by > `git filter-branch --tree-filter ...` which moved all the files under > th

Re: split directories into branches

2016-07-04 Thread shawn wilson
On Mon, Jul 4, 2016 at 2:29 PM, Konstantin Khomoutov wrote: > On Mon, 4 Jul 2016 14:15:58 -0400 > shawn wilson wrote: > > I don't possess the official stance on this topic but AFAIK user-level > questions are fine on this list. In that case :) ... still having issues w/ f

Re: split directories into branches

2016-07-04 Thread shawn wilson
On Mon, Jul 4, 2016 at 6:10 PM, Andreas Schwab wrote: > shawn wilson writes: > >> $ git filter-branch --tree-filter "shopt -s extglob && mkdir -p >> cookbooks/base_sys && mv !(cookbooks) cookbooks/base_sys" > > extglob changes the parser, you ne

Re: split directories into branches

2016-07-04 Thread shawn wilson
correction On Mon, Jul 4, 2016 at 7:30 PM, shawn wilson wrote: > shopt -s extglob; declare -a f=(!(cookbooks)); git filter-branch > --tree-filter "mkdir -p cookbooks/base_sys && mv ${f[@]} > cookbooks/base_sys" > -- To unsubscribe from this list: send the line &quo

git alias quoting help

2016-03-29 Thread shawn wilson
I've also tried to make this a plain bash script (w/o the function or if statements and am failing at the same place). The issue seems to be with the quoting in the filter-branch | ls-files bit. Also, the end goal here is to be able to move a directory from one repo and keep the history. While this

Re: git alias quoting help

2016-03-31 Thread shawn wilson
X_FILE=$GIT_INDEX_FILE.new git update-index --index-info && mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE On Wed, Mar 30, 2016 at 12:13 AM, shawn wilson wrote: > I've also tried to make this a plain bash script (w/o the function or > if statements and am failing at the same place)

Re: git alias quoting help

2016-03-31 Thread shawn wilson
FWIW, I (finally) found two projects that like they'll do what I want: git-splits and git_filter The later was lacking in documentation and after the build I couldn't figure it out at a glance and I think git-splits will DWIW. On Thu, Mar 31, 2016 at 10:27 AM, shawn wilson wrote: &

Re: git alias quoting help

2016-04-01 Thread shawn wilson
How do I prune these out? None of the files show up, but I do see reference to them in: git log --stat. And nothing I do with gc or prune seem to have any affect. On Fri, Apr 1, 2016 at 2:10 AM, shawn wilson wrote: > FWIW, I (finally) found two projects that like they'll do what I want: >

Re: git alias quoting help

2016-04-01 Thread shawn wilson
On Fri, Apr 1, 2016 at 7:05 AM, Christian Couder wrote: > On Wed, Mar 30, 2016 at 6:13 AM, shawn wilson wrote: >> I've also tried to make this a plain bash script (w/o the function or >> if statements and am failing at the same place). The issue seems to be >> with

filter clean leaves uncommitted file

2014-02-19 Thread shawn wilson
So, I want a way of sharing parts of a gitconfig organizationally, so I change and comment out some parts with a filter: [filter "gitconfig-rmuser"] clean = sed -e \"s/^\\( *email =\\).*/\\1 /\" -e \"s/^\\( *name =\\).*/\\1 /\" -e \"s/^\\( *signingkey =\\).*/\\1 /\" And then: $ cat .gitattribut

git $Id$ smudge filter

2014-03-11 Thread shawn wilson
Currently, I've got a perl script that modifies the Id line in a smudge filter: [filter "ident-line"] smudge = /usr/local/bin/githook_ident-filter.pl %f The problem I've noticed with smudge filters is that it leaves the repo dirty. How do I fix this? I am basically trying to replicate the behavi

push fail

2014-03-17 Thread shawn wilson
How do I get more info here (and hopefully resolve this)? % git push To ssh://server/foo/repo.git ! [rejected]test -> test (non-fast-forward) error: failed to push some refs to 'ssh://server/foo/repo.git' -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a

Re: push fail

2014-03-17 Thread shawn wilson
Thanks. Yeah, I should've thought to do a pull On Mon, Mar 17, 2014 at 9:34 AM, Dragos Foianu wrote: > shawn wilson gmail.com> writes: > >> >> How do I get more info here (and hopefully resolve this)? >> >> % git push >> To ssh://server/foo/r

filter / gitattributes

2014-06-24 Thread shawn wilson
So, I've got a gitconfig template for new people (also what link to as my ~/.gitconfig) so I have a smudge/clean: [filter "gitconfig-rmuser"] clean = sed -e \"s/^\\( *email =\\).*/\\1 /\" -e \"s/^\\( *name =\\).*/\\1 /\" -e \"s/^\\( *signingkey =\\).*/\\1 /\" smudge = egrep \"^ *(email|name|si

smudge filter

2013-06-17 Thread shawn wilson
Can someone take a look at this and let me know what I'm doing wrong? Also, what's the best way to test filters? I can't really do -Debug or really even print various output. https://github.com/ag4ve/github-test -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a me

Repo with only one file

2013-08-06 Thread shawn wilson
I started writing this script in a repo I have called misc-scripts where I just keep one off projects and the like (notes, throw away scripts, etc). Well, my boss asked me to create a repo for one of these scripts and I'd like to keep the commit history. Ok, so: % find -type f ! -iname "webban.pl"

Re: Repo with only one file

2013-08-07 Thread shawn wilson
On Wed, Aug 7, 2013 at 6:43 AM, Johannes Sixt wrote: > Am 8/7/2013 8:24, schrieb shawn wilson:> ... create a repo for one of >> these scripts and I'd like to keep the commit history. >> >> Ok, so: >> % find -type f ! -iname "webban.pl" | while read

Re: Repo with only one file

2013-08-08 Thread shawn wilson
On Fri, Aug 9, 2013 at 2:25 AM, Johannes Sixt wrote: > Am 8/8/2013 23:11, schrieb Phil Hord: >> On Wed, Aug 7, 2013 at 5:07 PM, shawn wilson wrote: >>> On Wed, Aug 7, 2013 at 6:43 AM, Johannes Sixt wrote: >>>> Am 8/7/2013 8:24, schrieb shawn wilson:> ... cre

Re: Repo with only one file

2013-08-09 Thread shawn wilson
On Fri, Aug 9, 2013 at 2:50 AM, Johannes Sixt wrote: > Am 8/9/2013 8:33, schrieb shawn wilson: >> On Fri, Aug 9, 2013 at 2:25 AM, Johannes Sixt wrote: >>> Am 8/8/2013 23:11, schrieb Phil Hord: >>>> On Wed, Aug 7, 2013 at 5:07 PM, shawn wilson wrote: >&g

Re: Repo with only one file

2013-08-09 Thread shawn wilson
On Fri, Aug 9, 2013 at 6:32 AM, Johannes Sixt wrote: > Am 8/9/2013 12:03, schrieb shawn wilson: >> The question still stands though - why is that unassociated commit left >> there? > > Because your command did not remove it. filter-branch does not know that > it is "

Move commits not in origin to a branch

2015-03-02 Thread shawn wilson
How do I move commits I haven't pushed into a new branch? % git log origin..master --pretty=format:'%h' f7d3a19 1f186c9 66d99f6 Which I'd like to be in a new branch. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More major

Re: Move commits not in origin to a branch

2015-03-02 Thread shawn wilson
On Mon, Mar 2, 2015 at 9:54 AM, Michael J Gruber wrote: > shawn wilson venit, vidit, dixit 02.03.2015 14:25: >> How do I move commits I haven't pushed into a new branch? >> >> % git log origin..master --pretty=format:'%h' >> f7d3a19 >> 1f186c

Preventing unsigned commit/merge/tag

2013-12-31 Thread shawn wilson
What's the best way of doing this? I'd prefer this be a pre hook on the server that rejects and the user has to rebase and fix their stuff. Though, if there's some way to make it easier for users not to mess up (other than an alias for everything which I'll probably do anyway) that would be useful.

submodules

2014-01-23 Thread shawn wilson
I've got a git repo that just contains a bunch of small projects (scripts, configs, etc). The idea was (is) to make it so that each project is tracked seperately (different branches, not needing to filter out logs for unrelated commits). And it works great for that. The problem is that I guess I do

Re: [ANNOUNCE] Git v1.8.3-rc0

2013-04-26 Thread shawn wilson
On Fri, Apr 26, 2013 at 8:22 PM, Junio C Hamano wrote: > * There was no good way to ask "I have a random string that came from >outside world. I want to turn it into a 40-hex object name while >making sure such an object exists". A new peeling suffix ^{object} >can be used for that

verify signature hook

2013-04-29 Thread shawn wilson
How do I complain when a commit/merge/tag/etc aren't signed? Ie, everything should be signed and I'd like a hook that complains loudly if something isn't signed (or if a signature isn't verifiable). Also, how do I default to signing everything? -- To unsubscribe from this list: send the line "unsu

Re: git log -p unexpected behaviour - security risk?

2013-04-30 Thread shawn wilson
Sorta OT, but I'm curious, On Sun, Apr 21, 2013 at 12:09 PM, Jonathan Nieder wrote: > For example, whenever git adds (or plans) support for a new header > line in commit objects, before you've upgraded, a prankster can > provide a bad value for that header line in objects they hand-craft. > "git

Re: verify signature hook

2013-04-30 Thread shawn wilson
Apparently GMail for Android only sends HTML encoded emails (and the list rightly rejected it). On Mon, Apr 29, 2013 at 4:31 PM, shawn wilson wrote: > > On Apr 29, 2013 12:42 PM, "Junio C Hamano" wrote: >> >> shawn wilson writes: >> >> > How do I

removing a bad commit

2013-05-02 Thread shawn wilson
I've got a commit that was done about a week ago that I want to remove (preferably remove and rewrite history as it's in a branch and it doesn't need to be in this branch until the branch is working) but if a reverse patch is the only way, i'll go with it. -- To unsubscribe from this list: send the

Re: change symlink

2012-10-30 Thread shawn wilson
On Tue, Oct 30, 2012 at 9:19 PM, Andreas Schwab wrote: > shawn wilson writes: >> % git status >> # On branch master >> # Changes not staged for commit: >> # (use "git add/rm ..." to update what will be committed) >> # (use "git checkout

Re: change symlink

2012-10-30 Thread shawn wilson
On Tue, Oct 30, 2012 at 9:35 PM, Andreas Schwab wrote: > shawn wilson writes: > >> but should t2 be reported as 'deleted'? > > Sure, that's what you did. > if i do the same to a file (same repo): touch test2 git add test2 git commit test2 -m "test2&quo

Re: change symlink

2012-10-30 Thread shawn wilson
On Tue, Oct 30, 2012 at 10:09 PM, Andreas Schwab wrote: > shawn wilson writes: > >> and once it's added, status says: >> # renamed:t2 -> t2/one/test >> >> that's not exactly true, but... > > What's wrong with it? Both files