Re: bug: Directory replaced by submodule -> checkout fails

2019-10-18 Thread Thomas Braun
Am 18.10.2019 um 01:07 schrieb Christopher Collins: Hi Christopher, > ### Reproduce:> > > git clone g...@github.com:JuulLabs-OSS/mcuboot.git > cd mcuboot > git submodule init > git submodule update > git checkout ae01f153b11637feaedbc9d9042172fba2e080c0 > > ### Discussion: > > In the above seq

Re: [PATCH 2/2] ci: disable Homebrew's auto cleanup

2019-07-03 Thread Thomas Braun
Am 03.07.2019 um 12:47 schrieb SZEDER Gábor: > Lately Homebrew learned to automagically clean up information about > outdated packages during other 'brew' commands, which might be useful > for the avarage user, but is a waste of time in CI build jobs, because > the next build jobs will start from t

[PATCH 1/1] mingw: optionally disable side-band-64k for transport

2019-04-29 Thread Thomas Braun via GitGitGadget
From: Thomas Braun Since commit 0c499ea60f (send-pack: demultiplex a sideband stream with status data, 2010-02-05) the built-in send-pack uses the side-band-64k capability if advertised by the server. Unfortunately this breaks pushing over the dump git protocol if used over a network connection

Re: disabling sha1dc unaligned access, was Re: One failed self test on Fedora 29

2019-03-13 Thread Thomas Braun
Am 12.03.2019 um 11:51 schrieb Jeff King: > On Tue, Mar 12, 2019 at 04:27:57PM +0900, Junio C Hamano wrote: > >> Jeff King writes: >> >>> The problem to me is not that the steps that a developer has to do, but >>> rather that we are dependent on the upstream project to make a simple >>> fix (whic

Re: disabling sha1dc unaligned access, was Re: One failed self test on Fedora 29

2019-03-11 Thread Thomas Braun
Am 11.03.2019 um 12:58 schrieb Duy Nguyen: > On Mon, Mar 11, 2019 at 10:48 AM Jeff King wrote: >> And AFAIK there is no good way to >> modify the submodule-provided content as part of the build. Why do we >> even have the submodule again? ;P > > Because of dogfooding of course. This is an interes

Re: Git Merge Conference Recordings [was: Re: [ANNOUNCE] Git Merge Contributor's Summit Jan 31, 2019, Brussels]

2019-02-21 Thread Thomas Braun
Am 21.02.2019 um 09:22 schrieb Jeff King: > On Wed, Feb 20, 2019 at 11:59:04PM -0500, Jeff King wrote: > >> On Wed, Feb 20, 2019 at 02:03:40PM +0100, Ævar Arnfjörð Bjarmason wrote: >> I wanted to point a colleague of mine to one of the talks. Unfortunately I could not find the recordings

Git Merge Conference Recordings [was: Re: [ANNOUNCE] Git Merge Contributor's Summit Jan 31, 2019, Brussels]

2019-02-20 Thread Thomas Braun
Hi Jeff, I wanted to point a colleague of mine to one of the talks. Unfortunately I could not find the recordings of the talks anywhere. Are these available? Thanks, Thomas > Jeff King hat am 9. November 2018 um 11:42 geschrieben: > > > Git Merge 2019 is happening on February 1st. There wil

mk/use-size-t-in-zlib [was: Re: What's cooking in git.git (Jan 2019, #05; Tue, 29)]

2019-01-31 Thread Thomas Braun
> Junio C Hamano hat am 29. Januar 2019 um 23:15 > geschrieben: [...] > * mk/use-size-t-in-zlib (2018-10-15) 1 commit > - zlib.c: use size_t for size > > The wrapper to call into zlib followed our long tradition to use > "unsigned long" for sizes of regions in memory, which have been > upd

Re:

2019-01-23 Thread Thomas Braun
Am 23.01.2019 um 15:16 schrieb Cody Kratzer: > I've sent this same email 3 times. I don't think it works. I'm > researching this morning how to unsubscribe from this git group. Hi Cody, https://git-scm.com/community says to subscribe you should send an email with body content subscribe git to

Re: [PATCH v2 1/1] Use size_t instead of 'unsigned long' for data in memory

2019-01-22 Thread Thomas Braun
Am 19.01.2019 um 18:06 schrieb Torsten Bögershausen: > On 16.01.19 22:46, Thomas Braun wrote: >> Am 20.11.2018 um 06:04 schrieb tbo...@web.de: >> >> I'm interested in helping getting this forward! >> >>> What we really need for this patch to fly are

Re: [PATCH v2 1/1] Use size_t instead of 'unsigned long' for data in memory

2019-01-16 Thread Thomas Braun
Am 20.11.2018 um 06:04 schrieb tbo...@web.de: I'm interested in helping getting this forward! > What we really need for this patch to fly are this branches: > mk/use-size-t-in-zlib In pu. > tb/print-size-t-with-uintmax-format in master. > And then it is rebased on top of all cooking stuff, to

Re: rebase: Ask before doing anything not undoable

2018-12-20 Thread Thomas Braun
Am 20.12.2018 um 22:11 schrieb Ricardo Biehl Pasquali: > Ccing the mailing list. > > On Thu, Dec 20, 2018 at 07:26:53PM +0100, Kevin Daudt wrote: >> It would be anoying for users to have to constantly confirm when they >> run git rebase --continue. Rather than asking confirmation, it would be >> b

Re: rebase: Ask before doing anything not undoable

2018-12-20 Thread Thomas Braun
Am 20.12.2018 um 18:33 schrieb Ricardo Biehl Pasquali: > It was the second time I've typed "git rebase --co", > hit tab (for completion) and enter, and the result was > --committer-date-is-author-date instead of --continue . > > Please do ask user before run actions like these! I have > not found

[PATCH v3] log -G: ignore binary files

2018-12-14 Thread Thomas Braun
ensure it stays that way. [1]: http://www.xmailserver.org/xdiff.html Signed-off-by: Thomas Braun --- Changes since v2: - Introduce a setup step for the new tests - Really start with a clean history in the tests - Added more complex commit history for the tests - Use test_when_finished for

Re: [PATCH v2] log -G: Ignore binary files

2018-12-14 Thread Thomas Braun
> Junio C Hamano hat am 29. November 2018 um 08:22 > geschrieben: > > > Junio C Hamano writes: > > >> +test_expect_success 'log -G ignores binary files' ' > >> + git checkout --orphan orphan1 && > >> + printf "a\0a" >data.bin && > >> + git add data.bin && > >> + git commit -m "message" &&

Re: [PATCH v2] log -G: Ignore binary files

2018-12-14 Thread Thomas Braun
> Junio C Hamano hat am 29. November 2018 um 08:10 > geschrieben: > > > Thomas Braun writes: > > > Subject: Re: [PATCH v2] log -G: Ignore binary files > > s/Ig/ig/; (will locally munge--this alone is no reason to reroll). Done. > The code changes looked s

Re: [PATCH v2] log -G: Ignore binary files

2018-12-14 Thread Thomas Braun
> Ævar Arnfjörð Bjarmason hat am 28. November 2018 um 13:54 > geschrieben: > > > > On Wed, Nov 28 2018, Thomas Braun wrote: > > Looks much better this time around. Thanks. > > The -G option of log looks for the differences whose patch text > > contains

[PATCH v2] log -G: Ignore binary files

2018-11-28 Thread Thomas Braun
number of occurrences of the specified block of text (i.e. addition/deletion) in a file. As we want to keep the current behaviour, add a test to ensure it. Signed-off-by: Thomas Braun --- Changes since v1: - Merged both patches into one - Adapted commit messages - Added missing support for -a

Re: [PATCH v1 1/2] log -G: Ignore binary files

2018-11-28 Thread Thomas Braun
> Ævar Arnfjörð Bjarmason hat am 22. November 2018 um 11:16 > geschrieben: [...] > > > > +test_expect_success 'log -G ignores binary files' ' > > + rm -rf .git && > > + git init && > > + printf "a\0b" >data.bin && > > + git add data.bin && > > + git commit -m "message" && > > + git

Re: [PATCH v1 1/2] log -G: Ignore binary files

2018-11-28 Thread Thomas Braun
> Junio C Hamano hat am 27. November 2018 um 01:51 > geschrieben: > > > Stefan Beller writes: > > > On Wed, Nov 21, 2018 at 1:08 PM Thomas Braun > > wrote: > >> > >> The -G option of log looks for the differences whose patch text &g

Re: [PATCH v1 2/2] log -S: Add test which searches in binary files

2018-11-28 Thread Thomas Braun
> Junio C Hamano hat am 22. November 2018 um 02:34 > geschrieben: > > > Thomas Braun writes: > > > The -S option of log looks for differences that changes the > > number of occurrences of the specified string (i.e. addition/deletion) > > in a file.

Re: [PATCH v1 2/2] log -S: Add test which searches in binary files

2018-11-28 Thread Thomas Braun
> Ævar Arnfjörð Bjarmason hat am 22. November 2018 um 10:14 > geschrieben: > > > > On Wed, Nov 21 2018, Thomas Braun wrote: > > > The -S option of log looks for differences that changes the > > number of occurrences of the specified string (i.e. addition/del

Re: [PATCH v1 1/2] log -G: Ignore binary files

2018-11-28 Thread Thomas Braun
> Ævar Arnfjörð Bjarmason hat am 22. November 2018 um 11:16 > geschrieben: [...] > > > > +test_expect_success 'log -G ignores binary files' ' > > + rm -rf .git && > > + git init && > > + printf "a\0b" >data.bin && > > + git add data.bin && > > + git commit -m "message" && > > + git

Re: [PATCH v1 1/2] log -G: Ignore binary files

2018-11-28 Thread Thomas Braun
> Jeff King hat am 22. November 2018 um 17:20 geschrieben: > > > On Wed, Nov 21, 2018 at 09:52:27PM +0100, Thomas Braun wrote: > > > diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c > > index 69fc55ea1e..8c2558b07d 100644 > > --- a/diffcore-picka

Re: [PATCH v1 1/2] log -G: Ignore binary files

2018-11-28 Thread Thomas Braun
> Junio C Hamano hat am 22. November 2018 um 02:29 > geschrieben: > > > Thomas Braun writes: > > > The -G option of log looks for the differences whose patch text > > contains added/removed lines that match regex. > > > > The concept of differences

[PATCH 0/2] Teach log -G to ignore binary files

2018-11-21 Thread Thomas Braun
Based on the previous discussion in [1] I've prepared patches which teach log -G to ignore binary files. log -S keeps its behaviour but got a test to ensure that. Feedback welcome! [1]: https://public-inbox.org/git/7a0992eb-adb9-a7a1-cfaa-3384bc4d3...@virtuell-zuhause.de/ Thomas Bra

[PATCH v1 1/2] log -G: Ignore binary files

2018-11-21 Thread Thomas Braun
The -G option of log looks for the differences whose patch text contains added/removed lines that match regex. The concept of differences only makes sense for text files, therefore we need to ignore binary files when searching with -G as well. Signed-off-by: Thomas Braun --- Documentation

[PATCH v1 2/2] log -S: Add test which searches in binary files

2018-11-21 Thread Thomas Braun
-by: Thomas Braun --- t/t4209-log-pickaxe.sh | 11 +++ 1 file changed, 11 insertions(+) diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh index 42cc8afd8b..d430f6f2f9 100755 --- a/t/t4209-log-pickaxe.sh +++ b/t/t4209-log-pickaxe.sh @@ -128,4 +128,15 @@ test_expect_success 'l

[PATCH 0/2] Teach log -G to ignore binary files

2018-11-21 Thread Thomas Braun
Based on the previous discussion in [1] I've prepared patches which teach log -G to ignore binary files. log -S keeps its behaviour but got a test to ensure that. Feedback welcome! [1]: https://public-inbox.org/git/7a0992eb-adb9-a7a1-cfaa-3384bc4d3...@virtuell-zuhause.de/ PS: This is the (poss

Re: Git for games working group

2018-10-03 Thread Thomas Braun
Am 17.09.2018 um 17:58 schrieb Jonathan Nieder: [...] > Ah, thanks. See git-config(1): > > core.bigFileThreshold > Files larger than this size are stored deflated, > without attempting delta compression. > > Default is 512 MiB on all platforms. >

2.19.0.rc2.windows.1: stash fails with dirty submodule

2018-09-07 Thread Thomas Braun
Hi, (reported at [1] already but reposting here as suggested) I'm using git with stash and rebase builtins. $ git --version --build-options git version 2.19.0.rc2.windows.1 cpu: x86_64 built from commit: 425f414f8e04123eacb5597776d6a8de445a8d8b sizeof-long: 4 sizeof-size_t: 8 With the followin

Re: [RFC PATCH v1] telemetry design overview (part 1)

2018-06-08 Thread Thomas Braun
Am 08.06.2018 um 11:07 schrieb Jeff King: > On Thu, Jun 07, 2018 at 11:10:52PM +0200, Johannes Sixt wrote: > >> Am 07.06.2018 um 16:53 schrieb g...@jeffhostetler.com: >>> From: Jeff Hostetler >>> >>> I've been working to add code to Git to optionally collect telemetry data. >>> The goal is to be

BUG: No way to set fsck. when cloning

2018-05-24 Thread Thomas Braun
Am 24.05.2018 um 17:25 schrieb Ævar Arnfjörð Bjarmason: > When I do: > > git -c fetch.fsckObjects=true clone > g...@github.com:robbyrussell/oh-my-zsh.git > > I get: > > error: object 2b7227859263b6aabcc28355b0b994995b7148b6: > zeroPaddedFilemode: contains zero-padded file modes > f

Re: [PATCH] travis-ci: run gcc-7 on linux-gcc jobs

2018-05-13 Thread Thomas Braun
Am 13.05.2018 um 11:17 schrieb Nguyễn Thái Ngọc Duy: > Switch from gcc-4.8 to gcc-7. Newer compilers come with more warning > checks (usually in -Wextra). Since -Wextra is enabled in developer > mode (which is also enabled in travis), this lets travis report more > warnings before other people do

Re: [RFC] 'unsigned long' to 'size_t' conversion

2017-12-06 Thread Thomas Braun
Am 06.12.2017 um 16:08 schrieb Derrick Stolee: Hi Derrick, > If there are small, isolated chunks that can be done safely, then this > may be a good target for a first patch. Here are some pointers to past discussions: - https://public-inbox.org/git/trinity-9f703269-6f73-4f6d-b90b-45e09e1c094c-14

Re: Unify annotated and non-annotated tags

2017-11-23 Thread Thomas Braun
Am 23.11.2017 um 16:08 schrieb Randall S. Becker: [...] >> So my proposal is to get rid of non-annotated tags, so to get all >> tags with commits that they point to, one would use: >> git for-each-ref --format='%(*objectname) %(refname)' refs/tags> >> For so-called non-annotated tags just leave t

[PATCH v2 1/1] completion: add remaining flags to checkout

2017-10-24 Thread Thomas Braun
t included. Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index d934417475..eb6ade6974 100644 --- a/contrib/comp

Re: [PATCH v1 1/1] completion: add remaining flags to checkout

2017-10-24 Thread Thomas Braun
> Johannes Sixt hat am 12. Oktober 2017 um 18:50 geschrieben: > > > Am 12.10.2017 um 14:20 schrieb Thomas Braun: > > In the commits 1d0fa898 (checkout: add --ignore-other-wortrees, > > 2015-01-03), 1fc458d9 (builtin/checkout: add --recurse-submodules switch, > > 2

[PATCH v1 1/1] completion: add remaining flags to checkout

2017-10-12 Thread Thomas Braun
completion was not updated, although these flags are useful completions. Add them. Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-compl

Re: Branch switching with submodules where the submodule replaces a folder aborts unexpectedly

2017-10-12 Thread Thomas Braun
> Stefan Beller hat am 9. Oktober 2017 um 23:59 > geschrieben: > > > On Mon, Oct 9, 2017 at 2:29 PM, Thomas Braun > wrote: > > Hi, > > > > I'm currently in the progress of pulling some subprojects in a git > > repository of mine into their &g

Branch switching with submodules where the submodule replaces a folder aborts unexpectedly

2017-10-09 Thread Thomas Braun
Hi, I'm currently in the progress of pulling some subprojects in a git repository of mine into their own repositories and adding these subprojects back as submodules. While doing this I enountered a potential bug as checkout complains on branch switching that a file already exists. I've repro

[PATCH v2 1/1] completion: add --broken and --dirty to describe

2017-10-06 Thread Thomas Braun
When the flags for broken and dirty were implemented in b0176ce6b5 (builtin/describe: introduce --broken flag, 2017-03-21) and 9f67d2e827 (Teach "git describe" --dirty option, 2009-10-21) the completion was not updated, although these flags are useful completions. Add them. Signed-off-

Re: [PATCH 1/1] completion: Add forgotten describe options

2017-10-06 Thread Thomas Braun
> Stefan Beller hat am 6. Oktober 2017 um 00:17 > geschrieben: > On Thu, Oct 5, 2017 at 2:23 PM, Thomas Braun > wrote: Hi Stefan, > > completion: Add forgotten describe options > > When/Why was it forgotten? git-blame thinks it was me in b0176ce6b5 > (builtin/d

[PATCH 1/1] completion: Add forgotten describe options

2017-10-05 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index d934417475..0e16f017a4 100644 --- a/contrib/completion/git

[PATCH 1/1] completion: Add forgotten describe options

2017-10-05 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index d934417475..0e16f017a4 100644 --- a/contrib/completion/git

Re: Commiting files larger than 4 GB on Windows

2017-03-18 Thread Thomas Braun
> Torsten Bögershausen hat am 17. März 2017 um 06:29 > geschrieben: > > > On 15/03/17 22:29, Junio C Hamano wrote: > > Torsten Bögershausen writes: > > > >> The real "show stopper" is at the end. > >> ... > >> > >> == > >> And it seams as if zlib is the limitation here.

Re: Commiting files larger than 4 GB on Windows

2017-03-15 Thread Thomas Braun
Am 15.03.2017 um 17:13 schrieb Jeff King: > On Wed, Mar 15, 2017 at 11:59:52AM -0400, Jeff King wrote: > >> I agree that detecting the situation in the meantime is a good idea. >> The patch above probably handles the bulk-checkin code path, I'd guess. >> It might be nice to have similar checks in

Re: Commiting files larger than 4 GB on Windows

2017-03-15 Thread Thomas Braun
Am 15.03.2017 um 14:00 schrieb Florian Adamus: > Hello, > > I am managing my large files with the git-lfs-extension. Some of them > were more than 4GB in size. After deleting one of those files from my > working tree and do a normal git checkout I ended up with a somehow > crippled file with a siz

Re: Delta compression not so effective

2017-03-07 Thread Thomas Braun
> Marius Storm-Olsen hat am 4. März 2017 um 09:27 > geschrieben: [...] > I really don't want the files on the mailinglist, so I'll send you a > link directly. However, small snippets for public discussions about > potential issues would be fine, obviously. git fast-export can anonymize a re

Re: log -S/-G (aka pickaxe) searches binary files by default

2017-03-03 Thread Thomas Braun
Am 03.03.2017 um 17:07 schrieb Junio C Hamano: > Jeff King writes: > >> On Thu, Mar 02, 2017 at 05:36:17PM -0800, Junio C Hamano wrote: >> ... Is that on purpose? >>> >>> No, it's a mere oversight (as I do not think I never even thought >>> about special casing binary >>> files from day one,

log -S/-G (aka pickaxe) searches binary files by default

2017-03-02 Thread Thomas Braun
Hi, I happen to have quite large binary files in my repos. Today I realized that a line like git log -G a searches also files found to be binary (or explicitly marked as binary). Is that on purpose? The documentation of "-G" states "Look for differences whose patch text contains added/removed l

Re: SHA1 collisions found

2017-02-26 Thread Thomas Braun
Am 25.02.2017 um 00:06 schrieb Jeff King: > So we don't actually know how Git would behave in the face of a SHA-1 > collision. It would be pretty easy to simulate it with something like: > > --- > diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c > index 22b125cf8..1be5b5ba3 100644 > --- a/block-s

Re: What's cooking in git.git (Jan 2017, #03; Thu, 19)

2017-01-24 Thread Thomas Braun
> Junio C Hamano hat am 20. Januar 2017 um 00:37 > geschrieben: [snip] > * rh/mergetool-regression-fix (2017-01-10) 14 commits > (merged to 'next' on 2017-01-10 at e8e00c798b) > + mergetool: fix running in subdir when rerere enabled > + mergetool: take the "-O" out of $orderfile > + t7610

Re: Idea: Add a filter option to 'git rebase'

2017-01-20 Thread Thomas Braun
Am 20.01.2017 um 23:28 schrieb Philip Oakley: > A recent question on stackoverflow > http://stackoverflow.com/questions/41753252/drop-commits-by-commit-message-in-git-rebase > sought to remove automatically commits that could be identified by > relevant words in the commit message. > > I had thoug

Re: [PATCH v4 2/3] completion: add __git_get_option_value helper

2016-06-25 Thread Thomas Braun
in the near future adressing your remarks. Bye, Thomas > Quoting Thomas Braun : > > > This function allows to search the commmand line and config > > files for an option, long and short, with mandatory value. > > > > The function would return e.g. for the command line > &

Re: [PATCH] hooks--pre-commit.sample: check for chars, that are not allowed for a windows file name

2016-06-15 Thread Thomas Braun
Am 15.06.2016 um 10:02 schrieb dexteritas: > After the ASCII-check, test the windows compatibility of file names. > Can be disabled by: > git config hooks.allownonwindowschars true > --- > templates/hooks--pre-commit.sample | 22 ++ > 1 file changed, 22 insertions(+) > > diff

[PATCH v5 1/3] completion: factor out untracked file modes into a variable

2016-06-10 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 3402475..addea89 100644 --- a/contrib/completion/git

[PATCH v5 3/3] completion: add git status

2016-06-10 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 50 ++ 1 file changed, 50 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0bf67c9..ddda5e5 100644 --- a/contrib/completion

Re: What's cooking in git.git (Jun 2016, #03; Thu, 9)

2016-06-10 Thread Thomas Braun
Am 09.06.2016 um 19:21 schrieb Junio C Hamano: > * tb/complete-status (2016-06-06) 3 commits > - completion: add git status > - completion: add __git_get_option_value helper > - completion: factor out untracked file modes into a variable > > The completion script (in contrib/) learned to compl

[PATCH v5 1/3] completion: factor out untracked file modes into a variable

2016-06-10 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 3402475..addea89 100644 --- a/contrib/completion/git

[PATCH v5 3/3] completion: add git status

2016-06-10 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 50 ++ 1 file changed, 50 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0bf67c9..ddda5e5 100644 --- a/contrib/completion

[PATCH v5 0/3] completion: add git status

2016-06-10 Thread Thomas Braun
Changes since v4: - Add SP before backslash at EOL - Fix line continuation issue in __git_get_option_value, now t9902 passes again Thomas Braun (3): completion: factor out untracked file modes into a variable completion: add __git_get_option_value helper completion: add git status

[PATCH v5 2/3] completion: add __git_get_option_value helper

2016-06-10 Thread Thomas Braun
This function allows to search the commmand line and config files for an option, long and short, with mandatory value. The function would return e.g. for the command line "git status -uno --untracked-files=all" the result "all" regardless of the config option. Signed-

Re: [PATCH v4 3/3] completion: add git status

2016-06-07 Thread Thomas Braun
Am 06.06.2016 um 19:57 schrieb Junio C Hamano: > Thomas Braun writes: > >> +case "$cur" in >> +--ignore-submodules=*) >> +__gitcomp "none untracked dirty all" "" >> "${cur##--ignore-submodules=}&quo

Re: Creating empty commits with --intent-to-add

2016-06-05 Thread Thomas Braun
Am 05.06.2016 um 05:15 schrieb Duy Nguyen: > On Sun, Jun 5, 2016 at 12:54 AM, Thomas Braun > wrote: >> Hi, >> >> the following procedure >> >> mkdir test >> cd test >> git init >> echo 1 >file >> git add --intent-to-add file &

Creating empty commits with --intent-to-add

2016-06-04 Thread Thomas Braun
Hi, the following procedure mkdir test cd test git init echo 1 >file git add --intent-to-add file git commit -m "blurb" results in a commit. I would have expected that git commit complains, as I have not pased the --allow-empty option. Is that intended behaviour? Tested with 2.8.3.windows.1 an

[PATCH v4 1/3] completion: factor out untracked file modes into a variable

2016-06-03 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 3402475..addea89 100644 --- a/contrib/completion/git

[PATCH v4 0/3] support completion for git status

2016-06-03 Thread Thomas Braun
changes since v3: * support short version -u of --untracked-files option * introduce __git_get_option_value for general usage * fix style issues * support order dependent statements like git status -uno --untracked-files=all properly Thomas Braun (3): completion: factor out untracked file

[PATCH v4 3/3] completion: add git status

2016-06-03 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 50 ++ 1 file changed, 50 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 4bd17aa..9eff33c 100644 --- a/contrib/completion

[PATCH v4 2/3] completion: add __git_get_option_value helper

2016-06-03 Thread Thomas Braun
This function allows to search the commmand line and config files for an option, long and short, with mandatory value. The function would return e.g. for the command line "git status -uno --untracked-files=all" the result "all" regardless of the config option. Signed-

Re: [PATCH v3 2/2] completion: add git status

2016-06-03 Thread Thomas Braun
Am 03.06.2016 um 19:54 schrieb Junio C Hamano: > Jeff King writes: > >> I know not everybody will the "natural thing" I claim, and if it were >> easy to support everywhere, I don't mind doing it. But I suspect >> (without thinking very hard on it) that it would make those case >> statements a bit

Re: [PATCH v3 2/2] completion: add git status

2016-06-03 Thread Thomas Braun
Am 02.06.2016 um 20:14 schrieb Junio C Hamano: > Thomas Braun writes: > >> +untracked_state="$(__git_find_on_cmdline "--untracked-files=no\ >> +--untracked-files=normal --untracked-files=all")" > > Just wondering but does this help

[PATCH v3 1/2] completion: factor out untracked file modes into a variable

2016-06-02 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 3402475..addea89 100644 --- a/contrib/completion/git

[PATCH v3 2/2] completion: add git status

2016-06-02 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 55 ++ 1 file changed, 55 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index addea89..fa7a03a 100644 --- a/contrib/completion

Re: [PATCH v2 2/2] completion: add git status

2016-06-02 Thread Thomas Braun
Am 01.06.2016 um 14:15 schrieb SZEDER Gábor: > > Quoting Thomas Braun : > >> Signed-off-by: Thomas Braun >> --- >> contrib/completion/git-completion.bash | 29 >> + >> 1 file changed, 29 insertions(+) >> >> diff

Re: [PATCH v2 1/2] completion: create variable for untracked file modes

2016-06-02 Thread Thomas Braun
Am 01.06.2016 um 13:59 schrieb SZEDER Gábor: > > This subject would perhaps read better: > > completion: factor out untracked file modes into a variable Yes, definitly. Will be included in reroll. > Quoting Thomas Braun : > >> Signed-off-by: Thomas Braun >>

[PATCH v2 2/2] completion: add git status

2016-06-01 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 29 + 1 file changed, 29 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index addea89..77343da 100644 --- a/contrib/completion/git

[PATCH v2 1/2] completion: create variable for untracked file modes

2016-06-01 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 3402475..addea89 100644 --- a/contrib/completion/git

Re: [PATCH 2/2] completion: add git status

2016-06-01 Thread Thomas Braun
> Jeff King hat am 1. Juni 2016 um 06:07 geschrieben: > > > On Wed, Jun 01, 2016 at 01:42:18AM +0200, Thomas Braun wrote: > > > Signed-off-by: Thomas Braun > > --- > > contrib/completion/git-completion.bash | 29 + &

Re: [PATCH 1/2] completion: create variable for untracked file modes

2016-06-01 Thread Thomas Braun
> Junio C Hamano hat am 1. Juni 2016 um 09:02 geschrieben: > > > Jeff King writes: > > >> diff --git a/contrib/completion/git-completion.bash > >> b/contrib/completion/git-completion.bash > >> index 3402475..57a0acc 100644 > >> --- a/contrib/completion/git-completion.bash > >> +++ b/contrib/co

[PATCH 1/2] completion: create variable for untracked file modes

2016-05-31 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 3402475..57a0acc 100644 --- a/contrib/completion/git

[PATCH 0/2] completion: add git status

2016-05-31 Thread Thomas Braun
Hi, I was suprised to learn that git status does not get completed for bash. So I thought this has to change, see the following patches. Thomas Braun (2): completion: create variable for untracked file modes completion: add git status contrib/completion/git-completion.bash | 33

[PATCH 2/2] completion: add git status

2016-05-31 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 29 + 1 file changed, 29 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 57a0acc..96b7d86 100644 --- a/contrib/completion/git

Creates unreadable pack files on platforms with sizeof(unsigned long) != sizeof(uintmax_t)

2016-03-20 Thread Thomas Braun
Hi, while playing around with some git settings I encountered some problems on Windows x64 using the 64bit build of git. And it is not restricted to that platform. Recipe to break: mkdir test && cd test && truncate -s 5g largefile.bin && git init && git add . && git commit -m "changes" && git fs

Re: [PATCH] completion: Add --word-diff-regex= to diff

2016-01-22 Thread Thomas Braun
Am 21.01.2016 um 01:18 schrieb Junio C Hamano: > Thomas Braun writes: > >> Signed-off-by: Thomas Braun >> --- >> contrib/completion/git-completion.bash | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/contrib/completion/git-c

[PATCH] completion: Add --word-diff-regex= to diff

2016-01-20 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ab4da7f..d2a08dd 100644 --- a/contrib/completion/git-completion.bash

[PATCH v3 1/1] completion: offer '--edit-todo' during interactive rebase

2015-08-05 Thread Thomas Braun
Signed-off-by: Thomas Braun Helped-by: John Keeping Helped-by: SZEDER Gábor --- Tested by: - ensuring I'm in a bash shell - source git-completion.bash - git rebase -i HEAD~1, choose edit instead of pick in the editor - on entering "git rebase" you should be offered "--

Re: [PATCH v2] completion: Add '--edit-todo' to rebase

2015-07-31 Thread Thomas Braun
Am 31.07.2015 um 12:16 schrieb SZEDER Gábor: > > Quoting John Keeping : > >> On Thu, Jul 30, 2015 at 01:24:03PM +0200, SZEDER Gábor wrote: >>> >>> Quoting Thomas Braun : >>> >>>> Signed-off-by: Thomas Braun >>>> --- >>&g

[PATCH v2] completion: Add '--edit-todo' to rebase

2015-07-27 Thread Thomas Braun
Signed-off-by: Thomas Braun --- > John Keeping hat am 13. Juli 2015 um 15:11 geschrieben: > git-rebase.sh contains: > > if test "$action" = "edit-todo" && test "$type" != "interactive" > then >

[PATCH] completion: Add '--edit-todo' to rebase

2015-07-13 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index c97c648..2567a61 100644 --- a/contrib/completion/git-completion.bash

Re: [msysGit] 4th release candidate of Git for Windows 2.x, was Re: 3rd release candidate of Git for Windows 2.x

2015-06-30 Thread Thomas Braun
Am 30.06.2015 um 19:15 schrieb Konstantin Khomoutov: > On Mon, 29 Jun 2015 18:19:09 +0200 > Johannes Schindelin wrote: > >>> I've finally took time to switch from my old "msys1" release to this >>> RC4, and immediately got hit by the fact Git is now speaking to me >>> in Russian, which is not wha

[PATCH v2 1/2] completion: Add sequencer function

2015-05-30 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 48 +++--- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index bfc74e9..f6e5bf6 100644 --- a

[PATCH v2 1/2] completion: Add sequencer function

2015-05-30 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 48 +++--- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index bfc74e9..f6e5bf6 100644 --- a

[PATCH v2 2/2] completion: suggest sequencer commands for revert

2015-05-30 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 8 1 file changed, 8 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index f6e5bf6..486c61b 100644 --- a/contrib/completion/git-completion.bash +++ b

[PATCH v2 0/2] completion: sequencer commands

2015-05-30 Thread Thomas Braun
Ramkumar Ramachandra wrote: > Junio C Hamano wrote: > > > > > contrib/completion/git-completion.bash | 5 + > > > 1 file changed, 5 insertions(+) > > > > > > diff --git a/contrib/completion/git-completion.bash > b/contrib/completion/git-completion.bash > > > index bfc74e9..3c00acd 100644 > > >

[PATCH] completion: suggest sequencer commands for revert

2015-05-25 Thread Thomas Braun
Signed-off-by: Thomas Braun --- Hi, I added the sequencer commands for git revert. These are handy in case a git revert needs manual intervention. Thanks, Thomas contrib/completion/git-completion.bash | 5 + 1 file changed, 5 insertions(+) diff --git a/contrib/completion/git

Re: Issue: repack semi-frequently fails on Windows (msysgit) - suspecting file descriptor issues

2015-04-16 Thread Thomas Braun
Am 16.04.2015 um 12:03 schrieb Andreas Mohr: > Hi all, > > over the years I've had the same phenomenon with various versions of msysgit > (now at 1.9.5.msysgit.0, on Windows 7 64bit), so I'm now sufficiently > confident of it being a long-standing, longer-term issue and thus I'm > reporting it now

Re:

2015-04-08 Thread Thomas Braun
Am 08.04.2015 um 22:44 schrieb Mamta Upadhyay: > Hi git team, (CC'ing msysgit as this is the git for windows list) Hi Mamta, > I tried to research everywhere on a issue I am facing and emailing you > as the last resource. This is critical for me and I needed your help. > > I am trying to run th

Re: [msysGit] Git for Windows 1.9.5.msysgit.1

2015-03-20 Thread Thomas Braun
On Freitag, 20. März 2015 02:15:31 CEST, Mike Hommey wrote: On Fri, Mar 20, 2015 at 12:03:43AM +0100, Thomas Braun wrote: Hi, the Git for Windows team just released the first maintenance release of the Windows-specific installers for git 1.9.5. is it expected that there is no corresponding

Git for Windows 1.9.5.msysgit.1

2015-03-19 Thread Thomas Braun
Hi, the Git for Windows team just released the first maintenance release of the Windows-specific installers for git 1.9.5. It can be downloaded from the usual place [1] and I also attached some (although non-gpg-signed) SHA sums [2]. New Features - Comes with Git 1.9.5 plus Windows-specific patc

  1   2   >