Re: [PATCH v6 03/21] range-diff: first rudimentary implementation

2019-03-04 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > + else if (!line.buf[0] || starts_with(line.buf, "index ")) > + /* > + * A completely blank (not ' \n', which is context) > + * line is not valid in a diff. We skip it I no

AW: AW: fast-import fails with case sensitive tags due to case insensitive lock files

2019-03-04 Thread Wendeborn, Jonathan
Hi Johannes, >> One thing I still would like to encourage to is to improve the error >> message which is really misleading in this case. > Well, that is at least something you could do. After all, you use a > volunteer-driven project, so you could at least volunteer a little time to > improvin

Re: [PATCH] builtin/config.c: don't print a newline with --color

2019-03-04 Thread Junio C Hamano
Jeff King writes: > I do wonder, though, if we're digging ourselves a hole with the > inconsistency between different --types that will bite us later. Given > that it's not that hard to chomp the output (and as you noted, the shell > does it fairly transparently), and given that the caller has to

Re: [PATCH 1/1] Makefile: use `git ls-files` to list header files, if possible

2019-03-04 Thread Junio C Hamano
Jeff King writes: > This makes sense to me, though as you noted elsewhere, it doesn't fix > the gcrypt problem, since that file unconditionally wants to look at the > system gcrypt.h (and we control at the Makefile level whether we > actually look at sha256/gcrypt.h). Hmm, is that because the he

Re: [PATCH 1/1] curl: anonymize URLs in error messages and warnings

2019-03-04 Thread Jeff King
On Mon, Mar 04, 2019 at 07:33:46AM -0800, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > Just like 47abd85ba0 (fetch: Strip usernames from url's before storing > them, 2009-04-17) and later 882d49ca5c (push: anonymize URL in status > output, 2016-07-13), this change

Re: is it "git gc --prune=now" or "git gc --prune=all"?

2019-03-04 Thread Jeff King
On Sat, Mar 02, 2019 at 03:26:37AM -0500, Robert P. J. Day wrote: > more pedantry, but digging through "git gc", the man page reads: > >--prune= >Prune loose objects older than date (default is 2 weeks >ago, overridable by the config variable gc.pruneExpire). >

Re: Do test-path_is_{file,dir,exists} make sense anymore with -x?

2019-03-04 Thread Jeff King
On Mon, Mar 04, 2019 at 03:36:33PM +0100, SZEDER Gábor wrote: > On Tue, Feb 26, 2019 at 04:01:01PM -0500, Jeff King wrote: > > > + { set +x ; } 2>/dev/null 4>/dev/null > > > > Ah, this is the magic. Doing: > > > > set +x 2>/dev/null > > > > will still show it, but doing the redirection in a w

Re: Do test-path_is_{file,dir,exists} make sense anymore with -x?

2019-03-04 Thread Jeff King
On Sun, Mar 03, 2019 at 05:04:59PM +0100, SZEDER Gábor wrote: > > > - && chains in test helper functions; we must make sure that the > > > tracing is restored even in case of a failure. > > Actually, the && chain is not really an issue, because we can simply > break the && chain at the very

Re: Questions on GSoC 2019 Ideas

2019-03-04 Thread Jeff King
On Sun, Mar 03, 2019 at 05:12:59PM +0700, Duy Nguyen wrote: > On Sun, Mar 3, 2019 at 2:18 PM Christian Couder > wrote: > > One thing I am still worried about is if we are sure that adding > > parallelism is likely to get us a significant performance improvement > > or not. If the performance of t

[PATCH v2 2/2] fsck: always compute USED flags for unreachable objects

2019-03-04 Thread Jeff King
The --connectivity-only option avoids opening every object, and instead just marks reachable objects with a flag and compares this to the set of all objects. This strategy is discussed in more detail in 3e3f8bd608 (fsck: prepare dummy objects for --connectivity-check, 2017-01-17). This means that

[PATCH v2 1/2] doc/fsck: clarify --connectivity-only behavior

2019-03-04 Thread Jeff King
On reading this again, there are two things that were not immediately clear to me: - we do still check links to blobs, even though we don't open the blobs themselves - we do not do the normal fsck checks, even for non-blob objects we do open Let's reword it to make these points a lit

[PATCH v2 0/2] fsck --connectivity-only --dangling

2019-03-04 Thread Jeff King
On Mon, Mar 04, 2019 at 11:26:01PM -0500, Jeff King wrote: > > > So I sketched up what it might look like to just fix the bug (but kick > > > in only when needed), which is below. > > > > As the primariy purose of the --conn-only option being such, perhaps > > we should have made --no-dangling th

Re: [PATCH] doc/fsck: discuss mix of --connectivity-only and --dangling

2019-03-04 Thread Jeff King
On Fri, Mar 01, 2019 at 11:50:31AM +0900, Junio C Hamano wrote: > > I'm actually a little torn on this. We could consider this a bug, and > > the "option" to disable it when you want things to go fast is to say > > "--no-dangling". That leaves no way to say "show me the list of > > unreachable obj

Re: [PATCH] builtin/config.c: don't print a newline with --color

2019-03-04 Thread Jeff King
On Mon, Mar 04, 2019 at 02:05:40PM +0900, Junio C Hamano wrote: > >> With respect to backwards compatibility, my thinking on the matter was > >> basically: > >> > >> 1. Since --type=color was supposed to be a drop-in replacement for > >> --get-color, it's a bug that they don't behave the sa

Re: [PATCH 0/3] prettier bisect output

2019-03-04 Thread Jeff King
On Sun, Mar 03, 2019 at 07:33:17PM +0100, Christian Couder wrote: > > I've run across this many times, too. Since it's been bugging me for a > > decade, I thought I'd finally try to address it. Here are some patches. > > > > There was some discussion about a year ago about just using "git show" >

Re: [PATCH 2/3] bisect: fix internal diff-tree config loading

2019-03-04 Thread Jeff King
On Sun, Mar 03, 2019 at 06:59:19PM +0100, Christian Couder wrote: > On Fri, Feb 22, 2019 at 7:21 AM Jeff King wrote: > > > > When we run our internal diff-tree to show the bisected commit, we call > > init_revisions(), then load config, then setup_revisions(). But that > > order is wrong: we copy

Re: [PATCH 1/2] fetch: avoid calling write_or_die()

2019-03-04 Thread Jeff King
On Mon, Mar 04, 2019 at 08:42:40PM +0700, Duy Nguyen wrote: > > - } else > > - write_or_die(fd, buf->buf, buf->len); > > + } else { > > + if (write_in_full(fd, buf->buf, buf->len) < 0) > > + die_errno("unable to write to remote"); > >

Re: [PATCH 2/2] fetch: ignore SIGPIPE during network operation

2019-03-04 Thread Jeff King
On Mon, Mar 04, 2019 at 10:11:46AM +0900, Junio C Hamano wrote: > Jeff King writes: > > > ... But by dying immediately, we never actually > > read the ERR packet and report its content to the user. This is a (racy) > > problem on all platforms. > > Yeah, I do not think of a good solution for it

Re: Large object issue (Windows)

2019-03-04 Thread brian m. carlson
On Mon, Mar 04, 2019 at 07:04:02PM -0500, Patrick Hogg wrote: > Hi all, > > While investigating the last issue I reported (and fixed) I was trying > to come up with a good test case for repos with large objects. In the > process I found an issue on Windows with objects at least 4g large: > > git

Re: [GSoC][PATCH v3 3/3] t3600: use helpers to replace test -d/f/e/s

2019-03-04 Thread Eric Sunshine
On Mon, Mar 4, 2019 at 7:09 AM Rohit Ashiwal wrote: > Previously we were using `test -(d|f|e|s)` to verify the presence of a > directory/file, but we already have helper functions, viz, `test_path_is_dir`, > `test_path_is_file`,`test_path_is_missing`and`test_file_not_empty` > w

Re: [GSoC][PATCH v3 2/3] t3600: modernize style

2019-03-04 Thread Eric Sunshine
On Mon, Mar 4, 2019 at 7:08 AM Rohit Ashiwal wrote: > The tests in `t3600-rm.sh` were written long time ago, and has a lot of > style violations, including the mixed use of tabs and spaces, not having > the title and the opening quote of the body on the first line of the > tests, and other s

Re: [GSoC][PATCH v3 1/3] test functions: add function `test_file_not_empty`

2019-03-04 Thread Eric Sunshine
On Mon, Mar 4, 2019 at 7:08 AM Rohit Ashiwal wrote: > Add a helper function to ensure that a given path is a non-empty file, > and give an error message when it is not. > > Signed-off-by: Rohit Ashiwal > --- > diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh > @@ -593,6 +593,15 @@ t

Re: [GSoC][PATCH v3 0/3] Use helper functions in test script

2019-03-04 Thread Eric Sunshine
On Mon, Mar 4, 2019 at 7:08 AM Rohit Ashiwal wrote: > This patch ultimately aims to replace `test -(d|f|e|s)` calls in t3600-rm.sh > Previously we were using these to verify the presence of diretory/file, but > we already have helper functions, viz, `test_path_is_dir`, > `test_path_is_file`, > `t

Large object issue (Windows)

2019-03-04 Thread Patrick Hogg
Hi all, While investigating the last issue I reported (and fixed) I was trying to come up with a good test case for repos with large objects. In the process I found an issue on Windows with objects at least 4g large: git init test cd test echo "*.exe binary" > .gitattributes truncate -s 4g nullby

Re: [PATCH] merge-recursive: ignore_case shouldn't reject intentional removals

2019-03-04 Thread Woody Woodman
Sent from my iPhone

Re: is "git rebase ... [branch]" equivalent to first "git checkout [branch]"?

2019-03-04 Thread Junio C Hamano
"Robert P. J. Day" writes: > i *think* i know the answer to this based on man page and reading > the code, but i just want to verify that i'm not missing any subtlety. > ... > "If is specified, git rebase will perform an automatic git > checkout before doing anything else. Otherwise it rema

Re: Can't build first git commit

2019-03-04 Thread Jonathan Nieder
Hi, Fabio Aiuto wrote: > What a pity, It would have been very useful for me, to debug around > that simple version, to understand how everithing works. Jeff King suggested how you can update the build command to get it working. In general, I think people sometimes overthink what is involved in

Re: Can't build first git commit

2019-03-04 Thread asymptosis
On Mon, Mar 04, 2019 at 09:19:52PM +0100, Fabio Aiuto wrote: > What a pity, It would have been very useful for me, to debug around > that simple version, to understand how everithing works. To understand how Git works, it is a good idea to work through the "Git Internals" chapter in the Git Book:

Re: [PATCH v2 1/1] Makefile: use `git ls-files` to list header files, if possible

2019-03-04 Thread Jeff King
On Mon, Mar 04, 2019 at 05:47:06AM -0800, Johannes Schindelin via GitGitGadget wrote: > Therefore, just like in 335339758c (Makefile: ask "ls-files" to list > source files if available, 2011-10-18), we now prefer to use `git > ls-files` to enumerate the header files to enumerating them via `find`

Re: [PATCH 1/1] Makefile: use `git ls-files` to list header files, if possible

2019-03-04 Thread Jeff King
On Mon, Mar 04, 2019 at 12:08:41PM +0100, Johannes Schindelin wrote: > -- snipsnap -- > From c13d9985284d4b452db0d95b6949e02c533db634 Mon Sep 17 00:00:00 2001 > From: Johannes Schindelin > Date: Sat, 23 Feb 2019 20:38:40 +0100 > Subject: [PATCH] hdr-check: make it work on Windows > > On Windows,

Re: [PATCH 1/1] Makefile: use `git ls-files` to list header files, if possible

2019-03-04 Thread Jeff King
On Mon, Mar 04, 2019 at 01:38:13PM +0100, Johannes Schindelin wrote: > > So, tl;dr: soon, I will be submitting a patch to remove the > > 'hdr-check' target completely, for now anyway. > > You mentioned later that you might be the only person using that target, > and if that were so, I would agree

Re: [PATCH] rev-list: allow cached objects in existence check

2019-03-04 Thread Jeff King
On Mon, Mar 04, 2019 at 11:19:32AM -0800, Jonathan Tan wrote: > > - some callers of has_sha1_file() might care about durability between > > processes. Because it's baked in, the empty tree is safe for that > > (whatever follow-on process runs, it will also be baked in there). > > But

Re: [PATCH v2 1/1] Makefile: use `git ls-files` to list header files, if possible

2019-03-04 Thread Ramsay Jones
On 04/03/2019 20:38, Ramsay Jones wrote: > > > On 04/03/2019 13:47, Johannes Schindelin via GitGitGadget wrote: >> From: Johannes Schindelin >> >> In d85b0dff72 (Makefile: use `find` to determine static header >> dependencies, 2014-08-25), we switched from a static list of header >> files to

is "git rebase ... [branch]" equivalent to first "git checkout [branch]"?

2019-03-04 Thread Robert P. J. Day
i *think* i know the answer to this based on man page and reading the code, but i just want to verify that i'm not missing any subtlety. according to "man git-rebase": git rebase [-i | --interactive] [] [--exec ] [--onto ] [ []] and: "If is specified, git rebase will p

Re: Can't build first git commit

2019-03-04 Thread Jeff King
On Mon, Mar 04, 2019 at 08:58:37PM +0100, Fabio Aiuto wrote: > I'm trying to build first commit of git made by Linus. I mean the one > named e83c5163316f89bfbde7d9ab23... (I think this is enough). > But at building stage i have the following error: > > make all  > gcc -g -o update-cache update-ca

Re: [PATCH v2 1/1] Makefile: use `git ls-files` to list header files, if possible

2019-03-04 Thread Ramsay Jones
On 04/03/2019 13:47, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > In d85b0dff72 (Makefile: use `find` to determine static header > dependencies, 2014-08-25), we switched from a static list of header > files to a dynamically-generated one, asking `find` to enumera

Re: [PATCH 1/1] Makefile: use `git ls-files` to list header files, if possible

2019-03-04 Thread Ramsay Jones
On 04/03/2019 12:38, Johannes Schindelin wrote: >> So, tl;dr: soon, I will be submitting a patch to remove the >> 'hdr-check' target completely, for now anyway. > > You mentioned later that you might be the only person using that target, > and if that were so, I would agree. It is obviously d

Re: Can't build first git commit

2019-03-04 Thread Santiago Torres
It happens. Something that I liked playing with to get myself a better handle of how git works is using libgit2 and its python bindings. I find the codebase a little bit smaller and its bindings to higher-level languages can help you abstract the memory management and other low-level stuff that i

Re: Can't build first git commit

2019-03-04 Thread Fabio Aiuto
What a pity, It would have been very useful for me, to debug around that simple version, to understand how everithing works. Thank you Santiago. Fabio. Il giorno lun, 04/03/2019 alle 15.10 -0500, Santiago Torres ha scritto: > This commit is about 14 years old: > > Date:   Thu Apr 7 15:13:13 20

Re: [RFC PATCH 4/4] Add alias option to git branch

2019-03-04 Thread Phil Sainty
5/03/19 5:23 AM, Kenneth Cochran wrote: > Adding Phil for comments Thank you for following this up, Kenneth. I'll do some testing with your patch sometime soon. I've realised that the last version of my script that I posted to the mailing list was buggy, and that in wanting to hold off sending a

Re: Can't build first git commit

2019-03-04 Thread Santiago Torres
This commit is about 14 years old: Date: Thu Apr 7 15:13:13 2005 -0700 Unless you have a toolchain from around that time, I'd be very surprised if things build. Notably, there you're having an issue with the symbols that lssl is exposing (I suspect you're not even using the openssl 1.0.0 se

Can't build first git commit

2019-03-04 Thread Fabio Aiuto
Hi to all, I'm trying to build first commit of git made by Linus. I mean the one named e83c5163316f89bfbde7d9ab23... (I think this is enough). But at building stage i have the following error: make all  gcc -g -o update-cache update-cache.o read-cache.o -lssl /usr/bin/ld: update-cache.o: undefine

Re: [RFC PATCH 4/4] Add alias option to git branch

2019-03-04 Thread Kenneth Cochran
On Mon, Mar 4, 2019 at 1:34 PM Phil Sainty wrote: > > 5/03/19 5:23 AM, Kenneth Cochran wrote: > > Adding Phil for comments > > Thank you for following this up, Kenneth. I'll do some testing with > your patch sometime soon. Thanks! Any feedback is appreciated. > > I've realised that the last ver

Test mail

2019-03-04 Thread Harshavardhan Unnibhavi
Test mail

Re: [PATCH] rev-list: allow cached objects in existence check

2019-03-04 Thread Jonathan Tan
> This patch makes the minimal fix, which is to swap out a direct call to > oid_object_info_extended(), minus the SKIP_CACHED flag, instead of > calling has_object_file(). This is all that has_object_file() is doing > under the hood. And there's little danger of unrelated fallout from > other unexp

Re: [PATCH v3] commit-tree: utilize parse-options api

2019-03-04 Thread Brandon Richardson
On Mon, Mar 4, 2019 at 7:18 AM Duy Nguyen wrote: > You probably should mention about the extra _() too (e.g. "while at > there, mark more strings for translation") just to be clear it's > intentional. Good call. Will update. > > +#include "parse-options.h" > > +#include "string-list.h" > > Every

[PATCH] rev-list: allow cached objects in existence check

2019-03-04 Thread Jeff King
This fixes a regression in 7c0fe330d5 (rev-list: handle missing tree objects properly, 2018-10-05) where rev-list will now complain about the empty tree when it doesn't physically exist on disk. Before that commit, we relied on the traversal code in list-objects.c to walk through the trees. Since

[PATCH 0/5] git-p4: a few assorted fixes for branches, excludes

2019-03-04 Thread Mazo, Andrey
This series fixes a couple of corner cases with branch detection and handling of excludes by git-p4. Andrey Mazo (5): git-p4: detect/prevent infinite loop in gitCommitByP4Change() git-p4: match branches case insensitively if configured git-p4: don't groom exclude path list on every commit

[PATCH 1/5] git-p4: detect/prevent infinite loop in gitCommitByP4Change()

2019-03-04 Thread Mazo, Andrey
Under certain circumstances, gitCommitByP4Change() can enter an infinite loop resulting in `git p4 sync` hanging forever. The problem is that `git rev-list --bisect ^` can return ``, which would result in reinspecting and potentially an infinite loop. This can happen when importing just a subse

[PATCH 2/5] git-p4: match branches case insensitively if configured

2019-03-04 Thread Mazo, Andrey
git-p4 knows how to handle case insensitivity in file paths if core.ignorecase is set. However, when determining a branch for a file, it still does a case-sensitive prefix match. This may result in some file changes to be lost on import. For example, given the following commits 1. add //depot/mai

[PATCH 5/5] git-p4: don't exclude other files with same prefix

2019-03-04 Thread Mazo, Andrey
Make sure not to exclude files unintentionally if exclude paths are specified without a trailing /. I.e., don't exclude "//depot/file_dont_exclude" if run with "-//depot/file". Do this by ensuring that paths without a trailing "/" are only matched completely. Also, abort path search on the first

[PATCH 3/5] git-p4: don't groom exclude path list on every commit

2019-03-04 Thread Mazo, Andrey
Currently, `cloneExclude` array is being groomed (by removing trailing "...") on every changeset. (since `extractFilesFromCommit()` is called on every imported changeset) As a micro-optimization, do it once while parsing arguments. Also, prepend "/" and remove trailing "..." at the same time. Sig

[PATCH 4/5] git-p4: add failing test for "don't exclude other files with same prefix"

2019-03-04 Thread Mazo, Andrey
In preparation for a fix, add a failing test case to test that git-p4 doesn't exclude files with the same prefix unintentionally when exclude paths are specified without a trailing /. I.e., don't exclude "//depot/file_dont_exclude" if run with "-//depot/file". or don't exclude "//depot/discard_file

Re: [RFC PATCH 4/4] Add alias option to git branch

2019-03-04 Thread Kenneth Cochran
Adding Phil for comments

Re: [RFC PATCH 3/4] Add alias option to git branch

2019-03-04 Thread Kenneth Cochran
From 9f9b9010cb0b8c2874428d2f4bd21f06f747bfee Mon Sep 17 00:00:00 2001 From: Kenneth Cochran Date: Sun, 3 Mar 2019 15:34:20 -0600 Subject: [RFC PATCH 3/4] worktree: symref should be found anywhere in chain Cc: Sahil Dua , Duy Nguyen , Jeff King Currently, when searching for a shared symr

Re: [RFC PATCH 4/4] Add alias option to git branch

2019-03-04 Thread Kenneth Cochran
From c1bad54b29ae1c1d8548d248f6ecaa5959e55f7b Mon Sep 17 00:00:00 2001 From: Kenneth Cochran Date: Mon, 4 Mar 2019 01:08:46 -0600 Subject: [RFC PATCH 4/4] branch: disallow accidentally breaking symrefs Cc: Sahil Dua , Duy Nguyen , Jeff King Currently, symrefs are ignored when deleting a

Re: [RFC PATCH 2/4] Add alias option to git branch

2019-03-04 Thread Kenneth Cochran
From 5aa6f037642df3b358ab659d17b5fb5bc7936f0f Mon Sep 17 00:00:00 2001 From: Kenneth Cochran Date: Sun, 3 Mar 2019 15:05:11 -0600 Subject: [RFC PATCH 2/4] refs: add function to iteratively dereference symref chain Cc: Sahil Dua , Duy Nguyen , Jeff King As far as I can tell, currently, t

[RFC PATCH 0/4] Add alias option to git branch

2019-03-04 Thread Kenneth Cochran
From c1bad54b29ae1c1d8548d248f6ecaa5959e55f7b Mon Sep 17 00:00:00 2001 From: Kenneth Cochran Date: Mon, 4 Mar 2019 09:40:22 -0600 Subject: [RFC PATCH 0/4] Add alias option to git branch Cc: Sahil Dua , Duy Nguyen , Jeff King I find myself often using git symbolic-ref to get around work r

Re: [RFC PATCH 1/4] Add alias option to git branch

2019-03-04 Thread Kenneth Cochran
From 2f6409a39b24db826a22d2813ec8d5de46723500 Mon Sep 17 00:00:00 2001 From: Kenneth Cochran Date: Tue, 26 Feb 2019 04:41:22 -0600 Subject: [RFC PATCH 1/4] branch: add "--alias" option to create an alias Cc: Sahil Dua , Duy Nguyen , Jeff King Often, people have to use long or unweildly b

[PATCH 0/1] Anonymize URLs in error messages and warnings of git-remote-curl

2019-03-04 Thread Johannes Schindelin via GitGitGadget
I have just noticed locally that certain errors (in my case, a stale entry in /etc/hosts) use the un-scrubbed URL in the error message when dying. Let's scrub them. Johannes Schindelin (1): curl: anonymize URLs in error messages and warnings remote-curl.c | 19 +-- 1 file chang

[PATCH 1/1] curl: anonymize URLs in error messages and warnings

2019-03-04 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Just like 47abd85ba0 (fetch: Strip usernames from url's before storing them, 2009-04-17) and later 882d49ca5c (push: anonymize URL in status output, 2016-07-13), this change anonymizes URLs (read: strips them of user names and especially passwords) in user-facing error m

Re: AW: fast-import fails with case sensitive tags due to case insensitive lock files

2019-03-04 Thread Johannes Schindelin
Hi Jonathan, On Mon, 4 Mar 2019, Wendeborn, Jonathan wrote: > > Right now, you have some choices: > > • Volunteer to implement reftable. > > • Since you're on Windows 10, set your Git repository directory as > >   case-sensitive. > > • Use Windows Subsystem for Linux, which is case sensitive

Re: small fix for git-diff man page

2019-03-04 Thread Kenneth Cochran
> On Mar 4, 2019, at 8:09 AM, Олег Самойлов wrote: > > A small pull request. > > https://github.com/git/git/pull/580 > > Git diff can work with a tree in the form git diff tree..tree too, only > the form git diff commit...commit can't accept a tree instead of a commit. > > Also added useful

Re: [PATCH v3 1/1] worktree add: sanitize worktree names

2019-03-04 Thread Johannes Schindelin
Hi Duy, On Tue, 26 Feb 2019, Nguyễn Thái Ngọc Duy wrote: > diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh > index 286bba35d8..ea22207361 100755 > --- a/t/t2025-worktree-add.sh > +++ b/t/t2025-worktree-add.sh > @@ -570,4 +570,11 @@ test_expect_success '"add" an existing locked but

worth enhancing "man git-rebase" to show non-HEAD examples?

2019-03-04 Thread Robert P. J. Day
one of the things i've noticed about the examples in "man git-rebase" is that they invariably show rebasing relative to a branch point that has not moved. for example, there's this example: o---o---o---o---o master \ o---o---o---o---o next

Re: [PATCH] Makefile: remove the 'hdr-check' target

2019-03-04 Thread Johannes Schindelin
Hi Ramsay, On Sun, 3 Mar 2019, Ramsay Jones wrote: > The 'hdr-check' target has proved to be costly for some developers and > platforms, depending on the configuration, even when not using this > target. In part, this is due to the use of $(FIND) in the definition > of the $(LIB_H) variable. This

hope

2019-03-04 Thread alfasasi kelani
Good day , my name is Kelani Alfasasi, i sent you a mail and there was no response , please confirm that you did get this mail for more details. Regards Kelani Alfasasi

Re: Do test-path_is_{file,dir,exists} make sense anymore with -x?

2019-03-04 Thread SZEDER Gábor
On Tue, Feb 26, 2019 at 04:01:01PM -0500, Jeff King wrote: > > + { set +x ; } 2>/dev/null 4>/dev/null > > Ah, this is the magic. Doing: > > set +x 2>/dev/null > > will still show it, but doing the redirection in a wrapping block means > that it is applied before the command inside the block

small fix for git-diff man page

2019-03-04 Thread Олег Самойлов
A small pull request. https://github.com/git/git/pull/580 Git diff can work with a tree in the form git diff tree..tree too, only the form git diff commit...commit can't accept a tree instead of a commit. Also added useful example about using a tree with git diff. But what is strange. I changed

Re: [PATCH v2] git-gui: Handle Ctrl + BS/Del in the commit msg

2019-03-04 Thread Ismael Luceno
On 21/Feb/2019 12:47, Junio C Hamano wrote: > Ismael Luceno writes: > > >> I am not sure if going > >> back by one character from where the current insertion cursor is and > >> further go back to the wordstart would give the beginning of the > >> word to the left of the cursor, though. > >

[PATCH v2 1/1] Makefile: use `git ls-files` to list header files, if possible

2019-03-04 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin In d85b0dff72 (Makefile: use `find` to determine static header dependencies, 2014-08-25), we switched from a static list of header files to a dynamically-generated one, asking `find` to enumerate them. Back in those days, we did not use `$(LIB_H)` by default, and many a

[PATCH v2 0/1] Avoid calling find in the Makefile, if possible

2019-03-04 Thread Johannes Schindelin via GitGitGadget
I noticed this quite a bit of time ago, but did not get a chance to look into it in detail: all of a sudden, make started really slowly over here. The culprit turned out to be a find call, which was in the Makefile for ages, so I was puzzled why it only caused problems recently. After some diggin

Re: [PATCH 1/2] fetch: avoid calling write_or_die()

2019-03-04 Thread Duy Nguyen
On Sun, Mar 3, 2019 at 11:55 PM Jeff King wrote: > > The write_or_die() function has one quirk that a caller might not > expect: when it sees EPIPE from the write() call, it translates that > into a death by SIGPIPE. This doesn't change the overall behavior (the > program exits either way), but it

Re: [PATCH 2/2] setup: don't fail if commondir reference is deleted.

2019-03-04 Thread Michal Suchánek
Hello, On Thu, 21 Feb 2019 17:27:04 + Phillip Wood wrote: > Hi Eric > > On 21/02/2019 17:12, Eric Sunshine wrote: > > On Thu, Feb 21, 2019 at 12:07 PM Phillip Wood > > wrote: > >> On 21/02/2019 13:50, Michal Suchánek wrote: > On Tue, Feb 19, 2019 at 12:05 AM Michal Suchanek > >

Git Monorepo

2019-03-04 Thread Sandu Turcan
At my company we need to be able to manage access to different parts of source code. We've used separate git repos in the past, but then discovered Mercurial’s narrow extension, which supports sever side filtering. We all clone one repo, but get different subsets of the source, based on permissio

Re: [PATCH 1/1] Makefile: use `git ls-files` to list header files, if possible

2019-03-04 Thread Johannes Schindelin
Hi Ramsay, On Sun, 3 Mar 2019, Ramsay Jones wrote: > On 03/03/2019 17:19, Jeff King wrote: > > On Sat, Mar 02, 2019 at 09:05:24PM +0100, Johannes Schindelin wrote: > > > >>> That seems reasonable (regardless of whether it is in a script or in the > >>> Makefile). Another option is to use -maxdep

Re: [PATCH v3] commit-tree: utilize parse-options api

2019-03-04 Thread Duy Nguyen
On Mon, Mar 4, 2019 at 3:02 AM Brandon Richardson wrote: > > Rather than parse options manually, which is both difficult to > read and error prone, parse options supplied to commit-tree > using the parse-options api. > > It was discovered that the --no-gpg-sign option was documented > but not impl

[GSoC][PATCH v3 2/3] t3600: modernize style

2019-03-04 Thread Rohit Ashiwal
The tests in `t3600-rm.sh` were written long time ago, and has a lot of style violations, including the mixed use of tabs and spaces, not having the title and the opening quote of the body on the first line of the tests, and other shell script style violations. Update it to match the CodingG

[GSoC][PATCH v3 1/3] test functions: add function `test_file_not_empty`

2019-03-04 Thread Rohit Ashiwal
Add a helper function to ensure that a given path is a non-empty file, and give an error message when it is not. Signed-off-by: Rohit Ashiwal --- t/test-lib-functions.sh | 9 + 1 file changed, 9 insertions(+) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 80402a428

[GSoC][PATCH v3 3/3] t3600: use helpers to replace test -d/f/e/s

2019-03-04 Thread Rohit Ashiwal
Previously we were using `test -(d|f|e|s)` to verify the presence of a directory/file, but we already have helper functions, viz, `test_path_is_dir`, `test_path_is_file`,`test_path_is_missing`and`test_file_not_empty` with better functionality. These helper functions make code m

[GSoC][PATCH v3 0/3] Use helper functions in test script

2019-03-04 Thread Rohit Ashiwal
This patch ultimately aims to replace `test -(d|f|e|s)` calls in t3600-rm.sh Previously we were using these to verify the presence of diretory/file, but we already have helper functions, viz, `test_path_is_dir`, `test_path_is_file`, `test_path_is_missing` and `test_file_not_empty` with better funct

Re: [PATCH v3 1/1] worktree add: sanitize worktree names

2019-03-04 Thread Duy Nguyen
On Mon, Mar 04, 2019 at 06:19:15PM +0700, Duy Nguyen wrote: > On Wed, Feb 27, 2019 at 11:05 PM Jeff King wrote: > > > > On Wed, Feb 27, 2019 at 09:23:33AM -0500, Eric Sunshine wrote: > > > > > > If we just cared about saying "is this worktree name valid", I'd suggest > > > > actually constructing

Re: [PATCH v3 1/1] worktree add: sanitize worktree names

2019-03-04 Thread Duy Nguyen
On Wed, Feb 27, 2019 at 11:05 PM Jeff King wrote: > > On Wed, Feb 27, 2019 at 09:23:33AM -0500, Eric Sunshine wrote: > > > > If we just cared about saying "is this worktree name valid", I'd suggest > > > actually constructing a sample refname with the worktree name embedded > > > in it and feeding

Re: [PATCH 1/1] Makefile: use `git ls-files` to list header files, if possible

2019-03-04 Thread Johannes Schindelin
Hi Peff, On Sun, 3 Mar 2019, Jeff King wrote: > By the way, "make hdr-check" already fails for me on master, as I do not > have libgcrypt installed, and it unconditionally checks sha256/gcrypt.h. Oh? I thought it'd fail only on Windows, so I have not submitted https://github.com/dscho/git/commit

End of Outreachy internship

2019-03-04 Thread Slavica Djukic
Hi everyone, Today is officially the last day of my Outreachy internship. I wanted to say a few things about my experience and future of the project I worked on. Project was "Turn git add -i into built-in" with Johannes Schindelin as my mentor. I truly had amazing time, I learned so much about c

[PATCH 1/1] gitk: Update Bulgarian translation (317t)

2019-03-04 Thread ash
From: Alexander Shopov Signed-off-by: Alexander Shopov --- po/bg.po | 660 +-- 1 file changed, 343 insertions(+), 317 deletions(-) diff --git a/po/bg.po b/po/bg.po index 407d5550b1..87ab1fac24 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,15 +1,

Re: [PATCH 1/2] gitk: refresh the colour scheme

2019-03-04 Thread Andrej Shadura
On 03/03/2019 00:02, Paul Mackerras wrote: > On Tue, Feb 26, 2019 at 12:05:34PM +0100, Andrej Shadura wrote: >> The colours gitk is currently using are from the basic 16 colour >> palette, and are a bit too intensive to be comfortable or pleasant >> to work with. >> >> Adjust the main colours (comm

Re: [PATCH 1/1] Add feature to show log as a tree

2019-03-04 Thread Micha Nelissen
On 03-03-2019 14:16, Junio C Hamano wrote: I am not sure what you mean by a "tree". It definitely is not a tree perceived by Git users (which is what represents a directory structure), and abusing the established term is confusing. I called it tree because the output looks like (right half) of

Re: [GSoC] Query regarding microproject

2019-03-04 Thread Christian Couder
On Mon, Mar 4, 2019 at 8:54 AM Duy Nguyen wrote: > > On Mon, Mar 4, 2019 at 2:43 PM Junio C Hamano wrote: > > > > Umang Parmar writes: > > > > > I am interested in micro project "Add configuration options for > > > some commonly used command-line”. So can you point me out to > > > implementation

Re: [WIP 0/7] CDN offloading of fetch response

2019-03-04 Thread Christian Couder
Hi, On Fri, Mar 1, 2019 at 12:21 AM Jonathan Nieder wrote: > > Sorry for the slow followup. Thanks for probing into the design --- > this should be useful for getting the docs to be clear. > > Christian Couder wrote: > > > So it's likely that users will want a way to host on such sites > > incom

Re: [WIP 0/7] CDN offloading of fetch response

2019-03-04 Thread Christian Couder
On Tue, Feb 26, 2019 at 10:12 AM Ævar Arnfjörð Bjarmason wrote: > > On Tue, Feb 26 2019, Christian Couder wrote: > > > On Tue, Feb 26, 2019 at 12:45 AM Jonathan Nieder wrote: > >> But the same thing can happen with redirects, with embedded assets in > >> web pages, and so on. > > > > I don't thi

[GIT PULL] l10n updates for 2.21.0 round 2.1

2019-03-04 Thread Jiang Xin
Hi Junio, Please pull the following l10n updates for Git 2.21.0 to the maint branch. These updates include l10n of Vietnamese and fixes of l10n of French and Catalan. The following changes since commit 8104ec994ea3849a968b4667d072fedd1e688642: Git 2.21 (2019-02-24 07:55:19 -0800) are availabl