Re: How to `git status' without scrambling modified with new, etc

On Fri, May 5, 2017 at 9:24 AM, Ævar Arnfjörð Bjarmason wrote: > On Fri, May 5, 2017 at 4:02 PM, Harry Putnam wrote: >> This is probably what everyone sees: >> >> When I run `git status'; I see modified and newfiles scrambled together >> >> Is there a trick

Re: [PATCH 1/7] t7300: skip untracked dirs containing ignored files

On Wed, May 3, 2017 at 1:19 PM, Stefan Beller <sbel...@google.com> wrote: > On Tue, May 2, 2017 at 8:29 PM, Samuel Lijin <sxli...@gmail.com> wrote: >> If git sees a directory which contains only untracked and ignored >> files, clean -d should not remove that directory.

Re: [PATCH 0/5] Start of a journey: drop NO_THE_INDEX_COMPATIBILITY_MACROS

On Wed, May 3, 2017 at 12:14 PM, Stefan Beller <sbel...@google.com> wrote: > On Wed, May 3, 2017 at 4:31 AM, Samuel Lijin <sxli...@gmail.com> wrote: >> >> Just to throw out an example, I'm relatively new to the codebase (I've >> been lurking on the

Re: [PATCH 0/5] Start of a journey: drop NO_THE_INDEX_COMPATIBILITY_MACROS

On Tue, May 2, 2017 at 9:05 AM, Jeff Hostetler wrote: > > > On 5/2/2017 12:17 AM, Stefan Beller wrote: >> >> On Mon, May 1, 2017 at 6:36 PM, Junio C Hamano wrote: >>> >>> Stefan Beller writes: >>> This applies to origin/master.

Re: Terrible bad performance for it blame --date=iso -C -C master --

On Mon, May 1, 2017 at 7:59 PM, Junio C Hamano <gits...@pobox.com> wrote: > Samuel Lijin <sxli...@gmail.com> writes: > >> On Fri, Mar 31, 2017 at 10:52 AM, Junio C Hamano <gits...@pobox.com> wrote: >> >>> It might not be a bad idea to teach

[PATCH 4/7] dir: hide untracked contents of untracked dirs

When we taught read_directory_recursive() to recurse into untracked directories in search of ignored files given DIR_SHOW_IGNORED_TOO, that had the side effect of teaching it to collect the untracked contents of untracked directories. It does not make sense to return these, so we teach

[PATCH 0/7] Keep git clean -d from inadvertently removing ignored files

directory, whereas previously it would not. First patches to the actual C code that I'm sending out! :D Looking forward to feedback - the changes I made in read_directory_recursive() and read_directory() feel a bit hacky, but I'm not sure how to get around that. Samuel Lijin (7): t7300: skip untr

[PATCH 3/7] dir: add method to check if a dir_entry lexically contains another

Introduce a method that allows us to check if one dir_entry corresponds to a path which contains the path corresponding to another dir_entry. --- dir.c | 8 1 file changed, 8 insertions(+) diff --git a/dir.c b/dir.c index 6bd0350e9..25cb9eadf 100644 --- a/dir.c +++ b/dir.c @@ -1852,6

[PATCH 6/7] builtin/clean: teach clean -d to skip dirs containing ignored files

There is an implicit assumption that a directory containing only untracked and ignored files should itself be considered untracked. This makes sense in use cases where we're asking if a directory should be added to the git database, but not when we're asking if a directory can be safely removed

[PATCH 7/7] t7061: check for ignored file in untracked dir

--- t/t7061-wtstatus-ignore.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh index cdc0747bf..fc6013ba3 100755 --- a/t/t7061-wtstatus-ignore.sh +++ b/t/t7061-wtstatus-ignore.sh @@ -9,6 +9,7 @@ cat >expected <<\EOF ?? actual ??

[PATCH 2/7] dir: recurse into untracked dirs for ignored files

We consider directories containing only untracked and ignored files to be themselves untracked, which in the usual case means we don't have to search these directories. This is problematic when we want to collect ignored files with DIR_SHOW_IGNORED_TOO, though, so we teach

[PATCH 5/7] dir: change linkage of cmp_name() and check_contains()

--- dir.c | 4 ++-- dir.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dir.c b/dir.c index f0ddb4608..91103b561 100644 --- a/dir.c +++ b/dir.c @@ -1844,7 +1844,7 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, return dir_state; }

[PATCH 1/7] t7300: skip untracked dirs containing ignored files

If git sees a directory which contains only untracked and ignored files, clean -d should not remove that directory. --- t/t7300-clean.sh | 10 ++ 1 file changed, 10 insertions(+) diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index b89fd2a6a..948a455e8 100755 --- a/t/t7300-clean.sh +++

Re: Terrible bad performance for it blame --date=iso -C -C master --

On Fri, Mar 31, 2017 at 10:52 AM, Junio C Hamano wrote: > "Ulrich Windl" writes: > >> I was running "vc-annotate" in Emacs for a file from a large >> repository (>4 files, a big percentage being binary, about 10 >> commits). For the first

Re: Bug Report: .gitignore behavior is not matching in git clean and git status

dir.c:fill_directory(), and then clean -d can prune out directories that contain ignored files; two, path_treatment can learn about untracked directories which contain excluded (ignored) files. On Mon, May 1, 2017 at 8:51 AM, Samuel Lijin <sxli...@gmail.com> wrote: > On Sun, Apr 30, 2017 at 8:56 PM, Chri

Re: Bug Report: .gitignore behavior is not matching in git clean and git status

On Sun, Apr 30, 2017 at 8:56 PM, Chris Johnson wrote: > Good assessment/understanding of the issue. git clean -n does not > report anything as being targeted for removal, and git clean -f > matches that behavior. I agree with it probably being related > specifically to

Question re testing configuration

Hi all, I'm a new developer trying to get my feet wet and I'm running into an issue with the tests that I can't figure out at this point. I *know* that the changes I'm working on are causing the tests to fail, but I can't figure out how to induce the failure manually (so that I can throw gdb at

Re: I suggest a new feature: One copy from files

gt; wrote: > Yes, but i say about of have a update only the last change, and not > record the old changes. Interesting command the 'update-index', this > is a permanent config for each dir/files? > > 2017-04-24 1:59 GMT-03:00 Samuel Lijin <sxli...@gmail.com>: >> Ah -

Re: I suggest a new feature: One copy from files

...what? I'm sorry, I have absolutely no idea what you're asking. You're going to have to be a lot more specific with your description of the desired behavior because as is, I have no idea what purpose your .gitonecopy or .gitonelog would serve. I also have no idea what this has to do with the

Re: [bug?] docs in Documentation/technical/ do not seem to be distributed

On Wed, Apr 19, 2017 at 12:05 PM, Jonathan Nieder <jrnie...@gmail.com> wrote: > Hi, > > Samuel Lijin wrote: > >> It's possible this may have nothing to do with the Git project itself >> because I have absolutely no idea how this is handled on the packaging >> si

[bug?] docs in Documentation/technical/ do not seem to be distributed

It's possible this may have nothing to do with the Git project itself because I have absolutely no idea how this is handled on the packaging side or, possibly, if this is actually intended. There are a couple of links floating around in the man pages pointing to pages in technical/, such as to

Re: Feature request: --format=json

If for some reason your use case is so performance intensive that you can't just `git cat-file commit` every entry in `git rev-list --all` individually, then you can also pipe input into `git cat-file --batch` and read output as you pipe input in, which will give you a very simple mechanism for

Re: Terrible bad performance for it blame --date=iso -C -C master --

Hi Ulrich, Is there any chance you could share the repo where this is coming from? This is actually something a colleague and I are looking into seeing if we can crunch out some performance gains since -C -C isn't threaded. Sam On Fri, Mar 31, 2017 at 10:52 AM, Junio C Hamano

Re: [PATCH v1] travis-ci: build and test Git on Windows

On Thu, Mar 23, 2017 at 2:38 PM, Jeff King wrote: > On Thu, Mar 23, 2017 at 08:26:15PM +0100, Lars Schneider wrote: > >> > I think we do build against PRs now. E.g.: >> > >> > https://travis-ci.org/git/git/builds/213896051 >> > >> > But it looks like we can turn that off. >> >>

Re: Is there a way to have a local version of a header file?

Arduino is basically a simplified/streamlined cross-compilation toolchain with very tightly coupled IDE integration. I'd just provide a .sample and tell people what to do with it in the README. The alternative is to provide config.h as is and tell people to use "git update-index

Re: [PATCH] travis-ci: run scan-build every time

On Sun, Feb 26, 2017 at 8:12 AM, Lars Schneider <larsxschnei...@gmail.com> wrote: > >> On 26 Feb 2017, at 03:09, Samuel Lijin <sxli...@gmail.com> wrote: >> >> On Sat, Feb 25, 2017 at 3:48 PM, Lars Schneider >> <larsxschnei...@gmail.com> wrote: >>

Re: [PATCH] travis-ci: run scan-build every time

On Sat, Feb 25, 2017 at 3:48 PM, Lars Schneider <larsxschnei...@gmail.com> wrote: > >> On 24 Feb 2017, at 18:29, Samuel Lijin <sxli...@gmail.com> wrote: >> >> It's worth noting that there seems to be a weird issue with scan-build >> where it *will*

[PATCH] travis-ci: run scan-build every time

Introduces the scan-build static code analysis tool from the Clang project to all Travis CI builds. Installs clang (since scan-build needs clang as a dependency) to make this possible (on macOS, also updates PATH to allow scan-build to be invoked without referencing the full path). --- A build

Re: Trying to use xfuncname without success.

o, the question is, what is causing this problem on my system? > > Anyone have an idea to help diagnose this problem? > > On Wed, Feb 8, 2017 at 3:24 PM, Samuel Lijin <sxli...@gmail.com> wrote: >> On Windows 7, it works for me in both CMD and Git Bash: >> >> $ git --

Re: Trying to use xfuncname without success.

On Windows 7, it works for me in both CMD and Git Bash: $ git --version git version 2.11.0.windows.3 $ git diff HEAD^ --word-diff diff --git a/test.natvis b/test.natvis index 93396ad..1233b8c 100644 --- a/test.natvis +++ b/test.natvis @@ -18,6 +18,7 @@ test {+added_var+}

Re: Request re git status

On Wed, Feb 8, 2017 at 12:30 AM, Jacob Keller wrote: > On Tue, Feb 7, 2017 at 10:13 PM, Duy Nguyen wrote: >> On Wed, Feb 8, 2017 at 2:18 AM, Jacob Keller wrote: >>> Personally, I think that the fact that Git forces the user to

Re: git/git-scm.com GH Issue Tracker

On Mon, Feb 6, 2017 at 12:34 PM, Jeff King <p...@peff.net> wrote: > On Mon, Feb 06, 2017 at 12:15:08AM -0600, Samuel Lijin wrote: > >> I've went through a bunch of open issues on the git/git-scm.com repo >> (specifically, everything after #600) and I think the bulk of them can

Re: subtree merging fails

Have you tried using (without -s subtree) -X subtree=path/to/add/subtree/at? >From the man page: subtree[=] This option is a more advanced form of subtree strategy, where the strategy makes a guess on how two trees must be shifted to match with each other

Re: Request re git status

On Mon, Feb 6, 2017 at 6:45 PM, Phil Hord wrote: > On Mon, Feb 6, 2017 at 3:36 PM Ron Pero wrote: >> I almost got bit by git: I knew there were changes on the remote >> server, but git status said I was uptodate with the remote. >> > > Do you mean you

Re: warning in tree xxx: contains zero-padded file modes

On Mon, Feb 6, 2017 at 2:23 PM, Samuel Lijin <sxli...@gmail.com> wrote: > I'm just going to go ahead and split this off the git/git-scm.com > issues thread since this is a distinct topic. > > On Mon, Feb 6, 2017 at 12:49 PM, Jeff King <p...@peff.net> wrote: >> On M

warning in tree xxx: contains zero-padded file modes

I'm just going to go ahead and split this off the git/git-scm.com issues thread since this is a distinct topic. On Mon, Feb 6, 2017 at 12:49 PM, Jeff King <p...@peff.net> wrote: > On Mon, Feb 06, 2017 at 05:18:03PM +0700, Duy Nguyen wrote: > >> On Mon, Feb 6, 2017 at 1:15 PM,

git/git-scm.com GH Issue Tracker

I've went through a bunch of open issues on the git/git-scm.com repo (specifically, everything after #600) and I think the bulk of them can be closed. I've taken the liberty of classifying them as shown below. - Sam # Irrelevant but someone should take a look 693 # Irrelevant to git-scm.com

Re: git-scm.com status report

On Fri, Feb 3, 2017 at 5:58 AM, Jeff King <p...@peff.net> wrote: > On Thu, Feb 02, 2017 at 12:54:53AM -0600, Samuel Lijin wrote: > >> In theory, you could also dump the build artifacts to a GH Pages repo >> and host it from there, although I don't know if you wou

Re: git-scm.com status report

For anyone interested, this thread is on the HN front page right now[0]. There's one suggestion in particular that stands out to me - shifting to Digital Ocean[1], which for $240/mo offers wa more than what it sounds like the current Heroku costs are. [0]

Re: git-scm.com status report

In theory, you could also dump the build artifacts to a GH Pages repo and host it from there, although I don't know if you would run up against any of the usage limits[0]. The immediate problem I see with that approach, though, is that I have no idea how any of the dynamic stuff (e.g. search)

octopus merge --no-ff claims to fast-forward even though it doesn't

I was doing an octopus merge earlier and noticed that it claims to fast-forward when you specify --no-ff, even though it does actually abide by --no-ff. I can consistently reproduce as follows: $ git clone https://github.com/sxlijin/merge-octopus-experiment $ cd merge-octopus-experiment $ git

Re: [RFC] stash --continue

>> At least `git stash pop --continue` would be consistent with all other >> `--continue` options in Git that I can think of... > Alas, I disagree! I'm with Johannes here. "git stash" sans subcommand is pretty explicitly defined as "git stash save", so by similar logic, "git stash --continue",

Minor Bug in Renaming Branches

Hi, Not quite sure where to submit bug reports about Git, this was the best I could find, so if there's a better place to do this, please let me know and I will. The short of this issue is that on Mac and Windows, if a branch has a slash in its name, changing it from lowercase to uppercase

<    1   2