Re: Question about git log --merge option

Thanks Junio, I understand the option's meaning now :) On Thu, Apr 14, 2016 at 4:37 AM, Junio C Hamano wrote: > Andrey Hsiao writes: > >> Dear list: >> >> Just encountered the --merge option for git log. >> >> In the man page, it has the following explanation: >> - After a failed merge, show ref

Re: Migrating away from SHA-1?

On Tue, Apr 12, 2016 at 07:15:34PM -0400, David Turner wrote: > > If SHA-1 is broken (in certain ways), someone *can* replace an > arbitrary blob. GPG does not help in this case, because the signature > is over the commit object (which points to a tree, which eventually > points to the blob), and

Re: Merge conflicts are reported relative to root not cwd

On Wed, Apr 13, 2016 at 3:41 PM, Jeff King wrote: > On Wed, Apr 13, 2016 at 03:18:24PM -0700, Stefan Beller wrote: > >> * This is your preference for whole-tree operations. What are >>whole-tree operations? (Is there a concise definition? >>Are submodules whole tree operations?) >>Thes

Re: Ambiguous sha-1 during a rebase

On Wed, Apr 13, 2016 at 03:42:44PM -0700, Junio C Hamano wrote: > Mike Hommey writes: > > > Should git-rebase use full sha-1s under the hood to avoid these type of > > races? > > It already should be doing so since Aug 2013, IIRC. I'm using 2.8.1. Would there have been a regression? Mike -- To

Re: [PATCHv3 0/2] Fix relative path issues in recursive submodules.

Stefan Beller writes: > ... so what is your concern for holding instead of merging? Nothing specific. Remember, I may be aware of all the discussion threads but I am certainly not reading every word in every thread. When the participants are trustworthy enough, instead of going back to the list

Re: Ambiguous sha-1 during a rebase

Mike Hommey writes: > Should git-rebase use full sha-1s under the hood to avoid these type of > races? It already should be doing so since Aug 2013, IIRC. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info

Re: Merge conflicts are reported relative to root not cwd

On Wed, Apr 13, 2016 at 03:18:24PM -0700, Stefan Beller wrote: > * This is your preference for whole-tree operations. What are >whole-tree operations? (Is there a concise definition? >Are submodules whole tree operations?) >These questions are motivated by origin/sb/submodule-path-misc

Re: Merge conflicts are reported relative to root not cwd

Stefan Beller writes: > * What are >whole-tree operations? "git merge" does not let you merge "changes just in my current directory". You only merge the whole tree, and you can get conflicts from all over the tree, not just in your current directory. -- To unsubscribe from this list:

Re: Default authentication over https?

On Mon, Apr 11, 2016 at 12:04:02PM -0400, Isaac Levy wrote: > I use a git server which requires authentication over https. Git seems > determined to always try an unauthenticated request first, slowing > down operations by a couple seconds. > > Is there a way to configure git to default to authen

Re: [PATCHv3 0/2] Fix relative path issues in recursive submodules.

On Wed, Apr 13, 2016 at 3:23 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> >> Ok fixed this instance here, too. > > ... So... should I hold sb/submodule-helper-clone-regression-fix? > It has been marked to be merged to 'next' for some time now. (Both things Ramsay pointed at are in subm

Ambiguous sha-1 during a rebase

Hi, Something interesting happened to me. I was in the middle of an interactive rebase, and after a --continue, I got: error: short SHA1 e34ff55 is ambiguous. fatal: Needed a single revision Invalid commit name: e34ff55 One thing that happened, is that, while running that interactive rebase, I /

Re: clone hang prevention / timeout?

On Mon, Apr 11, 2016 at 10:49:19PM +0100, Jason Vas Dias wrote: > Is there any option I can specify to get the clone to timeout, or do I > manually > have to strace the git process and send it a signal after a hang is detected? Oh, one other thing you might consider, it something like "timeout"

Re: clone hang prevention / timeout?

On Mon, Apr 11, 2016 at 10:49:19PM +0100, Jason Vas Dias wrote: > It appears GIT has no way of specifying a timeout for a clone operation - > if the server decides not to complete a get request, the clone can > hang forever - > is this correct ? Yes. Git's protocol has no timeouts, though each si

Re: [PATCHv3 0/2] Fix relative path issues in recursive submodules.

Stefan Beller writes: > > Ok fixed this instance here, too. ... So... should I hold sb/submodule-helper-clone-regression-fix? It has been marked to be merged to 'next' for some time now. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.

Re: Merge conflicts are reported relative to root not cwd

On Wed, Apr 13, 2016 at 2:58 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> $ cd t/ >> $ git merge ... >> ... >> Auto-merging builtin/submodule--helper.c >> Auto-merging builtin/fetch.c >> CONFLICT (content): Merge conflict in builtin/fetch.c >> Auto-merging builtin/clone.c >> Auto-mergin

Re: [PATCH v4 15/16] branch: use ref-filter printing APIs

On Thu, Apr 14, 2016 at 12:31:41AM +0530, Karthik Nayak wrote: > On Wed, Apr 13, 2016 at 8:42 PM, Junio C Hamano wrote: > >>> Having said that, doesn't this need to be further adjusted for > >>> 95c38fb0 (branch: fix shortening of non-remote symrefs, 2016-04-03)? > >>> > >>> http://thread.gmane.o

Re: credentials are being erased from credential manager via git credential-wincred erase command

On Wed, Apr 13, 2016 at 01:12:06PM -0600, Bryan Turner wrote: > From the credentials code in Git (which I could be mis-reading; I'm > sure others on the list will correct me if I'm wrong), it appears the > erase is done after a cached credential is rejected by the server. > That implies that, peri

Re: Why doesn't gitk highlight commit references from git-describe?

Stephen Kelly wrote: > cmake describe --contains Oops, I mean git describe --contains of course. Thanks, Steve. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-in

Re: Merge conflicts are reported relative to root not cwd

Stefan Beller writes: > $ cd t/ > $ git merge ... > ... > Auto-merging builtin/submodule--helper.c > Auto-merging builtin/fetch.c > CONFLICT (content): Merge conflict in builtin/fetch.c > Auto-merging builtin/clone.c > Auto-merging README.md > ... > > It should say ../builtin/fetch.c IMHO. > Any

Re: Why doesn't gitk highlight commit references from git-describe?

Stefan Beller wrote: > We also want to have 4b9ab0ee0130~1^2 to work `right`, in the sense > that not just the hexadecimals are highlighted and linking to > 4b9ab0ee0130, but the whole expression should link to 49e863b02ae177. Presumably the same logic which finds 4b9ab0ee0130 to link it can also

Re: Why doesn't gitk highlight commit references from git-describe?

Stefan Beller writes: > But it should not be just tags? > > We also want to have 4b9ab0ee0130~1^2 to work `right`, I'd consider that just "crazy", though. I'd be just happy to see 4b9ab0ee0130 highlighted and lead to the named commit, i.e. as long as ~1^2 is not part of the link, it is sufficie

Re: [PATCH] git-p4.py: Make submit working on bare repository

Amadeusz Żołnowski writes: >> Has anything happened to this topic after this? I am wondering if I >> should discard the topic az/p4-bare-no-rebase without prejudice. > > Sorry, I haven't got time to take a loot at this, but I'll return to > that soon, OK? I'll prepare a patch with an option to s

Re: Why doesn't gitk highlight commit references from git-describe?

On Wed, Apr 13, 2016 at 2:32 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> How would you know(/code) that v1.6.0-rc0~120^2 is a text worth linking? >> "v1.6.0-rc0" is a custom string as that is how we name tags in this project. >> It can follow any convention in other projects. >> >> May

Re: Why doesn't gitk highlight commit references from git-describe?

Stefan Beller wrote: > How would you know(/code) that v1.6.0-rc0~120^2 is a text worth linking? > "v1.6.0-rc0" is a custom string as that is how we name tags in this > project. It can follow any convention in other projects. > > Maybe a first approximation is if there is a `~` followed by numbers

Merge conflicts are reported relative to root not cwd

$ cd t/ $ git merge ... ... Auto-merging builtin/submodule--helper.c Auto-merging builtin/fetch.c CONFLICT (content): Merge conflict in builtin/fetch.c Auto-merging builtin/clone.c Auto-merging README.md ... It should say ../builtin/fetch.c IMHO. Any reason to keep the old behavior? Thanks, Stefa

Re: Why doesn't gitk highlight commit references from git-describe?

Stefan Beller writes: > How would you know(/code) that v1.6.0-rc0~120^2 is a text worth linking? > "v1.6.0-rc0" is a custom string as that is how we name tags in this project. > It can follow any convention in other projects. > > Maybe a first approximation is if there is a `~` followed by number

Re: Why doesn't gitk highlight commit references from git-describe?

On Wed, Apr 13, 2016 at 1:36 PM, Stephen Kelly wrote: > Hi, > > If I look at git commit 89ea90351dd32fbe384d0cf844640a9c55606f3b in gitk, it > does not linkify the v1.6.0-rc0~120^2 in the commit message. > > Is there any reason for that, or can gitk be changed? Sure it can be changed. Go for it.

Re: [PATCHv3 0/2] Fix relative path issues in recursive submodules.

Ramsay Jones writes: > Also, I note that t7406-submodule-update.sh test #4 is failing. > (looks like absolute vs relative paths) I think that is $gmane/291363 http://thread.gmane.org/gmane.comp.version-control.git/291334/focus=291363 -- To unsubscribe from this list: send the line "unsubscribe

Re: [PATCH] git-p4.py: Make submit working on bare repository

Hi, Junio C Hamano writes: > Has anything happened to this topic after this? I am wondering if I > should discard the topic az/p4-bare-no-rebase without prejudice. Sorry, I haven't got time to take a loot at this, but I'll return to that soon, OK? I'll prepare a patch with an option to skip reb

Why doesn't gitk highlight commit references from git-describe?

Hi, If I look at git commit 89ea90351dd32fbe384d0cf844640a9c55606f3b in gitk, it does not linkify the v1.6.0-rc0~120^2 in the commit message. Is there any reason for that, or can gitk be changed? Thanks, Steve. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of

Re: Question about git log --merge option

Andrey Hsiao writes: > Dear list: > > Just encountered the --merge option for git log. > > In the man page, it has the following explanation: > - After a failed merge, show refs that touch files having a conflict > and don't exist on all heads to merge. git log --merge [options] -- $path

Re: [PATCHv3 0/2] Fix relative path issues in recursive submodules.

On Wed, Apr 13, 2016 at 12:21 PM, Ramsay Jones wrote: > > > On 12/04/16 16:58, Stefan Beller wrote: >> On Fri, Apr 1, 2016 at 7:41 AM, Ramsay Jones >> wrote: >>> > [snip[ > - } + sm_gitdir_rel = strbuf_detach(&sb, NULL); >>> >>> ... this is good, but ... >>> + sm_gitdir

Re: [PATCHv3 0/2] Fix relative path issues in recursive submodules.

On 12/04/16 16:58, Stefan Beller wrote: > On Fri, Apr 1, 2016 at 7:41 AM, Ramsay Jones > wrote: >> [snip[ >>> - } >>> + sm_gitdir_rel = strbuf_detach(&sb, NULL); >> >> ... this is good, but ... >> >>> + sm_gitdir = absolute_path(sm_gitdir_rel); >>> >>> if (!is_absolute_path(pa

Re: credentials are being erased from credential manager via git credential-wincred erase command

Ken, I'm one of the developers for Atlassian Bitbucket Server (formerly Stash), which I believe you're running. >From the credentials code in Git (which I could be mis-reading; I'm sure others on the list will correct me if I'm wrong), it appears the erase is done after a cached credential is rej

Re: [PATCH v4 15/16] branch: use ref-filter printing APIs

On Wed, Apr 13, 2016 at 8:42 PM, Junio C Hamano wrote: >>> Having said that, doesn't this need to be further adjusted for >>> 95c38fb0 (branch: fix shortening of non-remote symrefs, 2016-04-03)? >>> >>> http://thread.gmane.org/gmane.comp.version-control.git/290622/focus=290624 >>> >> >> That was o

credentials are being erased from credential manager via git credential-wincred erase command

Good afternoon, My company setup wincred for management of our git/stash user credentials for our automated build scripts. It works great for days, sometimes a couple weeks. Then one day build haven't run and we discover the scripts are randomly found at a user prompt awaiting stash user creden

Re: [PATCH v4 03/16] index-helper: new daemon for caching index and related stuff

On Wed, 2016-04-13 at 20:43 +0700, Duy Nguyen wrote: > On Wed, Apr 13, 2016 at 7:32 AM, David Turner < > dtur...@twopensource.com> wrote: > > +NOTES > > +- > > + > > +$GIT_DIR/index-helper.path is a symlink > > In multiple worktree context, this file will be per-worktree. So we > have one daem

Re: [PATCH] t1500-rev-parse: rewrite each test to run in isolation

On Wed, Apr 13, 2016 at 12:54:16AM -0400, Eric Sunshine wrote: > > -# label is-bare is-inside-git is-inside-work prefix git-dir > > absolute-git-dir > > +test_expect_success '.git/: is-inside-git-dir' ' > > + (cd .git && test true = "$(git rev-parse --is-inside-git-dir)") > > Simpler: > >

Re: [PATCH] gitk: Fix how remote branch names with / are drawn

On Wed, Apr 13, 2016 at 2:19 PM, David Holmer wrote: > I agree that this switches the issue around and that a remote with a > '/' in the name would be miss colored in the same way a branch with a > '/' in the name is miss colored now. However, I would guess that > branches with '/' are MUCH MUCH m

Re: [PATCH] gitk: Fix how remote branch names with / are drawn

I agree that this switches the issue around and that a remote with a '/' in the name would be miss colored in the same way a branch with a '/' in the name is miss colored now. However, I would guess that branches with '/' are MUCH MUCH more common than remotes with '/', so like you say "this is a b

Re: [PATCH v1] Documentation: add setup instructions for Travis CI

On Wed, Apr 13, 2016 at 10:39 AM, Junio C Hamano wrote: > here, create a "GitHub-Travis CI hints" section just before "MUA > specific hints" section, Somebody (I think it was you, Lars?) at GitMerge suggested to break up the SubmittingPatches document into more than one, i.e. the MUA hints and t

Re: [PATCH v14 4/6] parse-options.c: make OPTION_COUNTUP respect "unspecified" values

On Wed, Apr 13, 2016 at 1:43 PM, Pranit Bauva wrote: > On Wed, Apr 13, 2016 at 11:03 PM, Eric Sunshine > wrote: >> On Wed, Apr 13, 2016 at 4:39 AM, Pranit Bauva wrote: >>> On Wed, Apr 13, 2016 at 11:26 AM, Eric Sunshine >>> wrote: On Tue, Apr 12, 2016 at 7:02 PM, Pranit Bauva wrot

Re: 0 bot for Git

Lars Schneider writes: > I am not sure what you mean by "fail to hit 'pu'". Maybe we talk at > cross purposes. Here is what I think you do, please correct me: > > 1.) You pick the topics from the mailing list and create feature > branches for each one of them. E.g. one of my recent topics >

Re: [PATCH v1] Documentation: add setup instructions for Travis CI

larsxschnei...@gmail.com writes: > From: Lars Schneider > > Signed-off-by: Lars Schneider > --- > Documentation/SubmittingPatches | 39 --- > 1 file changed, 36 insertions(+), 3 deletions(-) > > diff --git a/Documentation/SubmittingPatches b/Documentation/Sub

Re: [PATCH v14 6/6] commit: add a commit.verbose config variable

On Wed, Apr 13, 2016 at 5:15 AM, Pranit Bauva wrote: > On Wed, Apr 13, 2016 at 11:44 AM, Eric Sunshine > wrote: >> On Tue, Apr 12, 2016 at 7:02 PM, Pranit Bauva wrote: >>> +test_expect_success 'status does not verbose without --verbose' ' >>> + git status >actual && >>> + ! grep "^d

Re: [PATCH v14 4/6] parse-options.c: make OPTION_COUNTUP respect "unspecified" values

On Wed, Apr 13, 2016 at 11:03 PM, Eric Sunshine wrote: > On Wed, Apr 13, 2016 at 4:39 AM, Pranit Bauva wrote: >> On Wed, Apr 13, 2016 at 11:26 AM, Eric Sunshine >> wrote: >>> On Tue, Apr 12, 2016 at 7:02 PM, Pranit Bauva >>> wrote: +test_expect_success 'OPT_COUNTUP() resets to 0 with --n

Re: 0 bot for Git

On Wed, Apr 13, 2016 at 10:29:57AM -0700, Stefan Beller wrote: > > At Git Merge Greg said (paraphrasing here): > > We waste developers time, because we have plenty of it. Maintainers time > however is precious because maintainers are the bottleneck and a scare > resource to come by. s/scar

Re: [PATCH v14 4/6] parse-options.c: make OPTION_COUNTUP respect "unspecified" values

On Wed, Apr 13, 2016 at 4:39 AM, Pranit Bauva wrote: > On Wed, Apr 13, 2016 at 11:26 AM, Eric Sunshine > wrote: >> On Tue, Apr 12, 2016 at 7:02 PM, Pranit Bauva wrote: >>> +test_expect_success 'OPT_COUNTUP() resets to 0 with --no- flag' ' >>> + test-parse-options --no-verbose >output 2>ou

Re: 0 bot for Git

On Wed, Apr 13, 2016 at 10:09 AM, Lars Schneider wrote: > >> On 13 Apr 2016, at 18:27, Junio C Hamano wrote: >> >> Lars Schneider writes: >> >>> @Junio: >>> If you setup Travis CI for your https://github.com/gitster/git fork >>> then Travis CI would build all your topic branches and you (and >>>

Re: [PATCH v14 3/6] t0040-parse-options: improve test coverage

On Wed, Apr 13, 2016 at 4:59 AM, Pranit Bauva wrote: > On Wed, Apr 13, 2016 at 10:56 AM, Eric Sunshine > wrote: >> On Tue, Apr 12, 2016 at 7:02 PM, Pranit Bauva wrote: >>> +test_expect_success '--no-quiet sets quiet to 0' ' >>> + test-parse-options --no-quiet >output 2>output.err && >> >>

Re: [PATCH v4 03/16] index-helper: new daemon for caching index and related stuff

On Wed, 2016-04-13 at 18:00 +0100, Ramsay Jones wrote: > > On 13/04/16 01:32, David Turner wrote: > > [snip] > > > diff --git a/git-compat-util.h b/git-compat-util.h > > index c07e0c1..8b878fe 100644 > > --- a/git-compat-util.h > > +++ b/git-compat-util.h > > @@ -513,6 +513,7 @@ static inline in

Re: 0 bot for Git

> On 13 Apr 2016, at 18:27, Junio C Hamano wrote: > > Lars Schneider writes: > >> @Junio: >> If you setup Travis CI for your https://github.com/gitster/git fork >> then Travis CI would build all your topic branches and you (and >> everyone who is interested) could check >> https://travis-ci.

Re: [PATCH v4 03/16] index-helper: new daemon for caching index and related stuff

On 13/04/16 01:32, David Turner wrote: [snip] > diff --git a/git-compat-util.h b/git-compat-util.h > index c07e0c1..8b878fe 100644 > --- a/git-compat-util.h > +++ b/git-compat-util.h > @@ -513,6 +513,7 @@ static inline int ends_with(const char *str, const char > *suffix) > #define PROT_READ 1

Question about git log --merge option

Dear list: Just encountered the --merge option for git log. In the man page, it has the following explanation: - After a failed merge, show refs that touch files having a conflict and don't exist on all heads to merge. I tried this option and get below results: 1. For a failed merge (with confl

Re: 0 bot for Git

Lars Schneider writes: > @Junio: > If you setup Travis CI for your https://github.com/gitster/git fork > then Travis CI would build all your topic branches and you (and > everyone who is interested) could check > https://travis-ci.org/gitster/git/branches to see which branches > will break pu

Re: 0 bot for Git

Matthieu Moy writes: True, presumably the Travis integration already solves that part, so I suspect it is just the matter of setting up: - a fork of git.git and have Travis monitor any and all new branches; - a bot that scans the list traffic, applies each s

Re: 0 bot for Git

> On 13 Apr 2016, at 14:30, Matthieu Moy wrote: > > Lars Schneider writes: > >>> On 13 Apr 2016, at 07:43, Matthieu Moy wrote: >>> >>> Junio C Hamano writes: >>> Matthieu Moy writes: True, presumably the Travis integration already solves that part, so I suspect it is

Re: [PATCH v4 4/4] format-patch: introduce format.base configuration

On Tue, Apr 12, 2016 at 12:47:23PM -0700, Junio C Hamano wrote: >Xiaolong Ye writes: > >> +static int config_base_commit; > >This variable is used as a simple boolean whose name is overly broad >(if it were named "config_base_auto" this complaint would not >apply). If you envision possible future

Re: [PATCH v4 2/4] format-patch: add '--base' option to record base tree info

On Tue, Apr 12, 2016 at 12:08:33PM -0700, Junio C Hamano wrote: >Xiaolong Ye writes: > >> Maintainers or third party testers may want to know the exact base tree >> the patch series applies to. Teach git format-patch a '--base' option >> to record the base tree info and append it at the end of the

Re: [PATCH v2 19/21] bisect: use a bottom-up traversal to find relevant weights

On Sun, Apr 10, 2016 at 3:19 PM, Stephan Beyer wrote: > The idea is to reverse the DAG and perform a traversal > starting on all sources of the reversed DAG. > > We walk from the bottom commits, incrementing the weight while > walking on a part of the graph that is single strand of pearls, > or do

Re: 0 bot for Git

> > I don't know how 0 bot solves this, but the obvious issue with this > > approach is to allow dealing with someone sending a patch like > > > > +++ Makefile > > --- Makefile > > +all: > > + rm -fr $(HOME); sudo rm -fr / > > > > to the list. One thing that Travis gives us for free is isolation:

Re: [PATCH v4 03/16] index-helper: new daemon for caching index and related stuff

On Wed, Apr 13, 2016 at 7:32 AM, David Turner wrote: > +NOTES > +- > + > +$GIT_DIR/index-helper.path is a symlink In multiple worktree context, this file will be per-worktree. So we have one daemon per worktree. I think that's fine. > to a directory in $TMPDIR > +containing a Unix domain soc

Re: CC in git cover letter vs patches (was Re: [PATCH 0/19] get rid of superfluous __GFP_REPORT)

On Wed 13-04-16 16:51:37, Vineet Gupta wrote: > Trimming CC list + CC git folks > > Hi Michal, > > On Monday 11 April 2016 04:37 PM, Michal Hocko wrote: > > Hi, > > this is the second version of the patchset previously sent [1] > > I have a git question if you didn't mind w.r.t. this series. May

Re: [PATCH v2 17/21] bisect: rename count_distance() to compute_weight()

On Sun, Apr 10, 2016 at 3:19 PM, Stephan Beyer wrote: > > @@ -70,7 +70,7 @@ static inline int distance_direction(struct commit *commit) > return 0; > } > > -static int count_distance(struct commit *elem) > +static int compute_weight(struct commit *elem) > { > int nr = 0; >

Re: [PATCH v2 16/21] bisect: make total number of commits global

On Sun, Apr 10, 2016 at 3:19 PM, Stephan Beyer wrote: > The total number of commits in a bisect process is a property of > the bisect process. Making this property global helps to make the code > clearer. > > Signed-off-by: Stephan Beyer > --- > bisect.c | 74 > +

[PATCH] Move test-* to t/helper/ subdirectory

This keeps top dir a bit less crowded. And because these programs are for testing purposes, it makes sense that they stay somewhere in t/ Signed-off-by: Nguyễn Thái Ngọc Duy --- This patch will break any patches that add new test programs. Luckily, none in 'next' or 'pu' does that. I know lmdb

[PATCH 16/25] worktree.c: add validate_worktree()

This function is later used by "worktree move" and "worktree remove" to ensure that we have a good connection between the repository and the worktree. Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 63 ++ worktree.h | 5 + 2

[PATCH 21/25] worktree: add "lock" command

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-worktree.txt | 12 -- builtin/worktree.c | 41 ++ contrib/completion/git-completion.bash | 5 - t/t2028-worktree-move.sh (new +x) | 34 ++

[PATCH 13/25] worktree.c: add clear_worktree()

Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 14 +++--- worktree.h | 5 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/worktree.c b/worktree.c index 4c38414..b4e4b57 100644 --- a/worktree.c +++ b/worktree.c @@ -4,14 +4,22 @@ #include "worktree.h" #include

[PATCH 24/25] worktree move: accept destination as directory

Similar to "mv a b/", which is actually "mv a b/a", we extract basename of source worktree and create a directory of the same name at destination if dst path is a directory. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 19 ++- 1 file changed, 18 insertions(+), 1 d

[PATCH 17/25] worktree.c: add update_worktree_location()

Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 25 + worktree.h | 6 ++ 2 files changed, 31 insertions(+) diff --git a/worktree.c b/worktree.c index 28195b1..e526e25 100644 --- a/worktree.c +++ b/worktree.c @@ -282,6 +282,31 @@ int validate_worktree(const struc

[PATCH 18/25] worktree.c: add is_worktree_locked()

Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 18 ++ worktree.h | 6 ++ 2 files changed, 24 insertions(+) diff --git a/worktree.c b/worktree.c index e526e25..37eec09 100644 --- a/worktree.c +++ b/worktree.c @@ -219,6 +219,24 @@ int is_main_worktree(const struct worktr

[PATCH 14/25] worktree.c: add find_worktree_by_path()

Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 16 worktree.h | 6 ++ 2 files changed, 22 insertions(+) diff --git a/worktree.c b/worktree.c index b4e4b57..e444ad1 100644 --- a/worktree.c +++ b/worktree.c @@ -198,6 +198,22 @@ const char *get_worktree_git_dir(const str

[PATCH 15/25] worktree.c: add is_main_worktree()

Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 5 + worktree.h | 5 + 2 files changed, 10 insertions(+) diff --git a/worktree.c b/worktree.c index e444ad1..e878f49 100644 --- a/worktree.c +++ b/worktree.c @@ -214,6 +214,11 @@ struct worktree *find_worktree_by_path(struct worktree

[PATCH 22/25] worktree: add "unlock" command

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-worktree.txt | 5 + builtin/worktree.c | 31 +++ contrib/completion/git-completion.bash | 2 +- t/t2028-worktree-move.sh | 14 ++ 4 files changed, 51 i

[PATCH 25/25] worktree: add "remove" command

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-worktree.txt | 22 + builtin/worktree.c | 81 ++ contrib/completion/git-completion.bash | 5 ++- t/t2028-worktree-move.sh | 26 +++ 4 files changed,

[PATCH 19/25] worktree: avoid 0{40}, too many zeroes, hard to read

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index 7ff66fa..e041d7f 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -261,7 +261,7 @@ static int add_worktree(const

[PATCH 20/25] worktree: simplify prefixing paths

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index e041d7f..a9e91ab 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -330,7 +330,7 @@ static int add(int ac, cons

[PATCH 23/25] worktree: add "move" commmand

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-worktree.txt | 6 +++- builtin/worktree.c | 60 ++ contrib/completion/git-completion.bash | 2 +- t/t2028-worktree-move.sh | 29 4 files changed,

[PATCH 11/25] worktree.c: use is_dot_or_dotdot()

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 2 +- worktree.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index 575f899..7ff66fa 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -94,7 +94,7 @@ s

[PATCH 08/25] completion: support git-worktree

Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 23 +++ 1 file changed, 23 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index e3918c8..f66db2d 100644 --- a/contrib/completion/git-c

[PATCH 06/25] copy.c: style fix

Signed-off-by: Nguyễn Thái Ngọc Duy --- copy.c | 50 +- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/copy.c b/copy.c index cdb38d5..00f8349 100644 --- a/copy.c +++ b/copy.c @@ -111,8 +111,10 @@ int FAST_FUNC copy_file(const char *

[PATCH 09/25] git-worktree.txt: keep subcommand listing in alphabetical order

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-worktree.txt | 10 +- builtin/worktree.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 62c76c1..1c9d7c1 100644 --- a/Docume

[PATCH 10/25] path.c: add git_common_path() and strbuf_git_common_path()

Signed-off-by: Nguyễn Thái Ngọc Duy --- cache.h | 3 +++ path.c | 29 + 2 files changed, 32 insertions(+) diff --git a/cache.h b/cache.h index 213a8d3..c81f654 100644 --- a/cache.h +++ b/cache.h @@ -767,11 +767,14 @@ extern int check_repository_format(void); */ e

[PATCH 07/25] copy.c: convert copy_file() to copy_dir_recursively()

This finally enables busybox's copy_file() code under a new name (because "copy_file" is already taken in Git code base). Because this comes from busybox, POSIXy (or even Linuxy) behavior is expected. More changes may be needed for Windows support. Signed-off-by: Nguyễn Thái Ngọc Duy --- cache.h

[PATCH 05/25] copy.c: convert bb_(p)error_msg to (sys_)error

Signed-off-by: Nguyễn Thái Ngọc Duy --- copy.c | 85 -- 1 file changed, 31 insertions(+), 54 deletions(-) diff --git a/copy.c b/copy.c index d24a8ae..cdb38d5 100644 --- a/copy.c +++ b/copy.c @@ -82,23 +82,16 @@ int FAST_FUNC copy_fi

[PATCH 12/25] worktree.c: store "id" instead of "git_dir"

We can reconstruct git_dir from id quite easily. It's a bit hackier to do the reverse. Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 29 - worktree.h | 7 ++- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/worktree.c b/worktree.c index dd

[PATCH 04/25] copy.c: delete unused code in copy_file()

- selinux preservation code - make-link code - delete link dereference code - non-recursive copy code - stat no preservation code - verbose printing code Signed-off-by: Nguyễn Thái Ngọc Duy --- copy.c | 101 + 1 file changed,

[PATCH 02/25] usage.c: add sys_error() that prints strerror() automatically

Signed-off-by: Nguyễn Thái Ngọc Duy --- git-compat-util.h | 1 + usage.c | 10 ++ 2 files changed, 11 insertions(+) diff --git a/git-compat-util.h b/git-compat-util.h index 4743954..e8e7765 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -412,6 +412,7 @@ extern NORET

[PATCH 03/25] copy.c: import copy_file() from busybox

This is busybox's unmodified copy_file() in libbb/copy_file.c from the GPL2+ commit f2c043acfcf9dad9fd3d65821b81f89986bbe54e (busybox: fix uninitialized memory when displaying IPv6 addresses - 2016-01-18) Signed-off-by: Nguyễn Thái Ngọc Duy --- copy.c | 331 ++

[PATCH 00/25] worktree lock, move, remove and unlock

This is basically a resend from last time, which happened during rc time. It adds 4 more commands, basically cleaning up the "TODO" list in git-worktree.txt. So far I've only actually used move and remove (and maybe unlock once because worktree-add failed on me and I had to unlock it manually). An

[PATCH 01/25] usage.c: move format processing out of die_errno()

Signed-off-by: Nguyễn Thái Ngọc Duy --- usage.c | 25 +++-- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/usage.c b/usage.c index 82ff131..0dba0c5 100644 --- a/usage.c +++ b/usage.c @@ -109,19 +109,12 @@ void NORETURN die(const char *err, ...) va_end(

[PATCH 24/26] upload-pack: split check_unreachable() in two, prep for get_reachable_list()

Signed-off-by: Nguyễn Thái Ngọc Duy --- upload-pack.c | 41 ++--- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/upload-pack.c b/upload-pack.c index 95a0bfb..9e4a4fa 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -452,24 +452,24 @@ static in

[PATCH 17/26] clone: define shallow clone boundary based on time with --shallow-since

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-clone.txt | 3 +++ builtin/clone.c | 16 +--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index b7c467a..a410409 100644 --- a/Documentat

[PATCH 15/26] upload-pack: add deepen-since to cut shallow repos based on time

This should allow the user to say "create a shallow clone containing the work from last year" (once the client side is fixed up, of course). In theory deepen-since and deepen (aka --depth) can be used together to draw the shallow boundary (whether it's intersection or union is up to discussion, bu

[PATCH 22/26] clone: define shallow clone boundary with --shallow-exclude

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-clone.txt | 5 + builtin/clone.c | 18 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index a410409..5049663 100644 --- a/Documen

[PATCH 16/26] fetch: define shallow boundary with --shallow-since

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/fetch-options.txt | 4 Documentation/git-fetch-pack.txt| 4 Documentation/gitremote-helpers.txt | 3 +++ builtin/fetch-pack.c| 4 builtin/fetch.c | 29 +++--

[PATCH 14/26] shallow.c: implement a generic shallow boundary finder based on rev-list

Instead of a custom commit walker like get_shallow_commits(), this new function uses rev-list to mark NOT_SHALLOW to all reachable commits, except borders. The definition of reachable is to be defined by the protocol later. This makes it more flexible to define shallow boundary. The way we find fi

[PATCH 18/26] t5500, t5539: tests for shallow depth since a specific date

Signed-off-by: Nguyễn Thái Ngọc Duy --- t/t5500-fetch-pack.sh | 24 t/t5539-fetch-http-shallow.sh | 26 ++ 2 files changed, 50 insertions(+) diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index e5f83bf..26f050d 100755 --- a/t/t

[PATCH 23/26] t5500, t5539: tests for shallow depth excluding a ref

Signed-off-by: Nguyễn Thái Ngọc Duy --- t/t5500-fetch-pack.sh | 22 ++ t/t5539-fetch-http-shallow.sh | 22 ++ 2 files changed, 44 insertions(+) diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index 26f050d..a3fe5ca 100755 --- a/t/t5500-f

  1   2   >