Re: git reset --hard should not irretrievably destroy new files

Am 03.12.2016 um 06:04 schrieb Julian de Bhal: If you `git add new_file; git reset --hard`, new_file is gone forever. AFAIC, this is a feature ;-) I occasionally use it to remove a file when I already have git-gui in front of me. Then it's often less convenient to type the path in a shell,

Re: [PATCH] commit: make --only --allow-empty work without paths

On Fri, 02 Dec 2016 23:32:55 +, Jeff King wrote: > On Fri, Dec 02, 2016 at 11:15:13PM +0100, Andreas Krey wrote: > > > --only is implied when paths are present, and required > > them unless --amend. But with --allow-empty it should > > be allowed as well - it is the only way to create an > >

git add -p doesn't honor diff.noprefix config

Hi all I set the config diff.noprefix = true because I don't like the a/ and b/ prefixes, which nicely changed the output of `git diff`. Unfortunately, the filenames in the output of `git add --patch` are still prefixed. To me, this seems like a bug. Or there's a config option missing. Best

Re: [RFC PATCH 00/16] Checkout aware of Submodules!

I found this patch on Reddit and personally support this idea to simplify the submodule update and checkout process. I don't know how other users handle the submodule update process, I do sometimes forget to checkout in superprojects with submodules and get a lot of trouble in using the submodule

Re: [PATCH 4/4] shallow.c: remove useless test

On Fri, Dec 02, 2016 at 09:31:04PM +0100, Rasmus Villemoes wrote: > It seems to be odd to do x=y if x==y. Maybe there's a bug somewhere near > this, but as is this is somewhat confusing. Yeah, this code is definitely wrong, but I'm not sure what it's trying to do. This is the first time I've

Re: [PATCH 3/4] shallow.c: bit manipulation tweaks

On Fri, Dec 02, 2016 at 09:31:03PM +0100, Rasmus Villemoes wrote: > First of all, 1 << 31 is technically undefined behaviour, so let's just > use an unsigned literal. It took me a second to realize that you weren't talking about the unsigned parameter here. You mean using "1U". It might be worth

Re: [PATCH 2/4] shallow.c: avoid theoretical pointer wrap-around

On Fri, Dec 02, 2016 at 09:31:02PM +0100, Rasmus Villemoes wrote: > The expression info->free+size is technically undefined behaviour in > exactly the case we want to test for. Moreover, the compiler is likely > to translate the expression to > > (unsigned long)info->free + size > (unsigned

Re: [PATCH 1/4] shallow.c: make paint_alloc slightly more robust

On Fri, Dec 02, 2016 at 09:31:01PM +0100, Rasmus Villemoes wrote: > I have no idea if this is a real issue, but it's not obvious to me that > paint_alloc cannot be called with info->nr_bits greater than about > 4M (\approx 8*COMMIT_SLAB_SIZE). In that case the new slab would be too > small. So

git reset --hard should not irretrievably destroy new files

If you `git add new_file; git reset --hard`, new_file is gone forever. This is totally what git says it will do on the box, but it caught me out. It might seem a little less stupid if I explain what I was doing: I was breaking apart a chunk of work into smaller changes: git commit -a -m 'tmp'

Re: [PATCH] commit: make --only --allow-empty work without paths

On Fri, Dec 02, 2016 at 11:15:13PM +0100, Andreas Krey wrote: > --only is implied when paths are present, and required > them unless --amend. But with --allow-empty it should > be allowed as well - it is the only way to create an > empty commit in the presence of staged changes. OK. I'm not sure

Re: [BUG] Index.lock error message regression in git 2.11.0

Apparently I'm not supposed to send attachments >_<. Here's the script in non-attachement form: #!/bin/bash make -j 8 2>&1 > /dev/null if [[ $? != 0 ]]; then # skip this version exit 125 fi git=`realpath ./git` rm -rf .test_repo || true mkdir .test_repo cd .test_repo $git init

[BUG] Index.lock error message regression in git 2.11.0

Hello, I just upgraded to 2.11.0 from 2.10.2, and I noticed that some commands no longer print an error message when the `index.lock` file exists (such as `git merge --ff-only`). It appears this bug was introduced in 55f5704da69d3e6836620f01bee0093ad5e331e8 (sequencer: lib'ify

[RFC PATCHv2 17/17] checkout: add config option to recurse into submodules by default

To make it easier for the user, who doesn't want to give the `--recurse-submodules` option whenever they run checkout, have an option for to set the default behavior for checkout to recurse into submodules. Signed-off-by: Stefan Beller --- Documentation/config.txt | 6

[RFC PATCHv2 13/17] entry: write_entry to write populate submodules

Signed-off-by: Stefan Beller --- entry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/entry.c b/entry.c index 02c4ac9f22..a668025b8e 100644 --- a/entry.c +++ b/entry.c @@ -2,6 +2,7 @@ #include "blob.h" #include "dir.h" #include "streaming.h" +#include

[RFC PATCHv2 11/17] unpack-trees: teach verify_clean_submodule to inspect submodules

As a later patch will modify submodules, if they are interesting we need to see if the submodule is clean in case they are interesting. If they are not interesting, then we do not care about the submodule keeping historic behavior. Signed-off-by: Stefan Beller ---

[RFC PATCHv2 01/17] submodule.h: add extern keyword to functions

As the upcoming series will add a lot of functions to the submodule header, let's first make the header consistent to the rest of the project by adding the extern keyword to functions. As per the CodingGuidelines we try to stay below 80 characters per line, so adapt all those functions to stay

[RFC PATCHv2 06/17] update submodules: add a config option to determine if submodules are updated

In later patches we introduce the options and flag for commands that modify the working directory, e.g. git-checkout. Have a central place to store such settings whether we want to update a submodule. Signed-off-by: Stefan Beller --- submodule.c | 6 ++ submodule.h | 1

[RFC PATCHv2 14/17] submodule: teach unpack_trees() to update submodules

Signed-off-by: Stefan Beller --- entry.c| 7 +++--- unpack-trees.c | 76 +- unpack-trees.h | 1 + 3 files changed, 65 insertions(+), 19 deletions(-) diff --git a/entry.c b/entry.c index a668025b8e..3ed885b886

[RFC PATCHv2 07/17] update submodules: introduce submodule_is_interesting

In later patches we introduce the --recurse-submodule flag for commands that modify the working directory, e.g. git-checkout. It is potentially expensive to check if a submodule needs an update, because a common theme to interact with submodules is to spawn a child process for each interaction.

[RFC PATCHv2 05/17] update submodules: add submodule config parsing

Similar to b33a15b08 (push: add recurseSubmodules config option, 2015-11-17) and 027771fcb1 (submodule: allow erroneous values for the fetchRecurseSubmodules option, 2015-08-17), we add submodule-config code that is later used to parse whether we are interested in updating submodules. We need the

[RFC PATCHv2 15/17] checkout: recurse into submodules if asked to

Allow checkout to recurse into submodules via the command line option --[no-]recurse-submodules. The flag for recurse-submodules in its current form could be an OPT_BOOL, but eventually we may want to have it as: git checkout --recurse-submodules=rebase|merge| \

[RFC PATCHv2 04/17] update submodules: add is_submodule_populated

See if a submodule is populated by checking if there is a .git file or directory at the given path. Signed-off-by: Stefan Beller --- submodule.c | 11 +++ submodule.h | 1 + 2 files changed, 12 insertions(+) diff --git a/submodule.c b/submodule.c index

[RFC PATCHv2 03/17] update submodules: move up prepare_submodule_repo_env

In a later patch we need to prepare the submodule environment with another git directory, so split up the function. Also move it up in the file such that we do not need to declare the function later before using it. Signed-off-by: Stefan Beller --- submodule.c | 27

[RFC PATCHv2 08/17] update submodules: add depopulate_submodule

Implement the functionality needed to enable work tree manipulating commands so that a deleted submodule should not only affect the index (leaving all the files of the submodule in the work tree) but also to remove the work tree of the superproject (including any untracked files). To do so, we

[RFC PATCHv2 09/17] update submodules: add scheduling to update submodules

The walker of a tree is only expected to call `schedule_submodule_for_update` and once done, to run `update_submodules`. This avoids directory/file conflicts and later we can parallelize all submodule actions if needed. Signed-off-by: Stefan Beller --- submodule.c | 132

[RFC PATCHv2 16/17] completion: add '--recurse-submodules' to checkout

Signed-off-by: Stefan Beller --- contrib/completion/git-completion.bash | 2 +- t/t9902-completion.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index

[RFC PATCHv2 10/17] update submodules: is_submodule_checkout_safe

In later patches we introduce the options and flag for commands that modify the working directory, e.g. git-checkout. This piece of code will answer the question: "Is it safe to change the submodule to this new state?" e.g. is it overwriting untracked files or are there local changes that would

[RFC PATCHv2 12/17] unpack-trees: remove submodule contents if interesting

Currently when a unlink_entry() is called on a submodule, this fails as remove_or_warn detects it needs to delete a directory via rmdir. However rmdir only works on empty directories, such that the "_or_warn" part kicks in, and we get a warning message. In case the submodule is of no interest

[RFC PATCHv2 00/17] Checkout aware of Submodules!

v2: * based on top of the series sent out an hour ago "[PATCHv4 0/5] submodule embedgitdirs" * Try to embed a submodule if we need to remove it. * Strictly do not change behavior if not giving the new flag. * I think I missed some review comments from v1, but I'd like to get the current state

[RFC PATCHv2 02/17] submodule: modernize ok_to_remove_submodule to use argv_array

Instead of constructing the NULL terminated array ourselves, we should make use of the argv_array infrastructure. Signed-off-by: Stefan Beller --- submodule.c | 14 -- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/submodule.c b/submodule.c index

Re: [PATCH v6 1/6] submodules: add helper functions to determine presence of submodules

On 12/02, Jeff King wrote: > On Fri, Dec 02, 2016 at 11:28:49AM -0800, Stefan Beller wrote: > > > I just reviewed 2 libc implementations (glibc and an Android libc) and > > both of them > > do not use chdir internally, but use readlink and compose the path > > 'manually' > > c.f.

[PATCHv4 5/5] submodule: add embed-git-dir function

When a submodule has its git dir inside the working dir, the submodule support for checkout that we plan to add in a later patch will fail. Add functionality to migrate the git directory to be embedded into the superprojects git directory. Signed-off-by: Stefan Beller

[PATCHv4 2/5] submodule helper: support super prefix

Just like main commands in Git, the submodule helper needs access to the superproject prefix. Enable this in the git.c but have its own fuse in the helper code by having a flag to turn on the super prefix. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

[PATCHv4 4/5] worktree: get worktrees from submodules

In a later patch we want to move around the the git directory of a submodule. Both submodules as well as worktrees are involved in placing git directories at unusual places, so their functionality may collide. To react appropriately to situations where worktrees in submodules are in use, offer a

[PATCHv4 3/5] test-lib-functions.sh: teach test_commit -C

Specifically when setting up submodule tests, it comes in handy if we can create commits in repositories that are not at the root of the tested trash dir. Add "-C " similar to gits -C parameter that will perform the operation in the given directory. Signed-off-by: Stefan Beller

[PATCHv4 0/5] submodule embedgitdirs

v4: * rebuilt on top of nd/worktree-list-fixup * fix and test behavior for un-init submodules (don't crash, rather do nothing) * incorporated a "static" as pointed out by Ramsay * use internal functions instead of duplicating code in worktree.c (use get_common_dir_noenv for the submodule to

[PATCHv4 1/5] submodule: use absolute path for computing relative path connecting

The current caller of connect_work_tree_and_git_dir passes an absolute path for the `git_dir` parameter. In the future patch we will also pass in relative path for `git_dir`. Extend the functionality of connect_work_tree_and_git_dir to take relative paths for parameters. We could work around this

difftool -d not populating left correctly when not in git root

Hi, looks like this broke between 2.9.2 and 2.9.3 cat ~/.gitconfig [difftool "diff"] cmd = ls -l ${LOCAL}/* ${REMOTE}/* #cmd = diff -r ${LOCAL} ${REMOTE} | less ~/stuff/gittest> ls -l * d1: total 8 -rw-r--r-- 1 frank staff 16 2 Dec 14:30 test.txt d2: total 8 -rw-r--r-- 1 frank

[PATCHv1 1/2] git-p4: support git-workspaces

Teach git-p4 about git-workspaces. Signed-off-by: Luke Diamand --- git-p4.py | 6 ++ 1 file changed, 6 insertions(+) diff --git a/git-p4.py b/git-p4.py index 0c4f2afd2..5e2db1919 100755 --- a/git-p4.py +++ b/git-p4.py @@ -566,6 +566,12 @@ def isValidGitDir(path): if

[PATCHv1 0/2] git-p4 patches

This is a couple of small patches for git-p4. The first just teaches git-p4 about git workspaces, so that you can do "git p4 submit" from within a workspace (P.S. workspaces are completely *awesome*). The second follows on from the work by Vinicius for shelving changelists, by letting you update

[PATCHv1 2/2] git-p4: support updating an existing shelved changelist

Adds new option "--update-shelve CHANGELIST" which updates an existing shelved changelist. The original changelist must have been created by the current user. This allows workflow something like: hack hack hack git commit git p4 submit --shelve $mail interested parties about shelved

Re: git 2.11.0 error when pushing to remote located on a windows share

On Fri, Dec 02, 2016 at 06:02:16PM +, thomas.attw...@stfc.ac.uk wrote: > After updating git from 2.10.0 to 2.11.0 when trying to push any > changes to a repo located in a windows share, the following error > occurs: > > $ git push origin test > Counting objects: 2, done. > Delta compression

Re: Where is Doc to configure Git + Apache + kerberos for Project level access in repo?

On Fri, Dec 02, 2016 at 01:15:02PM -0500, ken edward wrote: > Where is Doc to configure Git + Apache + kerberos for Project level > access in repo? I don't know about Kerberos, but all of the documentation in git for configuring Apache is found in "git help http-backend". -Peff

[PATCH] commit: make --only --allow-empty work without paths

--only is implied when paths are present, and required them unless --amend. But with --allow-empty it should be allowed as well - it is the only way to create an empty commit in the presence of staged changes. Signed-off-by: Andreas Krey --- I stumbled over this omission trying

Re: [PATCH] worktree: mark a file-local symbol with static

On Fri, Dec 2, 2016 at 12:55 PM, Ramsay Jones wrote: > > Signed-off-by: Ramsay Jones > --- > > Hi Stefan, > > If you need to re-roll your 'sb/submodule-intern-gitdir' > branch, I will need to reroll it. > could you please squash

Re: [PATCH v6 1/6] submodules: add helper functions to determine presence of submodules

On Fri, Dec 02, 2016 at 11:28:49AM -0800, Stefan Beller wrote: > I just reviewed 2 libc implementations (glibc and an Android libc) and > both of them > do not use chdir internally, but use readlink and compose the path 'manually' > c.f.

Re: [PATCH v6 1/6] submodules: add helper functions to determine presence of submodules

On 12/02, Jacob Keller wrote: > On Fri, Dec 2, 2016 at 11:28 AM, Stefan Beller wrote: > > On Fri, Dec 2, 2016 at 11:20 AM, Jacob Keller > > wrote: > >>> > >>> So is there a reason why the library function realpath() can't be used? > >>> From a cursory

[PATCH 2/2] unicode: update the tables to Unicode 9.0

A rerun of the previously fixed update-unicode.sh produces these new tables. Signed-off-by: Beat Bolli --- unicode_width.h | 122 +++- 1 file changed, 111 insertions(+), 11 deletions(-) diff --git a/unicode_width.h

[PATCH 1/2] update-unicode.sh: automatically download newer definition files

Checking just for the files' existence is not enough; we should also download them if a newer version exists on the Unicode servers. Signed-off-by: Beat Bolli --- update_unicode.sh | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/update_unicode.sh

Re: [PATCH v6 1/6] submodules: add helper functions to determine presence of submodules

On Fri, Dec 2, 2016 at 11:28 AM, Stefan Beller wrote: > On Fri, Dec 2, 2016 at 11:20 AM, Jacob Keller wrote: >>> >>> So is there a reason why the library function realpath() can't be used? >>> From a cursory look at its man page it seems to do the

[PATCH] worktree: mark a file-local symbol with static

Signed-off-by: Ramsay Jones --- Hi Stefan, If you need to re-roll your 'sb/submodule-intern-gitdir' branch, could you please squash something similar to this into the relevant patch (commit 2529715dc, "worktree: get worktrees from submodules", 01-12-2016). [This

[PATCH 1/4] shallow.c: make paint_alloc slightly more robust

I have no idea if this is a real issue, but it's not obvious to me that paint_alloc cannot be called with info->nr_bits greater than about 4M (\approx 8*COMMIT_SLAB_SIZE). In that case the new slab would be too small. So just round up the allocation to the maximum of COMMIT_SLAB_SIZE and size.

[PATCH 2/4] shallow.c: avoid theoretical pointer wrap-around

The expression info->free+size is technically undefined behaviour in exactly the case we want to test for. Moreover, the compiler is likely to translate the expression to (unsigned long)info->free + size > (unsigned long)info->end where there's at least a theoretical chance that the LHS could

[PATCH 3/4] shallow.c: bit manipulation tweaks

First of all, 1 << 31 is technically undefined behaviour, so let's just use an unsigned literal. If i is 'signed int' and gcc doesn't know that i is positive, gcc generates code to compute the C99-mandated values of "i / 32" and "i % 32", which is a lot more complicated than simple a simple

[PATCH 4/4] shallow.c: remove useless test

It seems to be odd to do x=y if x==y. Maybe there's a bug somewhere near this, but as is this is somewhat confusing. Signed-off-by: Rasmus Villemoes --- shallow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shallow.c b/shallow.c index

[PATCH] t3600: remove useless redirect

In the next line the `actual` is overwritten again, so no need to redirect the output of checkout into that file. Signed-off-by: Stefan Beller --- t/t3600-rm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index

[no subject]

ارسال از تلفن همراه Huawei من

Re: EXT: Re: "Your branch is ahead of 'origin' by X commits"

Hi Matthieu, It was my mistake, I had a local branch called “origin” which was the upstream for master. I sent more details in a later email, reproduced below. Sorry for the false alarm. Thanks, Ernesto >>

Re: [PATCH v6 1/6] submodules: add helper functions to determine presence of submodules

On Fri, Dec 2, 2016 at 11:20 AM, Jacob Keller wrote: >> >> So is there a reason why the library function realpath() can't be used? >> From a cursory look at its man page it seems to do the symlink >> resolution. >> >> -- >> Brandon Williams > > I believe it uses the same

RE: [PATCH] unpack-trees: fix grammar for untracked files in directories

LGTM. > -Original Message- > From: Stefan Beller [mailto:sbel...@google.com] > Sent: Friday, December 02, 2016 2:18 PM > To: gits...@pobox.com > Cc: git@vger.kernel.org; David Turner; Stefan Beller > Subject: [PATCH] unpack-trees: fix grammar for untracked files in > directories > >

Re: [PATCH v6 1/6] submodules: add helper functions to determine presence of submodules

On Fri, Dec 2, 2016 at 10:49 AM, Brandon Williams wrote: > On 12/02, Jacob Keller wrote: >> On Fri, Dec 2, 2016 at 10:36 AM, Brandon Williams wrote: >> > On 12/01, Jeff King wrote: >> >> On Thu, Dec 01, 2016 at 01:56:32PM -0800, Stefan Beller wrote: >> >> >>

[PATCH] unpack-trees: fix grammar for untracked files in directories

Noticed-by: David Turner Signed-off-by: Stefan Beller --- This was noticed by David when reviewing the submodule checkout series, though rolling this as an independent fix is better :) Thanks, Stefan t/t7609-merge-co-error-msgs.sh | 2 +-

[PATCH v2] diff: handle --no-abbrev outside of repository

The "git diff --no-index" codepath didn't handle the --no-abbrev option. Also it didn't behave the same as find_unique_abbrev() in the case where abbrev == 0. find_unique_abbrev() returns the full, unabbreviated string in that case, but the "git diff --no-index" codepath returned an empty string.

Re: [PATCH v6 1/6] submodules: add helper functions to determine presence of submodules

On 12/02, Jacob Keller wrote: > On Fri, Dec 2, 2016 at 10:36 AM, Brandon Williams wrote: > > On 12/01, Jeff King wrote: > >> On Thu, Dec 01, 2016 at 01:56:32PM -0800, Stefan Beller wrote: > >> > >> > > Bleh. Looks like it happens as part of the recently-added > >> > >

Re: [PATCH v6 1/6] submodules: add helper functions to determine presence of submodules

On Fri, Dec 2, 2016 at 10:36 AM, Brandon Williams wrote: > On 12/01, Jeff King wrote: >> On Thu, Dec 01, 2016 at 01:56:32PM -0800, Stefan Beller wrote: >> >> > > Bleh. Looks like it happens as part of the recently-added >> > > get_common_dir(). I'm not sure if that is ever

Re: [PATCH v6 1/6] submodules: add helper functions to determine presence of submodules

On 12/01, Jeff King wrote: > On Thu, Dec 01, 2016 at 01:56:32PM -0800, Stefan Beller wrote: > > > > Bleh. Looks like it happens as part of the recently-added > > > get_common_dir(). I'm not sure if that is ever relevant for submodules, > > > but I guess in theory you could have a submodule clone

git 2.11.0 error when pushing to remote located on a windows share

After updating git from 2.10.0 to 2.11.0 when trying to push any changes to a repo located in a windows share, the following error occurs: $ git push origin test Counting objects: 2, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done. Writing objects: 100%

Where is Doc to configure Git + Apache + kerberos for Project level access in repo?

Where is Doc to configure Git + Apache + kerberos for Project level access in repo?

Re: [PATCH v7 4/4] transport: add from_user parameter to is_transport_allowed

On 12/01, Jeff King wrote: > On Thu, Dec 01, 2016 at 03:26:56PM -0800, Brandon Williams wrote: > > > > I started taking a look at your http redirect series (I really should > > > have taking a look at it sooner) and I see exactly what you're talking > > > about. We can easily move this logic

Re: Error after calling git difftool -d with

Hi Peter, On Fri, 2 Dec 2016, P. Duijst wrote: > Incase filenames are used with a quote ' or a bracket [ (and maybe some more > characters), git "diff" and "difftool -y" works fine, but git *difftool **-d* > gives the next error message: > >peter@scm_ws_10 MINGW64 /d/Dev/test (master) >

Re: "Your branch is ahead of 'origin' by X commits"

"Alfonsogonzalez, Ernesto (GE Digital)" writes: > Hi, > > Git status tells me "Your branch is ahead of 'origin' by 108 commits.², > but my local and origin/master are pointing to the same commit. > > What am I doing wrong? > > $ git diff origin/master > $ git

Re: [PATCH v2 1/1] convert: git cherry-pick -Xrenormalize did not work

Yup, this is what I queued. Looks good, thanks you all.