[PATCH v4 1/4] t7501: add coverage for flags which imply dry runs

a new commit by asserting that HEAD has not changed, instead of by crafting the commit. Signed-off-by: Samuel Lijin --- t/t7501-commit.sh | 146 +- 1 file changed, 132 insertions(+), 14 deletions(-) diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh

[PATCH v4 0/4] Rerolling patch series to fix t7501

Following up on Junio's review from last time. Samuel Lijin (4): t7501: add coverage for flags which imply dry runs wt-status: rename commitable to committable wt-status: teach wt_status_collect about merges in progress commit: fix exit code when doing a dry run builtin/commit.c | 32

[PATCH v4 2/4] wt-status: rename commitable to committable

Fix a typo in the name of the committable bit in wt_status_state. Signed-off-by: Samuel Lijin --- builtin/commit.c | 18 +- wt-status.c | 10 +- wt-status.h | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/builtin/commit.c b/builtin

[PATCH v4 4/4] commit: fix exit code when doing a dry run

hether or not there are unmerged paths, instead of the stagemask field, to improve readability. Also stop setting s->committable in wt_longstatus_print_updated() and show_merge_in_progress(), and const-ify wt_status_state in the method signatures in those callpaths. Signed-off-by: Samuel Lijin --- t/t7501-

[PATCH v4 3/4] wt-status: teach wt_status_collect about merges in progress

to use, add a helper method to clean up wt_status_state, const-ify as many struct pointers in method signatures as possible, and add a FIXME for a struct pointer which should be const but isn't (that this patch series will not address). Signed-off-by: Samuel Lijin --- gitster: I kept the FIXME

Re: [PATCH v3 3/3] commit: fix exit code for --short/--porcelain

Thanks for the review. On Tue, Jul 17, 2018 at 10:33 AM Junio C Hamano wrote: > > Samuel Lijin writes: > > > diff --git a/wt-status.c b/wt-status.c > > index 75d389944..4ba657978 100644 > > --- a/wt-status.c > > +++ b/wt-status.c > > @@ -718,6 +718,39 @@

[PATCH v3 1/3] t7501: add merge conflict tests for dry run

) there is at least one unfixed merge conflict and (2) when all merge conflicts are all fixed. Signed-off-by: Samuel Lijin --- t/t7501-commit.sh | 45 - 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index

[PATCH v3 2/3] wt-status: teach wt_status_collect about merges in progress

be const but isn't (that this patch series will not address). Signed-off-by: Samuel Lijin --- builtin/commit.c | 32 ref-filter.c | 3 +- wt-status.c | 188 +++ wt-status.h | 13 ++-- 4 files changed, 120 insertions(+), 116

[PATCH v3 3/3] commit: fix exit code for --short/--porcelain

t_updated() and show_merge_in_progress(), and const-ify wt_status_state in the method signatures in those callpaths. Signed-off-by: Samuel Lijin --- t/t7501-commit.sh | 8 ++--- wt-status.c | 82 +-- 2 files changed, 55 insertions(+), 35 deletions(-) diff --git

[PATCH v3 0/3] Fix --short/--porcelain options for git commit

. There are also other tests in t7501 that rely on state left from earlier tests, so it's not really clear to me what the best thing to do here is. Also added a FIXME in the second patch for something I think should be fixed, but doesn't make sense to fix in this patch series. Samuel Lijin (3): t7501

Re: [PATCH v2 1/2] commit: fix --short and --porcelain options

On Tue, May 1, 2018 at 10:50 PM Junio C Hamano <gits...@pobox.com> wrote: > Samuel Lijin <sxli...@gmail.com> writes: > > Mark the commitable flag in the wt_status object in the call to > > `wt_status_collect()`, instead of in `wt_longstatus_print_updated()`,

public-inbox.org down?

DNS lookup is working but the website (possibly the server) seems to be down. The TLS handshake is never acked: $ curl -v https://public-inbox.org * Rebuilt URL to: https://public-inbox.org/ * Trying 64.71.152.64... * TCP_NODELAY set * Connected to public-inbox.org (64.71.152.64) port 443 (#0)

[PATCH v2 2/2] wt-status: const-ify all printf helper methods

Change the method signatures of all printf helper methods to take a `const struct wt_status *` rather than a `struct wt_status *`. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- wt-status.c | 18 +- wt-status.h | 4 ++-- 2 files changed, 11 insertions(+), 11 del

[PATCH v2 1/2] commit: fix --short and --porcelain options

zero when there is something to commit. This fixes two bugs documented in the test suite. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7501-commit.sh | 4 ++-- wt-status.c | 38 +++--- 2 files changed, 29 insertions(+), 13 deletions(-) diff

[PATCH v2 0/2] Fix --short and --porcelain options for commit

Rerolling patch series to fix t7501. Samuel Lijin (2): commit: fix --short and --porcelain options wt-status: const-ify all printf helper methods t/t7501-commit.sh | 4 ++-- wt-status.c | 56 ++- wt-status.h | 4 ++-- 3 files changed

Re: [PATCH 1/2] commit: fix --short and --porcelain

On Wed, Apr 18, 2018 at 8:55 PM, Samuel Lijin <sxli...@gmail.com> wrote: > Thanks for the quick review! > > On Wed, Apr 18, 2018 at 11:38 AM, Martin Ågren <martin.ag...@gmail.com> wrote: >> Hi Samuel, >> >> Welcome back. :-) >> >> On 18 April 20

[PATCH 0/2] Fix --short and --porcelain options for commit

Hi all - I last contributed about a year ago and I've finally found the time to start contributing again, and hopefully I'll stick around this time. Figured I'd start with something small :) Samuel Lijin (2): commit: fix --short and --porcelain wt-status: const-ify all printf helper methods

[PATCH 2/2] wt-status: const-ify all printf helper methods

Change the method signatures of all printf helper methods to take a `const struct wt_status *` rather than a `struct wt_status *`. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- wt-status.c | 18 +- wt-status.h | 4 ++-- 2 files changed, 11 insertions(+), 11 del

[PATCH 1/2] commit: fix --short and --porcelain

to take advantage of the logic shifted to the former. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7501-commit.sh | 4 ++-- wt-status.c | 39 +++ 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/t/t7501-commit.sh b/t

Re: Using '--help' for aliases

You could also just make the alias a bash function that does git help checkout when you pass the --help flag to the alias.

Re: [PATCH v3] mergetools/meld: improve compatibiilty with Meld on macOS X

uot; accept it in > the "--output=" form, so use "--output=" for > maximum compatibility. Aha, then if that's the case this looks fine to me. Thanks! > [1] https://github.com/yousseb/meld > [2] https://github.com/yousseb/meld/blob/master/osx/Meld > [3] https://

Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output"

On Sun, Jun 18, 2017 at 8:17 PM, David Aguilar <dav...@gmail.com> wrote: > On Sun, Jun 18, 2017 at 05:11:48AM -0400, Samuel Lijin wrote: >> On Sun, Jun 18, 2017 at 3:46 AM, David Aguilar <dav...@gmail.com> wrote: >> > On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel

Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output"

On Sun, Jun 18, 2017 at 3:46 AM, David Aguilar <dav...@gmail.com> wrote: > On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote: >> On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar <dav...@gmail.com> wrote: >> > Meld 3.16.0 requires a "=" in the --o

Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output"

On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar wrote: > Meld 3.16.0 requires a "=" in the --output argument, as it uses > a simple hand-rolled command-line parser. > > Newer versions of Meld (3.16.4, and possibly earlier) use > optpaarse, which accepts either "--output " or >

Re: [suggestion] Include commit-ish in git status output

On Thu, Jun 15, 2017 at 7:43 PM, Mahmoud Al-Qudsi wrote: > Hello all, > > I hope it is not considered too forward of me for my first post to this list > to be a suggestion on a change to git’s behavior (though not in any > functional manner); but a persistent frustration for

Re: git diff sometimes brings up buggy pager

Any chance you can tell us what repo this happens on? + git version, OS, and what the triggering diff invocation is. On Thu, Jun 15, 2017 at 12:19 PM, Matthew Groth wrote: > When I do `git diff` sometimes I get this: > > > ...skipping... > ~ > ~ > ~ > ~ > ~ > ~ > ~ > ~ > ~ >

Re: [PATCH] wt-status.c: Modified status message shown for a parent-less branch

On Thu, Jun 15, 2017 at 4:42 AM, Jeff King wrote: > > On Thu, Jun 15, 2017 at 01:49:20PM +0530, Kaartic Sivaraam wrote: > > > What about, "not making any assumptions" about what the user would > > think when he views the output of `git status` ? Why not try some > > general

Re: Feature Request: Show status of the stash in git status command

On Sat, Jun 10, 2017 at 4:25 AM, Jeff King wrote: > On Wed, Jun 07, 2017 at 06:46:18PM -0400, Houston Fortney wrote: > >> I sometimes forget about something that I stashed. It would be nice if >> the git status command would just say "There are x entries in the >> stash." It can

Clarifying behavior of diff --stat

I noticed when answering a StackOverflow question that apparently --stat modifies the raw diff itself, instead of just adding a diffstat to the output. In the linux kernel: $ git diff-tree --raw -M 00a2430ff07d4e0e0e7e24e02fd8adede333b797 00a2430ff07d4e0e0e7e24e02fd8adede333b797 :04 04

Re: send-email: Net::SSLeay failure

On Thu, Jun 8, 2017 at 5:53 AM, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > On Thu, Jun 8, 2017 at 11:06 AM, Samuel Lijin <sxli...@gmail.com> wrote: >> Sorry, I should've been clearer. Currently send-email fails for me >> with this error: >> >> SSLea

Re: send-email: Net::SSLeay failure

Sorry, I should've been clearer. Currently send-email fails for me with this error: SSLeay.c: loadable library and perl binaries are mismatched (got handshake key 0xdb80080, needed 0xde00080) I thought the undefined symbol stuff in the .so could have been part of the problem, but I guess not.

Re: send-email: Net::SSLeay failure

On Wed, Jun 7, 2017 at 8:26 PM, Liam Breck <l...@networkimprov.net> wrote: > On Wed, Jun 7, 2017 at 5:06 PM, Samuel Lijin <sxli...@gmail.com> wrote: >> On Wed, Jun 7, 2017 at 4:43 PM, Ævar Arnfjörð Bjarmason >> <ava...@gmail.com> wrote: >>>

Re: send-email: Net::SMTP::SSL failure

On Wed, Jun 7, 2017 at 4:43 PM, Ævar Arnfjörð Bjarmason wrote: > Ah, so you installed Net::SSLeay via CPAN, and then upgraded your Arch > openssl, breaking the CPAN-built *.so object? > >> Agreed that send-email should be report errors properly. It's a rather >> essential tool.

Re: pushing for a new hash, was Re: [PATCH 2/3] rebase: Add tests for console output

On Tue, Jun 6, 2017 at 6:45 PM, Stefan Beller wrote: > On Tue, Jun 6, 2017 at 3:22 PM, Johannes Schindelin > wrote: >> >> 4) we still have the problem that there is no cryptography expert among >> those who in the Git project are listened to > > I

Re: What does this output of git supposed to mean ?

On Mon, Jun 5, 2017 at 9:11 PM, brian m. carlson wrote: > On Tue, Jun 06, 2017 at 10:00:12AM +0900, Junio C Hamano wrote: >> Stefan Beller writes: >> >> > On the subject: maybe we want to rename initial commit >> > to root commit? (evil-me also

Re: git-gui ignores core.hooksPath

On Fri, Jun 2, 2017 at 9:41 AM, Philipp Gortan wrote: > Hi git devs, > > First off, thanks for your awesome work! > > I've been unhappy for quite a while that I had to configure the hooks > manually for each of my repos - until I found out recently that there is > the

Re: preserve untracked cache, was Re: What's cooking in git.git (Jun 2017, #01; Thu, 1)

On Thu, Jun 1, 2017 at 2:56 PM, Johannes Schindelin wrote: > Hi Junio, > > On Thu, 1 Jun 2017, Junio C Hamano wrote: > >> * dt/unpack-save-untracked-cache-extension (2017-05-20) 1 commit >> (merged to 'next' on 2017-05-23 at 3196d093d6) >> + unpack-trees: preserve

Re: Coloring

On Wed, May 31, 2017 at 5:10 PM, Irving Rabin <irv...@edmodo.com> wrote: > > Thanks Jeff, my problem has been resolved by Samuel Lijin. > My terminal settings didn't set bold which remained white. I fixed it > and my problem was gone! Specifically, Irving's terminal rendered

Re: Coloring

On Wed, May 31, 2017 at 2:33 PM, Irving Rabin wrote: > > Folks, I am reporting an issue with coloring of the output of Git > commands, like status, diff, etc. > > Specifically, if the field is supposed to be white, it doesn't mean it > should be literally 0xFF. It should be

Re: What's cooking in git.git (May 2017, #08; Mon, 29)

On Mon, May 29, 2017 at 2:23 AM, Junio C Hamano wrote: > * sl/clean-d-ignored-fix (2017-05-24) 6 commits > (merged to 'next' on 2017-05-29 at 837c255ae8) > + clean: teach clean -d to preserve ignored paths > + dir: expose cmp_name() and check_contains() > + dir: hide

Re: [PATCH] doc: filter-branch does not require re-export of vars

On Fri, May 26, 2017 at 2:37 PM, Jeff King wrote: > > On Fri, May 26, 2017 at 07:36:54PM +0200, Andreas Heiduk wrote: > > > The function `set_ident` in `filter-branch` exported the variables > > GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL|DATE) at least since 6f6826c52b in 2007. > >

Re: [PATCH v6 6/6] clean: teach clean -d to preserve ignored paths

On Wed, May 24, 2017 at 12:14 AM, Torsten Bögershausen wrote: > >> diff --git a/builtin/clean.c b/builtin/clean.c >> index d861f836a..937eb17b6 100644 >> --- a/builtin/clean.c >> +++ b/builtin/clean.c >> @@ -857,6 +857,38 @@ static void interactive_main_loop(void) >> } >>

[PATCH v6 6/6] clean: teach clean -d to preserve ignored paths

cmd_clean(). This also fixes the known breakage in t7300, since clean -d now skips untracked directories containing ignored paths. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- builtin/clean.c | 42 ++ t/t7300-clean.sh | 2 +- 2 files changed, 43

[PATCH v6 3/6] dir: recurse into untracked dirs for ignored files

() to recurse into untracked directories to find the ignored files they contain when DIR_SHOW_IGNORED_TOO is set. This has the side effect of also collecting all untracked files in untracked directories as well. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- dir.c | 5 - 1 file chan

[PATCH v6 2/6] t7061: status --ignored should search untracked dirs

well." Thus we revisit eb8c5b87 and decide that for such directories, `status --ignored` will list the directory as untracked *and* list all ignored files within said directory even without `-uall`. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7061-wtstatus-ignore.sh | 5 +++-- 1

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

ath corresponding to another dir_entry. This also fixes known breakages in t7061, since status --ignored now searches untracked directories for ignored files. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- Documentation/technical/api-directory-listing.txt | 6 +++

[PATCH v6 5/6] dir: expose cmp_name() and check_contains()

namespace. The second is achieved by renaming cmp_name() to cmp_dir_entry() and check_contains() to check_dir_entry_contains(). Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- dir.c | 11 ++- dir.h | 3 +++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dir.c b

[PATCH v6 1/6] t7300: clean -d should skip dirs with ignored files

that. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7300-clean.sh | 16 1 file changed, 16 insertions(+) diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index b89fd2a6a..3a2d709c2 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -653,4 +

[PATCH v6 0/6] Fix clean -d and status --ignored

Messed up on 6/6 in v5, forgot to include changes from earlier versions (karma for not running tests before I send-email'd the patch series). Samuel Lijin (6): t7300: clean -d should skip dirs with ignored files t7061: status --ignored should search untracked dirs dir: recurse

Re: [PATCH v5 6/6] clean: teach clean -d to preserve ignored paths

On Tue, May 23, 2017 at 8:52 AM, Junio C Hamano <gits...@pobox.com> wrote: > Samuel Lijin <sxli...@gmail.com> writes: > >> @@ -931,6 +961,7 @@ int cmd_clean(int argc, const char **argv, const char >> *prefix) >> prefi

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

ath corresponding to another dir_entry. This also fixes known breakages in t7061, since status --ignored now searches untracked directories for ignored files. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- Documentation/technical/api-directory-listing.txt | 6 +++

[PATCH v5 5/6] dir: expose cmp_name() and check_contains()

namespace. The second is achieved by renaming cmp_name() to cmp_dir_entry() and check_contains() to check_dir_entry_contains(). Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- dir.c | 11 ++- dir.h | 3 +++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dir.c b

[PATCH v5 0/6] Fix clean -d and status --ignored

Incorporates latest round of feedback from Junio about how to best structure the changes to cmd_clean() for maintainability. Samuel Lijin (6): t7300: clean -d should skip dirs with ignored files t7061: status --ignored should search untracked dirs dir: recurse into untracked dirs

[PATCH v5 3/6] dir: recurse into untracked dirs for ignored files

() to recurse into untracked directories to find the ignored files they contain when DIR_SHOW_IGNORED_TOO is set. This has the side effect of also collecting all untracked files in untracked directories as well. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- dir.c | 5 - 1 file chan

[PATCH v5 1/6] t7300: clean -d should skip dirs with ignored files

that. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7300-clean.sh | 16 1 file changed, 16 insertions(+) diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index b89fd2a6a..3a2d709c2 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -653,4 +

[PATCH v5 6/6] clean: teach clean -d to preserve ignored paths

e in t7300, since clean -d now skips untracked directories containing ignored paths. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- builtin/clean.c | 31 +++ t/t7300-clean.sh | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/builtin/c

[PATCH v5 2/6] t7061: status --ignored should search untracked dirs

well." Thus we revisit eb8c5b87 and decide that for such directories, `status --ignored` will list the directory as untracked *and* list all ignored files within said directory even without `-uall`. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7061-wtstatus-ignore.sh | 5 +++-- 1

Re: [Bug] cloning a repository with a default MASTER branch tries to check out the master branch

For some reason the repo on GH does not have a HEAD pointer: $ git ls-remote https://github.com/passcod/UPPERCASE-NPM.git efc7dbfd6ca155d5d19ce67eb98603896062f35arefs/heads/MASTER e60ea8e6ec45ec45ff44ac8939cb4105b16477darefs/pull/1/head f35a73dcb151d336dc3d30c9a2c7423ecdb7bd1c

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

On Mon, May 22, 2017 at 2:17 AM, Junio C Hamano <gits...@pobox.com> wrote: > Samuel Lijin <sxli...@gmail.com> writes: > >>> By the way, instead of putting NULL, it may be easier to follow if >>> you used two pointers, src and dst, into dir.entries[], just lik

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

On Mon, May 22, 2017 at 12:48 AM, Junio C Hamano <gits...@pobox.com> wrote: > Samuel Lijin <sxli...@gmail.com> writes: > >> + for (j = i = 0; i < dir.nr;) { >> + for (; >> + j < dir.ignored_nr &&

Re: [PATCH v2 1/2] refs: Add for_each_worktree_ref for iterating over all worktree HEADs

On Thu, May 18, 2017 at 5:40 AM, Simon Ruderich wrote: > On Wed, May 17, 2017 at 06:45:31PM -0700, Manish Goregaokar wrote: >> Hm, my invocation of git-send-email keeps getting the threading wrong. >> Is there a recommended set of arguments to the command? > > The threading

[PATCH v4 0/6] Fix clean -d and status --ignored

nts DIR_KEEP_UNTRACKED_CONTENTS in the corresponding technical API doc Samuel Lijin (6): t7300: clean -d should skip dirs with ignored files t7061: status --ignored should search untracked dirs dir: recurse into untracked dirs for ignored files dir: hide untracked contents of untracked dirs dir: expose cmp_n

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

ath corresponding to another dir_entry. This also fixes known breakages in t7061, since status --ignored now searches untracked directories for ignored files. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- Documentation/technical/api-directory-listing.txt | 6 +++

[PATCH v4 1/6] t7300: clean -d should skip dirs with ignored files

that. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7300-clean.sh | 16 1 file changed, 16 insertions(+) diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index b89fd2a6a..3a2d709c2 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -653,4 +

[PATCH v4 5/6] dir: expose cmp_name() and check_contains()

namespace. The second is achieved by renaming cmp_name() to cmp_dir_entry() and check_contains() to check_dir_entry_contains(). Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- dir.c | 11 ++- dir.h | 3 +++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dir.c b

[PATCH v4 3/6] dir: recurse into untracked dirs for ignored files

() to recurse into untracked directories to find the ignored files they contain when DIR_SHOW_IGNORED_TOO is set. This has the side effect of also collecting all untracked files in untracked directories as well. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- dir.c | 5 - 1 file chan

[PATCH v4 2/6] t7061: status --ignored should search untracked dirs

well." Thus we revisit eb8c5b87 and decide that for such directories, `status --ignored` will list the directory as untracked *and* list all ignored files within said directory even without `-uall`. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7061-wtstatus-ignore.sh | 5 +++-- 1

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

while still removing the untracked contents of such dirs). This also fixes the known breakage in t7300 since clean -d now skips untracked directories containing ignored files. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- builtin/clean.c | 38 +- t

Re: [PATCH v3 6/8] clean: teach clean -d to skip dirs containing ignored files

On Wed, May 17, 2017 at 10:34 PM, Junio C Hamano <gits...@pobox.com> wrote: > Samuel Lijin <sxli...@gmail.com> writes: > >> @@ -932,7 +935,7 @@ int cmd_clean(int argc, const char **argv, const char >> *prefix) >> >> fill_directory(

Re: Diff topic branch + working copy changes?

On Wed, May 17, 2017 at 9:39 AM, Robert Dailey wrote: > > Would be nice in the future to have another revision specification > like @{wc} for "HEAD + working copy". I guess this technically isn't a > revision, but something along those lines. Or maybe just an >

Re: [PATCH v3 4/8] dir: hide untracked contents of untracked dirs

On Wed, May 17, 2017 at 2:47 AM, Junio C Hamano <gits...@pobox.com> wrote: > Samuel Lijin <sxli...@gmail.com> writes: > >> When we taught read_directory_recursive() to recurse into untracked >> directories in search of ignored files given DIR_SHOW_IGNORED_TO

Re: [PATCH v3 3/8] dir: recurse into untracked dirs for ignored files

On Wed, May 17, 2017 at 2:23 AM, Junio C Hamano <gits...@pobox.com> wrote: > Samuel Lijin <sxli...@gmail.com> writes: > >> We consider directories containing only untracked and ignored files to >> be themselves untracked, which in the usual case means we don't have

Re: git-scm.com status report

On Mon, Feb 6, 2017 at 1:27 PM, Jeff King wrote: > On Thu, Feb 02, 2017 at 03:33:50AM +0100, Jeff King wrote: > >> We (the Git project) got control of the git-scm.com domain this year. We >> have never really had an "official" website, but I think a lot of people >> consider this

Re: [fixed] error using `git mergetool --tool=meld`

On Tue, May 16, 2017 at 5:55 PM, Matthew Groth wrote: > I needed to use `git config mergetool.meld.hasOutput false` Hm, that's interesting - the source code snippet you quoted from meld implies it supports --output. What version of meld do you have? David Aguilar seems to be

Re: bug with git add and .gitignore

On Wed, May 10, 2017 at 9:44 AM, Orgad Shaneh wrote: > Hi, > > When a not-ignored file inside an ignore directory is added along with > other files, a false alarm is shown: > > git init > echo /d/ > .gitignore > mkdir d > touch d/file foo > git add -f d/file foo > git add d/file

Re: error using `git mergetool --tool=meld`

Can you try `git config mergetool.meld.hasOutput true` and see if that fixes the issue?

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

while still removing the untracked contents of such dirs). Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- builtin/clean.c | 32 ++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/builtin/clean.c b/builtin/clean.c index d861f836a..25f3efce5 10

[PATCH v3 8/8] t7061: status --ignored now searches untracked dirs

Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7061-wtstatus-ignore.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh index 15e7592b6..fc6013ba3 100755 --- a/t/t7061-wtstatus-ignore.sh +++ b/t/t7061-wt

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

ath corresponding to another dir_entry. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- dir.c | 54 ++ dir.h | 3 ++- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/dir.c b/dir.c index 6bd0350e9..214a148ee 100644 --- a/dir.c ++

[PATCH v3 3/8] dir: recurse into untracked dirs for ignored files

() to recurse into untracked directories to find the ignored files they contain when DIR_SHOW_IGNORED_TOO is set. This has the side effect of also collecting all untracked files in untracked directories as well. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- dir.c | 7 ++- 1 file c

[PATCH v3 5/8] dir: expose cmp_name() and check_contains()

namespace. The second is achieved by renaming cmp_name() to cmp_dir_entry() and check_contains() to check_dir_entry_contains(). Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- dir.c | 10 +- dir.h | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dir.c b

[PATCH v3 2/8] t7061: status --ignored should search untracked dirs

well." Thus we revisit eb8c5b87 and decide that for such directories, `status --ignored` will list the directory as untracked *and* list all ignored files within said directory even without `-uall`. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7061-wtstatus-ignore.sh | 5 +++-- 1

[PATCH v3 7/8] t7300: clean -d now skips untracked dirs containing ignored files

Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7300-clean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index c14c98e56..b65d4719c 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -653,7 +653,7 @@ test_expect_succes

[PATCH v3 1/8] t7300: clean -d should skip dirs with ignored files

that. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7300-clean.sh | 11 +++ 1 file changed, 11 insertions(+) diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index b89fd2a6a..c14c98e56 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -653,4 +653,15 @@ test_expect_s

[PATCH v3 0/8] Fix clean -d and status --ignored

been fixed. Samuel Lijin (8): t7300: clean -d should skip dirs with ignored files t7061: status --ignored should search untracked dirs dir: recurse into untracked dirs for ignored files dir: hide untracked contents of untracked dirs dir: expose cmp_name() and check_contains() clean: teach

Re: git log --follow after subtree merge

On Wed, May 10, 2017 at 9:46 AM, Jonny Gilchrist wrote: > Hi, > > After doing a subtree merge, using 'git log' and 'git log --follow' on > files in the subtree show only the merge commit in which they were > added. > > After reading around I understand that the issue is

Re: [PATCH v2 0/9] Keep git clean -d from inadvertently removing ignored files

On Sun, May 7, 2017 at 11:26 PM, Junio C Hamano <gits...@pobox.com> wrote: > Samuel Lijin <sxli...@gmail.com> writes: > >> Addresses the issues raised by Stefan and Junio (thanks for your >> feedback) about not using C99-style comments and keeping tests >>

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

On Sun, May 7, 2017 at 2:12 PM, Torsten Bögershausen <tbo...@web.de> wrote: > On 2017-05-05 12:46, Samuel Lijin wrote: >> If git sees a directory which contains only untracked and ignored >> files, clean -d should not remove that directory. It was recently >> discove

Re: vger not relaying some of Junio's messages today?

On Sat, May 6, 2017 at 3:50 PM, Eric Wong <e...@80x24.org> wrote: > (I have no idea what Jonathan Tirado wrote; it was encrypted (but > sent to a public list). > > Samuel Lijin <sxli...@gmail.com> wrote: >> Yep, I see these on public-inbox.org/git/ but not in my gma

[PATCH v2 5/9] dir: hide untracked contents of untracked dirs

read_directory() to strip dir->entries of any such untracked contents. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- dir.c | 44 1 file changed, 44 insertions(+) diff --git a/dir.c b/dir.c index 4739087f4..fd445ee9e 100644 --- a/dir.c +++ b/dir.c @

[PATCH v2 8/9] t7300: clean -d now skips untracked dirs containing ignored files

This was previously broken (and likely never worked); this concludes the patch series fixing the behavior of clean -d. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7300-clean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7300-clean.sh b/t/t7300-cl

[PATCH v2 9/9] t7061: expect ignored files in untracked dirs

We now expect `status --ignored` to list ignored files even if they are in an untracked directory. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7061-wtstatus-ignore.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wt

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

from the working tree; as a result, clean -d would assume that an "untracked" directory containing ignored files could be deleted. To get around this, we teach clean -d to collect ignored files and skip over so-called "untracked" directories if they contain any ignored files. S

[PATCH v2 6/9] dir: change linkage of cmp_name() and check_contains()

Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- dir.c | 4 ++-- dir.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dir.c b/dir.c index fd445ee9e..6a71683df 100644 --- a/dir.c +++ b/dir.c @@ -1844,7 +1844,7 @@ static enum path_treatment read_directory_rec

[PATCH v2 4/9] 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. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- dir.c | 8 1 file changed, 8 insertions(+) diff --git a/dir.c b/dir.c index 6bd

[PATCH v2 3/9] dir: recurse into untracked dirs for ignored files

() to recurse into untracked directories to find the ignored files they contain when DIR_SHOW_IGNORED_TOO is set. This has the side effect of also collecting all untracked files in untracked directories as well. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- dir.c | 7 ++- 1 file c

[PATCH v2 2/9] t7061: expect failure where expected behavior will change

This changes tests for `status --ignored` from test_expect_success to test_expect_failure in preparation for a change in its expected behavior (namely, that ignored files in untracked dirs will be reported). Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7061-wtstatus-ignore.

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

that. Signed-off-by: Samuel Lijin <sxli...@gmail.com> --- t/t7300-clean.sh | 10 ++ 1 file changed, 10 insertions(+) diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index b89fd2a6a..252c75b40 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -653,4 +653,14 @@ test_expect_succes

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

that there are standard practices that I might have missed, so if there is anything along those lines, I'd appreciate you letting me know. (As an aside, about the git bisect thing: is there a script somewhere that people use to test patch series before sending them out?) Samuel Lijin (9): t7300: skip

Re: vger not relaying some of Junio's messages today?

Yep, I see these on public-inbox.org/git/ but not in my gmail inbox: - Brandon [RFC 01/14] through [RFC 14/14] convert dir.c to take an index parameter - Johanne's Coverity patch series

  1   2   >