Re: Show-branch without commits

2018-12-21 Thread David
On Sat, 22 Dec 2018 at 10:04, Brian Johnson wrote: > > Is it possible (or could a flag be added) to have show-branch only > show the branch hierarchy at the top and not print out the commit > list? Does git show-branch --list do what you want?

Re: Can git choose perl at runtime?

2018-12-21 Thread brian m. carlson
On Tue, Dec 18, 2018 at 10:09:14PM -0500, John Passaro wrote: > I recently submitted my first patch using OSX and found the experience > frustrating, for reasons that have come up on the list before, > concerning git-send-email and perl dependencies that you need to be > root to update. > > Last s

Re: [PATCH] diff: add support for reading files literally with --no-index

2018-12-21 Thread brian m. carlson
On Fri, Dec 21, 2018 at 12:52:04PM +0100, Johannes Schindelin wrote: > ... and in Git for Windows' Bash, it would result in something like: > > $ git -P diff --no-index <(printf "a\nb\n") <(printf "a\nc\n") > error: Could not access '/proc/24012/fd/63' > > ... because the Bash is "MSY

Re: Unable to install latest git version. Claims git process pid running

2018-12-21 Thread David Brown
Howdy Johannes, thanks for the speedy reply. Unfortunately I have hit refresh many times in previous attempts. Notwithstanding, the dialog maintains the error condition claiming pid 10128 must be closed prior to install. I'm a big fan of Git but not a Windows fan in the least. I have downloa

[PATCH v2 2/7] Docs: rearrange subcommands for multi-pack-index

2018-12-21 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee We will add new subcommands to the multi-pack-index, and that will make the documentation a bit messier. Clean up the 'verb' descriptions by renaming the concept to 'subcommand' and removing the reference to the object directory. Helped-by: Stefan Beller Helped-by: Szeder G

[PATCH v2 0/7] Create 'expire' and 'repack' verbs for git-multi-pack-index

2018-12-21 Thread Derrick Stolee via GitGitGadget
The multi-pack-index provides a fast way to find an object among a large list of pack-files. It stores a single pack-reference for each object id, so duplicate objects are ignored. Among a list of pack-files storing the same object, the most-recently modified one is used. Create new subcommands fo

[PATCH v2 5/7] multi-pack-index: implement 'expire' verb

2018-12-21 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The 'git multi-pack-index expire' command looks at the existing mult-pack-index, counts the number of objects referenced in each pack-file, deletes the pack-fils with no referenced objects, and rewrites the multi-pack-index to no longer reference those packs. Refactor the wr

[PATCH v2 3/7] multi-pack-index: prepare for 'expire' subcommand

2018-12-21 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The multi-pack-index tracks objects in a collection of pack-files. Only one copy of each object is indexed, using the modified time of the pack-files to determine tie-breakers. It is possible to have a pack-file with no referenced objects because all objects have a duplicate

[PATCH v2 7/7] midx: implement midx_repack()

2018-12-21 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee To repack using a multi-pack-index, first sort all pack-files by their modified time. Second, walk those pack-files from oldest to newest, adding the packs to a list if they are smaller than the given pack-size. Finally, collect the objects from the multi-pack- index that are

[PATCH v2 6/7] multi-pack-index: prepare 'repack' subcommand

2018-12-21 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee In an environment where the multi-pack-index is useful, it is due to many pack-files and an inability to repack the object store into a single pack-file. However, it is likely that many of these pack-files are rather small, and could be repacked into a slightly larger pack-fi

[PATCH v2 1/7] repack: refactor pack deletion for future use

2018-12-21 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The repack builtin deletes redundant pack-files and their associated .idx, .promisor, .bitmap, and .keep files. We will want to re-use this logic in the future for other types of repack, so pull the logic into 'unlink_pack_path()' in packfile.c. The 'ignore_keep' parameter i

[PATCH v2 4/7] midx: refactor permutation logic

2018-12-21 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee When writing a multi-pack-index, we keep track of an integer permutation, tracking the list of pack-files that we know about (both from the existing multi-pack-index and the new pack-files being introduced) and converting them into a sorted order for the new multi-pack-index.

Re: [PATCH 2/2] Rebase: Run post-checkout hook on checkout

2018-12-21 Thread Johannes Schindelin
Hi Orgad, On Thu, 20 Dec 2018, org...@gmail.com wrote: > From: Orgad Shaneh > > Signed-off-by: Orgad Shaneh Feel free to steal the PR description I added to your PR at https://github.com/git-for-windows/git/pull/1992 > diff --git a/builtin/rebase.c b/builtin/rebase.c > index b5c99ec10c..78a0

Re: [PATCH 1/2] t5403: Refactor

2018-12-21 Thread Johannes Schindelin
Hi Orgad, On Thu, 20 Dec 2018, org...@gmail.com wrote: > diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh > index fc898c9eac..7e941537f9 100755 > --- a/t/t5403-post-checkout-hook.sh > +++ b/t/t5403-post-checkout-hook.sh > @@ -7,67 +7,48 @@ test_description='Test the post

Re: Unable to install latest git version. Claims git process pid running

2018-12-21 Thread Johannes Schindelin
Hi, On Thu, 20 Dec 2018, David Brown wrote: > - [ ] I was not able to find an > [open](https://github.com/git-for-windows/git/issues?q=is%3Aopen) or > [closed](https://github.com/git-for-windows/git/issues?q=is%3Aclosed) issue > matching what I'm seeing That's a new one. I saw many bug reporter

Re: [PATCH] t5570: drop racy test

2018-12-21 Thread Johannes Schindelin
Hi Thomas & Peff, On Thu, 20 Dec 2018, Jeff King wrote: > On Thu, Dec 20, 2018 at 04:41:50PM +, Thomas Gummerer wrote: > > > > That doesn't really fix it, but just broadens the race window. I dunno. > > > Maybe that is enough in practice. We could do something like: > > > > > > repeat_wit

Show-branch without commits

2018-12-21 Thread Brian Johnson
Is it possible (or could a flag be added) to have show-branch only show the branch hierarchy at the top and not print out the commit list? --Brian

Re: "git show --usage" no "usage" displayed

2018-12-21 Thread Duy Nguyen
On Fri, Dec 21, 2018 at 9:40 AM Nicholas Hsiang wrote: > > Dear git: > > When I type `git remote --usage`, The command panel will prompt > 'error: unknown option `usage', Then there will be `git remote` > related instructions. > But I type `git show --usage`, just display 'fatal: unrecognized > ar

Re: [PATCH 0/4] Expose gpgsig in pretty-print

2018-12-21 Thread Michał Górny
On Wed, 2018-12-19 at 00:59 -0500, John Passaro wrote: > On Fri, Dec 14, 2018 at 6:10 PM John Passaro wrote: > > All seems to work fine when I treat %Gs as a detached signature. > > In light of this, my best guess as to why the cleartext PGP message > didn't verify properly is that the commit data

[PATCH 0/4] Let the builtin rebase call the git am command directly

2018-12-21 Thread Johannes Schindelin via GitGitGadget
Especially on Windows, where Unix shell scripting is a foreign endeavor, and an expensive one at that, we really want to avoid running through the Bash. This not only makes everything faster, but also more robust, as the Bash we use on Windows relies on a derivative of the Cygwin runtime, which in

[PATCH 2/4] rebase: avoid double reflog entry when switching branches

2018-12-21 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When switching a branch *and* updating said branch to a different revision, let's avoid a double entry by first updating the branch and then adjusting the symbolic ref HEAD. Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 7 --- 1 file changed, 4 inserti

[PATCH 3/4] rebase: teach `reset_head()` to optionally skip the worktree

2018-12-21 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin This is what the legacy (scripted) rebase does in `move_to_original_branch`, and we will need this functionality in the next commit. Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/buil

[PATCH 1/4] rebase: move `reset_head()` into a better spot

2018-12-21 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Over the next commits, we want to make use of it in `run_am()` (i.e. running the `--am` backend directly, without detouring to Unix shell script code) which in turn will be called from `run_specific_rebase()`. So let's move it before that latter function. This commit i

[PATCH 4/4] built-in rebase: call `git am` directly

2018-12-21 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin While the scripted `git rebase` still has to rely on the `git-rebase--am.sh` script to implement the glue between the `rebase` and the `am` commands, we can go a more direct route in the built-in rebase and avoid using a shell script altogether. This patch represents a

Does "git push" open a pack for read before closing it?

2018-12-21 Thread git-mailinglist
[Major ignorance alert] I'm writing software to implement a FUSE mount for a decentralised file system and during testing with git I see some strange behaviour which I'd like to investigate. It might be a bug in my code, or even the FUSE lib I'm using, or it might be intended behaviour by git. So

Re: [PATCH 1/1] Add author and committer configuration settings

2018-12-21 Thread Johannes Schindelin
Hi William, thank you for putting this together. On Wed, 19 Dec 2018, William Hubbs wrote: > -extern const char *fmt_name(const char *name, const char *email); > +extern const char *fmt_committer_name(void); If it would not be too much trouble for you, could I ask you to split this change out i

Re: [PATCH v2] git: add -P as a short option for --no-pager

2018-12-21 Thread Johannes Schindelin
Hi Hannes, On Thu, 3 May 2018, Johannes Sixt wrote: > It is possible to configure 'less', the pager, to use an alternate > screen to show the content, for example, by setting LESS=RS in the > environment. When it is closed in this configuration, it switches > back to the original screen, and all

Re: [PATCH] diff: add support for reading files literally with --no-index

2018-12-21 Thread Johannes Schindelin
Hi Brian, On Thu, 20 Dec 2018, brian m. carlson wrote: > In some shells, such as bash and zsh, it's possible to use a command > substitution to provide the output of a command as a file argument to > another process, like so: > > diff -u <(printf "a\nb\n") <(printf "a\nc\n") > > However, this

[PATCH 0/1] Make abspath() aware of case-insensitive filesystems

2018-12-21 Thread Johannes Schindelin via GitGitGadget
It is completely legitimate these days to call git add with absolute paths. Of course, on a case-insensitive file system, users rightfully expect the argument to be handled case-insensitively, too. This patch makes it so. Git for Windows carried this patch for over one and a half years already, I

[PATCH 1/1] abspath_part_inside_repo: respect core.fileMode

2018-12-21 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin If the file system is case-insensitive, we really must be careful to ignore differences in case only. This fixes https://github.com/git-for-windows/git/issues/735 Signed-off-by: Johannes Schindelin --- setup.c| 6 +++--- t/t3700-add.sh | 7 +++ 2 files ch

Suppress reporting implicit git gc calls, when they don’t do anything

2018-12-21 Thread Дилян Палаузов
Hello, With git 19.2.2 after `git pull` the output was 1. Autopacking the repository in background for optimal performance. See "git help gc" for manual housekeeping 2. error: Your local changes to the following files would be overwritten by merge: … Please commit your changes or stash them be

comment for git-config man

2018-12-21 Thread Олег Самойлов
cite worktree.guessRemote With add, if no branch argument, cite end This was very confusing for me. Much be better if «With worktree add».