Re: split directories into branches

2016-07-04 Thread Andreas Schwab
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 need to set that on a separate line. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG

[PATCH] add documentation to mw-to-git

2016-07-04 Thread Alexandru Zbarcea
Signed-off-by: Alexandru Zbarcea --- contrib/mw-to-git/Makefile | 44 - contrib/mw-to-git/git-mediawiki.txt| 100 + contrib/mw-to-git/git-remote-mediawiki.txt | 7 -- 3 files changed, 142 insertions(+), 9

[RFC] notes..rewriteMode configuration option

2016-07-04 Thread Barret Rennie
Hi all, The project I work on currently heavily uses git. We would like to add some tools based around detecting how branches change over time for code review, so that users can compare commits as they change. We'd like to do this via adding metadata in git notes, so that we can detect when

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 :) ...

Missing Package in git Installation Instructions (git-scm.com)

2016-07-04 Thread Christoph Michelbach
Hi, I noticed that the instructions on https://git-scm.com/book/en/v2/G etting-Started-Installing-Git don't work without dh-autoreconf installed on an apt-get system which isn't listed on that site. Can you fix that or tell me whom to tell about this? The website doesn't offer contact information.

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 need to

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 "unsubscribe

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 Konstantin Khomoutov
On Mon, 4 Jul 2016 12:45:39 -0400 shawn wilson wrote: > 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

[PATCH] cache-tree.c: fix i-t-a check skipping directory updates sometimes

2016-07-04 Thread Nguyễn Thái Ngọc Duy
Commit 3cf773e (cache-tree: fix writing cache-tree when CE_REMOVE is present - 2012-12-16) skips i-t-a entries when building trees objects from the index. Unfortunately it may skip too much. The code in question checks if an entry is an i-t-a one, then no tree entry will be written. But it does

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

Re: split directories into branches

2016-07-04 Thread Konstantin Khomoutov
On Mon, 4 Jul 2016 14:15:58 -0400 shawn wilson wrote: [...] > > I know Git tracks content, not files (and directory) but still many > > folks have "stable" directories for their files, assign certain > > semantics to them etc. I've needed such transfers myself, and this > >

--dir-diff not working with partial path limiter

2016-07-04 Thread Bernhard Kirchen
Hello! Today I started using --dir-diff and noticed a problem when specifying a non-full path limiter. My diff tool is setup to be meld (*1). OK while working directory is repo root; also OK while working directory is repo subfolder "actual": git difftool --dir-diff HEAD~1 HEAD --

Re: [PATCH v4 1/5] git-fetch.txt: document fetch output

2016-07-04 Thread Duy Nguyen
On Mon, Jul 4, 2016 at 5:25 PM, Jakub Narębski wrote: > W dniu 2016-07-04 o 17:17, Duy Nguyen pisze: >> On Mon, Jul 4, 2016 at 4:07 PM, Jakub Narębski wrote: >>> W dniu 2016-06-26 o 07:58, Nguyễn Thái Ngọc Duy pisze: +summary:: + For a

Re: [PATCH v4 1/5] git-fetch.txt: document fetch output

2016-07-04 Thread Jakub Narębski
W dniu 2016-06-26 o 07:58, Nguyễn Thái Ngọc Duy pisze: > +summary:: > + For a successfully fetched ref, the summary shows the old and new > + values of the ref in a form suitable for using as an argument to > + `git log` (this is `..` in most cases, and > + `...` for forced

Re: [PATCH] diff compaction heuristic: favor shortest neighboring blank lines

2016-07-04 Thread Jakub Narębski
W dniu 2016-07-01 o 20:01, Junio C Hamano pisze: > Michael Haggerty writes: >> It often fails to get C preprocessor directives right: >> >>> a08595f76159b09d57553e37a5123f1091bb13e7:http.c >>> aeff8a61216bf6e0d663c08c583bc8552fa3c344:http.c + 429 >>>

Re: [PATCH v4 1/5] git-fetch.txt: document fetch output

2016-07-04 Thread Jakub Narębski
W dniu 2016-07-04 o 17:17, Duy Nguyen pisze: > On Mon, Jul 4, 2016 at 4:07 PM, Jakub Narębski wrote: >> W dniu 2016-06-26 o 07:58, Nguyễn Thái Ngọc Duy pisze: >>> +summary:: >>> + For a successfully fetched ref, the summary shows the old and new >>> + values of the ref

Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.8.4

2016-07-04 Thread Johannes Schindelin
Hi Fabio, On Mon, 4 Jul 2016, Fabio Porcedda wrote: > How i can download the version 2.8.4? > Trough the download link https://git-for-windows.github.io/ it's available > only the latest version. Please click on the "repository" link in the header of that web site. This will take you to the

Re: Git doesn't always add files to a commit (amend)

2016-07-04 Thread Duy Nguyen
On Mon, Jul 04, 2016 at 04:50:38PM +0300, Yuri Kanivetsky wrote: > Hi, > > When intent to add a directory is made (`git add -N`), and then > contents of any but the first file is staged, `git commit -v --amend` > doesn't add it to the commit Oops, a bug since 2012. Thanks for the report. I know

Re: [PATCH v4 1/5] git-fetch.txt: document fetch output

2016-07-04 Thread Duy Nguyen
On Mon, Jul 4, 2016 at 4:07 PM, Jakub Narębski wrote: > W dniu 2016-06-26 o 07:58, Nguyễn Thái Ngọc Duy pisze: >> +summary:: >> + For a successfully fetched ref, the summary shows the old and new >> + values of the ref in a form suitable for using as an argument to >> +

Git doesn't always add files to a commit (amend)

2016-07-04 Thread Yuri Kanivetsky
Hi, When intent to add a directory is made (`git add -N`), and then contents of any but the first file is staged, `git commit -v --amend` doesn't add it to the commit, see for yourself: #!/usr/bin/env bash set -eu rm -rf 1 mkdir 1 cd 1 git init echo 1 > 1 && git add 1

Re: [PATCH v5 0/5] Better ref summary alignment in "git fetch"

2016-07-04 Thread Duy Nguyen
On Mon, Jul 4, 2016 at 3:17 PM, Marc Branchaud wrote: > On 2016-07-01 12:03 PM, Nguyễn Thái Ngọc Duy wrote: >> >> v5 changes the substitute symbol from '$' to '*' in compact mode and >> makes sure long lines in compact mode will not make the remote ref >> column too big

[ANNOUNCE] git-cinnabar 0.4.0 beta 1

2016-07-04 Thread Mike Hommey
Git-cinnabar is a git remote helper to interact with mercurial repositories. It allows to clone, pull and push from/to mercurial remote repositories, using git. Code on https://github.com/glandium/git-cinnabar This release on https://github.com/glandium/git-cinnabar/releases/tag/0.4.0b1 [

Re: [PATCH v5 0/5] Better ref summary alignment in "git fetch"

2016-07-04 Thread Marc Branchaud
On 2016-07-01 12:03 PM, Nguyễn Thái Ngọc Duy wrote: v5 changes the substitute symbol from '$' to '*' in compact mode and makes sure long lines in compact mode will not make the remote ref column too big (it's far from perfect but I think it's still good to do). I think the first 4 patches are

[PATCH v14 21/21] mailmap: use main email address for dturner

2016-07-04 Thread David Turner
Signed-off-by: David Turner --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index e5b4126..edcae89 100644 --- a/.mailmap +++ b/.mailmap @@ -46,6 +46,7 @@ David D. Kilzer David Kågedal David

[PATCH v14 20/21] index-helper: indexhelper.exitAfter config

2016-07-04 Thread David Turner
From: David Turner Add a configuration variable, indexhelper.exitAfter, which provides a default time to keep the index-helper alive. This is useful with indexhelper.autorun; some users will want to keep the automatically-run index-helper alive across their lunch break

Re: [PATCH v14 00/21] index-helper/watchman

2016-07-04 Thread Johannes Schindelin
Hi Dave, On Sun, 3 Jul 2016, Johannes Schindelin wrote: > On Sun, 3 Jul 2016, David Turner wrote: > > > This addresses comments on v13: > > removed unnecessary no_mmap ifdef > > add an ifdef in unix-socket > > OS X fix for select() > > test improvement > > Thanks. > > Would you mind